Many structural improvements to the test project