MDL-70412 groups: Improving create_group data generator