Added comments for groups, fixed test suite for new comments