Merge "Better TEST_MAPPING for TileService tests"