Renamed tests
Minor refactoring