Renamed unit tests