Renaming test directories
Adding new test directories