Fix regression in subgroups tests after merging 393912cd