Changes to test for MapQueryService