All test up to date on GroupByTest passing...