Added tests for city management