simplifying the include paths for the new test runner