Rename and fix testcase for group