Remove #map tests