renaming tests
Renamed some more stuff