changed polygon object, added multipolygon
added new tests