anchor.diff:      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}),
  +    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(ClientName)], []),
       Result = chef_db:update(Group#oc_chef_group{clients = [ClientName], users =  [], groups = []}, ?CTX, ?AUTHZ),
       ?assertEqual(ok, Result),
  
positive.code:     create_group(OrgId, GroupName),
      RootGroupAuthzId = suite_helper:make_az_id(GroupName),
      expect_get_group(RootGroupAuthzId, [], [suite_helper:make_az_id(TestGroupName)]),
      Group = chef_sql:fetch(#oc_chef_group{org_id = OrgId,name = GroupName, last_updated_by = ?AUTHZ}),
      TestGroupAuthzId = suite_helper:make_az_id(TestGroupName),
      expect_delete_group(RootGroupAuthzId, [],[TestGroupAuthzId]),
      Result = chef_db:update(Group#oc_chef_group{auth_side_groups = [TestGroupAuthzId], clients = [], users = [], groups = []}, ?CTX, ?AUTHZ),
  
negative.code:     GroupName = <<"test-group">>,
      RootGroupAuthzId = suite_helper:make_az_id(GroupName),
      expect_get_group(RootGroupAuthzId, Actors, Groups),
      #oc_chef_group{ clients = ClientNames, users = Usernames, groups = Groupnames} = GroupRecord = chef_sql:fetch(#oc_chef_group{org_id = OrgId, name = GroupName, authz_id = RootGroupAuthzId, for_requestor_id = ?AUTHZ}),
      ?assertMatch(#oc_chef_group{name = GroupName, org_id = OrgId, authz_id = RootGroupAuthzId}, GroupRecord),
      ?assertEqual([<<"client1">>, <<"client2">>], ClientNames),
      ?assertEqual([<<"user1">>, <<"user2">>], Usernames),
  