changing include structure so tests can be parallelized