freshened up usersandgroups test data fixture