Merge "Adjust tests for renaming groupHint to cluster."