Partial conversion of subtest to use g-boxed-refs