renaming and fixing tests