Fixing renaming tests