[Pranav] Renamed SetCityAdmin to CityAdmin, tested add_to_catered_cities and remove_from_catered_cities