Refactor group count test to new model.