CitySDK WP4 minor improvements and unit test data