Move test includes from test folder to include folder