changed City and its tests.