Renaming and reorganizing tests