anchor.diff:      create_group(OrgId, Name),
       AuthzId = suite_helper:make_az_id("admins"),
       expect_get_group(suite_helper:make_az_id(Name), [], []),
  -    Group = chef_sql:fetch(#oc_chef_group{org_id = OrgId,name = Name, last_updated_by = ?AUTHZ}),
  +    Group = chef_sql:fetch(#oc_chef_group{org_id = OrgId,name = Name, for_requestor_id = ?AUTHZ}),
       ?assertMatch(
          #oc_chef_group{
             org_id = OrgId,
  
positive.code:     insert_client(OrgId, ClientName),
      RootGroupAuthzId = suite_helper:make_az_id(GroupName),
      expect_get_group(RootGroupAuthzId, [], []),
      Group = chef_sql:fetch(#oc_chef_group{org_id = OrgId,name = GroupName, last_updated_by = ?AUTHZ}),
      expect_put_group(RootGroupAuthzId, [suite_helper:make_az_id(ClientName)], []),
      Result = chef_db:update(Group#oc_chef_group{clients = [ClientName], users =  [], groups = []}, ?CTX, ?AUTHZ),
      ?assertEqual(ok, Result),
  
negative.code:     insert_user(UserName),
      RootGroupAuthzId = suite_helper:make_az_id(GroupName),
      expect_get_group(suite_helper:make_az_id(GroupName), [], []),
      Group = chef_sql:fetch(#oc_chef_group{org_id = OrgId,name = GroupName, for_requestor_id = ?AUTHZ}),
      expect_put_group(RootGroupAuthzId, [suite_helper:make_az_id(UserName)], []),
      Result = chef_db:update(Group#oc_chef_group{ clients = [], users = [UserName], groups = []}, ?CTX, ?AUTHZ),
      ?assertEqual(ok, Result),
  