update and revamp grouping tests