added more test dirs and directory renaming