Rename and group with next test.