ENG-5616 Confirm group by fix with new test case