Updated test to expose the problem.

Obviously failing for now.

Refs #7852
Solved the problem by removing old groups after regrouping.

Refs #7852
Merge remote-tracking branch 'origin/feature/7852_excess_groups'