Renamed generator unit tests