fixed unit tests broken in earlier map/geometry refactoring