refactor the test directory