more grouping fixes and tests