changed validation and test to validate inclusion in valid cities