Fixing groupIterator.remove as that would cause concurrentModificationException on the groupMaps
fix indentation on test