Merging tests and tester projects