Updated include paths for regression test refactoring