refactoring test directory