Clean up directory test names

Clean up directory test names