Add changes in GroupsTest