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, TestGroupName),
      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, last_updated_by = ?AUTHZ}),
      expect_put_group(RootGroupAuthzId, [], [suite_helper:make_az_id(TestGroupName)]),
      Result = chef_db:update(Group#oc_chef_group{clients = [], users = [], groups =  [TestGroupName]}, ?CTX, ?AUTHZ),
      ?assertEqual(ok, Result),
  
negative.code:     create_group(OrgId, GroupName),
      RootGroupAuthzId = suite_helper:make_az_id(GroupName),
      expect_get_group(RootGroupAuthzId, [suite_helper:make_az_id(ClientName)], []),
      Group = chef_sql:fetch(#oc_chef_group{org_id = OrgId,name = GroupName, for_requestor_id = ?AUTHZ}),
      expect_delete_group(RootGroupAuthzId, [suite_helper:make_az_id(ClientName)],[]),
      Result = chef_db:update(Group#oc_chef_group{auth_side_actors = [suite_helper:make_az_id(ClientName)], clients = [], users = [], groups = []}, ?CTX, ?AUTHZ),
      ?assertEqual(ok, Result),
  