Modifying test dir naming scheme