Restructuring some of the test project