Refactored vlidation for City
Merge pull request #17 from Qwinix/city_testcase

[development city_testcase] Refactored vlidation for City