Refactoring the test project.