fix grouping tests for new collection hooks