multipolygon and tests, polygon test tweaks