Finishes test for grouping and fix for live lock.