added all the unit tests from CityDoctor