Better group by instance but still erratic test failure in GroupByInstancesTest.
3 files changed