refactor of some of CityGenerator tests
Merge pull request #126 from morgajel/develop

refactor of some of CityGenerator tests