Merge "Cleanup a.t.TestGrouping"