Added tests for CityController
Removed samples