Merge "Use test user helper methods in UserGroupMembershipTest/UserTest"