Got group-count and group-by tests passing.