Starting with top level tests
Moving test files inside tests
Cleaning up dead test files