Renamed tests to be consistent