- Fix a bug with addGrouping + aggregates causing grid aggregates to appear in the middle of grid.
- Minor unit test code clean up