Cleanup
Refactoring tests: Renaming tests ot reflect fixtures