Merge "Fix SGLM test's child matching"