refactor of some of CityGenerator tests