diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/AuthorizationServerIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/AuthorizationServerIT.groovy
index e59f572d039..898426c84af 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/AuthorizationServerIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/AuthorizationServerIT.groovy
@@ -566,7 +566,7 @@ class AuthorizationServerIT extends ITSupport {
         assertThat(createdPolicyRule, notNullValue())
         assertThat(createdPolicyRule.getType(), equalTo(AuthorizationServerPolicyRule.TypeEnum.ACCESS))
 
-        retrievedPolicy.deletePolicyRule(createdAuthorizationServer.getId(), createdPolicyRule.getId())
+        createdPolicyRule.deletePolicyRule(createdAuthorizationServer.getId())
 
         // delete may not effect immediately in the backend
         sleep(getTestOperationDelay())
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupsIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupsIT.groovy
index 3b64bc6b81f..93762a304d3 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupsIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupsIT.groovy
@@ -99,7 +99,7 @@ class GroupsIT extends ITSupport implements CrudTestSupport {
         validateGroup(group, groupName)
 
         // 2. Search the group by name
-        assertPresent(client.listGroups(groupName, null), group)
+        assertPresent(client.listGroups(groupName, null, null), group)
     }
 
     @Test
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UsersIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UsersIT.groovy
index 99c56171c64..e9a85973f19 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UsersIT.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UsersIT.groovy
@@ -568,7 +568,7 @@ class UsersIT extends ITSupport implements CrudTestSupport {
         Role role = user.assignRole(assignRoleRequest)
 
         // 3. Add Group Target to User Admin Role
-        user.addGroupTarget(role.id, group.id)
+        user.addGroupTarget(role.getId(), group.getId())
 
         // 4. List Group Targets for Role
         assertGroupTargetPresent(user, group, role)
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/util/ClientProvider.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/util/ClientProvider.groovy
index 94c5633bef5..171f03718ae 100644
--- a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/util/ClientProvider.groovy
+++ b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/util/ClientProvider.groovy
@@ -156,7 +156,7 @@ trait ClientProvider implements IHookable {
 
     void deleteGroup(String groupName, Client client) {
         Util.ignoring(ResourceException) {
-            GroupList groups = client.listGroups(groupName, null)
+            GroupList groups = client.listGroups(groupName, null, null)
             groups.each {group ->
                 if (groupName.equals(group.profile.name)) {
                     group.delete()
diff --git a/src/swagger/api.yaml b/src/swagger/api.yaml
index b37f6a2dbf9..63b15e6b070 100644
--- a/src/swagger/api.yaml
+++ b/src/swagger/api.yaml
@@ -2278,6 +2278,12 @@ paths:
           in: query
           name: limit
           type: integer
+        - description: >-
+            If specified, it causes additional metadata to be included in the
+            response.
+          in: query
+          name: expand
+          type: string
       produces:
         - application/json
       responses:
@@ -7662,6 +7668,16 @@ definitions:
           - dest: policyId
             src: id
         operationId: getAuthorizationServerPolicy
+      - alias: updatePolicy
+        arguments:
+          - dest: policyId
+            src: id
+        operationId: updateAuthorizationServerPolicy
+      - alias: deletePolicy
+        arguments:
+          - dest: policyId
+            src: id
+        operationId: deleteAuthorizationServerPolicy
     x-okta-operations:
       - alias: listPolicyRules
         arguments:
@@ -7730,6 +7746,13 @@ definitions:
           - dest: policyId
             parentSrc: id
         operationId: updateAuthorizationServerPolicyRule
+      - alias: deletePolicyRule
+        arguments:
+          - dest: ruleId
+            src: id
+          - dest: policyId
+            parentSrc: id
+        operationId: deleteAuthorizationServerPolicyRule
     x-okta-operations:
       - alias: activate
         arguments: