finished refactoring the testing directory