Whoops. Tests updated.
Merge pull request #233 from sellout/209-incorrect-group-by-plan-merge

Whoops. Tests updated.