Reorganized the tests project.