Merge changes from topic "b340665334-AutogroupingTestBehaviors" into main

* changes:
  Parameterizes GroupHelperTest
  Fix Group Helper tests to have appropriate counts