move CityTest to OmniTest