Fix multi group by aggregate collisions

Silly bug.

Also add a test that fails before the fix in b514b22