Added test city
Renamed test corporations
Updated test suite