[development city_testcase] Refactored vlidation for City