Fixing tests
Renames