cleaning up and renaming test directory