From a50a7caff5bddcdfe177750f0112e4387b0e1567 Mon Sep 17 00:00:00 2001
From: fern-api <115122769+fern-api[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 04:38:40 +0000
Subject: [PATCH] SDK regeneration

---
 package.json                                  |    9 +-
 src/management/Client.ts                      |   31 -
 src/management/api/types/types.ts             |   25 +-
 src/management/core/auth/BasicAuth.ts         |   11 +-
 src/management/core/fetcher/BinaryResponse.ts |    2 +-
 src/management/core/fetcher/Fetcher.ts        |    7 -
 src/management/core/fetcher/index.ts          |    2 -
 .../core/fetcher/makePassthroughRequest.ts    |  189 --
 src/management/core/fetcher/makeRequest.ts    |   28 -
 .../core/form-data-utils/FormDataWrapper.ts   |    6 +-
 src/management/core/pagination/CustomPager.ts |  194 ++
 src/management/core/pagination/Page.ts        |    2 +-
 src/management/core/pagination/index.ts       |    1 +
 src/management/core/runtime/runtime.ts        |   16 +-
 src/management/errors/ManagementError.ts      |    6 -
 .../errors/ManagementTimeoutError.ts          |    7 +-
 .../errors/handleNonStatusCodeError.ts        |    5 +-
 .../tests/mock-server/MockServerPool.ts       |    2 +-
 .../tests/mock-server/mockEndpointBuilder.ts  |   10 +-
 .../tests/mock-server/withFormUrlEncoded.ts   |   19 +-
 src/management/tests/tsconfig.json            |    3 +-
 .../tests/unit/auth/BasicAuth.test.ts         |   28 +-
 .../tests/unit/auth/BearerToken.test.ts       |    2 +-
 src/management/tests/unit/base64.test.ts      |    2 +-
 .../tests/unit/fetcher/Fetcher.test.ts        |    4 +-
 .../unit/fetcher/HttpResponsePromise.test.ts  |    4 +-
 .../tests/unit/fetcher/RawResponse.test.ts    |    2 +-
 .../unit/fetcher/createRequestUrl.test.ts     |    2 +-
 .../tests/unit/fetcher/getRequestBody.test.ts |    4 +-
 .../unit/fetcher/getResponseBody.test.ts      |    4 +-
 .../tests/unit/fetcher/logging.test.ts        |    2 +-
 .../fetcher/makePassthroughRequest.test.ts    |  397 ---
 .../tests/unit/fetcher/makeRequest.test.ts    |  102 +-
 .../tests/unit/fetcher/redacting.test.ts      |    2 +-
 .../unit/fetcher/requestWithRetries.test.ts   |    2 +-
 .../tests/unit/fetcher/signals.test.ts        |    2 +-
 src/management/tests/unit/file/file.test.ts   |    2 +-
 .../encodeAsFormParameter.test.ts             |    2 +-
 .../form-data-utils/formDataWrapper.test.ts   |    2 +-
 .../tests/unit/logging/logger.test.ts         |    2 +-
 src/management/tests/unit/url/join.test.ts    |    2 +-
 src/management/tests/unit/url/qs.test.ts      |    2 +-
 .../unit/utils/setObjectProperty.test.ts      |    2 +-
 src/management/tests/wire/actions.test.ts     |  465 +++-
 .../tests/wire/actions/executions.test.ts     |   21 +-
 .../tests/wire/actions/modules.test.ts        |  206 +-
 .../wire/actions/modules/versions.test.ts     |   76 +-
 .../tests/wire/actions/triggers.test.ts       |   24 +-
 .../wire/actions/triggers/bindings.test.ts    |   37 +-
 .../tests/wire/actions/versions.test.ts       |  183 +-
 .../tests/wire/anomaly/blocks.test.ts         |    9 -
 .../attackProtection/botDetection.test.ts     |   29 +-
 .../breachedPasswordDetection.test.ts         |   39 +-
 .../bruteForceProtection.test.ts              |   25 +-
 .../wire/attackProtection/captcha.test.ts     |   68 +-
 .../suspiciousIpThrottling.test.ts            |   41 +-
 src/management/tests/wire/branding.test.ts    |   33 +-
 .../wire/branding/phone/providers.test.ts     |  106 +-
 .../wire/branding/phone/templates.test.ts     |  125 +-
 .../tests/wire/branding/templates.test.ts     |   20 +-
 .../tests/wire/branding/themes.test.ts        |  342 ++-
 .../tests/wire/clientGrants.test.ts           |   83 +-
 .../wire/clientGrants/organizations.test.ts   |   19 +-
 src/management/tests/wire/clients.test.ts     | 2412 +++++++++++++----
 .../tests/wire/clients/connections.test.ts    |   30 +-
 .../tests/wire/clients/credentials.test.ts    |   80 +-
 .../tests/wire/connectionProfiles.test.ts     |  179 +-
 src/management/tests/wire/connections.test.ts |  129 +-
 .../tests/wire/connections/clients.test.ts    |   20 +-
 .../connections/directoryProvisioning.test.ts |  125 +-
 .../synchronizations.test.ts                  |   13 +-
 .../tests/wire/connections/keys.test.ts       |   64 +-
 .../connections/scimConfiguration.test.ts     |   92 +-
 .../scimConfiguration/tokens.test.ts          |   27 +-
 .../tests/wire/connections/users.test.ts      |    4 -
 .../tests/wire/customDomains.test.ts          |  279 +-
 .../tests/wire/deviceCredentials.test.ts      |   35 +-
 .../tests/wire/emailTemplates.test.ts         |   71 +-
 .../tests/wire/emails/provider.test.ts        |   72 +-
 .../tests/wire/eventStreams.test.ts           |  144 +-
 .../wire/eventStreams/deliveries.test.ts      |   56 +-
 .../wire/eventStreams/redeliveries.test.ts    |   18 +-
 src/management/tests/wire/flows.test.ts       |  107 +-
 .../tests/wire/flows/executions.test.ts       |   44 +-
 .../wire/flows/vault/connections.test.ts      |   84 +-
 src/management/tests/wire/forms.test.ts       |  247 +-
 src/management/tests/wire/groups.test.ts      |   43 +-
 .../tests/wire/groups/members.test.ts         |   18 +-
 .../tests/wire/guardian/enrollments.test.ts   |   27 +-
 .../tests/wire/guardian/factors.test.ts       |   20 +-
 .../guardian/factors/duo/settings.test.ts     |   30 +-
 .../tests/wire/guardian/factors/phone.test.ts |   73 +-
 .../guardian/factors/pushNotification.test.ts |  112 +-
 .../tests/wire/guardian/factors/sms.test.ts   |   56 +-
 .../tests/wire/guardian/policies.test.ts      |   12 +-
 src/management/tests/wire/hooks.test.ts       |   80 +-
 .../tests/wire/hooks/secrets.test.ts          |   25 +-
 src/management/tests/wire/jobs.test.ts        |   25 +-
 src/management/tests/wire/jobs/errors.test.ts |   15 +-
 .../tests/wire/jobs/usersExports.test.ts      |   21 +-
 .../tests/wire/jobs/verificationEmail.test.ts |   12 +-
 .../tests/wire/keys/customSigning.test.ts     |   55 +-
 .../tests/wire/keys/encryption.test.ts        |   88 +-
 .../tests/wire/keys/signing.test.ts           |   61 +-
 src/management/tests/wire/logStreams.test.ts  |  127 +-
 src/management/tests/wire/logs.test.ts        |   81 +-
 src/management/tests/wire/networkAcls.test.ts |  194 +-
 .../tests/wire/organizations.test.ts          |  145 +-
 .../wire/organizations/clientGrants.test.ts   |   42 +-
 .../wire/organizations/connections.test.ts    |   83 +-
 .../organizations/discoveryDomains.test.ts    |   82 +-
 .../organizations/enabledConnections.test.ts  |   70 +-
 .../wire/organizations/invitations.test.ts    |  100 +-
 .../tests/wire/organizations/members.test.ts  |   26 +-
 .../wire/organizations/members/roles.test.ts  |   27 +-
 src/management/tests/wire/prompts.test.ts     |   21 +-
 .../tests/wire/prompts/customText.test.ts     |   14 +-
 .../tests/wire/prompts/partials.test.ts       |   14 +-
 .../tests/wire/prompts/rendering.test.ts      |  128 +-
 .../tests/wire/refreshTokens.test.ts          |  100 +-
 .../tests/wire/resourceServers.test.ts        |  221 +-
 .../wire/riskAssessments/settings.test.ts     |   19 +-
 .../settings/newDevice.test.ts                |   19 +-
 src/management/tests/wire/roles.test.ts       |   58 +-
 .../tests/wire/roles/permissions.test.ts      |   28 +-
 src/management/tests/wire/roles/users.test.ts |   23 +-
 src/management/tests/wire/rules.test.ts       |   72 +-
 .../tests/wire/rulesConfigs.test.ts           |   22 +-
 .../tests/wire/selfServiceProfiles.test.ts    |  124 +-
 .../selfServiceProfiles/customText.test.ts    |   18 +-
 .../selfServiceProfiles/ssoTicket.test.ts     |   12 +-
 src/management/tests/wire/sessions.test.ts    |   86 +-
 src/management/tests/wire/stats.test.ts       |   22 +-
 .../tests/wire/supplementalSignals.test.ts    |   18 +-
 .../tests/wire/tenants/settings.test.ts       |  202 +-
 src/management/tests/wire/tickets.test.ts     |   20 +-
 .../tests/wire/tokenExchangeProfiles.test.ts  |   60 +-
 .../tests/wire/userAttributeProfiles.test.ts  |  150 +-
 src/management/tests/wire/userBlocks.test.ts  |   40 +-
 src/management/tests/wire/userGrants.test.ts  |   25 +-
 src/management/tests/wire/users.test.ts       |  226 +-
 .../wire/users/authenticationMethods.test.ts  |  158 +-
 .../tests/wire/users/authenticators.test.ts   |    4 -
 .../wire/users/connectedAccounts.test.ts      |   21 +-
 .../tests/wire/users/enrollments.test.ts      |   20 +-
 .../federatedConnectionsTokensets.test.ts     |   20 +-
 .../tests/wire/users/groups.test.ts           |   24 +-
 .../tests/wire/users/identities.test.ts       |   55 +-
 src/management/tests/wire/users/logs.test.ts  |   37 +-
 .../tests/wire/users/multifactor.test.ts      |    8 -
 .../tests/wire/users/organizations.test.ts    |   20 +-
 .../tests/wire/users/permissions.test.ts      |   28 +-
 .../tests/wire/users/refreshToken.test.ts     |   31 +-
 .../tests/wire/users/riskAssessments.test.ts  |    4 -
 src/management/tests/wire/users/roles.test.ts |   24 +-
 .../tests/wire/users/sessions.test.ts         |   30 +-
 .../verification/templates.test.ts            |   96 +-
 yarn.lock                                     |  223 +-
 158 files changed, 7926 insertions(+), 3800 deletions(-)
 delete mode 100644 src/management/core/fetcher/makePassthroughRequest.ts
 create mode 100644 src/management/core/pagination/CustomPager.ts
 delete mode 100644 src/management/tests/unit/fetcher/makePassthroughRequest.test.ts

diff --git a/package.json b/package.json
index 3b7668aa0d..98036d03e7 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "types": "./dist/cjs/index.d.ts",
     "exports": {
         ".": {
+            "types": "./dist/cjs/index.d.ts",
             "import": {
                 "types": "./dist/esm/index.d.mts",
                 "default": "./dist/esm/index.mjs"
@@ -76,8 +77,8 @@
         "auth0-legacy": "npm:auth0@^4.27.0"
     },
     "devDependencies": {
-        "webpack": "^5.105.4",
-        "ts-loader": "^9.5.4",
+        "webpack": "^5.97.1",
+        "ts-loader": "^9.5.1",
         "jest": "^29.7.0",
         "@jest/globals": "^29.7.0",
         "@types/jest": "^29.5.14",
@@ -85,8 +86,8 @@
         "jest-environment-jsdom": "^29.7.0",
         "msw": "2.11.2",
         "@types/node": "^18.19.70",
-        "typescript": "~5.9.3",
-        "prettier": "3.8.1",
+        "typescript": "~5.7.2",
+        "prettier": "3.7.4",
         "typedoc": "^0.28.7",
         "typedoc-plugin-missing-exports": "^4.0.0",
         "nock": "^14.0.6",
diff --git a/src/management/Client.ts b/src/management/Client.ts
index e946a8b278..4f58da9ea3 100644
--- a/src/management/Client.ts
+++ b/src/management/Client.ts
@@ -275,35 +275,4 @@ export class ManagementClient {
     public get verifiableCredentials(): VerifiableCredentialsClient {
         return (this._verifiableCredentials ??= new VerifiableCredentialsClient(this._options));
     }
-
-    /**
-     * Make a passthrough request using the SDK's configured auth, retry, logging, etc.
-     * This is useful for making requests to endpoints not yet supported in the SDK.
-     * The input can be a URL string, URL object, or Request object. Relative paths are resolved against the configured base URL.
-     *
-     * @param {Request | string | URL} input - The URL, path, or Request object.
-     * @param {RequestInit} init - Standard fetch RequestInit options.
-     * @param {core.PassthroughRequest.RequestOptions} requestOptions - Per-request overrides (timeout, retries, headers, abort signal).
-     * @returns {Promise<Response>} A standard Response object.
-     */
-    public async fetch(
-        input: Request | string | URL,
-        init?: RequestInit,
-        requestOptions?: core.PassthroughRequest.RequestOptions,
-    ): Promise<Response> {
-        return core.makePassthroughRequest(
-            input,
-            init,
-            {
-                baseUrl: this._options.baseUrl ?? this._options.environment,
-                headers: this._options.headers,
-                timeoutInSeconds: this._options.timeoutInSeconds,
-                maxRetries: this._options.maxRetries,
-                fetch: this._options.fetch,
-                logging: this._options.logging,
-                getAuthHeaders: async () => (await this._options.authProvider.getAuthRequest()).headers,
-            },
-            requestOptions,
-        );
-    }
 }
diff --git a/src/management/api/types/types.ts b/src/management/api/types/types.ts
index dab06d269f..9757299b85 100644
--- a/src/management/api/types/types.ts
+++ b/src/management/api/types/types.ts
@@ -3538,6 +3538,14 @@ export type ConnectionDomainGoogleApps = string;
  */
 export type ConnectionDomainOkta = string;
 
+/** Algorithm used for DPoP proof JWT signing. */
+export const ConnectionDpopSigningAlgEnum = {
+    Es256: "ES256",
+    Ed25519: "Ed25519",
+} as const;
+export type ConnectionDpopSigningAlgEnum =
+    (typeof ConnectionDpopSigningAlgEnum)[keyof typeof ConnectionDpopSigningAlgEnum];
+
 /**
  * JSON array containing a list of the JWS signing algorithms (alg values) supported for DPoP proof JWT signing.
  */
@@ -4465,6 +4473,7 @@ export interface ConnectionOptionsCommonOidc {
     client_secret?: Management.ConnectionClientSecretOidc | undefined;
     connection_settings?: Management.ConnectionConnectionSettings | undefined;
     domain_aliases?: Management.ConnectionDomainAliases | undefined;
+    dpop_signing_alg?: Management.ConnectionDpopSigningAlgEnum | undefined;
     federated_connections_access_tokens?: (Management.ConnectionFederatedConnectionsAccessTokens | null) | undefined;
     icon_url?: Management.ConnectionIconUrl | undefined;
     id_token_signed_response_algs?: ((Management.ConnectionIdTokenSignedResponseAlgs | undefined) | null) | undefined;
@@ -5809,7 +5818,7 @@ export interface ConnectionPropertiesOptions {
     /** Enable this if you have a legacy user store and you want to gradually migrate those users to the Auth0 user store */
     import_mode?: boolean | undefined;
     /** Stores encrypted string only configurations for connections */
-    configuration?: (Record<string, string | null> | null) | undefined;
+    configuration?: (Record<string, (string | null) | undefined> | null) | undefined;
     customScripts?: Management.ConnectionCustomScripts | undefined;
     authentication_methods?: (Management.ConnectionAuthenticationMethods | null) | undefined;
     passkey_options?: (Management.ConnectionPasskeyOptions | null) | undefined;
@@ -7322,7 +7331,7 @@ export type ConnectionUpstreamAliasEnum =
  * Options for adding parameters in the request to the upstream IdP
  */
 export type ConnectionUpstreamParams =
-    | (Record<string, Management.ConnectionUpstreamAdditionalProperties | null> | null)
+    | (Record<string, (Management.ConnectionUpstreamAdditionalProperties | null) | undefined> | null)
     | undefined;
 
 /**
@@ -7407,7 +7416,7 @@ export type ConnectionWaadProtocolEnumAzureAd =
 /**
  * Metadata associated with the connection in the form of an object with string values (max 255 chars).  Maximum of 10 metadata properties allowed.
  */
-export type ConnectionsMetadata = Record<string, string | null>;
+export type ConnectionsMetadata = Record<string, (string | null) | undefined>;
 
 export interface CreateActionModuleResponseContent {
     /** The unique ID of the module. */
@@ -10185,7 +10194,7 @@ export type DomainCertificateStatusEnum =
 /**
  * Domain metadata associated with the custom domain, in the form of an object with string values (max 255 chars). Maximum of 10 domain metadata properties allowed.
  */
-export type DomainMetadata = Record<string, string | null>;
+export type DomainMetadata = Record<string, (string | null) | undefined>;
 
 /**
  * Domain verification settings.
@@ -11170,7 +11179,7 @@ export type FlowActionAuth0SendRequestParamsPayloadObject = Record<string, unkno
 
 export type FlowActionAuth0SendRequestParamsQueryParams = Record<
     string,
-    FlowActionAuth0SendRequestParamsQueryParams.Value | null
+    (FlowActionAuth0SendRequestParamsQueryParams.Value | null) | undefined
 >;
 
 export namespace FlowActionAuth0SendRequestParamsQueryParams {
@@ -11676,7 +11685,7 @@ export type FlowActionHttpSendRequestParamsPayloadObject = Record<string, unknow
 
 export type FlowActionHttpSendRequestParamsQueryParams = Record<
     string,
-    FlowActionHttpSendRequestParamsQueryParams.Value | null
+    (FlowActionHttpSendRequestParamsQueryParams.Value | null) | undefined
 >;
 
 export namespace FlowActionHttpSendRequestParamsQueryParams {
@@ -17551,7 +17560,7 @@ export interface OrganizationMemberRole {
 /**
  * Metadata associated with the organization, in the form of an object with string values (max 255 chars). Maximum of 25 metadata properties allowed.
  */
-export type OrganizationMetadata = Record<string, string | null>;
+export type OrganizationMetadata = Record<string, (string | null) | undefined>;
 
 /** Defines whether organizations can be used with client credentials exchanges for this grant. */
 export const OrganizationUsageEnum = {
@@ -20060,7 +20069,7 @@ export interface UpdateConnectionOptions {
     /** Enable this if you have a legacy user store and you want to gradually migrate those users to the Auth0 user store */
     import_mode?: boolean | undefined;
     /** Stores encrypted string only configurations for connections */
-    configuration?: (Record<string, string | null> | null) | undefined;
+    configuration?: (Record<string, (string | null) | undefined> | null) | undefined;
     customScripts?: Management.ConnectionCustomScripts | undefined;
     authentication_methods?: (Management.ConnectionAuthenticationMethods | null) | undefined;
     passkey_options?: (Management.ConnectionPasskeyOptions | null) | undefined;
diff --git a/src/management/core/auth/BasicAuth.ts b/src/management/core/auth/BasicAuth.ts
index f34fca5cc4..a642359100 100644
--- a/src/management/core/auth/BasicAuth.ts
+++ b/src/management/core/auth/BasicAuth.ts
@@ -1,8 +1,8 @@
 import { base64Decode, base64Encode } from "../base64.js";
 
 export interface BasicAuth {
-    username?: string;
-    password?: string;
+    username: string;
+    password: string;
 }
 
 const BASIC_AUTH_HEADER_PREFIX = /^Basic /i;
@@ -12,12 +12,7 @@ export const BasicAuth = {
         if (basicAuth == null) {
             return undefined;
         }
-        const username = basicAuth.username ?? "";
-        const password = basicAuth.password ?? "";
-        if (username === "" && password === "") {
-            return undefined;
-        }
-        const token = base64Encode(`${username}:${password}`);
+        const token = base64Encode(`${basicAuth.username}:${basicAuth.password}`);
         return `Basic ${token}`;
     },
     fromAuthorizationHeader: (header: string): BasicAuth => {
diff --git a/src/management/core/fetcher/BinaryResponse.ts b/src/management/core/fetcher/BinaryResponse.ts
index b9e40fb62c..bca7f4c779 100644
--- a/src/management/core/fetcher/BinaryResponse.ts
+++ b/src/management/core/fetcher/BinaryResponse.ts
@@ -14,7 +14,7 @@ export type BinaryResponse = {
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/bytes)
      * Some versions of the Fetch API may not support this method.
      */
-    bytes?(): Promise<Uint8Array>;
+    bytes?(): ReturnType<Response["bytes"]>;
 };
 
 export function getBinaryResponse(response: Response): BinaryResponse {
diff --git a/src/management/core/fetcher/Fetcher.ts b/src/management/core/fetcher/Fetcher.ts
index 928dfeaaba..5e5058a914 100644
--- a/src/management/core/fetcher/Fetcher.ts
+++ b/src/management/core/fetcher/Fetcher.ts
@@ -56,13 +56,11 @@ export declare namespace Fetcher {
 
     export interface TimeoutError {
         reason: "timeout";
-        cause?: unknown;
     }
 
     export interface UnknownError {
         reason: "unknown";
         errorMessage: string;
-        cause?: unknown;
     }
 }
 
@@ -284,7 +282,6 @@ export async function fetcherImpl<R = unknown>(args: Fetcher.Args): Promise<APIR
                     args.abortSignal,
                     args.withCredentials,
                     args.duplex,
-                    args.responseType === "streaming" || args.responseType === "sse",
                 ),
             args.maxRetries,
         );
@@ -340,7 +337,6 @@ export async function fetcherImpl<R = unknown>(args: Fetcher.Args): Promise<APIR
                 error: {
                     reason: "unknown",
                     errorMessage: "The user aborted a request",
-                    cause: error,
                 },
                 rawResponse: abortRawResponse,
             };
@@ -357,7 +353,6 @@ export async function fetcherImpl<R = unknown>(args: Fetcher.Args): Promise<APIR
                 ok: false,
                 error: {
                     reason: "timeout",
-                    cause: error,
                 },
                 rawResponse: abortRawResponse,
             };
@@ -375,7 +370,6 @@ export async function fetcherImpl<R = unknown>(args: Fetcher.Args): Promise<APIR
                 error: {
                     reason: "unknown",
                     errorMessage: error.message,
-                    cause: error,
                 },
                 rawResponse: unknownRawResponse,
             };
@@ -394,7 +388,6 @@ export async function fetcherImpl<R = unknown>(args: Fetcher.Args): Promise<APIR
             error: {
                 reason: "unknown",
                 errorMessage: toJson(error),
-                cause: error,
             },
             rawResponse: unknownRawResponse,
         };
diff --git a/src/management/core/fetcher/index.ts b/src/management/core/fetcher/index.ts
index bd5db362c7..c3bc6da20f 100644
--- a/src/management/core/fetcher/index.ts
+++ b/src/management/core/fetcher/index.ts
@@ -6,8 +6,6 @@ export type { Fetcher, FetchFunction } from "./Fetcher.js";
 export { fetcher } from "./Fetcher.js";
 export { getHeader } from "./getHeader.js";
 export { HttpResponsePromise } from "./HttpResponsePromise.js";
-export type { PassthroughRequest } from "./makePassthroughRequest.js";
-export { makePassthroughRequest } from "./makePassthroughRequest.js";
 export type { RawResponse, WithRawResponse } from "./RawResponse.js";
 export { abortRawResponse, toRawResponse, unknownRawResponse } from "./RawResponse.js";
 export { Supplier } from "./Supplier.js";
diff --git a/src/management/core/fetcher/makePassthroughRequest.ts b/src/management/core/fetcher/makePassthroughRequest.ts
deleted file mode 100644
index f5ba761400..0000000000
--- a/src/management/core/fetcher/makePassthroughRequest.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-import { createLogger, type LogConfig, type Logger } from "../logging/logger.js";
-import { join } from "../url/join.js";
-import { EndpointSupplier } from "./EndpointSupplier.js";
-import { getFetchFn } from "./getFetchFn.js";
-import { makeRequest } from "./makeRequest.js";
-import { requestWithRetries } from "./requestWithRetries.js";
-import { Supplier } from "./Supplier.js";
-
-export declare namespace PassthroughRequest {
-    /**
-     * Per-request options that can override the SDK client defaults.
-     */
-    export interface RequestOptions {
-        /** Override the default timeout for this request (in seconds). */
-        timeoutInSeconds?: number;
-        /** Override the default number of retries for this request. */
-        maxRetries?: number;
-        /** Additional headers to include in this request. */
-        headers?: Record<string, string>;
-        /** Abort signal for this request. */
-        abortSignal?: AbortSignal;
-    }
-
-    /**
-     * SDK client configuration used by the passthrough fetch method.
-     */
-    export interface ClientOptions {
-        /** The base URL or environment for the client. */
-        environment?: Supplier<string>;
-        /** Override the base URL. */
-        baseUrl?: Supplier<string>;
-        /** Default headers to include in requests. */
-        headers?: Record<string, unknown>;
-        /** Default maximum time to wait for a response in seconds. */
-        timeoutInSeconds?: number;
-        /** Default number of times to retry the request. Defaults to 2. */
-        maxRetries?: number;
-        /** A custom fetch function. */
-        fetch?: typeof fetch;
-        /** Logging configuration. */
-        logging?: LogConfig | Logger;
-        /** A function that returns auth headers. */
-        getAuthHeaders?: () => Promise<Record<string, string>>;
-    }
-}
-
-/**
- * Makes a passthrough HTTP request using the SDK's configuration (auth, retry, logging, etc.)
- * while mimicking the standard `fetch` API.
- *
- * @param input - The URL, path, or Request object. If a relative path, it will be resolved against the configured base URL.
- * @param init - Standard RequestInit options (method, headers, body, signal, etc.)
- * @param clientOptions - SDK client options (auth, default headers, logging, etc.)
- * @param requestOptions - Per-request overrides (timeout, retries, extra headers, abort signal).
- * @returns A standard Response object.
- */
-export async function makePassthroughRequest(
-    input: Request | string | URL,
-    init: RequestInit | undefined,
-    clientOptions: PassthroughRequest.ClientOptions,
-    requestOptions?: PassthroughRequest.RequestOptions,
-): Promise<Response> {
-    const logger = createLogger(clientOptions.logging);
-
-    // Extract URL and default init properties from Request object if provided
-    let url: string;
-    let effectiveInit: RequestInit | undefined = init;
-    if (input instanceof Request) {
-        url = input.url;
-        // If no explicit init provided, extract properties from the Request object
-        if (init == null) {
-            effectiveInit = {
-                method: input.method,
-                headers: Object.fromEntries(input.headers.entries()),
-                body: input.body,
-                signal: input.signal,
-                credentials: input.credentials,
-                cache: input.cache as RequestCache,
-                redirect: input.redirect,
-                referrer: input.referrer,
-                integrity: input.integrity,
-                mode: input.mode,
-            };
-        }
-    } else {
-        url = input instanceof URL ? input.toString() : input;
-    }
-
-    // Resolve the base URL
-    const baseUrl =
-        (clientOptions.baseUrl != null ? await Supplier.get(clientOptions.baseUrl) : undefined) ??
-        (clientOptions.environment != null ? await Supplier.get(clientOptions.environment) : undefined);
-
-    // Determine the full URL
-    let fullUrl: string;
-    if (url.startsWith("http://") || url.startsWith("https://")) {
-        fullUrl = url;
-    } else if (baseUrl != null) {
-        fullUrl = join(baseUrl, url);
-    } else {
-        fullUrl = url;
-    }
-
-    // Merge headers: SDK default headers -> auth headers -> user-provided headers
-    const mergedHeaders: Record<string, string> = {};
-
-    // Apply SDK default headers (resolve suppliers)
-    if (clientOptions.headers != null) {
-        for (const [key, value] of Object.entries(clientOptions.headers)) {
-            const resolved = await EndpointSupplier.get(value, { endpointMetadata: {} });
-            if (resolved != null) {
-                mergedHeaders[key.toLowerCase()] = `${resolved}`;
-            }
-        }
-    }
-
-    // Apply auth headers
-    if (clientOptions.getAuthHeaders != null) {
-        const authHeaders = await clientOptions.getAuthHeaders();
-        for (const [key, value] of Object.entries(authHeaders)) {
-            mergedHeaders[key.toLowerCase()] = value;
-        }
-    }
-
-    // Apply user-provided headers from init
-    if (effectiveInit?.headers != null) {
-        const initHeaders =
-            effectiveInit.headers instanceof Headers
-                ? Object.fromEntries(effectiveInit.headers.entries())
-                : Array.isArray(effectiveInit.headers)
-                  ? Object.fromEntries(effectiveInit.headers)
-                  : effectiveInit.headers;
-        for (const [key, value] of Object.entries(initHeaders)) {
-            if (value != null) {
-                mergedHeaders[key.toLowerCase()] = value;
-            }
-        }
-    }
-
-    // Apply per-request option headers (highest priority)
-    if (requestOptions?.headers != null) {
-        for (const [key, value] of Object.entries(requestOptions.headers)) {
-            mergedHeaders[key.toLowerCase()] = value;
-        }
-    }
-
-    const method = effectiveInit?.method ?? "GET";
-    const body = effectiveInit?.body;
-    const timeoutInSeconds = requestOptions?.timeoutInSeconds ?? clientOptions.timeoutInSeconds;
-    const timeoutMs = timeoutInSeconds != null ? timeoutInSeconds * 1000 : undefined;
-    const maxRetries = requestOptions?.maxRetries ?? clientOptions.maxRetries;
-    const abortSignal = requestOptions?.abortSignal ?? effectiveInit?.signal ?? undefined;
-    const fetchFn = clientOptions.fetch ?? (await getFetchFn());
-
-    if (logger.isDebug()) {
-        logger.debug("Making passthrough HTTP request", {
-            method,
-            url: fullUrl,
-            hasBody: body != null,
-        });
-    }
-
-    const response = await requestWithRetries(
-        async () =>
-            makeRequest(
-                fetchFn,
-                fullUrl,
-                method,
-                mergedHeaders,
-                body ?? undefined,
-                timeoutMs,
-                abortSignal,
-                effectiveInit?.credentials === "include",
-                undefined, // duplex
-                false, // disableCache
-            ),
-        maxRetries,
-    );
-
-    if (logger.isDebug()) {
-        logger.debug("Passthrough HTTP request completed", {
-            method,
-            url: fullUrl,
-            statusCode: response.status,
-        });
-    }
-
-    return response;
-}
diff --git a/src/management/core/fetcher/makeRequest.ts b/src/management/core/fetcher/makeRequest.ts
index 360a86df40..921565eb00 100644
--- a/src/management/core/fetcher/makeRequest.ts
+++ b/src/management/core/fetcher/makeRequest.ts
@@ -1,31 +1,5 @@
 import { anySignal, getTimeoutSignal } from "./signals.js";
 
-/**
- * Cached result of checking whether the current runtime supports
- * the `cache` option in `Request`. Some runtimes (e.g. Cloudflare Workers)
- * throw a TypeError when this option is used.
- */
-let _cacheNoStoreSupported: boolean | undefined;
-export function isCacheNoStoreSupported(): boolean {
-    if (_cacheNoStoreSupported != null) {
-        return _cacheNoStoreSupported;
-    }
-    try {
-        new Request("http://localhost", { cache: "no-store" });
-        _cacheNoStoreSupported = true;
-    } catch {
-        _cacheNoStoreSupported = false;
-    }
-    return _cacheNoStoreSupported;
-}
-
-/**
- * Reset the cached result of `isCacheNoStoreSupported`. Exposed for testing only.
- */
-export function resetCacheNoStoreSupported(): void {
-    _cacheNoStoreSupported = undefined;
-}
-
 export const makeRequest = async (
     fetchFn: (url: string, init: RequestInit) => Promise<Response>,
     url: string,
@@ -36,7 +10,6 @@ export const makeRequest = async (
     abortSignal?: AbortSignal,
     withCredentials?: boolean,
     duplex?: "half",
-    disableCache?: boolean,
 ): Promise<Response> => {
     const signals: AbortSignal[] = [];
 
@@ -59,7 +32,6 @@ export const makeRequest = async (
         credentials: withCredentials ? "include" : undefined,
         // @ts-ignore
         duplex,
-        ...(disableCache && isCacheNoStoreSupported() ? { cache: "no-store" as RequestCache } : {}),
     });
 
     if (timeoutAbortId != null) {
diff --git a/src/management/core/form-data-utils/FormDataWrapper.ts b/src/management/core/form-data-utils/FormDataWrapper.ts
index c4ae3f480d..bea0cf82b9 100644
--- a/src/management/core/form-data-utils/FormDataWrapper.ts
+++ b/src/management/core/form-data-utils/FormDataWrapper.ts
@@ -109,7 +109,7 @@ async function streamToBuffer(stream: unknown): Promise<Buffer> {
 async function convertToBlob(value: unknown, contentType?: string): Promise<Blob> {
     if (isStreamLike(value) || isReadableStream(value)) {
         const buffer = await streamToBuffer(value);
-        return new Blob([buffer as BlobPart], { type: contentType });
+        return new Blob([buffer], { type: contentType });
     }
 
     if (value instanceof Blob) {
@@ -117,7 +117,7 @@ async function convertToBlob(value: unknown, contentType?: string): Promise<Blob
     }
 
     if (isBuffer(value)) {
-        return new Blob([value as BlobPart], { type: contentType });
+        return new Blob([value], { type: contentType });
     }
 
     if (value instanceof ArrayBuffer) {
@@ -125,7 +125,7 @@ async function convertToBlob(value: unknown, contentType?: string): Promise<Blob
     }
 
     if (isArrayBufferView(value)) {
-        return new Blob([value as BlobPart], { type: contentType });
+        return new Blob([value], { type: contentType });
     }
 
     if (typeof value === "string") {
diff --git a/src/management/core/pagination/CustomPager.ts b/src/management/core/pagination/CustomPager.ts
new file mode 100644
index 0000000000..9317831207
--- /dev/null
+++ b/src/management/core/pagination/CustomPager.ts
@@ -0,0 +1,194 @@
+import type { BaseRequestOptions, NormalizedClientOptions } from "../../BaseClient.js";
+import type { APIResponse } from "../fetcher/APIResponse.js";
+import type { Fetcher } from "../fetcher/Fetcher.js";
+import type { RawResponse } from "../fetcher/index.js";
+
+/**
+ *
+ * @template TItem The type of the items in the page.
+ * @template TResponse The type of the API response.
+ */
+export class CustomPager<TItem, TResponse> implements AsyncIterable<TItem> {
+    /** The items from the current page */
+    public data: TItem[];
+    /** The raw HTTP response */
+    public rawResponse: RawResponse;
+    /** The parsed response object */
+    public response: TResponse;
+
+    private sendRequest: (request: Fetcher.Args) => Promise<APIResponse<TResponse, Fetcher.Error>>;
+    private nextRequest?: Fetcher.Args;
+    private previousRequest?: Fetcher.Args;
+    private _hasNextPage: boolean;
+    private _hasPreviousPage: boolean;
+
+    constructor(args: {
+        response: TResponse;
+        rawResponse: RawResponse;
+        items: TItem[];
+        hasNextPage: boolean;
+        hasPreviousPage: boolean;
+        nextRequest?: Fetcher.Args;
+        previousRequest?: Fetcher.Args;
+        sendRequest: (request: Fetcher.Args) => Promise<APIResponse<TResponse, Fetcher.Error>>;
+    }) {
+        this.response = args.response;
+        this.rawResponse = args.rawResponse;
+        this.data = args.items;
+        this._hasNextPage = args.hasNextPage;
+        this._hasPreviousPage = args.hasPreviousPage;
+        this.nextRequest = args.nextRequest;
+        this.previousRequest = args.previousRequest;
+        this.sendRequest = args.sendRequest;
+    }
+
+    /**
+     * @returns whether there is a next page to load
+     */
+    public hasNextPage(): boolean {
+        return this._hasNextPage;
+    }
+
+    /**
+     * @returns whether there is a previous page to load
+     */
+    public hasPreviousPage(): boolean {
+        return this._hasPreviousPage;
+    }
+
+    /**
+     * Returns the current page data.
+     * This is an alias for the `data` property for consistency with other pagination APIs.
+     *
+     * @returns the items from the current page
+     */
+    public getCurrentPage(): TItem[] {
+        return this.data;
+    }
+
+    /**
+     * Retrieves the next page of results.
+     * @returns this pager with updated data
+     * @throws Error if there is no next page
+     */
+    public async getNextPage(): Promise<this> {
+        if (!this._hasNextPage || !this.nextRequest) {
+            throw new Error("No next page available");
+        }
+        const response = await this.sendRequest(this.nextRequest);
+        if (!response.ok) {
+            const reason =
+                response.error.reason === "status-code" ? `HTTP ${response.error.statusCode}` : response.error.reason;
+            throw new Error(`Failed to fetch next page: ${reason}`);
+        }
+        const data = response.body;
+        const rawResponse = response.rawResponse;
+        const parsed = await parse<TItem, TResponse>({ request: this.nextRequest, data, rawResponse });
+        this.response = data;
+        this.rawResponse = rawResponse;
+        this.data = parsed.items;
+        this._hasNextPage = parsed.hasNextPage;
+        this._hasPreviousPage = parsed.hasPreviousPage;
+        this.nextRequest = parsed.nextRequest;
+        this.previousRequest = parsed.previousRequest;
+        return this;
+    }
+
+    /**
+     * Retrieves the previous page of results.
+     * @returns this pager with updated data
+     * @throws Error if there is no previous page
+     */
+    public async getPreviousPage(): Promise<this> {
+        if (!this._hasPreviousPage || !this.previousRequest) {
+            throw new Error("No previous page available");
+        }
+        const response = await this.sendRequest(this.previousRequest);
+        if (!response.ok) {
+            const reason =
+                response.error.reason === "status-code" ? `HTTP ${response.error.statusCode}` : response.error.reason;
+            throw new Error(`Failed to fetch previous page: ${reason}`);
+        }
+        const data = response.body;
+        const rawResponse = response.rawResponse;
+        const parsed = await parse<TItem, TResponse>({ request: this.previousRequest, data, rawResponse });
+        this.response = data;
+        this.rawResponse = rawResponse;
+        this.data = parsed.items;
+        this._hasNextPage = parsed.hasNextPage;
+        this._hasPreviousPage = parsed.hasPreviousPage;
+        this.nextRequest = parsed.nextRequest;
+        this.previousRequest = parsed.previousRequest;
+        return this;
+    }
+
+    private async *iterMessages(): AsyncGenerator<TItem, void> {
+        for (const item of this.data) {
+            yield item;
+        }
+
+        while (this.hasNextPage()) {
+            await this.getNextPage();
+            for (const item of this.data) {
+                yield item;
+            }
+        }
+    }
+
+    async *[Symbol.asyncIterator](): AsyncIterator<TItem, void, unknown> {
+        for await (const message of this.iterMessages()) {
+            yield message;
+        }
+    }
+}
+
+export async function createCustomPager<TItem, TResponse>({
+    sendRequest,
+    initialHttpRequest,
+    clientOptions,
+}: {
+    sendRequest: (request: Fetcher.Args) => Promise<APIResponse<TResponse, Fetcher.Error>>;
+    initialHttpRequest: Fetcher.Args;
+    clientOptions: NormalizedClientOptions;
+    requestOptions?: BaseRequestOptions;
+}): Promise<CustomPager<TItem, TResponse>> {
+    const response = await sendRequest(initialHttpRequest);
+    if (!response.ok) {
+        const reason =
+            response.error.reason === "status-code" ? `HTTP ${response.error.statusCode}` : response.error.reason;
+        throw new Error(`Failed to fetch initial page: ${reason}`);
+    }
+    const data = response.body;
+    const rawResponse = response.rawResponse;
+    const parsed = await parse<TItem, TResponse>({ request: initialHttpRequest, data, rawResponse });
+    return new CustomPager({
+        response: data,
+        rawResponse,
+        items: parsed.items,
+        hasNextPage: parsed.hasNextPage,
+        hasPreviousPage: parsed.hasPreviousPage,
+        nextRequest: parsed.nextRequest,
+        previousRequest: parsed.previousRequest,
+        sendRequest: sendRequest,
+    });
+}
+
+async function parse<TItem, TResponse>(args: {
+    request: Fetcher.Args;
+    data: TResponse;
+    rawResponse: RawResponse;
+}): Promise<{
+    nextRequest?: Fetcher.Args;
+    hasNextPage: boolean;
+    previousRequest?: Fetcher.Args;
+    hasPreviousPage: boolean;
+    items: TItem[];
+}> {
+    // Placeholder implementation.
+    // TODO: Replace this with actual parsing logic.
+    return {
+        items: [],
+        hasNextPage: false,
+        hasPreviousPage: false,
+    };
+}
diff --git a/src/management/core/pagination/Page.ts b/src/management/core/pagination/Page.ts
index 0321a3c045..6621a6f11f 100644
--- a/src/management/core/pagination/Page.ts
+++ b/src/management/core/pagination/Page.ts
@@ -68,7 +68,7 @@ export class Page<T, R = unknown> implements AsyncIterable<T> {
         }
     }
 
-    async *[Symbol.asyncIterator](): AsyncIterator<T, void, unknown> {
+    async *[Symbol.asyncIterator](): AsyncIterator<T, void, any> {
         for await (const message of this.iterMessages()) {
             yield message;
         }
diff --git a/src/management/core/pagination/index.ts b/src/management/core/pagination/index.ts
index 7781cbd6e9..fe9dc949ab 100644
--- a/src/management/core/pagination/index.ts
+++ b/src/management/core/pagination/index.ts
@@ -1 +1,2 @@
+export { CustomPager, createCustomPager } from "./CustomPager.js";
 export { Page } from "./Page.js";
diff --git a/src/management/core/runtime/runtime.ts b/src/management/core/runtime/runtime.ts
index e6e66b2a7b..56ebbb87c4 100644
--- a/src/management/core/runtime/runtime.ts
+++ b/src/management/core/runtime/runtime.ts
@@ -113,18 +113,18 @@ function evaluateRuntime(): Runtime {
 
     /**
      * A constant that indicates whether the environment the code is running is Node.JS.
-     *
-     * We assign `process` to a local variable first to avoid being flagged by
-     * bundlers that perform static analysis on `process.versions` (e.g. Next.js
-     * Edge Runtime warns about Node.js APIs even when they are guarded).
      */
-    const _process = typeof process !== "undefined" ? process : undefined;
-    const isNode = typeof _process !== "undefined" && typeof _process.versions?.node === "string";
+    const isNode =
+        typeof process !== "undefined" &&
+        "version" in process &&
+        !!process.version &&
+        "versions" in process &&
+        !!process.versions?.node;
     if (isNode) {
         return {
             type: "node",
-            version: _process.versions.node,
-            parsedVersion: Number(_process.versions.node.split(".")[0]),
+            version: process.versions.node,
+            parsedVersion: Number(process.versions.node.split(".")[0]),
         };
     }
 
diff --git a/src/management/errors/ManagementError.ts b/src/management/errors/ManagementError.ts
index d917d82053..db8e0cc6dc 100644
--- a/src/management/errors/ManagementError.ts
+++ b/src/management/errors/ManagementError.ts
@@ -7,20 +7,17 @@ export class ManagementError extends Error {
     public readonly statusCode?: number;
     public readonly body?: unknown;
     public readonly rawResponse?: core.RawResponse;
-    public readonly cause?: unknown;
 
     constructor({
         message,
         statusCode,
         body,
         rawResponse,
-        cause,
     }: {
         message?: string;
         statusCode?: number;
         body?: unknown;
         rawResponse?: core.RawResponse;
-        cause?: unknown;
     }) {
         super(buildMessage({ message, statusCode, body }));
         Object.setPrototypeOf(this, new.target.prototype);
@@ -32,9 +29,6 @@ export class ManagementError extends Error {
         this.statusCode = statusCode;
         this.body = body;
         this.rawResponse = rawResponse;
-        if (cause != null) {
-            this.cause = cause;
-        }
     }
 }
 
diff --git a/src/management/errors/ManagementTimeoutError.ts b/src/management/errors/ManagementTimeoutError.ts
index 6783b2b4d9..a90c5c38ba 100644
--- a/src/management/errors/ManagementTimeoutError.ts
+++ b/src/management/errors/ManagementTimeoutError.ts
@@ -1,9 +1,7 @@
 // This file was auto-generated by Fern from our API Definition.
 
 export class ManagementTimeoutError extends Error {
-    public readonly cause?: unknown;
-
-    constructor(message: string, opts?: { cause?: unknown }) {
+    constructor(message: string) {
         super(message);
         Object.setPrototypeOf(this, new.target.prototype);
         if (Error.captureStackTrace) {
@@ -11,8 +9,5 @@ export class ManagementTimeoutError extends Error {
         }
 
         this.name = this.constructor.name;
-        if (opts?.cause != null) {
-            this.cause = opts.cause;
-        }
     }
 }
diff --git a/src/management/errors/handleNonStatusCodeError.ts b/src/management/errors/handleNonStatusCodeError.ts
index 391b5ec55f..592a039800 100644
--- a/src/management/errors/handleNonStatusCodeError.ts
+++ b/src/management/errors/handleNonStatusCodeError.ts
@@ -22,14 +22,11 @@ export function handleNonStatusCodeError(
                 rawResponse: rawResponse,
             });
         case "timeout":
-            throw new errors.ManagementTimeoutError(`Timeout exceeded when calling ${method} ${path}.`, {
-                cause: error.cause,
-            });
+            throw new errors.ManagementTimeoutError(`Timeout exceeded when calling ${method} ${path}.`);
         case "unknown":
             throw new errors.ManagementError({
                 message: error.errorMessage,
                 rawResponse: rawResponse,
-                cause: error.cause,
             });
         default:
             throw new errors.ManagementError({
diff --git a/src/management/tests/mock-server/MockServerPool.ts b/src/management/tests/mock-server/MockServerPool.ts
index d48323281d..33b57f0c91 100644
--- a/src/management/tests/mock-server/MockServerPool.ts
+++ b/src/management/tests/mock-server/MockServerPool.ts
@@ -103,4 +103,4 @@ class MockServerPool {
     }
 }
 
-export const mockServerPool: MockServerPool = new MockServerPool();
+export const mockServerPool = new MockServerPool();
diff --git a/src/management/tests/mock-server/mockEndpointBuilder.ts b/src/management/tests/mock-server/mockEndpointBuilder.ts
index d374a14040..dc16c92e1a 100644
--- a/src/management/tests/mock-server/mockEndpointBuilder.ts
+++ b/src/management/tests/mock-server/mockEndpointBuilder.ts
@@ -2,9 +2,9 @@ import { type DefaultBodyType, type HttpHandler, HttpResponse, type HttpResponse
 
 import { url } from "../../core";
 import { toJson } from "../../core/json";
-import { type WithFormUrlEncodedOptions, withFormUrlEncoded } from "./withFormUrlEncoded";
+import { withFormUrlEncoded } from "./withFormUrlEncoded";
 import { withHeaders } from "./withHeaders";
-import { type WithJsonOptions, withJson } from "./withJson";
+import { withJson, type WithJsonOptions } from "./withJson";
 
 type HttpMethod = "all" | "get" | "post" | "put" | "delete" | "patch" | "options" | "head";
 
@@ -27,7 +27,7 @@ interface RequestHeadersStage extends RequestBodyStage, ResponseStage {
 
 interface RequestBodyStage extends ResponseStage {
     jsonBody(body: unknown, options?: WithJsonOptions): ResponseStage;
-    formUrlEncodedBody(body: unknown, options?: WithFormUrlEncodedOptions): ResponseStage;
+    formUrlEncodedBody(body: unknown): ResponseStage;
 }
 
 interface ResponseStage {
@@ -138,13 +138,13 @@ class RequestBuilder implements MethodStage, RequestHeadersStage, RequestBodySta
         return this;
     }
 
-    formUrlEncodedBody(body: unknown, options?: WithFormUrlEncodedOptions): ResponseStage {
+    formUrlEncodedBody(body: unknown): ResponseStage {
         if (body === undefined) {
             throw new Error(
                 "Undefined is not valid for form-urlencoded. Do not call formUrlEncodedBody if you want an empty body.",
             );
         }
-        this.predicates.push((resolver) => withFormUrlEncoded(body, resolver, options));
+        this.predicates.push((resolver) => withFormUrlEncoded(body, resolver));
         return this;
     }
 
diff --git a/src/management/tests/mock-server/withFormUrlEncoded.ts b/src/management/tests/mock-server/withFormUrlEncoded.ts
index a57a1df0a4..dfae7e5062 100644
--- a/src/management/tests/mock-server/withFormUrlEncoded.ts
+++ b/src/management/tests/mock-server/withFormUrlEncoded.ts
@@ -2,26 +2,12 @@ import { type HttpResponseResolver, passthrough } from "msw";
 
 import { toJson } from "../../core/json";
 
-export interface WithFormUrlEncodedOptions {
-    /**
-     * List of field names to ignore when comparing request bodies.
-     * This is useful for pagination cursor fields that change between requests.
-     */
-    ignoredFields?: string[];
-}
-
 /**
  * Creates a request matcher that validates if the request form-urlencoded body exactly matches the expected object
  * @param expectedBody - The exact body object to match against
  * @param resolver - Response resolver to execute if body matches
- * @param options - Optional configuration including fields to ignore
  */
-export function withFormUrlEncoded(
-    expectedBody: unknown,
-    resolver: HttpResponseResolver,
-    options?: WithFormUrlEncodedOptions,
-): HttpResponseResolver {
-    const ignoredFields = options?.ignoredFields ?? [];
+export function withFormUrlEncoded(expectedBody: unknown, resolver: HttpResponseResolver): HttpResponseResolver {
     return async (args) => {
         const { request } = args;
 
@@ -55,8 +41,7 @@ export function withFormUrlEncoded(
         }
 
         const mismatches = findMismatches(actualBody, expectedBody);
-        const filteredMismatches = Object.keys(mismatches).filter((key) => !ignoredFields.includes(key));
-        if (filteredMismatches.length > 0) {
+        if (Object.keys(mismatches).length > 0) {
             console.error("Form-urlencoded body mismatch:", toJson(mismatches, undefined, 2));
             return passthrough();
         }
diff --git a/src/management/tests/tsconfig.json b/src/management/tests/tsconfig.json
index dc47db4502..ba42ebd655 100644
--- a/src/management/tests/tsconfig.json
+++ b/src/management/tests/tsconfig.json
@@ -2,7 +2,8 @@
     "extends": "../../../tsconfig.base.json",
     "compilerOptions": {
         "outDir": null,
-        "rootDir": ".."
+        "rootDir": "..",
+        "baseUrl": ".."
     },
     "include": ["../../../src/management", "../../../src/management/tests"],
     "exclude": []
diff --git a/src/management/tests/unit/auth/BasicAuth.test.ts b/src/management/tests/unit/auth/BasicAuth.test.ts
index de92500a45..c048dbfa62 100644
--- a/src/management/tests/unit/auth/BasicAuth.test.ts
+++ b/src/management/tests/unit/auth/BasicAuth.test.ts
@@ -1,10 +1,10 @@
-import { BasicAuth } from "../../../core/auth/BasicAuth";
+import { BasicAuth } from "../../../../../src/management/core/auth/BasicAuth";
 
 describe("BasicAuth", () => {
     interface ToHeaderTestCase {
         description: string;
-        input: { username?: string; password?: string };
-        expected: string | undefined;
+        input: { username: string; password: string };
+        expected: string;
     }
 
     interface FromHeaderTestCase {
@@ -22,30 +22,10 @@ describe("BasicAuth", () => {
     describe("toAuthorizationHeader", () => {
         const toHeaderTests: ToHeaderTestCase[] = [
             {
-                description: "correctly converts to header with both username and password",
+                description: "correctly converts to header",
                 input: { username: "username", password: "password" },
                 expected: "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
             },
-            {
-                description: "encodes username only with trailing colon",
-                input: { username: "username" },
-                expected: "Basic dXNlcm5hbWU6",
-            },
-            {
-                description: "encodes password only with leading colon",
-                input: { password: "password" },
-                expected: "Basic OnBhc3N3b3Jk",
-            },
-            {
-                description: "returns undefined when neither provided",
-                input: {},
-                expected: undefined,
-            },
-            {
-                description: "returns undefined when both are empty strings",
-                input: { username: "", password: "" },
-                expected: undefined,
-            },
         ];
 
         toHeaderTests.forEach(({ description, input, expected }) => {
diff --git a/src/management/tests/unit/auth/BearerToken.test.ts b/src/management/tests/unit/auth/BearerToken.test.ts
index 1b988a76a9..a10b7dd9d8 100644
--- a/src/management/tests/unit/auth/BearerToken.test.ts
+++ b/src/management/tests/unit/auth/BearerToken.test.ts
@@ -1,4 +1,4 @@
-import { BearerToken } from "../../../core/auth/BearerToken";
+import { BearerToken } from "../../../../../src/management/core/auth/BearerToken";
 
 describe("BearerToken", () => {
     describe("toAuthorizationHeader", () => {
diff --git a/src/management/tests/unit/base64.test.ts b/src/management/tests/unit/base64.test.ts
index 1758cd3756..3a42594448 100644
--- a/src/management/tests/unit/base64.test.ts
+++ b/src/management/tests/unit/base64.test.ts
@@ -1,4 +1,4 @@
-import { base64Decode, base64Encode } from "../../core/base64";
+import { base64Decode, base64Encode } from "../../../../src/management/core/base64";
 
 describe("base64", () => {
     describe("base64Encode", () => {
diff --git a/src/management/tests/unit/fetcher/Fetcher.test.ts b/src/management/tests/unit/fetcher/Fetcher.test.ts
index b3a901657c..ac3285d1a6 100644
--- a/src/management/tests/unit/fetcher/Fetcher.test.ts
+++ b/src/management/tests/unit/fetcher/Fetcher.test.ts
@@ -1,8 +1,8 @@
 import fs from "fs";
 import { join } from "path";
 import stream from "stream";
-import type { BinaryResponse } from "../../../core";
-import { type Fetcher, fetcherImpl } from "../../../core/fetcher/Fetcher";
+import type { BinaryResponse } from "../../../../../src/management/core";
+import { type Fetcher, fetcherImpl } from "../../../../../src/management/core/fetcher/Fetcher";
 
 describe("Test fetcherImpl", () => {
     it("should handle successful request", async () => {
diff --git a/src/management/tests/unit/fetcher/HttpResponsePromise.test.ts b/src/management/tests/unit/fetcher/HttpResponsePromise.test.ts
index 654a9b60ef..48fe1a273c 100644
--- a/src/management/tests/unit/fetcher/HttpResponsePromise.test.ts
+++ b/src/management/tests/unit/fetcher/HttpResponsePromise.test.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, jest } from "@jest/globals";
 
-import { HttpResponsePromise } from "../../../core/fetcher/HttpResponsePromise";
-import type { RawResponse, WithRawResponse } from "../../../core/fetcher/RawResponse";
+import { HttpResponsePromise } from "../../../../../src/management/core/fetcher/HttpResponsePromise";
+import type { RawResponse, WithRawResponse } from "../../../../../src/management/core/fetcher/RawResponse";
 
 describe("HttpResponsePromise", () => {
     const mockRawResponse: RawResponse = {
diff --git a/src/management/tests/unit/fetcher/RawResponse.test.ts b/src/management/tests/unit/fetcher/RawResponse.test.ts
index 00909bf91d..16e1a689a4 100644
--- a/src/management/tests/unit/fetcher/RawResponse.test.ts
+++ b/src/management/tests/unit/fetcher/RawResponse.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "@jest/globals";
 
-import { toRawResponse } from "../../../core/fetcher/RawResponse";
+import { toRawResponse } from "../../../../../src/management/core/fetcher/RawResponse";
 
 describe("RawResponse", () => {
     describe("toRawResponse", () => {
diff --git a/src/management/tests/unit/fetcher/createRequestUrl.test.ts b/src/management/tests/unit/fetcher/createRequestUrl.test.ts
index 799ff9d257..a4fa804914 100644
--- a/src/management/tests/unit/fetcher/createRequestUrl.test.ts
+++ b/src/management/tests/unit/fetcher/createRequestUrl.test.ts
@@ -1,4 +1,4 @@
-import { createRequestUrl } from "../../../core/fetcher/createRequestUrl";
+import { createRequestUrl } from "../../../../../src/management/core/fetcher/createRequestUrl";
 
 describe("Test createRequestUrl", () => {
     const BASE_URL = "https://api.example.com";
diff --git a/src/management/tests/unit/fetcher/getRequestBody.test.ts b/src/management/tests/unit/fetcher/getRequestBody.test.ts
index f54b924ec7..ceed7fea04 100644
--- a/src/management/tests/unit/fetcher/getRequestBody.test.ts
+++ b/src/management/tests/unit/fetcher/getRequestBody.test.ts
@@ -1,5 +1,5 @@
-import { getRequestBody } from "../../../core/fetcher/getRequestBody";
-import { RUNTIME } from "../../../core/runtime";
+import { getRequestBody } from "../../../../../src/management/core/fetcher/getRequestBody";
+import { RUNTIME } from "../../../../../src/management/core/runtime";
 
 describe("Test getRequestBody", () => {
     interface TestCase {
diff --git a/src/management/tests/unit/fetcher/getResponseBody.test.ts b/src/management/tests/unit/fetcher/getResponseBody.test.ts
index 0e09a52c24..967c6c0332 100644
--- a/src/management/tests/unit/fetcher/getResponseBody.test.ts
+++ b/src/management/tests/unit/fetcher/getResponseBody.test.ts
@@ -1,6 +1,6 @@
-import { getResponseBody } from "../../../core/fetcher/getResponseBody";
+import { getResponseBody } from "../../../../../src/management/core/fetcher/getResponseBody";
 
-import { RUNTIME } from "../../../core/runtime";
+import { RUNTIME } from "../../../../../src/management/core/runtime";
 
 describe("Test getResponseBody", () => {
     interface SimpleTestCase {
diff --git a/src/management/tests/unit/fetcher/logging.test.ts b/src/management/tests/unit/fetcher/logging.test.ts
index e1c32f1083..d51a081529 100644
--- a/src/management/tests/unit/fetcher/logging.test.ts
+++ b/src/management/tests/unit/fetcher/logging.test.ts
@@ -1,4 +1,4 @@
-import { fetcherImpl } from "../../../core/fetcher/Fetcher";
+import { fetcherImpl } from "../../../../../src/management/core/fetcher/Fetcher";
 
 function createMockLogger() {
     return {
diff --git a/src/management/tests/unit/fetcher/makePassthroughRequest.test.ts b/src/management/tests/unit/fetcher/makePassthroughRequest.test.ts
deleted file mode 100644
index 92a1ed0331..0000000000
--- a/src/management/tests/unit/fetcher/makePassthroughRequest.test.ts
+++ /dev/null
@@ -1,397 +0,0 @@
-import { makePassthroughRequest } from "../../../core/fetcher/makePassthroughRequest";
-
-describe("makePassthroughRequest", () => {
-    let mockFetch: jest.Mock;
-
-    beforeEach(() => {
-        mockFetch = jest.fn();
-        mockFetch.mockResolvedValue(new Response(JSON.stringify({ ok: true }), { status: 200 }));
-    });
-
-    describe("URL resolution", () => {
-        it("should use absolute URL directly", async () => {
-            await makePassthroughRequest("https://api.example.com/v1/users", undefined, {
-                fetch: mockFetch,
-            });
-            const [calledUrl] = mockFetch.mock.calls[0];
-            expect(calledUrl).toBe("https://api.example.com/v1/users");
-        });
-
-        it("should resolve relative path against baseUrl", async () => {
-            await makePassthroughRequest("/v1/users", undefined, {
-                baseUrl: "https://api.example.com",
-                fetch: mockFetch,
-            });
-            const [calledUrl] = mockFetch.mock.calls[0];
-            expect(calledUrl).toBe("https://api.example.com/v1/users");
-        });
-
-        it("should resolve relative path against environment when baseUrl is not set", async () => {
-            await makePassthroughRequest("/v1/users", undefined, {
-                environment: "https://env.example.com",
-                fetch: mockFetch,
-            });
-            const [calledUrl] = mockFetch.mock.calls[0];
-            expect(calledUrl).toBe("https://env.example.com/v1/users");
-        });
-
-        it("should prefer baseUrl over environment", async () => {
-            await makePassthroughRequest("/v1/users", undefined, {
-                baseUrl: "https://base.example.com",
-                environment: "https://env.example.com",
-                fetch: mockFetch,
-            });
-            const [calledUrl] = mockFetch.mock.calls[0];
-            expect(calledUrl).toBe("https://base.example.com/v1/users");
-        });
-
-        it("should pass relative URL through as-is when no baseUrl or environment", async () => {
-            await makePassthroughRequest("/v1/users", undefined, {
-                fetch: mockFetch,
-            });
-            const [calledUrl] = mockFetch.mock.calls[0];
-            expect(calledUrl).toBe("/v1/users");
-        });
-
-        it("should resolve baseUrl supplier", async () => {
-            await makePassthroughRequest("/v1/users", undefined, {
-                baseUrl: () => "https://dynamic.example.com",
-                fetch: mockFetch,
-            });
-            const [calledUrl] = mockFetch.mock.calls[0];
-            expect(calledUrl).toBe("https://dynamic.example.com/v1/users");
-        });
-
-        it("should ignore absolute URL even when baseUrl is set", async () => {
-            await makePassthroughRequest("https://other.example.com/path", undefined, {
-                baseUrl: "https://base.example.com",
-                fetch: mockFetch,
-            });
-            const [calledUrl] = mockFetch.mock.calls[0];
-            expect(calledUrl).toBe("https://other.example.com/path");
-        });
-
-        it("should accept a URL object", async () => {
-            await makePassthroughRequest(new URL("https://api.example.com/v1/users"), undefined, {
-                fetch: mockFetch,
-            });
-            const [calledUrl] = mockFetch.mock.calls[0];
-            expect(calledUrl).toBe("https://api.example.com/v1/users");
-        });
-    });
-
-    describe("header merge order", () => {
-        it("should merge headers in correct priority: SDK defaults < auth < init < requestOptions", async () => {
-            await makePassthroughRequest(
-                "https://api.example.com",
-                {
-                    headers: { "X-Custom": "from-init", Authorization: "from-init" },
-                },
-                {
-                    headers: {
-                        "X-Custom": "from-sdk",
-                        "X-SDK-Only": "sdk-value",
-                        Authorization: "from-sdk",
-                    },
-                    getAuthHeaders: async () => ({
-                        Authorization: "Bearer auth-token",
-                        "X-Auth-Only": "auth-value",
-                    }),
-                    fetch: mockFetch,
-                },
-                {
-                    headers: { Authorization: "from-request-options" },
-                },
-            );
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            const headers = calledOptions.headers;
-
-            // requestOptions.headers wins for Authorization (highest priority)
-            expect(headers["authorization"]).toBe("from-request-options");
-            // init.headers wins over SDK defaults for X-Custom
-            expect(headers["x-custom"]).toBe("from-init");
-            // SDK-only header is preserved
-            expect(headers["x-sdk-only"]).toBe("sdk-value");
-            // Auth-only header is preserved
-            expect(headers["x-auth-only"]).toBe("auth-value");
-        });
-
-        it("should lowercase all header keys", async () => {
-            await makePassthroughRequest(
-                "https://api.example.com",
-                {
-                    headers: { "Content-Type": "application/json" },
-                },
-                {
-                    headers: { "X-Fern-Language": "JavaScript" },
-                    fetch: mockFetch,
-                },
-            );
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            const headers = calledOptions.headers;
-            expect(headers["content-type"]).toBe("application/json");
-            expect(headers["x-fern-language"]).toBe("JavaScript");
-            expect(headers["Content-Type"]).toBeUndefined();
-            expect(headers["X-Fern-Language"]).toBeUndefined();
-        });
-
-        it("should handle Headers object in init", async () => {
-            const initHeaders = new Headers();
-            initHeaders.set("X-From-Headers-Object", "value");
-            await makePassthroughRequest("https://api.example.com", { headers: initHeaders }, { fetch: mockFetch });
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.headers["x-from-headers-object"]).toBe("value");
-        });
-
-        it("should handle array-style headers in init", async () => {
-            await makePassthroughRequest(
-                "https://api.example.com",
-                { headers: [["X-Array-Header", "array-value"]] },
-                { fetch: mockFetch },
-            );
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.headers["x-array-header"]).toBe("array-value");
-        });
-
-        it("should skip null SDK default header values", async () => {
-            await makePassthroughRequest("https://api.example.com", undefined, {
-                headers: { "X-Present": "value", "X-Null": null },
-                fetch: mockFetch,
-            });
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.headers["x-present"]).toBe("value");
-            expect(calledOptions.headers["x-null"]).toBeUndefined();
-        });
-    });
-
-    describe("auth headers", () => {
-        it("should include auth headers when getAuthHeaders is provided", async () => {
-            await makePassthroughRequest("https://api.example.com", undefined, {
-                getAuthHeaders: async () => ({ Authorization: "Bearer my-token" }),
-                fetch: mockFetch,
-            });
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.headers["authorization"]).toBe("Bearer my-token");
-        });
-
-        it("should work without auth headers", async () => {
-            await makePassthroughRequest("https://api.example.com", undefined, {
-                fetch: mockFetch,
-            });
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.headers["authorization"]).toBeUndefined();
-        });
-
-        it("should allow init headers to override auth headers", async () => {
-            await makePassthroughRequest(
-                "https://api.example.com",
-                { headers: { Authorization: "Bearer override" } },
-                {
-                    getAuthHeaders: async () => ({ Authorization: "Bearer sdk-auth" }),
-                    fetch: mockFetch,
-                },
-            );
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.headers["authorization"]).toBe("Bearer override");
-        });
-    });
-
-    describe("method and body", () => {
-        it("should default to GET when no method specified", async () => {
-            await makePassthroughRequest("https://api.example.com", undefined, {
-                fetch: mockFetch,
-            });
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.method).toBe("GET");
-        });
-
-        it("should use the method from init", async () => {
-            await makePassthroughRequest(
-                "https://api.example.com",
-                { method: "POST", body: JSON.stringify({ key: "value" }) },
-                { fetch: mockFetch },
-            );
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.method).toBe("POST");
-            expect(calledOptions.body).toBe(JSON.stringify({ key: "value" }));
-        });
-
-        it("should pass body as undefined when not provided", async () => {
-            await makePassthroughRequest("https://api.example.com", { method: "GET" }, { fetch: mockFetch });
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.body).toBeUndefined();
-        });
-    });
-
-    describe("timeout and retries", () => {
-        it("should use requestOptions timeout over client timeout", async () => {
-            await makePassthroughRequest(
-                "https://api.example.com",
-                undefined,
-                { timeoutInSeconds: 30, fetch: mockFetch },
-                { timeoutInSeconds: 10 },
-            );
-            // The timeout is passed to makeRequest which converts to ms
-            // We verify via the signal timing behavior (indirectly tested through makeRequest)
-            expect(mockFetch).toHaveBeenCalledTimes(1);
-        });
-
-        it("should use client timeout when requestOptions timeout is not set", async () => {
-            await makePassthroughRequest("https://api.example.com", undefined, {
-                timeoutInSeconds: 30,
-                fetch: mockFetch,
-            });
-            expect(mockFetch).toHaveBeenCalledTimes(1);
-        });
-
-        it("should use requestOptions maxRetries over client maxRetries", async () => {
-            mockFetch.mockResolvedValue(new Response("", { status: 500 }));
-            jest.spyOn(global, "setTimeout").mockImplementation((callback: (args: void) => void) => {
-                process.nextTick(callback);
-                return null as any;
-            });
-
-            await makePassthroughRequest(
-                "https://api.example.com",
-                undefined,
-                { maxRetries: 5, fetch: mockFetch },
-                { maxRetries: 1 },
-            );
-            // 1 initial + 1 retry = 2 calls
-            expect(mockFetch).toHaveBeenCalledTimes(2);
-
-            jest.restoreAllMocks();
-        });
-    });
-
-    describe("abort signal", () => {
-        it("should use requestOptions.abortSignal over init.signal", async () => {
-            const initController = new AbortController();
-            const requestController = new AbortController();
-
-            await makePassthroughRequest(
-                "https://api.example.com",
-                { signal: initController.signal },
-                { fetch: mockFetch },
-                { abortSignal: requestController.signal },
-            );
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            // The signal passed to makeRequest is combined with timeout signal via anySignal,
-            // but the requestOptions.abortSignal should be the one that's used (not init.signal)
-            expect(calledOptions.signal).toBeDefined();
-        });
-
-        it("should use init.signal when requestOptions.abortSignal is not set", async () => {
-            const initController = new AbortController();
-
-            await makePassthroughRequest(
-                "https://api.example.com",
-                { signal: initController.signal },
-                { fetch: mockFetch },
-            );
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.signal).toBeDefined();
-        });
-    });
-
-    describe("credentials", () => {
-        it("should pass credentials include when set", async () => {
-            await makePassthroughRequest("https://api.example.com", { credentials: "include" }, { fetch: mockFetch });
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.credentials).toBe("include");
-        });
-
-        it("should not pass credentials when not set to include", async () => {
-            await makePassthroughRequest(
-                "https://api.example.com",
-                { credentials: "same-origin" },
-                {
-                    fetch: mockFetch,
-                },
-            );
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.credentials).toBeUndefined();
-        });
-    });
-
-    describe("response", () => {
-        it("should return the Response object from fetch", async () => {
-            const mockResponse = new Response(JSON.stringify({ data: "test" }), {
-                status: 200,
-                headers: { "Content-Type": "application/json" },
-            });
-            mockFetch.mockResolvedValue(mockResponse);
-
-            const response = await makePassthroughRequest("https://api.example.com", undefined, {
-                fetch: mockFetch,
-            });
-            expect(response).toBe(mockResponse);
-            expect(response.status).toBe(200);
-        });
-
-        it("should return error responses without throwing", async () => {
-            const errorResponse = new Response("Not Found", { status: 404 });
-            mockFetch.mockResolvedValue(errorResponse);
-
-            const response = await makePassthroughRequest("https://api.example.com", undefined, {
-                fetch: mockFetch,
-            });
-            expect(response.status).toBe(404);
-        });
-    });
-
-    describe("Request object input", () => {
-        it("should extract URL from Request object", async () => {
-            const request = new Request("https://api.example.com/v1/resource", { method: "POST" });
-            await makePassthroughRequest(request, undefined, {
-                fetch: mockFetch,
-            });
-            const [calledUrl, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledUrl).toBe("https://api.example.com/v1/resource");
-            expect(calledOptions.method).toBe("POST");
-        });
-
-        it("should extract headers from Request object when no init provided", async () => {
-            const request = new Request("https://api.example.com", {
-                headers: { "X-From-Request": "request-value" },
-            });
-            await makePassthroughRequest(request, undefined, {
-                fetch: mockFetch,
-            });
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.headers["x-from-request"]).toBe("request-value");
-        });
-
-        it("should use explicit init over Request object properties", async () => {
-            const request = new Request("https://api.example.com", {
-                method: "POST",
-                headers: { "X-From-Request": "request-value" },
-            });
-            await makePassthroughRequest(
-                request,
-                { method: "PUT", headers: { "X-From-Init": "init-value" } },
-                { fetch: mockFetch },
-            );
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.method).toBe("PUT");
-            expect(calledOptions.headers["x-from-init"]).toBe("init-value");
-            // Request headers should NOT be present since explicit init was provided
-            expect(calledOptions.headers["x-from-request"]).toBeUndefined();
-        });
-    });
-
-    describe("SDK default header suppliers", () => {
-        it("should resolve supplier functions for SDK default headers", async () => {
-            await makePassthroughRequest("https://api.example.com", undefined, {
-                headers: {
-                    "X-Static": "static-value",
-                    "X-Dynamic": () => "dynamic-value",
-                },
-                fetch: mockFetch,
-            });
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.headers["x-static"]).toBe("static-value");
-            expect(calledOptions.headers["x-dynamic"]).toBe("dynamic-value");
-        });
-    });
-});
diff --git a/src/management/tests/unit/fetcher/makeRequest.test.ts b/src/management/tests/unit/fetcher/makeRequest.test.ts
index 64a13b9d41..4d77a6c950 100644
--- a/src/management/tests/unit/fetcher/makeRequest.test.ts
+++ b/src/management/tests/unit/fetcher/makeRequest.test.ts
@@ -1,4 +1,4 @@
-import { makeRequest, isCacheNoStoreSupported, resetCacheNoStoreSupported } from "../../../core/fetcher/makeRequest";
+import { makeRequest } from "../../../../../src/management/core/fetcher/makeRequest";
 
 describe("Test makeRequest", () => {
     const mockPostUrl = "https://httpbin.org/post";
@@ -11,7 +11,6 @@ describe("Test makeRequest", () => {
     beforeEach(() => {
         mockFetch = jest.fn();
         mockFetch.mockResolvedValue(new Response(JSON.stringify({ test: "successful" }), { status: 200 }));
-        resetCacheNoStoreSupported();
     });
 
     it("should handle POST request correctly", async () => {
@@ -51,103 +50,4 @@ describe("Test makeRequest", () => {
         expect(calledOptions.signal).toBeDefined();
         expect(calledOptions.signal).toBeInstanceOf(AbortSignal);
     });
-
-    it("should not include cache option when disableCache is not set", async () => {
-        await makeRequest(mockFetch, mockGetUrl, "GET", mockHeaders, undefined);
-        const [, calledOptions] = mockFetch.mock.calls[0];
-        expect(calledOptions.cache).toBeUndefined();
-    });
-
-    it("should not include cache option when disableCache is false", async () => {
-        await makeRequest(
-            mockFetch,
-            mockGetUrl,
-            "GET",
-            mockHeaders,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            false,
-        );
-        const [, calledOptions] = mockFetch.mock.calls[0];
-        expect(calledOptions.cache).toBeUndefined();
-    });
-
-    it("should include cache: no-store when disableCache is true and runtime supports it", async () => {
-        // In Node.js test environment, Request supports the cache option
-        expect(isCacheNoStoreSupported()).toBe(true);
-        await makeRequest(
-            mockFetch,
-            mockGetUrl,
-            "GET",
-            mockHeaders,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            true,
-        );
-        const [, calledOptions] = mockFetch.mock.calls[0];
-        expect(calledOptions.cache).toBe("no-store");
-    });
-
-    it("should cache the result of isCacheNoStoreSupported", () => {
-        const first = isCacheNoStoreSupported();
-        const second = isCacheNoStoreSupported();
-        expect(first).toBe(second);
-    });
-
-    it("should reset cache detection state with resetCacheNoStoreSupported", () => {
-        // First call caches the result
-        const first = isCacheNoStoreSupported();
-        expect(first).toBe(true);
-
-        // Reset clears the cache
-        resetCacheNoStoreSupported();
-
-        // After reset, it should re-detect (and still return true in Node.js)
-        const second = isCacheNoStoreSupported();
-        expect(second).toBe(true);
-    });
-
-    it("should not include cache option when runtime does not support it (e.g. Cloudflare Workers)", async () => {
-        // Mock Request constructor to throw when cache option is passed,
-        // simulating runtimes like Cloudflare Workers
-        const OriginalRequest = globalThis.Request;
-        globalThis.Request = class MockRequest {
-            constructor(_url: string, init?: RequestInit) {
-                if (init?.cache != null) {
-                    throw new TypeError("The 'cache' field on 'RequestInitializerDict' is not implemented.");
-                }
-            }
-        } as unknown as typeof Request;
-
-        try {
-            // Reset so the detection runs fresh with the mocked Request
-            resetCacheNoStoreSupported();
-            expect(isCacheNoStoreSupported()).toBe(false);
-
-            await makeRequest(
-                mockFetch,
-                mockGetUrl,
-                "GET",
-                mockHeaders,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                true,
-            );
-            const [, calledOptions] = mockFetch.mock.calls[0];
-            expect(calledOptions.cache).toBeUndefined();
-        } finally {
-            // Restore original Request
-            globalThis.Request = OriginalRequest;
-            resetCacheNoStoreSupported();
-        }
-    });
 });
diff --git a/src/management/tests/unit/fetcher/redacting.test.ts b/src/management/tests/unit/fetcher/redacting.test.ts
index a235bc92c7..4d9d18d228 100644
--- a/src/management/tests/unit/fetcher/redacting.test.ts
+++ b/src/management/tests/unit/fetcher/redacting.test.ts
@@ -1,4 +1,4 @@
-import { fetcherImpl } from "../../../core/fetcher/Fetcher";
+import { fetcherImpl } from "../../../../../src/management/core/fetcher/Fetcher";
 
 function createMockLogger() {
     return {
diff --git a/src/management/tests/unit/fetcher/requestWithRetries.test.ts b/src/management/tests/unit/fetcher/requestWithRetries.test.ts
index 7e5de66d30..333b6c8e5d 100644
--- a/src/management/tests/unit/fetcher/requestWithRetries.test.ts
+++ b/src/management/tests/unit/fetcher/requestWithRetries.test.ts
@@ -1,4 +1,4 @@
-import { requestWithRetries } from "../../../core/fetcher/requestWithRetries";
+import { requestWithRetries } from "../../../../../src/management/core/fetcher/requestWithRetries";
 
 describe("requestWithRetries", () => {
     let mockFetch: jest.Mock;
diff --git a/src/management/tests/unit/fetcher/signals.test.ts b/src/management/tests/unit/fetcher/signals.test.ts
index 10289e2431..a957f16187 100644
--- a/src/management/tests/unit/fetcher/signals.test.ts
+++ b/src/management/tests/unit/fetcher/signals.test.ts
@@ -1,4 +1,4 @@
-import { anySignal, getTimeoutSignal } from "../../../core/fetcher/signals";
+import { anySignal, getTimeoutSignal } from "../../../../../src/management/core/fetcher/signals";
 
 describe("Test getTimeoutSignal", () => {
     beforeEach(() => {
diff --git a/src/management/tests/unit/file/file.test.ts b/src/management/tests/unit/file/file.test.ts
index f9e0f20e32..4fcdb4149f 100644
--- a/src/management/tests/unit/file/file.test.ts
+++ b/src/management/tests/unit/file/file.test.ts
@@ -1,7 +1,7 @@
 import fs from "fs";
 import { join } from "path";
 import { Readable } from "stream";
-import { toBinaryUploadRequest, type Uploadable } from "../../../core/file/index";
+import { toBinaryUploadRequest, type Uploadable } from "../../../../../src/management/core/file/index";
 
 describe("toBinaryUploadRequest", () => {
     const TEST_FILE_PATH = join(__dirname, "..", "test-file.txt");
diff --git a/src/management/tests/unit/form-data-utils/encodeAsFormParameter.test.ts b/src/management/tests/unit/form-data-utils/encodeAsFormParameter.test.ts
index b5448f081e..dbea945725 100644
--- a/src/management/tests/unit/form-data-utils/encodeAsFormParameter.test.ts
+++ b/src/management/tests/unit/form-data-utils/encodeAsFormParameter.test.ts
@@ -1,4 +1,4 @@
-import { encodeAsFormParameter } from "../../../core/form-data-utils/encodeAsFormParameter";
+import { encodeAsFormParameter } from "../../../../../src/management/core/form-data-utils/encodeAsFormParameter";
 
 describe("encodeAsFormParameter", () => {
     describe("Basic functionality", () => {
diff --git a/src/management/tests/unit/form-data-utils/formDataWrapper.test.ts b/src/management/tests/unit/form-data-utils/formDataWrapper.test.ts
index 7dda561a68..af822ceba0 100644
--- a/src/management/tests/unit/form-data-utils/formDataWrapper.test.ts
+++ b/src/management/tests/unit/form-data-utils/formDataWrapper.test.ts
@@ -2,7 +2,7 @@
 import { Readable } from "stream";
 import { join } from "path";
 import { File, Blob } from "buffer";
-import { FormDataWrapper, newFormData } from "../../../core/form-data-utils/FormDataWrapper";
+import { FormDataWrapper, newFormData } from "../../../../../src/management/core/form-data-utils/FormDataWrapper";
 
 // Helper function to serialize FormData to string for inspection
 async function serializeFormData(formData: FormData): Promise<string> {
diff --git a/src/management/tests/unit/logging/logger.test.ts b/src/management/tests/unit/logging/logger.test.ts
index f637c2445d..fc7836427b 100644
--- a/src/management/tests/unit/logging/logger.test.ts
+++ b/src/management/tests/unit/logging/logger.test.ts
@@ -1,4 +1,4 @@
-import { ConsoleLogger, createLogger, Logger, LogLevel } from "../../../core/logging/logger";
+import { ConsoleLogger, createLogger, Logger, LogLevel } from "../../../../../src/management/core/logging/logger";
 
 function createMockLogger() {
     return {
diff --git a/src/management/tests/unit/url/join.test.ts b/src/management/tests/unit/url/join.test.ts
index 9f50271337..91a190509a 100644
--- a/src/management/tests/unit/url/join.test.ts
+++ b/src/management/tests/unit/url/join.test.ts
@@ -1,4 +1,4 @@
-import { join } from "../../../core/url/index";
+import { join } from "../../../../../src/management/core/url/index";
 
 describe("join", () => {
     interface TestCase {
diff --git a/src/management/tests/unit/url/qs.test.ts b/src/management/tests/unit/url/qs.test.ts
index dde350341d..66172c760c 100644
--- a/src/management/tests/unit/url/qs.test.ts
+++ b/src/management/tests/unit/url/qs.test.ts
@@ -1,4 +1,4 @@
-import { toQueryString } from "../../../core/url/index";
+import { toQueryString } from "../../../../../src/management/core/url/index";
 
 describe("Test qs toQueryString", () => {
     interface BasicTestCase {
diff --git a/src/management/tests/unit/utils/setObjectProperty.test.ts b/src/management/tests/unit/utils/setObjectProperty.test.ts
index c3b86d8686..7dfa4085ee 100644
--- a/src/management/tests/unit/utils/setObjectProperty.test.ts
+++ b/src/management/tests/unit/utils/setObjectProperty.test.ts
@@ -1,4 +1,4 @@
-import { setObjectProperty } from "../../../core/utils/setObjectProperty";
+import { setObjectProperty } from "../../../../../src/management/core/utils/setObjectProperty";
 
 interface TestCase {
     description: string;
diff --git a/src/management/tests/wire/actions.test.ts b/src/management/tests/wire/actions.test.ts
index 1a94ac6f57..5fc84b8f47 100644
--- a/src/management/tests/wire/actions.test.ts
+++ b/src/management/tests/wire/actions.test.ts
@@ -33,7 +33,6 @@ describe("ActionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/actions")
@@ -42,7 +41,34 @@ describe("ActionsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            total: 1.1,
+            page: 1.1,
+            per_page: 1.1,
+            actions: [
+                {
+                    id: "id",
+                    name: "name",
+                    supported_triggers: [
+                        {
+                            id: "post-login",
+                        },
+                    ],
+                    all_changes_deployed: true,
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                    code: "code",
+                    dependencies: [{}],
+                    runtime: "runtime",
+                    secrets: [{}],
+                    installed_integration_id: "installed_integration_id",
+                    status: "pending",
+                    built_at: "2024-01-15T09:30:00Z",
+                    deploy: true,
+                    modules: [{}],
+                },
+            ],
+        };
         const page = await client.actions.list({
             triggerId: "post-login",
             actionName: "actionName",
@@ -63,7 +89,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/actions")
@@ -82,7 +107,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/actions")
@@ -101,7 +125,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/actions")
@@ -120,7 +143,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/actions")
@@ -219,7 +241,6 @@ describe("ActionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .post("/actions/actions")
@@ -237,7 +258,113 @@ describe("ActionsClient", () => {
                 },
             ],
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            supported_triggers: [
+                {
+                    id: "post-login",
+                    version: "version",
+                    status: "status",
+                    runtimes: ["runtimes"],
+                    default_runtime: "default_runtime",
+                    compatible_triggers: [
+                        {
+                            id: "post-login",
+                            version: "version",
+                        },
+                    ],
+                    binding_policy: "trigger-bound",
+                },
+            ],
+            all_changes_deployed: true,
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            code: "code",
+            dependencies: [
+                {
+                    name: "name",
+                    version: "version",
+                    registry_url: "registry_url",
+                },
+            ],
+            runtime: "runtime",
+            secrets: [
+                {
+                    name: "name",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            deployed_version: {
+                id: "id",
+                action_id: "action_id",
+                code: "code",
+                dependencies: [{}],
+                deployed: true,
+                runtime: "runtime",
+                secrets: [{}],
+                status: "pending",
+                number: 1.1,
+                errors: [{}],
+                action: {
+                    id: "id",
+                    name: "name",
+                    supported_triggers: [
+                        {
+                            id: "post-login",
+                        },
+                    ],
+                    all_changes_deployed: true,
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+                built_at: "2024-01-15T09:30:00Z",
+                created_at: "2024-01-15T09:30:00Z",
+                updated_at: "2024-01-15T09:30:00Z",
+                supported_triggers: [
+                    {
+                        id: "post-login",
+                    },
+                ],
+                modules: [{}],
+            },
+            installed_integration_id: "installed_integration_id",
+            integration: {
+                id: "id",
+                catalog_id: "catalog_id",
+                url_slug: "url_slug",
+                partner_id: "partner_id",
+                name: "name",
+                description: "description",
+                short_description: "short_description",
+                logo: "logo",
+                feature_type: "unspecified",
+                terms_of_use_url: "terms_of_use_url",
+                privacy_policy_url: "privacy_policy_url",
+                public_support_link: "public_support_link",
+                current_release: {
+                    id: "id",
+                    trigger: {
+                        id: "post-login",
+                    },
+                    required_secrets: [{}],
+                    required_configuration: [{}],
+                },
+                created_at: "2024-01-15T09:30:00Z",
+                updated_at: "2024-01-15T09:30:00Z",
+            },
+            status: "pending",
+            built_at: "2024-01-15T09:30:00Z",
+            deploy: true,
+            modules: [
+                {
+                    module_id: "module_id",
+                    module_name: "module_name",
+                    module_version_id: "module_version_id",
+                    module_version_number: 1,
+                },
+            ],
+        });
     });
 
     test("create (2)", async () => {
@@ -245,7 +372,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "my-action", supported_triggers: [{ id: "post-login" }, { id: "post-login" }] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions")
@@ -275,7 +401,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "my-action", supported_triggers: [{ id: "post-login" }, { id: "post-login" }] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions")
@@ -305,7 +430,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "my-action", supported_triggers: [{ id: "post-login" }, { id: "post-login" }] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions")
@@ -335,7 +459,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "my-action", supported_triggers: [{ id: "post-login" }, { id: "post-login" }] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions")
@@ -445,7 +568,6 @@ describe("ActionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .get("/actions/actions/id")
@@ -455,7 +577,113 @@ describe("ActionsClient", () => {
             .build();
 
         const response = await client.actions.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            supported_triggers: [
+                {
+                    id: "post-login",
+                    version: "version",
+                    status: "status",
+                    runtimes: ["runtimes"],
+                    default_runtime: "default_runtime",
+                    compatible_triggers: [
+                        {
+                            id: "post-login",
+                            version: "version",
+                        },
+                    ],
+                    binding_policy: "trigger-bound",
+                },
+            ],
+            all_changes_deployed: true,
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            code: "code",
+            dependencies: [
+                {
+                    name: "name",
+                    version: "version",
+                    registry_url: "registry_url",
+                },
+            ],
+            runtime: "runtime",
+            secrets: [
+                {
+                    name: "name",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            deployed_version: {
+                id: "id",
+                action_id: "action_id",
+                code: "code",
+                dependencies: [{}],
+                deployed: true,
+                runtime: "runtime",
+                secrets: [{}],
+                status: "pending",
+                number: 1.1,
+                errors: [{}],
+                action: {
+                    id: "id",
+                    name: "name",
+                    supported_triggers: [
+                        {
+                            id: "post-login",
+                        },
+                    ],
+                    all_changes_deployed: true,
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+                built_at: "2024-01-15T09:30:00Z",
+                created_at: "2024-01-15T09:30:00Z",
+                updated_at: "2024-01-15T09:30:00Z",
+                supported_triggers: [
+                    {
+                        id: "post-login",
+                    },
+                ],
+                modules: [{}],
+            },
+            installed_integration_id: "installed_integration_id",
+            integration: {
+                id: "id",
+                catalog_id: "catalog_id",
+                url_slug: "url_slug",
+                partner_id: "partner_id",
+                name: "name",
+                description: "description",
+                short_description: "short_description",
+                logo: "logo",
+                feature_type: "unspecified",
+                terms_of_use_url: "terms_of_use_url",
+                privacy_policy_url: "privacy_policy_url",
+                public_support_link: "public_support_link",
+                current_release: {
+                    id: "id",
+                    trigger: {
+                        id: "post-login",
+                    },
+                    required_secrets: [{}],
+                    required_configuration: [{}],
+                },
+                created_at: "2024-01-15T09:30:00Z",
+                updated_at: "2024-01-15T09:30:00Z",
+            },
+            status: "pending",
+            built_at: "2024-01-15T09:30:00Z",
+            deploy: true,
+            modules: [
+                {
+                    module_id: "module_id",
+                    module_name: "module_name",
+                    module_version_id: "module_version_id",
+                    module_version_number: 1,
+                },
+            ],
+        });
     });
 
     test("get (2)", async () => {
@@ -463,7 +691,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/actions/id")
@@ -482,7 +709,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/actions/id")
@@ -501,7 +727,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/actions/id")
@@ -520,7 +745,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/actions/id")
@@ -539,7 +763,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/actions/id")
@@ -570,7 +793,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/actions/actions/id")
@@ -589,7 +811,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/actions/actions/id")
@@ -608,7 +829,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/actions/actions/id")
@@ -627,7 +847,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/actions/actions/id")
@@ -646,7 +865,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/actions/actions/id")
@@ -745,7 +963,6 @@ describe("ActionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .patch("/actions/actions/id")
@@ -756,7 +973,113 @@ describe("ActionsClient", () => {
             .build();
 
         const response = await client.actions.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            supported_triggers: [
+                {
+                    id: "post-login",
+                    version: "version",
+                    status: "status",
+                    runtimes: ["runtimes"],
+                    default_runtime: "default_runtime",
+                    compatible_triggers: [
+                        {
+                            id: "post-login",
+                            version: "version",
+                        },
+                    ],
+                    binding_policy: "trigger-bound",
+                },
+            ],
+            all_changes_deployed: true,
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            code: "code",
+            dependencies: [
+                {
+                    name: "name",
+                    version: "version",
+                    registry_url: "registry_url",
+                },
+            ],
+            runtime: "runtime",
+            secrets: [
+                {
+                    name: "name",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            deployed_version: {
+                id: "id",
+                action_id: "action_id",
+                code: "code",
+                dependencies: [{}],
+                deployed: true,
+                runtime: "runtime",
+                secrets: [{}],
+                status: "pending",
+                number: 1.1,
+                errors: [{}],
+                action: {
+                    id: "id",
+                    name: "name",
+                    supported_triggers: [
+                        {
+                            id: "post-login",
+                        },
+                    ],
+                    all_changes_deployed: true,
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+                built_at: "2024-01-15T09:30:00Z",
+                created_at: "2024-01-15T09:30:00Z",
+                updated_at: "2024-01-15T09:30:00Z",
+                supported_triggers: [
+                    {
+                        id: "post-login",
+                    },
+                ],
+                modules: [{}],
+            },
+            installed_integration_id: "installed_integration_id",
+            integration: {
+                id: "id",
+                catalog_id: "catalog_id",
+                url_slug: "url_slug",
+                partner_id: "partner_id",
+                name: "name",
+                description: "description",
+                short_description: "short_description",
+                logo: "logo",
+                feature_type: "unspecified",
+                terms_of_use_url: "terms_of_use_url",
+                privacy_policy_url: "privacy_policy_url",
+                public_support_link: "public_support_link",
+                current_release: {
+                    id: "id",
+                    trigger: {
+                        id: "post-login",
+                    },
+                    required_secrets: [{}],
+                    required_configuration: [{}],
+                },
+                created_at: "2024-01-15T09:30:00Z",
+                updated_at: "2024-01-15T09:30:00Z",
+            },
+            status: "pending",
+            built_at: "2024-01-15T09:30:00Z",
+            deploy: true,
+            modules: [
+                {
+                    module_id: "module_id",
+                    module_name: "module_name",
+                    module_version_id: "module_version_id",
+                    module_version_number: 1,
+                },
+            ],
+        });
     });
 
     test("update (2)", async () => {
@@ -764,7 +1087,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/actions/id")
@@ -784,7 +1106,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/actions/id")
@@ -804,7 +1125,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/actions/id")
@@ -824,7 +1144,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/actions/id")
@@ -844,7 +1163,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/actions/id")
@@ -905,7 +1223,6 @@ describe("ActionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .post("/actions/actions/id/deploy")
@@ -915,7 +1232,74 @@ describe("ActionsClient", () => {
             .build();
 
         const response = await client.actions.deploy("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            action_id: "action_id",
+            code: "code",
+            dependencies: [
+                {
+                    name: "name",
+                    version: "version",
+                    registry_url: "registry_url",
+                },
+            ],
+            deployed: true,
+            runtime: "runtime",
+            secrets: [
+                {
+                    name: "name",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            status: "pending",
+            number: 1.1,
+            errors: [
+                {
+                    id: "id",
+                    msg: "msg",
+                    url: "url",
+                },
+            ],
+            action: {
+                id: "id",
+                name: "name",
+                supported_triggers: [
+                    {
+                        id: "post-login",
+                    },
+                ],
+                all_changes_deployed: true,
+                created_at: "2024-01-15T09:30:00Z",
+                updated_at: "2024-01-15T09:30:00Z",
+            },
+            built_at: "2024-01-15T09:30:00Z",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            supported_triggers: [
+                {
+                    id: "post-login",
+                    version: "version",
+                    status: "status",
+                    runtimes: ["runtimes"],
+                    default_runtime: "default_runtime",
+                    compatible_triggers: [
+                        {
+                            id: "post-login",
+                            version: "version",
+                        },
+                    ],
+                    binding_policy: "trigger-bound",
+                },
+            ],
+            modules: [
+                {
+                    module_id: "module_id",
+                    module_name: "module_name",
+                    module_version_id: "module_version_id",
+                    module_version_number: 1,
+                },
+            ],
+        });
     });
 
     test("deploy (2)", async () => {
@@ -923,7 +1307,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions/id/deploy")
@@ -942,7 +1325,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions/id/deploy")
@@ -961,7 +1343,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions/id/deploy")
@@ -980,7 +1361,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions/id/deploy")
@@ -999,7 +1379,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { payload: { key: "value" } };
         const rawResponseBody = { payload: { key: "value" } };
-
         server
             .mockEndpoint()
             .post("/actions/actions/id/test")
@@ -1014,7 +1393,11 @@ describe("ActionsClient", () => {
                 key: "value",
             },
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            payload: {
+                key: "value",
+            },
+        });
     });
 
     test("test (2)", async () => {
@@ -1022,7 +1405,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { payload: { payload: { key: "value" } } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions/id/test")
@@ -1048,7 +1430,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { payload: { payload: { key: "value" } } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions/id/test")
@@ -1074,7 +1455,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { payload: { payload: { key: "value" } } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions/id/test")
@@ -1100,7 +1480,6 @@ describe("ActionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { payload: { payload: { key: "value" } } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions/id/test")
diff --git a/src/management/tests/wire/actions/executions.test.ts b/src/management/tests/wire/actions/executions.test.ts
index cd88cccc24..ee51a45acb 100644
--- a/src/management/tests/wire/actions/executions.test.ts
+++ b/src/management/tests/wire/actions/executions.test.ts
@@ -19,7 +19,6 @@ describe("ExecutionsClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .get("/actions/executions/id")
@@ -29,7 +28,20 @@ describe("ExecutionsClient", () => {
             .build();
 
         const response = await client.actions.executions.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            trigger_id: "post-login",
+            status: "unspecified",
+            results: [
+                {
+                    action_name: "action_name",
+                    started_at: "2024-01-15T09:30:00Z",
+                    ended_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("get (2)", async () => {
@@ -37,7 +49,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/executions/id")
@@ -56,7 +67,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/executions/id")
@@ -75,7 +85,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/executions/id")
@@ -94,7 +103,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/executions/id")
@@ -113,7 +121,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/executions/id")
diff --git a/src/management/tests/wire/actions/modules.test.ts b/src/management/tests/wire/actions/modules.test.ts
index 05c7d15902..f6ad23e77c 100644
--- a/src/management/tests/wire/actions/modules.test.ts
+++ b/src/management/tests/wire/actions/modules.test.ts
@@ -28,7 +28,6 @@ describe("ModulesClient", () => {
             page: 1,
             per_page: 1,
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules")
@@ -37,7 +36,25 @@ describe("ModulesClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            modules: [
+                {
+                    id: "id",
+                    name: "name",
+                    code: "code",
+                    dependencies: [{}],
+                    secrets: [{}],
+                    actions_using_module_total: 1,
+                    all_changes_published: true,
+                    latest_version_number: 1,
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            total: 1,
+            page: 1,
+            per_page: 1,
+        };
         const page = await client.actions.modules.list({
             page: 1,
             per_page: 1,
@@ -54,7 +71,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules")
@@ -73,7 +89,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules")
@@ -92,7 +107,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules")
@@ -111,7 +125,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules")
@@ -149,7 +162,6 @@ describe("ModulesClient", () => {
                 created_at: "2024-01-15T09:30:00Z",
             },
         };
-
         server
             .mockEndpoint()
             .post("/actions/modules")
@@ -163,7 +175,36 @@ describe("ModulesClient", () => {
             name: "name",
             code: "code",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            code: "code",
+            dependencies: [
+                {
+                    name: "name",
+                    version: "version",
+                },
+            ],
+            secrets: [
+                {
+                    name: "name",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            actions_using_module_total: 1,
+            all_changes_published: true,
+            latest_version_number: 1,
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            latest_version: {
+                id: "id",
+                version_number: 1,
+                code: "code",
+                dependencies: [{}],
+                secrets: [{}],
+                created_at: "2024-01-15T09:30:00Z",
+            },
+        });
     });
 
     test("create (2)", async () => {
@@ -171,7 +212,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name", code: "code" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules")
@@ -194,7 +234,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name", code: "code" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules")
@@ -217,7 +256,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name", code: "code" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules")
@@ -240,7 +278,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name", code: "code" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules")
@@ -263,7 +300,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name", code: "code" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules")
@@ -305,7 +341,6 @@ describe("ModulesClient", () => {
                 created_at: "2024-01-15T09:30:00Z",
             },
         };
-
         server
             .mockEndpoint()
             .get("/actions/modules/id")
@@ -315,7 +350,36 @@ describe("ModulesClient", () => {
             .build();
 
         const response = await client.actions.modules.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            code: "code",
+            dependencies: [
+                {
+                    name: "name",
+                    version: "version",
+                },
+            ],
+            secrets: [
+                {
+                    name: "name",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            actions_using_module_total: 1,
+            all_changes_published: true,
+            latest_version_number: 1,
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            latest_version: {
+                id: "id",
+                version_number: 1,
+                code: "code",
+                dependencies: [{}],
+                secrets: [{}],
+                created_at: "2024-01-15T09:30:00Z",
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -323,7 +387,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/modules/id")
@@ -342,7 +405,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/modules/id")
@@ -361,7 +423,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/modules/id")
@@ -380,7 +441,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/modules/id")
@@ -399,7 +459,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/modules/id")
@@ -428,7 +487,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/actions/modules/id")
@@ -447,7 +505,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/actions/modules/id")
@@ -466,7 +523,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/actions/modules/id")
@@ -485,7 +541,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/actions/modules/id")
@@ -504,7 +559,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/actions/modules/id")
@@ -523,7 +577,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/actions/modules/id")
@@ -561,7 +614,6 @@ describe("ModulesClient", () => {
                 created_at: "2024-01-15T09:30:00Z",
             },
         };
-
         server
             .mockEndpoint()
             .patch("/actions/modules/id")
@@ -572,7 +624,36 @@ describe("ModulesClient", () => {
             .build();
 
         const response = await client.actions.modules.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            code: "code",
+            dependencies: [
+                {
+                    name: "name",
+                    version: "version",
+                },
+            ],
+            secrets: [
+                {
+                    name: "name",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            actions_using_module_total: 1,
+            all_changes_published: true,
+            latest_version_number: 1,
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            latest_version: {
+                id: "id",
+                version_number: 1,
+                code: "code",
+                dependencies: [{}],
+                secrets: [{}],
+                created_at: "2024-01-15T09:30:00Z",
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -580,7 +661,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/modules/id")
@@ -600,7 +680,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/modules/id")
@@ -620,7 +699,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/modules/id")
@@ -640,7 +718,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/modules/id")
@@ -660,7 +737,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/modules/id")
@@ -680,7 +756,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/modules/id")
@@ -713,7 +788,6 @@ describe("ModulesClient", () => {
             page: 1,
             per_page: 1,
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules/id/actions")
@@ -722,7 +796,24 @@ describe("ModulesClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            actions: [
+                {
+                    action_id: "action_id",
+                    action_name: "action_name",
+                    module_version_id: "module_version_id",
+                    module_version_number: 1,
+                    supported_triggers: [
+                        {
+                            id: "post-login",
+                        },
+                    ],
+                },
+            ],
+            total: 1,
+            page: 1,
+            per_page: 1,
+        };
         const page = await client.actions.modules.listActions("id", {
             page: 1,
             per_page: 1,
@@ -739,7 +830,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules/id/actions")
@@ -758,7 +848,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules/id/actions")
@@ -777,7 +866,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules/id/actions")
@@ -796,7 +884,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules/id/actions")
@@ -815,7 +902,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules/id/actions")
@@ -853,7 +939,6 @@ describe("ModulesClient", () => {
                 created_at: "2024-01-15T09:30:00Z",
             },
         };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/rollback")
@@ -866,7 +951,36 @@ describe("ModulesClient", () => {
         const response = await client.actions.modules.rollback("id", {
             module_version_id: "module_version_id",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            code: "code",
+            dependencies: [
+                {
+                    name: "name",
+                    version: "version",
+                },
+            ],
+            secrets: [
+                {
+                    name: "name",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            actions_using_module_total: 1,
+            all_changes_published: true,
+            latest_version_number: 1,
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            latest_version: {
+                id: "id",
+                version_number: 1,
+                code: "code",
+                dependencies: [{}],
+                secrets: [{}],
+                created_at: "2024-01-15T09:30:00Z",
+            },
+        });
     });
 
     test("rollback (2)", async () => {
@@ -874,7 +988,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { module_version_id: "module_version_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/rollback")
@@ -896,7 +1009,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { module_version_id: "module_version_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/rollback")
@@ -918,7 +1030,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { module_version_id: "module_version_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/rollback")
@@ -940,7 +1051,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { module_version_id: "module_version_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/rollback")
@@ -962,7 +1072,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { module_version_id: "module_version_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/rollback")
@@ -984,7 +1093,6 @@ describe("ModulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { module_version_id: "module_version_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/rollback")
diff --git a/src/management/tests/wire/actions/modules/versions.test.ts b/src/management/tests/wire/actions/modules/versions.test.ts
index 823ee581b8..a00acca3a5 100644
--- a/src/management/tests/wire/actions/modules/versions.test.ts
+++ b/src/management/tests/wire/actions/modules/versions.test.ts
@@ -25,7 +25,6 @@ describe("VersionsClient", () => {
             page: 1,
             per_page: 1,
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules/id/versions")
@@ -34,7 +33,22 @@ describe("VersionsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            versions: [
+                {
+                    id: "id",
+                    module_id: "module_id",
+                    version_number: 1,
+                    code: "code",
+                    secrets: [{}],
+                    dependencies: [{}],
+                    created_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            total: 1,
+            page: 1,
+            per_page: 1,
+        };
         const page = await client.actions.modules.versions.list("id", {
             page: 1,
             per_page: 1,
@@ -51,7 +65,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules/id/versions")
@@ -70,7 +83,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules/id/versions")
@@ -89,7 +101,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules/id/versions")
@@ -108,7 +119,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules/id/versions")
@@ -127,7 +137,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/modules/id/versions")
@@ -154,7 +163,6 @@ describe("VersionsClient", () => {
             dependencies: [{ name: "name", version: "version" }],
             created_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/versions")
@@ -164,7 +172,25 @@ describe("VersionsClient", () => {
             .build();
 
         const response = await client.actions.modules.versions.create("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            module_id: "module_id",
+            version_number: 1,
+            code: "code",
+            secrets: [
+                {
+                    name: "name",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            dependencies: [
+                {
+                    name: "name",
+                    version: "version",
+                },
+            ],
+            created_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("create (2)", async () => {
@@ -172,7 +198,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/versions")
@@ -191,7 +216,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/versions")
@@ -210,7 +234,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/versions")
@@ -229,7 +252,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/versions")
@@ -248,7 +270,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/versions")
@@ -267,7 +288,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/modules/id/versions")
@@ -294,7 +314,6 @@ describe("VersionsClient", () => {
             dependencies: [{ name: "name", version: "version" }],
             created_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .get("/actions/modules/id/versions/versionId")
@@ -304,7 +323,25 @@ describe("VersionsClient", () => {
             .build();
 
         const response = await client.actions.modules.versions.get("id", "versionId");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            module_id: "module_id",
+            version_number: 1,
+            code: "code",
+            secrets: [
+                {
+                    name: "name",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            dependencies: [
+                {
+                    name: "name",
+                    version: "version",
+                },
+            ],
+            created_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("get (2)", async () => {
@@ -312,7 +349,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/modules/id/versions/versionId")
@@ -331,7 +367,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/modules/id/versions/versionId")
@@ -350,7 +385,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/modules/id/versions/versionId")
@@ -369,7 +403,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/modules/id/versions/versionId")
@@ -388,7 +421,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/modules/id/versions/versionId")
diff --git a/src/management/tests/wire/actions/triggers.test.ts b/src/management/tests/wire/actions/triggers.test.ts
index d746f82647..6c4911e690 100644
--- a/src/management/tests/wire/actions/triggers.test.ts
+++ b/src/management/tests/wire/actions/triggers.test.ts
@@ -22,11 +22,27 @@ describe("TriggersClient", () => {
                 },
             ],
         };
-
         server.mockEndpoint().get("/actions/triggers").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.actions.triggers.list();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            triggers: [
+                {
+                    id: "post-login",
+                    version: "version",
+                    status: "status",
+                    runtimes: ["runtimes"],
+                    default_runtime: "default_runtime",
+                    compatible_triggers: [
+                        {
+                            id: "post-login",
+                            version: "version",
+                        },
+                    ],
+                    binding_policy: "trigger-bound",
+                },
+            ],
+        });
     });
 
     test("list (2)", async () => {
@@ -34,7 +50,6 @@ describe("TriggersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/actions/triggers").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -47,7 +62,6 @@ describe("TriggersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/actions/triggers").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -60,7 +74,6 @@ describe("TriggersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/actions/triggers").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -73,7 +86,6 @@ describe("TriggersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/actions/triggers").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
diff --git a/src/management/tests/wire/actions/triggers/bindings.test.ts b/src/management/tests/wire/actions/triggers/bindings.test.ts
index 3b99960f53..bf3b483ae3 100644
--- a/src/management/tests/wire/actions/triggers/bindings.test.ts
+++ b/src/management/tests/wire/actions/triggers/bindings.test.ts
@@ -23,7 +23,6 @@ describe("BindingsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/triggers/post-login/bindings")
@@ -32,7 +31,20 @@ describe("BindingsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            total: 1.1,
+            page: 1.1,
+            per_page: 1.1,
+            bindings: [
+                {
+                    id: "id",
+                    trigger_id: "post-login",
+                    display_name: "display_name",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+        };
         const page = await client.actions.triggers.bindings.list("post-login", {
             page: 1,
             per_page: 1,
@@ -49,7 +61,6 @@ describe("BindingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/triggers/post-login/bindings")
@@ -68,7 +79,6 @@ describe("BindingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/triggers/post-login/bindings")
@@ -87,7 +97,6 @@ describe("BindingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/triggers/post-login/bindings")
@@ -106,7 +115,6 @@ describe("BindingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/triggers/post-login/bindings")
@@ -135,7 +143,6 @@ describe("BindingsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .patch("/actions/triggers/post-login/bindings")
@@ -146,7 +153,17 @@ describe("BindingsClient", () => {
             .build();
 
         const response = await client.actions.triggers.bindings.updateMany("post-login");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            bindings: [
+                {
+                    id: "id",
+                    trigger_id: "post-login",
+                    display_name: "display_name",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+        });
     });
 
     test("updateMany (2)", async () => {
@@ -154,7 +171,6 @@ describe("BindingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/triggers/post-login/bindings")
@@ -174,7 +190,6 @@ describe("BindingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/triggers/post-login/bindings")
@@ -194,7 +209,6 @@ describe("BindingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/triggers/post-login/bindings")
@@ -214,7 +228,6 @@ describe("BindingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/actions/triggers/post-login/bindings")
diff --git a/src/management/tests/wire/actions/versions.test.ts b/src/management/tests/wire/actions/versions.test.ts
index 6d8f51b4dd..331bf1e47c 100644
--- a/src/management/tests/wire/actions/versions.test.ts
+++ b/src/management/tests/wire/actions/versions.test.ts
@@ -33,7 +33,6 @@ describe("VersionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/actions/actionId/versions")
@@ -42,7 +41,34 @@ describe("VersionsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            total: 1.1,
+            page: 1.1,
+            per_page: 1.1,
+            versions: [
+                {
+                    id: "id",
+                    action_id: "action_id",
+                    code: "code",
+                    dependencies: [{}],
+                    deployed: true,
+                    runtime: "runtime",
+                    secrets: [{}],
+                    status: "pending",
+                    number: 1.1,
+                    errors: [{}],
+                    built_at: "2024-01-15T09:30:00Z",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                    supported_triggers: [
+                        {
+                            id: "post-login",
+                        },
+                    ],
+                    modules: [{}],
+                },
+            ],
+        };
         const page = await client.actions.versions.list("actionId", {
             page: 1,
             per_page: 1,
@@ -59,7 +85,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/actions/actionId/versions")
@@ -78,7 +103,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/actions/actionId/versions")
@@ -97,7 +121,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/actions/actionId/versions")
@@ -116,7 +139,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/actions/actions/actionId/versions")
@@ -176,7 +198,6 @@ describe("VersionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .get("/actions/actions/actionId/versions/id")
@@ -186,7 +207,74 @@ describe("VersionsClient", () => {
             .build();
 
         const response = await client.actions.versions.get("actionId", "id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            action_id: "action_id",
+            code: "code",
+            dependencies: [
+                {
+                    name: "name",
+                    version: "version",
+                    registry_url: "registry_url",
+                },
+            ],
+            deployed: true,
+            runtime: "runtime",
+            secrets: [
+                {
+                    name: "name",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            status: "pending",
+            number: 1.1,
+            errors: [
+                {
+                    id: "id",
+                    msg: "msg",
+                    url: "url",
+                },
+            ],
+            action: {
+                id: "id",
+                name: "name",
+                supported_triggers: [
+                    {
+                        id: "post-login",
+                    },
+                ],
+                all_changes_deployed: true,
+                created_at: "2024-01-15T09:30:00Z",
+                updated_at: "2024-01-15T09:30:00Z",
+            },
+            built_at: "2024-01-15T09:30:00Z",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            supported_triggers: [
+                {
+                    id: "post-login",
+                    version: "version",
+                    status: "status",
+                    runtimes: ["runtimes"],
+                    default_runtime: "default_runtime",
+                    compatible_triggers: [
+                        {
+                            id: "post-login",
+                            version: "version",
+                        },
+                    ],
+                    binding_policy: "trigger-bound",
+                },
+            ],
+            modules: [
+                {
+                    module_id: "module_id",
+                    module_name: "module_name",
+                    module_version_id: "module_version_id",
+                    module_version_number: 1,
+                },
+            ],
+        });
     });
 
     test("get (2)", async () => {
@@ -194,7 +282,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/actions/actionId/versions/id")
@@ -213,7 +300,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/actions/actionId/versions/id")
@@ -232,7 +318,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/actions/actionId/versions/id")
@@ -251,7 +336,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/actions/actionId/versions/id")
@@ -270,7 +354,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/actions/actions/actionId/versions/id")
@@ -330,7 +413,6 @@ describe("VersionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .post("/actions/actions/actionId/versions/id/deploy")
@@ -340,7 +422,74 @@ describe("VersionsClient", () => {
             .build();
 
         const response = await client.actions.versions.deploy("actionId", "id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            action_id: "action_id",
+            code: "code",
+            dependencies: [
+                {
+                    name: "name",
+                    version: "version",
+                    registry_url: "registry_url",
+                },
+            ],
+            deployed: true,
+            runtime: "runtime",
+            secrets: [
+                {
+                    name: "name",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            status: "pending",
+            number: 1.1,
+            errors: [
+                {
+                    id: "id",
+                    msg: "msg",
+                    url: "url",
+                },
+            ],
+            action: {
+                id: "id",
+                name: "name",
+                supported_triggers: [
+                    {
+                        id: "post-login",
+                    },
+                ],
+                all_changes_deployed: true,
+                created_at: "2024-01-15T09:30:00Z",
+                updated_at: "2024-01-15T09:30:00Z",
+            },
+            built_at: "2024-01-15T09:30:00Z",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            supported_triggers: [
+                {
+                    id: "post-login",
+                    version: "version",
+                    status: "status",
+                    runtimes: ["runtimes"],
+                    default_runtime: "default_runtime",
+                    compatible_triggers: [
+                        {
+                            id: "post-login",
+                            version: "version",
+                        },
+                    ],
+                    binding_policy: "trigger-bound",
+                },
+            ],
+            modules: [
+                {
+                    module_id: "module_id",
+                    module_name: "module_name",
+                    module_version_id: "module_version_id",
+                    module_version_number: 1,
+                },
+            ],
+        });
     });
 
     test("deploy (2)", async () => {
@@ -348,7 +497,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions/actionId/versions/id/deploy")
@@ -367,7 +515,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions/actionId/versions/id/deploy")
@@ -386,7 +533,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions/actionId/versions/id/deploy")
@@ -405,7 +551,6 @@ describe("VersionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/actions/actions/actionId/versions/id/deploy")
diff --git a/src/management/tests/wire/anomaly/blocks.test.ts b/src/management/tests/wire/anomaly/blocks.test.ts
index d57d5811d8..289baa9bfe 100644
--- a/src/management/tests/wire/anomaly/blocks.test.ts
+++ b/src/management/tests/wire/anomaly/blocks.test.ts
@@ -20,7 +20,6 @@ describe("BlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/anomaly/blocks/ips/id")
@@ -39,7 +38,6 @@ describe("BlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/anomaly/blocks/ips/id")
@@ -58,7 +56,6 @@ describe("BlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/anomaly/blocks/ips/id")
@@ -77,7 +74,6 @@ describe("BlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/anomaly/blocks/ips/id")
@@ -96,7 +92,6 @@ describe("BlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/anomaly/blocks/ips/id")
@@ -125,7 +120,6 @@ describe("BlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/anomaly/blocks/ips/id")
@@ -144,7 +138,6 @@ describe("BlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/anomaly/blocks/ips/id")
@@ -163,7 +156,6 @@ describe("BlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/anomaly/blocks/ips/id")
@@ -182,7 +174,6 @@ describe("BlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/anomaly/blocks/ips/id")
diff --git a/src/management/tests/wire/attackProtection/botDetection.test.ts b/src/management/tests/wire/attackProtection/botDetection.test.ts
index a88c7a51c5..f9e94dfa91 100644
--- a/src/management/tests/wire/attackProtection/botDetection.test.ts
+++ b/src/management/tests/wire/attackProtection/botDetection.test.ts
@@ -17,7 +17,6 @@ describe("BotDetectionClient", () => {
             allowlist: ["allowlist"],
             monitoring_mode_enabled: true,
         };
-
         server
             .mockEndpoint()
             .get("/attack-protection/bot-detection")
@@ -27,7 +26,14 @@ describe("BotDetectionClient", () => {
             .build();
 
         const response = await client.attackProtection.botDetection.get();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            bot_detection_level: "low",
+            challenge_password_policy: "never",
+            challenge_passwordless_policy: "never",
+            challenge_password_reset_policy: "never",
+            allowlist: ["allowlist"],
+            monitoring_mode_enabled: true,
+        });
     });
 
     test("get (2)", async () => {
@@ -35,7 +41,6 @@ describe("BotDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/bot-detection")
@@ -54,7 +59,6 @@ describe("BotDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/bot-detection")
@@ -73,7 +77,6 @@ describe("BotDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/bot-detection")
@@ -92,7 +95,6 @@ describe("BotDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/bot-detection")
@@ -118,7 +120,6 @@ describe("BotDetectionClient", () => {
             allowlist: ["allowlist"],
             monitoring_mode_enabled: true,
         };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/bot-detection")
@@ -129,7 +130,14 @@ describe("BotDetectionClient", () => {
             .build();
 
         const response = await client.attackProtection.botDetection.update();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            bot_detection_level: "low",
+            challenge_password_policy: "never",
+            challenge_passwordless_policy: "never",
+            challenge_password_reset_policy: "never",
+            allowlist: ["allowlist"],
+            monitoring_mode_enabled: true,
+        });
     });
 
     test("update (2)", async () => {
@@ -137,7 +145,6 @@ describe("BotDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/bot-detection")
@@ -157,7 +164,6 @@ describe("BotDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/bot-detection")
@@ -177,7 +183,6 @@ describe("BotDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/bot-detection")
@@ -197,7 +202,6 @@ describe("BotDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/bot-detection")
@@ -217,7 +221,6 @@ describe("BotDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/bot-detection")
diff --git a/src/management/tests/wire/attackProtection/breachedPasswordDetection.test.ts b/src/management/tests/wire/attackProtection/breachedPasswordDetection.test.ts
index 4c1d40346e..6151509ffc 100644
--- a/src/management/tests/wire/attackProtection/breachedPasswordDetection.test.ts
+++ b/src/management/tests/wire/attackProtection/breachedPasswordDetection.test.ts
@@ -16,7 +16,6 @@ describe("BreachedPasswordDetectionClient", () => {
             method: "standard",
             stage: { "pre-user-registration": { shields: ["block"] }, "pre-change-password": { shields: ["block"] } },
         };
-
         server
             .mockEndpoint()
             .get("/attack-protection/breached-password-detection")
@@ -26,7 +25,20 @@ describe("BreachedPasswordDetectionClient", () => {
             .build();
 
         const response = await client.attackProtection.breachedPasswordDetection.get();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enabled: true,
+            shields: ["block"],
+            admin_notification_frequency: ["immediately"],
+            method: "standard",
+            stage: {
+                "pre-user-registration": {
+                    shields: ["block"],
+                },
+                "pre-change-password": {
+                    shields: ["block"],
+                },
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -34,7 +46,6 @@ describe("BreachedPasswordDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/breached-password-detection")
@@ -53,7 +64,6 @@ describe("BreachedPasswordDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/breached-password-detection")
@@ -72,7 +82,6 @@ describe("BreachedPasswordDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/breached-password-detection")
@@ -97,7 +106,6 @@ describe("BreachedPasswordDetectionClient", () => {
             method: "standard",
             stage: { "pre-user-registration": { shields: ["block"] }, "pre-change-password": { shields: ["block"] } },
         };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/breached-password-detection")
@@ -108,7 +116,20 @@ describe("BreachedPasswordDetectionClient", () => {
             .build();
 
         const response = await client.attackProtection.breachedPasswordDetection.update();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enabled: true,
+            shields: ["block"],
+            admin_notification_frequency: ["immediately"],
+            method: "standard",
+            stage: {
+                "pre-user-registration": {
+                    shields: ["block"],
+                },
+                "pre-change-password": {
+                    shields: ["block"],
+                },
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -116,7 +137,6 @@ describe("BreachedPasswordDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/breached-password-detection")
@@ -136,7 +156,6 @@ describe("BreachedPasswordDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/breached-password-detection")
@@ -156,7 +175,6 @@ describe("BreachedPasswordDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/breached-password-detection")
@@ -176,7 +194,6 @@ describe("BreachedPasswordDetectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/breached-password-detection")
diff --git a/src/management/tests/wire/attackProtection/bruteForceProtection.test.ts b/src/management/tests/wire/attackProtection/bruteForceProtection.test.ts
index 11493c760d..f4f0652996 100644
--- a/src/management/tests/wire/attackProtection/bruteForceProtection.test.ts
+++ b/src/management/tests/wire/attackProtection/bruteForceProtection.test.ts
@@ -16,7 +16,6 @@ describe("BruteForceProtectionClient", () => {
             mode: "count_per_identifier_and_ip",
             max_attempts: 1,
         };
-
         server
             .mockEndpoint()
             .get("/attack-protection/brute-force-protection")
@@ -26,7 +25,13 @@ describe("BruteForceProtectionClient", () => {
             .build();
 
         const response = await client.attackProtection.bruteForceProtection.get();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enabled: true,
+            shields: ["block"],
+            allowlist: ["allowlist"],
+            mode: "count_per_identifier_and_ip",
+            max_attempts: 1,
+        });
     });
 
     test("get (2)", async () => {
@@ -34,7 +39,6 @@ describe("BruteForceProtectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/brute-force-protection")
@@ -53,7 +57,6 @@ describe("BruteForceProtectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/brute-force-protection")
@@ -72,7 +75,6 @@ describe("BruteForceProtectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/brute-force-protection")
@@ -97,7 +99,6 @@ describe("BruteForceProtectionClient", () => {
             mode: "count_per_identifier_and_ip",
             max_attempts: 1,
         };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/brute-force-protection")
@@ -108,7 +109,13 @@ describe("BruteForceProtectionClient", () => {
             .build();
 
         const response = await client.attackProtection.bruteForceProtection.update();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enabled: true,
+            shields: ["block"],
+            allowlist: ["allowlist"],
+            mode: "count_per_identifier_and_ip",
+            max_attempts: 1,
+        });
     });
 
     test("update (2)", async () => {
@@ -116,7 +123,6 @@ describe("BruteForceProtectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/brute-force-protection")
@@ -136,7 +142,6 @@ describe("BruteForceProtectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/brute-force-protection")
@@ -156,7 +161,6 @@ describe("BruteForceProtectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/brute-force-protection")
@@ -176,7 +180,6 @@ describe("BruteForceProtectionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/brute-force-protection")
diff --git a/src/management/tests/wire/attackProtection/captcha.test.ts b/src/management/tests/wire/attackProtection/captcha.test.ts
index 0768469451..6bc6ab6878 100644
--- a/src/management/tests/wire/attackProtection/captcha.test.ts
+++ b/src/management/tests/wire/attackProtection/captcha.test.ts
@@ -24,7 +24,6 @@ describe("CaptchaClient", () => {
             recaptcha_v2: { site_key: "site_key" },
             simple_captcha: { key: "value" },
         };
-
         server
             .mockEndpoint()
             .get("/attack-protection/captcha")
@@ -34,7 +33,34 @@ describe("CaptchaClient", () => {
             .build();
 
         const response = await client.attackProtection.captcha.get();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            active_provider_id: "active_provider_id",
+            arkose: {
+                site_key: "site_key",
+                fail_open: true,
+                client_subdomain: "client_subdomain",
+                verify_subdomain: "verify_subdomain",
+            },
+            auth_challenge: {
+                fail_open: true,
+            },
+            hcaptcha: {
+                site_key: "site_key",
+            },
+            friendly_captcha: {
+                site_key: "site_key",
+            },
+            recaptcha_enterprise: {
+                site_key: "site_key",
+                project_id: "project_id",
+            },
+            recaptcha_v2: {
+                site_key: "site_key",
+            },
+            simple_captcha: {
+                key: "value",
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -42,7 +68,6 @@ describe("CaptchaClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/captcha")
@@ -61,7 +86,6 @@ describe("CaptchaClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/captcha")
@@ -80,7 +104,6 @@ describe("CaptchaClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/captcha")
@@ -99,7 +122,6 @@ describe("CaptchaClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/captcha")
@@ -132,7 +154,6 @@ describe("CaptchaClient", () => {
             recaptcha_v2: { site_key: "site_key" },
             simple_captcha: { key: "value" },
         };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/captcha")
@@ -143,7 +164,34 @@ describe("CaptchaClient", () => {
             .build();
 
         const response = await client.attackProtection.captcha.update();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            active_provider_id: "active_provider_id",
+            arkose: {
+                site_key: "site_key",
+                fail_open: true,
+                client_subdomain: "client_subdomain",
+                verify_subdomain: "verify_subdomain",
+            },
+            auth_challenge: {
+                fail_open: true,
+            },
+            hcaptcha: {
+                site_key: "site_key",
+            },
+            friendly_captcha: {
+                site_key: "site_key",
+            },
+            recaptcha_enterprise: {
+                site_key: "site_key",
+                project_id: "project_id",
+            },
+            recaptcha_v2: {
+                site_key: "site_key",
+            },
+            simple_captcha: {
+                key: "value",
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -151,7 +199,6 @@ describe("CaptchaClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/captcha")
@@ -171,7 +218,6 @@ describe("CaptchaClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/captcha")
@@ -191,7 +237,6 @@ describe("CaptchaClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/captcha")
@@ -211,7 +256,6 @@ describe("CaptchaClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/captcha")
diff --git a/src/management/tests/wire/attackProtection/suspiciousIpThrottling.test.ts b/src/management/tests/wire/attackProtection/suspiciousIpThrottling.test.ts
index 49bd214f23..e5df84efbe 100644
--- a/src/management/tests/wire/attackProtection/suspiciousIpThrottling.test.ts
+++ b/src/management/tests/wire/attackProtection/suspiciousIpThrottling.test.ts
@@ -15,7 +15,6 @@ describe("SuspiciousIpThrottlingClient", () => {
             allowlist: ["allowlist"],
             stage: { "pre-login": { max_attempts: 1, rate: 1 }, "pre-user-registration": { max_attempts: 1, rate: 1 } },
         };
-
         server
             .mockEndpoint()
             .get("/attack-protection/suspicious-ip-throttling")
@@ -25,7 +24,21 @@ describe("SuspiciousIpThrottlingClient", () => {
             .build();
 
         const response = await client.attackProtection.suspiciousIpThrottling.get();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enabled: true,
+            shields: ["block"],
+            allowlist: ["allowlist"],
+            stage: {
+                "pre-login": {
+                    max_attempts: 1,
+                    rate: 1,
+                },
+                "pre-user-registration": {
+                    max_attempts: 1,
+                    rate: 1,
+                },
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -33,7 +46,6 @@ describe("SuspiciousIpThrottlingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/suspicious-ip-throttling")
@@ -52,7 +64,6 @@ describe("SuspiciousIpThrottlingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/suspicious-ip-throttling")
@@ -71,7 +82,6 @@ describe("SuspiciousIpThrottlingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/attack-protection/suspicious-ip-throttling")
@@ -95,7 +105,6 @@ describe("SuspiciousIpThrottlingClient", () => {
             allowlist: ["allowlist"],
             stage: { "pre-login": { max_attempts: 1, rate: 1 }, "pre-user-registration": { max_attempts: 1, rate: 1 } },
         };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/suspicious-ip-throttling")
@@ -106,7 +115,21 @@ describe("SuspiciousIpThrottlingClient", () => {
             .build();
 
         const response = await client.attackProtection.suspiciousIpThrottling.update();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enabled: true,
+            shields: ["block"],
+            allowlist: ["allowlist"],
+            stage: {
+                "pre-login": {
+                    max_attempts: 1,
+                    rate: 1,
+                },
+                "pre-user-registration": {
+                    max_attempts: 1,
+                    rate: 1,
+                },
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -114,7 +137,6 @@ describe("SuspiciousIpThrottlingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/suspicious-ip-throttling")
@@ -134,7 +156,6 @@ describe("SuspiciousIpThrottlingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/suspicious-ip-throttling")
@@ -154,7 +175,6 @@ describe("SuspiciousIpThrottlingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/suspicious-ip-throttling")
@@ -174,7 +194,6 @@ describe("SuspiciousIpThrottlingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/attack-protection/suspicious-ip-throttling")
diff --git a/src/management/tests/wire/branding.test.ts b/src/management/tests/wire/branding.test.ts
index 057f4edc57..a037d367a1 100644
--- a/src/management/tests/wire/branding.test.ts
+++ b/src/management/tests/wire/branding.test.ts
@@ -15,11 +15,20 @@ describe("BrandingClient", () => {
             logo_url: "logo_url",
             font: { url: "url" },
         };
-
         server.mockEndpoint().get("/branding").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.branding.get();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            colors: {
+                primary: "primary",
+                page_background: "page_background",
+            },
+            favicon_url: "favicon_url",
+            logo_url: "logo_url",
+            font: {
+                url: "url",
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -27,7 +36,6 @@ describe("BrandingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/branding").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -40,7 +48,6 @@ describe("BrandingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/branding").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -53,7 +60,6 @@ describe("BrandingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/branding").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -71,7 +77,6 @@ describe("BrandingClient", () => {
             logo_url: "logo_url",
             font: { url: "url" },
         };
-
         server
             .mockEndpoint()
             .patch("/branding")
@@ -82,7 +87,17 @@ describe("BrandingClient", () => {
             .build();
 
         const response = await client.branding.update();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            colors: {
+                primary: "primary",
+                page_background: "page_background",
+            },
+            favicon_url: "favicon_url",
+            logo_url: "logo_url",
+            font: {
+                url: "url",
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -90,7 +105,6 @@ describe("BrandingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding")
@@ -110,7 +124,6 @@ describe("BrandingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding")
@@ -130,7 +143,6 @@ describe("BrandingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding")
@@ -150,7 +162,6 @@ describe("BrandingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding")
diff --git a/src/management/tests/wire/branding/phone/providers.test.ts b/src/management/tests/wire/branding/phone/providers.test.ts
index 1711440df4..8d17ed08b2 100644
--- a/src/management/tests/wire/branding/phone/providers.test.ts
+++ b/src/management/tests/wire/branding/phone/providers.test.ts
@@ -23,7 +23,6 @@ describe("ProvidersClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .get("/branding/phone/providers")
@@ -35,7 +34,23 @@ describe("ProvidersClient", () => {
         const response = await client.branding.phone.providers.list({
             disabled: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            providers: [
+                {
+                    id: "id",
+                    tenant: "tenant",
+                    name: "twilio",
+                    channel: "phone",
+                    disabled: true,
+                    configuration: {
+                        sid: "sid",
+                        delivery_methods: ["text"],
+                    },
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+        });
     });
 
     test("list (2)", async () => {
@@ -43,7 +58,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/providers")
@@ -62,7 +76,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/providers")
@@ -81,7 +94,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/providers")
@@ -100,7 +112,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/providers")
@@ -128,7 +139,6 @@ describe("ProvidersClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers")
@@ -144,7 +154,21 @@ describe("ProvidersClient", () => {
                 auth_token: "auth_token",
             },
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            tenant: "tenant",
+            name: "twilio",
+            channel: "phone",
+            disabled: true,
+            configuration: {
+                default_from: "default_from",
+                mssid: "mssid",
+                sid: "sid",
+                delivery_methods: ["text"],
+            },
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("create (2)", async () => {
@@ -152,7 +176,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "twilio", credentials: { auth_token: "x" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers")
@@ -177,7 +200,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "twilio", credentials: { auth_token: "x" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers")
@@ -202,7 +224,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "twilio", credentials: { auth_token: "x" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers")
@@ -227,7 +248,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "twilio", credentials: { auth_token: "x" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers")
@@ -252,7 +272,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "twilio", credentials: { auth_token: "x" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers")
@@ -286,7 +305,6 @@ describe("ProvidersClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .get("/branding/phone/providers/id")
@@ -296,7 +314,21 @@ describe("ProvidersClient", () => {
             .build();
 
         const response = await client.branding.phone.providers.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            tenant: "tenant",
+            name: "twilio",
+            channel: "phone",
+            disabled: true,
+            configuration: {
+                default_from: "default_from",
+                mssid: "mssid",
+                sid: "sid",
+                delivery_methods: ["text"],
+            },
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("get (2)", async () => {
@@ -304,7 +336,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/providers/id")
@@ -323,7 +354,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/providers/id")
@@ -342,7 +372,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/providers/id")
@@ -361,7 +390,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/providers/id")
@@ -380,7 +408,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/providers/id")
@@ -409,7 +436,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/phone/providers/id")
@@ -428,7 +454,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/phone/providers/id")
@@ -447,7 +472,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/phone/providers/id")
@@ -466,7 +490,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/phone/providers/id")
@@ -494,7 +517,6 @@ describe("ProvidersClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/providers/id")
@@ -505,7 +527,21 @@ describe("ProvidersClient", () => {
             .build();
 
         const response = await client.branding.phone.providers.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            tenant: "tenant",
+            name: "twilio",
+            channel: "phone",
+            disabled: true,
+            configuration: {
+                default_from: "default_from",
+                mssid: "mssid",
+                sid: "sid",
+                delivery_methods: ["text"],
+            },
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("update (2)", async () => {
@@ -513,7 +549,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/providers/id")
@@ -533,7 +568,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/providers/id")
@@ -553,7 +587,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/providers/id")
@@ -573,7 +606,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/providers/id")
@@ -593,7 +625,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/providers/id")
@@ -613,7 +644,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/providers/id")
@@ -633,7 +663,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "to" };
         const rawResponseBody = { code: 1.1, message: "message" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers/id/try")
@@ -646,7 +675,10 @@ describe("ProvidersClient", () => {
         const response = await client.branding.phone.providers.test("id", {
             to: "to",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            code: 1.1,
+            message: "message",
+        });
     });
 
     test("test (2)", async () => {
@@ -654,7 +686,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers/id/try")
@@ -676,7 +707,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers/id/try")
@@ -698,7 +728,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers/id/try")
@@ -720,7 +749,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers/id/try")
@@ -742,7 +770,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers/id/try")
@@ -764,7 +791,6 @@ describe("ProvidersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/providers/id/try")
diff --git a/src/management/tests/wire/branding/phone/templates.test.ts b/src/management/tests/wire/branding/phone/templates.test.ts
index e12e8b157e..20679f9393 100644
--- a/src/management/tests/wire/branding/phone/templates.test.ts
+++ b/src/management/tests/wire/branding/phone/templates.test.ts
@@ -22,7 +22,6 @@ describe("TemplatesClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .get("/branding/phone/templates")
@@ -34,7 +33,19 @@ describe("TemplatesClient", () => {
         const response = await client.branding.phone.templates.list({
             disabled: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            templates: [
+                {
+                    id: "id",
+                    channel: "channel",
+                    customizable: true,
+                    tenant: "tenant",
+                    content: {},
+                    type: "otp_verify",
+                    disabled: true,
+                },
+            ],
+        });
     });
 
     test("list (2)", async () => {
@@ -42,7 +53,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/templates")
@@ -61,7 +71,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/templates")
@@ -80,7 +89,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/templates")
@@ -99,7 +107,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/templates")
@@ -126,7 +133,6 @@ describe("TemplatesClient", () => {
             type: "otp_verify",
             disabled: true,
         };
-
         server
             .mockEndpoint()
             .post("/branding/phone/templates")
@@ -137,7 +143,22 @@ describe("TemplatesClient", () => {
             .build();
 
         const response = await client.branding.phone.templates.create();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            channel: "channel",
+            customizable: true,
+            tenant: "tenant",
+            content: {
+                syntax: "syntax",
+                from: "from",
+                body: {
+                    text: "text",
+                    voice: "voice",
+                },
+            },
+            type: "otp_verify",
+            disabled: true,
+        });
     });
 
     test("create (2)", async () => {
@@ -145,7 +166,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/templates")
@@ -165,7 +185,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/templates")
@@ -185,7 +204,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/templates")
@@ -205,7 +223,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/templates")
@@ -225,7 +242,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/templates")
@@ -253,7 +269,6 @@ describe("TemplatesClient", () => {
             type: "otp_verify",
             disabled: true,
         };
-
         server
             .mockEndpoint()
             .get("/branding/phone/templates/id")
@@ -263,7 +278,22 @@ describe("TemplatesClient", () => {
             .build();
 
         const response = await client.branding.phone.templates.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            channel: "channel",
+            customizable: true,
+            tenant: "tenant",
+            content: {
+                syntax: "syntax",
+                from: "from",
+                body: {
+                    text: "text",
+                    voice: "voice",
+                },
+            },
+            type: "otp_verify",
+            disabled: true,
+        });
     });
 
     test("get (2)", async () => {
@@ -271,7 +301,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/templates/id")
@@ -290,7 +319,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/templates/id")
@@ -309,7 +337,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/templates/id")
@@ -328,7 +355,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/templates/id")
@@ -347,7 +373,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/phone/templates/id")
@@ -376,7 +401,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/phone/templates/id")
@@ -395,7 +419,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/phone/templates/id")
@@ -414,7 +437,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/phone/templates/id")
@@ -433,7 +455,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/phone/templates/id")
@@ -452,7 +473,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/phone/templates/id")
@@ -479,7 +499,6 @@ describe("TemplatesClient", () => {
             type: "otp_verify",
             disabled: true,
         };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/templates/id")
@@ -490,7 +509,22 @@ describe("TemplatesClient", () => {
             .build();
 
         const response = await client.branding.phone.templates.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            channel: "channel",
+            customizable: true,
+            tenant: "tenant",
+            content: {
+                syntax: "syntax",
+                from: "from",
+                body: {
+                    text: "text",
+                    voice: "voice",
+                },
+            },
+            type: "otp_verify",
+            disabled: true,
+        });
     });
 
     test("update (2)", async () => {
@@ -498,7 +532,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/templates/id")
@@ -518,7 +551,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/templates/id")
@@ -538,7 +570,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/templates/id")
@@ -558,7 +589,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/templates/id")
@@ -578,7 +608,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/templates/id")
@@ -606,7 +635,6 @@ describe("TemplatesClient", () => {
             type: "otp_verify",
             disabled: true,
         };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/templates/id/reset")
@@ -619,7 +647,22 @@ describe("TemplatesClient", () => {
         const response = await client.branding.phone.templates.reset("id", {
             key: "value",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "x",
+            channel: "channel",
+            customizable: true,
+            tenant: "x",
+            content: {
+                syntax: "syntax",
+                from: "x",
+                body: {
+                    text: "x",
+                    voice: "x",
+                },
+            },
+            type: "otp_verify",
+            disabled: true,
+        });
     });
 
     test("reset (2)", async () => {
@@ -627,7 +670,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { key: "value" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/templates/id/reset")
@@ -649,7 +691,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { key: "value" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/templates/id/reset")
@@ -671,7 +712,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { key: "value" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/templates/id/reset")
@@ -693,7 +733,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { key: "value" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/phone/templates/id/reset")
@@ -715,7 +754,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "to" };
         const rawResponseBody = { message: "message" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/templates/id/try")
@@ -728,7 +766,9 @@ describe("TemplatesClient", () => {
         const response = await client.branding.phone.templates.test("id", {
             to: "to",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            message: "message",
+        });
     });
 
     test("test (2)", async () => {
@@ -736,7 +776,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/templates/id/try")
@@ -758,7 +797,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/templates/id/try")
@@ -780,7 +818,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/templates/id/try")
@@ -802,7 +839,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/templates/id/try")
@@ -824,7 +860,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { to: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/phone/templates/id/try")
diff --git a/src/management/tests/wire/branding/templates.test.ts b/src/management/tests/wire/branding/templates.test.ts
index 2b421eaf76..0b756d1466 100644
--- a/src/management/tests/wire/branding/templates.test.ts
+++ b/src/management/tests/wire/branding/templates.test.ts
@@ -10,7 +10,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { body: "body" };
-
         server
             .mockEndpoint()
             .get("/branding/templates/universal-login")
@@ -20,7 +19,9 @@ describe("TemplatesClient", () => {
             .build();
 
         const response = await client.branding.templates.getUniversalLogin();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            body: "body",
+        });
     });
 
     test("getUniversalLogin (2)", async () => {
@@ -28,7 +29,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/templates/universal-login")
@@ -47,7 +47,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/templates/universal-login")
@@ -66,7 +65,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/templates/universal-login")
@@ -85,7 +83,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/templates/universal-login")
@@ -104,7 +101,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/templates/universal-login")
@@ -140,7 +136,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = "string";
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/branding/templates/universal-login")
@@ -160,7 +155,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = "string";
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/branding/templates/universal-login")
@@ -180,7 +174,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = "string";
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/branding/templates/universal-login")
@@ -200,7 +193,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = "string";
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/branding/templates/universal-login")
@@ -220,7 +212,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = "string";
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/branding/templates/universal-login")
@@ -240,7 +231,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = "string";
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/branding/templates/universal-login")
@@ -270,7 +260,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/templates/universal-login")
@@ -289,7 +278,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/templates/universal-login")
@@ -308,7 +296,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/templates/universal-login")
@@ -327,7 +314,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/templates/universal-login")
diff --git a/src/management/tests/wire/branding/themes.test.ts b/src/management/tests/wire/branding/themes.test.ts
index 537145d254..7245807483 100644
--- a/src/management/tests/wire/branding/themes.test.ts
+++ b/src/management/tests/wire/branding/themes.test.ts
@@ -122,7 +122,6 @@ describe("ThemesClient", () => {
                 social_buttons_layout: "bottom",
             },
         };
-
         server
             .mockEndpoint()
             .post("/branding/themes")
@@ -204,7 +203,84 @@ describe("ThemesClient", () => {
                 social_buttons_layout: "bottom",
             },
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            borders: {
+                button_border_radius: 1.1,
+                button_border_weight: 1.1,
+                buttons_style: "pill",
+                input_border_radius: 1.1,
+                input_border_weight: 1.1,
+                inputs_style: "pill",
+                show_widget_shadow: true,
+                widget_border_weight: 1.1,
+                widget_corner_radius: 1.1,
+            },
+            colors: {
+                base_focus_color: "base_focus_color",
+                base_hover_color: "base_hover_color",
+                body_text: "body_text",
+                captcha_widget_theme: "auto",
+                error: "error",
+                header: "header",
+                icons: "icons",
+                input_background: "input_background",
+                input_border: "input_border",
+                input_filled_text: "input_filled_text",
+                input_labels_placeholders: "input_labels_placeholders",
+                links_focused_components: "links_focused_components",
+                primary_button: "primary_button",
+                primary_button_label: "primary_button_label",
+                read_only_background: "read_only_background",
+                secondary_button_border: "secondary_button_border",
+                secondary_button_label: "secondary_button_label",
+                success: "success",
+                widget_background: "widget_background",
+                widget_border: "widget_border",
+            },
+            displayName: "displayName",
+            fonts: {
+                body_text: {
+                    bold: true,
+                    size: 1.1,
+                },
+                buttons_text: {
+                    bold: true,
+                    size: 1.1,
+                },
+                font_url: "font_url",
+                input_labels: {
+                    bold: true,
+                    size: 1.1,
+                },
+                links: {
+                    bold: true,
+                    size: 1.1,
+                },
+                links_style: "normal",
+                reference_text_size: 1.1,
+                subtitle: {
+                    bold: true,
+                    size: 1.1,
+                },
+                title: {
+                    bold: true,
+                    size: 1.1,
+                },
+            },
+            page_background: {
+                background_color: "background_color",
+                background_image_url: "background_image_url",
+                page_layout: "center",
+            },
+            themeId: "themeId",
+            widget: {
+                header_text_alignment: "center",
+                logo_height: 1.1,
+                logo_position: "center",
+                logo_url: "logo_url",
+                social_buttons_layout: "bottom",
+            },
+        });
     });
 
     test("create (2)", async () => {
@@ -265,7 +341,6 @@ describe("ThemesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/themes")
@@ -409,7 +484,6 @@ describe("ThemesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/themes")
@@ -553,7 +627,6 @@ describe("ThemesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/themes")
@@ -697,7 +770,6 @@ describe("ThemesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/themes")
@@ -841,7 +913,6 @@ describe("ThemesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/branding/themes")
@@ -991,7 +1062,6 @@ describe("ThemesClient", () => {
                 social_buttons_layout: "bottom",
             },
         };
-
         server
             .mockEndpoint()
             .get("/branding/themes/default")
@@ -1001,7 +1071,84 @@ describe("ThemesClient", () => {
             .build();
 
         const response = await client.branding.themes.getDefault();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            borders: {
+                button_border_radius: 1.1,
+                button_border_weight: 1.1,
+                buttons_style: "pill",
+                input_border_radius: 1.1,
+                input_border_weight: 1.1,
+                inputs_style: "pill",
+                show_widget_shadow: true,
+                widget_border_weight: 1.1,
+                widget_corner_radius: 1.1,
+            },
+            colors: {
+                base_focus_color: "base_focus_color",
+                base_hover_color: "base_hover_color",
+                body_text: "body_text",
+                captcha_widget_theme: "auto",
+                error: "error",
+                header: "header",
+                icons: "icons",
+                input_background: "input_background",
+                input_border: "input_border",
+                input_filled_text: "input_filled_text",
+                input_labels_placeholders: "input_labels_placeholders",
+                links_focused_components: "links_focused_components",
+                primary_button: "primary_button",
+                primary_button_label: "primary_button_label",
+                read_only_background: "read_only_background",
+                secondary_button_border: "secondary_button_border",
+                secondary_button_label: "secondary_button_label",
+                success: "success",
+                widget_background: "widget_background",
+                widget_border: "widget_border",
+            },
+            displayName: "displayName",
+            fonts: {
+                body_text: {
+                    bold: true,
+                    size: 1.1,
+                },
+                buttons_text: {
+                    bold: true,
+                    size: 1.1,
+                },
+                font_url: "font_url",
+                input_labels: {
+                    bold: true,
+                    size: 1.1,
+                },
+                links: {
+                    bold: true,
+                    size: 1.1,
+                },
+                links_style: "normal",
+                reference_text_size: 1.1,
+                subtitle: {
+                    bold: true,
+                    size: 1.1,
+                },
+                title: {
+                    bold: true,
+                    size: 1.1,
+                },
+            },
+            page_background: {
+                background_color: "background_color",
+                background_image_url: "background_image_url",
+                page_layout: "center",
+            },
+            themeId: "themeId",
+            widget: {
+                header_text_alignment: "center",
+                logo_height: 1.1,
+                logo_position: "center",
+                logo_url: "logo_url",
+                social_buttons_layout: "bottom",
+            },
+        });
     });
 
     test("getDefault (2)", async () => {
@@ -1009,7 +1156,6 @@ describe("ThemesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/themes/default")
@@ -1028,7 +1174,6 @@ describe("ThemesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/themes/default")
@@ -1047,7 +1192,6 @@ describe("ThemesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/themes/default")
@@ -1066,7 +1210,6 @@ describe("ThemesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/themes/default")
@@ -1144,7 +1287,6 @@ describe("ThemesClient", () => {
                 social_buttons_layout: "bottom",
             },
         };
-
         server
             .mockEndpoint()
             .get("/branding/themes/themeId")
@@ -1154,7 +1296,84 @@ describe("ThemesClient", () => {
             .build();
 
         const response = await client.branding.themes.get("themeId");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            borders: {
+                button_border_radius: 1.1,
+                button_border_weight: 1.1,
+                buttons_style: "pill",
+                input_border_radius: 1.1,
+                input_border_weight: 1.1,
+                inputs_style: "pill",
+                show_widget_shadow: true,
+                widget_border_weight: 1.1,
+                widget_corner_radius: 1.1,
+            },
+            colors: {
+                base_focus_color: "base_focus_color",
+                base_hover_color: "base_hover_color",
+                body_text: "body_text",
+                captcha_widget_theme: "auto",
+                error: "error",
+                header: "header",
+                icons: "icons",
+                input_background: "input_background",
+                input_border: "input_border",
+                input_filled_text: "input_filled_text",
+                input_labels_placeholders: "input_labels_placeholders",
+                links_focused_components: "links_focused_components",
+                primary_button: "primary_button",
+                primary_button_label: "primary_button_label",
+                read_only_background: "read_only_background",
+                secondary_button_border: "secondary_button_border",
+                secondary_button_label: "secondary_button_label",
+                success: "success",
+                widget_background: "widget_background",
+                widget_border: "widget_border",
+            },
+            displayName: "displayName",
+            fonts: {
+                body_text: {
+                    bold: true,
+                    size: 1.1,
+                },
+                buttons_text: {
+                    bold: true,
+                    size: 1.1,
+                },
+                font_url: "font_url",
+                input_labels: {
+                    bold: true,
+                    size: 1.1,
+                },
+                links: {
+                    bold: true,
+                    size: 1.1,
+                },
+                links_style: "normal",
+                reference_text_size: 1.1,
+                subtitle: {
+                    bold: true,
+                    size: 1.1,
+                },
+                title: {
+                    bold: true,
+                    size: 1.1,
+                },
+            },
+            page_background: {
+                background_color: "background_color",
+                background_image_url: "background_image_url",
+                page_layout: "center",
+            },
+            themeId: "themeId",
+            widget: {
+                header_text_alignment: "center",
+                logo_height: 1.1,
+                logo_position: "center",
+                logo_url: "logo_url",
+                social_buttons_layout: "bottom",
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -1162,7 +1381,6 @@ describe("ThemesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/themes/themeId")
@@ -1181,7 +1399,6 @@ describe("ThemesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/themes/themeId")
@@ -1200,7 +1417,6 @@ describe("ThemesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/themes/themeId")
@@ -1219,7 +1435,6 @@ describe("ThemesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/branding/themes/themeId")
@@ -1248,7 +1463,6 @@ describe("ThemesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/themes/themeId")
@@ -1267,7 +1481,6 @@ describe("ThemesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/themes/themeId")
@@ -1286,7 +1499,6 @@ describe("ThemesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/themes/themeId")
@@ -1305,7 +1517,6 @@ describe("ThemesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/branding/themes/themeId")
@@ -1436,7 +1647,6 @@ describe("ThemesClient", () => {
                 social_buttons_layout: "bottom",
             },
         };
-
         server
             .mockEndpoint()
             .patch("/branding/themes/themeId")
@@ -1518,7 +1728,84 @@ describe("ThemesClient", () => {
                 social_buttons_layout: "bottom",
             },
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            borders: {
+                button_border_radius: 1.1,
+                button_border_weight: 1.1,
+                buttons_style: "pill",
+                input_border_radius: 1.1,
+                input_border_weight: 1.1,
+                inputs_style: "pill",
+                show_widget_shadow: true,
+                widget_border_weight: 1.1,
+                widget_corner_radius: 1.1,
+            },
+            colors: {
+                base_focus_color: "base_focus_color",
+                base_hover_color: "base_hover_color",
+                body_text: "body_text",
+                captcha_widget_theme: "auto",
+                error: "error",
+                header: "header",
+                icons: "icons",
+                input_background: "input_background",
+                input_border: "input_border",
+                input_filled_text: "input_filled_text",
+                input_labels_placeholders: "input_labels_placeholders",
+                links_focused_components: "links_focused_components",
+                primary_button: "primary_button",
+                primary_button_label: "primary_button_label",
+                read_only_background: "read_only_background",
+                secondary_button_border: "secondary_button_border",
+                secondary_button_label: "secondary_button_label",
+                success: "success",
+                widget_background: "widget_background",
+                widget_border: "widget_border",
+            },
+            displayName: "displayName",
+            fonts: {
+                body_text: {
+                    bold: true,
+                    size: 1.1,
+                },
+                buttons_text: {
+                    bold: true,
+                    size: 1.1,
+                },
+                font_url: "font_url",
+                input_labels: {
+                    bold: true,
+                    size: 1.1,
+                },
+                links: {
+                    bold: true,
+                    size: 1.1,
+                },
+                links_style: "normal",
+                reference_text_size: 1.1,
+                subtitle: {
+                    bold: true,
+                    size: 1.1,
+                },
+                title: {
+                    bold: true,
+                    size: 1.1,
+                },
+            },
+            page_background: {
+                background_color: "background_color",
+                background_image_url: "background_image_url",
+                page_layout: "center",
+            },
+            themeId: "themeId",
+            widget: {
+                header_text_alignment: "center",
+                logo_height: 1.1,
+                logo_position: "center",
+                logo_url: "logo_url",
+                social_buttons_layout: "bottom",
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -1579,7 +1866,6 @@ describe("ThemesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/themes/themeId")
@@ -1723,7 +2009,6 @@ describe("ThemesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/themes/themeId")
@@ -1867,7 +2152,6 @@ describe("ThemesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/themes/themeId")
@@ -2011,7 +2295,6 @@ describe("ThemesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/themes/themeId")
@@ -2155,7 +2438,6 @@ describe("ThemesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/branding/themes/themeId")
diff --git a/src/management/tests/wire/clientGrants.test.ts b/src/management/tests/wire/clientGrants.test.ts
index b6a844ea2e..205c14b02a 100644
--- a/src/management/tests/wire/clientGrants.test.ts
+++ b/src/management/tests/wire/clientGrants.test.ts
@@ -26,7 +26,6 @@ describe("ClientGrantsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/client-grants")
@@ -35,7 +34,23 @@ describe("ClientGrantsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            next: "next",
+            client_grants: [
+                {
+                    id: "id",
+                    client_id: "client_id",
+                    audience: "audience",
+                    scope: ["scope"],
+                    organization_usage: "deny",
+                    allow_any_organization: true,
+                    is_system: true,
+                    subject_type: "client",
+                    authorization_details_types: ["authorization_details_types"],
+                    allow_all_scopes: true,
+                },
+            ],
+        };
         const page = await client.clientGrants.list({
             from: "from",
             take: 1,
@@ -56,7 +71,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/client-grants").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -69,7 +83,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/client-grants").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -82,7 +95,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/client-grants").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -106,7 +118,6 @@ describe("ClientGrantsClient", () => {
             authorization_details_types: ["authorization_details_types"],
             allow_all_scopes: true,
         };
-
         server
             .mockEndpoint()
             .post("/client-grants")
@@ -119,7 +130,18 @@ describe("ClientGrantsClient", () => {
         const response = await client.clientGrants.create({
             audience: "audience",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            client_id: "client_id",
+            audience: "audience",
+            scope: ["scope"],
+            organization_usage: "deny",
+            allow_any_organization: true,
+            is_system: true,
+            subject_type: "client",
+            authorization_details_types: ["authorization_details_types"],
+            allow_all_scopes: true,
+        });
     });
 
     test("create (2)", async () => {
@@ -127,7 +149,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { audience: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/client-grants")
@@ -149,7 +170,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { audience: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/client-grants")
@@ -171,7 +191,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { audience: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/client-grants")
@@ -193,7 +212,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { audience: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/client-grants")
@@ -215,7 +233,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { audience: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/client-grants")
@@ -237,7 +254,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { audience: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/client-grants")
@@ -270,11 +286,21 @@ describe("ClientGrantsClient", () => {
             authorization_details_types: ["authorization_details_types"],
             allow_all_scopes: true,
         };
-
         server.mockEndpoint().get("/client-grants/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.clientGrants.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            client_id: "client_id",
+            audience: "audience",
+            scope: ["scope"],
+            organization_usage: "deny",
+            allow_any_organization: true,
+            is_system: true,
+            subject_type: "client",
+            authorization_details_types: ["authorization_details_types"],
+            allow_all_scopes: true,
+        });
     });
 
     test("get (2)", async () => {
@@ -282,7 +308,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/client-grants/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -295,7 +320,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/client-grants/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -308,7 +332,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/client-grants/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -321,7 +344,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/client-grants/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -344,7 +366,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/client-grants/id")
@@ -363,7 +384,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/client-grants/id")
@@ -382,7 +402,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/client-grants/id")
@@ -401,7 +420,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/client-grants/id")
@@ -431,7 +449,6 @@ describe("ClientGrantsClient", () => {
             authorization_details_types: ["authorization_details_types"],
             allow_all_scopes: true,
         };
-
         server
             .mockEndpoint()
             .patch("/client-grants/id")
@@ -442,7 +459,18 @@ describe("ClientGrantsClient", () => {
             .build();
 
         const response = await client.clientGrants.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            client_id: "client_id",
+            audience: "audience",
+            scope: ["scope"],
+            organization_usage: "deny",
+            allow_any_organization: true,
+            is_system: true,
+            subject_type: "client",
+            authorization_details_types: ["authorization_details_types"],
+            allow_all_scopes: true,
+        });
     });
 
     test("update (2)", async () => {
@@ -450,7 +478,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/client-grants/id")
@@ -470,7 +497,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/client-grants/id")
@@ -490,7 +516,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/client-grants/id")
@@ -510,7 +535,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/client-grants/id")
@@ -530,7 +554,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/client-grants/id")
diff --git a/src/management/tests/wire/clientGrants/organizations.test.ts b/src/management/tests/wire/clientGrants/organizations.test.ts
index 05bd50cff0..8cd2d47ee5 100644
--- a/src/management/tests/wire/clientGrants/organizations.test.ts
+++ b/src/management/tests/wire/clientGrants/organizations.test.ts
@@ -15,7 +15,6 @@ describe("OrganizationsClient", () => {
                 { id: "id", name: "name", display_name: "display_name", token_quota: { client_credentials: {} } },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/client-grants/id/organizations")
@@ -24,7 +23,19 @@ describe("OrganizationsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            next: "next",
+            organizations: [
+                {
+                    id: "id",
+                    name: "name",
+                    display_name: "display_name",
+                    token_quota: {
+                        client_credentials: {},
+                    },
+                },
+            ],
+        };
         const page = await client.clientGrants.organizations.list("id", {
             from: "from",
             take: 1,
@@ -41,7 +52,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/client-grants/id/organizations")
@@ -60,7 +70,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/client-grants/id/organizations")
@@ -79,7 +88,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/client-grants/id/organizations")
@@ -98,7 +106,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/client-grants/id/organizations")
diff --git a/src/management/tests/wire/clients.test.ts b/src/management/tests/wire/clients.test.ts
index 28f51811b9..d72b795d74 100644
--- a/src/management/tests/wire/clients.test.ts
+++ b/src/management/tests/wire/clients.test.ts
@@ -74,7 +74,6 @@ describe("ClientsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/clients")
@@ -83,7 +82,81 @@ describe("ClientsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            clients: [
+                {
+                    client_id: "client_id",
+                    tenant: "tenant",
+                    name: "name",
+                    description: "description",
+                    global: true,
+                    client_secret: "client_secret",
+                    app_type: "native",
+                    logo_uri: "logo_uri",
+                    is_first_party: true,
+                    oidc_conformant: true,
+                    callbacks: ["callbacks"],
+                    allowed_origins: ["allowed_origins"],
+                    web_origins: ["web_origins"],
+                    client_aliases: ["client_aliases"],
+                    allowed_clients: ["allowed_clients"],
+                    allowed_logout_urls: ["allowed_logout_urls"],
+                    grant_types: ["grant_types"],
+                    signing_keys: [{}],
+                    sso: true,
+                    sso_disabled: true,
+                    cross_origin_authentication: true,
+                    cross_origin_loc: "cross_origin_loc",
+                    custom_login_page_on: true,
+                    custom_login_page: "custom_login_page",
+                    custom_login_page_preview: "custom_login_page_preview",
+                    form_template: "form_template",
+                    token_endpoint_auth_method: "none",
+                    is_token_endpoint_ip_header_trusted: true,
+                    client_metadata: {
+                        key: "value",
+                    },
+                    initiate_login_uri: "initiate_login_uri",
+                    refresh_token: {
+                        rotation_type: "rotating",
+                        expiration_type: "expiring",
+                    },
+                    default_organization: {
+                        organization_id: "organization_id",
+                        flows: ["client_credentials"],
+                    },
+                    organization_usage: "deny",
+                    organization_require_behavior: "no_prompt",
+                    organization_discovery_methods: ["email"],
+                    require_pushed_authorization_requests: true,
+                    require_proof_of_possession: true,
+                    compliance_level: "none",
+                    skip_non_verifiable_callback_uri_confirmation_prompt: true,
+                    par_request_expiry: 1,
+                    token_quota: {
+                        client_credentials: {},
+                    },
+                    express_configuration: {
+                        initiate_login_uri_template: "initiate_login_uri_template",
+                        user_attribute_profile_id: "user_attribute_profile_id",
+                        connection_profile_id: "connection_profile_id",
+                        enable_client: true,
+                        enable_organization: true,
+                        okta_oin_client_id: "okta_oin_client_id",
+                        admin_login_domain: "admin_login_domain",
+                    },
+                    resource_server_identifier: "resource_server_identifier",
+                    async_approval_notification_channels: ["guardian-push"],
+                    external_metadata_type: "cimd",
+                    external_metadata_created_by: "admin",
+                    external_client_id: "external_client_id",
+                    jwks_uri: "jwks_uri",
+                },
+            ],
+        };
         const page = await client.clients.list({
             fields: "fields",
             include_fields: true,
@@ -108,7 +181,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/clients")
@@ -127,7 +199,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/clients")
@@ -146,7 +217,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/clients")
@@ -165,7 +235,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/clients")
@@ -378,7 +447,6 @@ describe("ClientsClient", () => {
             external_client_id: "external_client_id",
             jwks_uri: "jwks_uri",
         };
-
         server
             .mockEndpoint()
             .post("/clients")
@@ -391,189 +459,354 @@ describe("ClientsClient", () => {
         const response = await client.clients.create({
             name: "name",
         });
-        expect(response).toEqual(rawResponseBody);
-    });
-
-    test("create (2)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = { name: "name" };
-        const rawResponseBody = { key: "value" };
-
-        server
-            .mockEndpoint()
-            .post("/clients")
-            .jsonBody(rawRequestBody)
-            .respondWith()
-            .statusCode(400)
-            .jsonBody(rawResponseBody)
-            .build();
-
-        await expect(async () => {
-            return await client.clients.create({
-                name: "name",
-            });
-        }).rejects.toThrow(Management.BadRequestError);
-    });
-
-    test("create (3)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = { name: "name" };
-        const rawResponseBody = { key: "value" };
-
-        server
-            .mockEndpoint()
-            .post("/clients")
-            .jsonBody(rawRequestBody)
-            .respondWith()
-            .statusCode(401)
-            .jsonBody(rawResponseBody)
-            .build();
-
-        await expect(async () => {
-            return await client.clients.create({
-                name: "name",
-            });
-        }).rejects.toThrow(Management.UnauthorizedError);
-    });
-
-    test("create (4)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = { name: "name" };
-        const rawResponseBody = { key: "value" };
-
-        server
-            .mockEndpoint()
-            .post("/clients")
-            .jsonBody(rawRequestBody)
-            .respondWith()
-            .statusCode(403)
-            .jsonBody(rawResponseBody)
-            .build();
-
-        await expect(async () => {
-            return await client.clients.create({
-                name: "name",
-            });
-        }).rejects.toThrow(Management.ForbiddenError);
-    });
-
-    test("create (5)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = { name: "name" };
-        const rawResponseBody = { key: "value" };
-
-        server
-            .mockEndpoint()
-            .post("/clients")
-            .jsonBody(rawRequestBody)
-            .respondWith()
-            .statusCode(409)
-            .jsonBody(rawResponseBody)
-            .build();
-
-        await expect(async () => {
-            return await client.clients.create({
-                name: "name",
-            });
-        }).rejects.toThrow(Management.ConflictError);
-    });
-
-    test("create (6)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = { name: "name" };
-        const rawResponseBody = { key: "value" };
-
-        server
-            .mockEndpoint()
-            .post("/clients")
-            .jsonBody(rawRequestBody)
-            .respondWith()
-            .statusCode(429)
-            .jsonBody(rawResponseBody)
-            .build();
-
-        await expect(async () => {
-            return await client.clients.create({
-                name: "name",
-            });
-        }).rejects.toThrow(Management.TooManyRequestsError);
-    });
-
-    test("previewCimdMetadata (1)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = { external_client_id: "external_client_id" };
-        const rawResponseBody = {
+        expect(response).toEqual({
             client_id: "client_id",
-            errors: ["errors"],
-            validation: { valid: true, violations: ["violations"], warnings: ["warnings"] },
-            mapped_fields: {
-                external_client_id: "external_client_id",
-                name: "name",
-                app_type: "app_type",
-                callbacks: ["callbacks"],
-                logo_uri: "logo_uri",
-                description: "description",
-                grant_types: ["grant_types"],
-                token_endpoint_auth_method: "token_endpoint_auth_method",
-                jwks_uri: "jwks_uri",
-                client_authentication_methods: {
-                    private_key_jwt: { credentials: [{ credential_type: "credential_type", kid: "kid", alg: "alg" }] },
+            tenant: "tenant",
+            name: "name",
+            description: "description",
+            global: true,
+            client_secret: "client_secret",
+            app_type: "native",
+            logo_uri: "logo_uri",
+            is_first_party: true,
+            oidc_conformant: true,
+            callbacks: ["callbacks"],
+            allowed_origins: ["allowed_origins"],
+            web_origins: ["web_origins"],
+            client_aliases: ["client_aliases"],
+            allowed_clients: ["allowed_clients"],
+            allowed_logout_urls: ["allowed_logout_urls"],
+            session_transfer: {
+                can_create_session_transfer_token: true,
+                enforce_cascade_revocation: true,
+                allowed_authentication_methods: ["cookie"],
+                enforce_device_binding: "ip",
+                allow_refresh_token: true,
+                enforce_online_refresh_tokens: true,
+            },
+            oidc_logout: {
+                backchannel_logout_urls: ["backchannel_logout_urls"],
+                backchannel_logout_initiators: {
+                    mode: "custom",
+                    selected_initiators: ["rp-logout"],
+                },
+                backchannel_logout_session_metadata: {
+                    include: true,
                 },
             },
-        };
-
-        server
-            .mockEndpoint()
-            .post("/clients/cimd/preview")
-            .jsonBody(rawRequestBody)
-            .respondWith()
-            .statusCode(200)
-            .jsonBody(rawResponseBody)
-            .build();
-
-        const response = await client.clients.previewCimdMetadata({
-            external_client_id: "external_client_id",
-        });
-        expect(response).toEqual(rawResponseBody);
-    });
-
-    test("previewCimdMetadata (2)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = { external_client_id: "x" };
-        const rawResponseBody = { key: "value" };
-
-        server
-            .mockEndpoint()
-            .post("/clients/cimd/preview")
-            .jsonBody(rawRequestBody)
-            .respondWith()
-            .statusCode(400)
-            .jsonBody(rawResponseBody)
+            grant_types: ["grant_types"],
+            jwt_configuration: {
+                lifetime_in_seconds: 1,
+                secret_encoded: true,
+                scopes: {
+                    key: "value",
+                },
+                alg: "HS256",
+            },
+            signing_keys: [
+                {
+                    pkcs7: "pkcs7",
+                    cert: "cert",
+                    subject: "subject",
+                },
+            ],
+            encryption_key: {
+                pub: "pub",
+                cert: "cert",
+                subject: "subject",
+            },
+            sso: true,
+            sso_disabled: true,
+            cross_origin_authentication: true,
+            cross_origin_loc: "cross_origin_loc",
+            custom_login_page_on: true,
+            custom_login_page: "custom_login_page",
+            custom_login_page_preview: "custom_login_page_preview",
+            form_template: "form_template",
+            addons: {
+                aws: {
+                    principal: "principal",
+                    role: "role",
+                    lifetime_in_seconds: 1,
+                },
+                azure_blob: {
+                    accountName: "accountName",
+                    storageAccessKey: "storageAccessKey",
+                    containerName: "containerName",
+                    blobName: "blobName",
+                    expiration: 1,
+                    signedIdentifier: "signedIdentifier",
+                    blob_read: true,
+                    blob_write: true,
+                    blob_delete: true,
+                    container_read: true,
+                    container_write: true,
+                    container_delete: true,
+                    container_list: true,
+                },
+                azure_sb: {
+                    namespace: "namespace",
+                    sasKeyName: "sasKeyName",
+                    sasKey: "sasKey",
+                    entityPath: "entityPath",
+                    expiration: 1,
+                },
+                rms: {
+                    url: "url",
+                },
+                mscrm: {
+                    url: "url",
+                },
+                slack: {
+                    team: "team",
+                },
+                sentry: {
+                    org_slug: "org_slug",
+                    base_url: "base_url",
+                },
+                box: {
+                    key: "value",
+                },
+                cloudbees: {
+                    key: "value",
+                },
+                concur: {
+                    key: "value",
+                },
+                dropbox: {
+                    key: "value",
+                },
+                echosign: {
+                    domain: "domain",
+                },
+                egnyte: {
+                    domain: "domain",
+                },
+                firebase: {
+                    secret: "secret",
+                    private_key_id: "private_key_id",
+                    private_key: "private_key",
+                    client_email: "client_email",
+                    lifetime_in_seconds: 1,
+                },
+                newrelic: {
+                    account: "account",
+                },
+                office365: {
+                    domain: "domain",
+                    connection: "connection",
+                },
+                salesforce: {
+                    entity_id: "entity_id",
+                },
+                salesforce_api: {
+                    clientid: "clientid",
+                    principal: "principal",
+                    communityName: "communityName",
+                    community_url_section: "community_url_section",
+                },
+                salesforce_sandbox_api: {
+                    clientid: "clientid",
+                    principal: "principal",
+                    communityName: "communityName",
+                    community_url_section: "community_url_section",
+                },
+                samlp: {
+                    mappings: {
+                        key: "value",
+                    },
+                    audience: "audience",
+                    recipient: "recipient",
+                    createUpnClaim: true,
+                    mapUnknownClaimsAsIs: true,
+                    passthroughClaimsWithNoMapping: true,
+                    mapIdentities: true,
+                    signatureAlgorithm: "signatureAlgorithm",
+                    digestAlgorithm: "digestAlgorithm",
+                    issuer: "issuer",
+                    destination: "destination",
+                    lifetimeInSeconds: 1,
+                    signResponse: true,
+                    nameIdentifierFormat: "nameIdentifierFormat",
+                    nameIdentifierProbes: ["nameIdentifierProbes"],
+                    authnContextClassRef: "authnContextClassRef",
+                },
+                layer: {
+                    providerId: "providerId",
+                    keyId: "keyId",
+                    privateKey: "privateKey",
+                    principal: "principal",
+                    expiration: 1,
+                },
+                sap_api: {
+                    clientid: "clientid",
+                    usernameAttribute: "usernameAttribute",
+                    tokenEndpointUrl: "tokenEndpointUrl",
+                    scope: "scope",
+                    servicePassword: "servicePassword",
+                    nameIdentifierFormat: "nameIdentifierFormat",
+                },
+                sharepoint: {
+                    url: "url",
+                    external_url: ["external_url"],
+                },
+                springcm: {
+                    acsurl: "acsurl",
+                },
+                wams: {
+                    masterkey: "masterkey",
+                },
+                wsfed: {
+                    key: "value",
+                },
+                zendesk: {
+                    accountName: "accountName",
+                },
+                zoom: {
+                    account: "account",
+                },
+                sso_integration: {
+                    name: "name",
+                    version: "version",
+                },
+            },
+            token_endpoint_auth_method: "none",
+            is_token_endpoint_ip_header_trusted: true,
+            client_metadata: {
+                key: "value",
+            },
+            mobile: {
+                android: {
+                    app_package_name: "app_package_name",
+                    sha256_cert_fingerprints: ["sha256_cert_fingerprints"],
+                },
+                ios: {
+                    team_id: "team_id",
+                    app_bundle_identifier: "app_bundle_identifier",
+                },
+            },
+            initiate_login_uri: "initiate_login_uri",
+            refresh_token: {
+                rotation_type: "rotating",
+                expiration_type: "expiring",
+                leeway: 1,
+                token_lifetime: 1,
+                infinite_token_lifetime: true,
+                idle_token_lifetime: 1,
+                infinite_idle_token_lifetime: true,
+                policies: [
+                    {
+                        audience: "audience",
+                        scope: ["scope"],
+                    },
+                ],
+            },
+            default_organization: {
+                organization_id: "organization_id",
+                flows: ["client_credentials"],
+            },
+            organization_usage: "deny",
+            organization_require_behavior: "no_prompt",
+            organization_discovery_methods: ["email"],
+            client_authentication_methods: {
+                private_key_jwt: {
+                    credentials: [
+                        {
+                            id: "id",
+                        },
+                    ],
+                },
+                tls_client_auth: {
+                    credentials: [
+                        {
+                            id: "id",
+                        },
+                    ],
+                },
+                self_signed_tls_client_auth: {
+                    credentials: [
+                        {
+                            id: "id",
+                        },
+                    ],
+                },
+            },
+            require_pushed_authorization_requests: true,
+            require_proof_of_possession: true,
+            signed_request_object: {
+                required: true,
+                credentials: [
+                    {
+                        id: "id",
+                    },
+                ],
+            },
+            compliance_level: "none",
+            skip_non_verifiable_callback_uri_confirmation_prompt: true,
+            token_exchange: {
+                allow_any_profile_of_type: ["custom_authentication"],
+            },
+            par_request_expiry: 1,
+            token_quota: {
+                client_credentials: {
+                    enforce: true,
+                    per_day: 1,
+                    per_hour: 1,
+                },
+            },
+            express_configuration: {
+                initiate_login_uri_template: "initiate_login_uri_template",
+                user_attribute_profile_id: "user_attribute_profile_id",
+                connection_profile_id: "connection_profile_id",
+                enable_client: true,
+                enable_organization: true,
+                linked_clients: [
+                    {
+                        client_id: "client_id",
+                    },
+                ],
+                okta_oin_client_id: "okta_oin_client_id",
+                admin_login_domain: "admin_login_domain",
+                oin_submission_id: "oin_submission_id",
+            },
+            resource_server_identifier: "resource_server_identifier",
+            async_approval_notification_channels: ["guardian-push"],
+            external_metadata_type: "cimd",
+            external_metadata_created_by: "admin",
+            external_client_id: "external_client_id",
+            jwks_uri: "jwks_uri",
+        });
+    });
+
+    test("create (2)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+        const rawRequestBody = { name: "name" };
+        const rawResponseBody = { key: "value" };
+        server
+            .mockEndpoint()
+            .post("/clients")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(400)
+            .jsonBody(rawResponseBody)
             .build();
 
         await expect(async () => {
-            return await client.clients.previewCimdMetadata({
-                external_client_id: "x",
+            return await client.clients.create({
+                name: "name",
             });
         }).rejects.toThrow(Management.BadRequestError);
     });
 
-    test("previewCimdMetadata (3)", async () => {
+    test("create (3)", async () => {
         const server = mockServerPool.createServer();
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = { external_client_id: "x" };
+        const rawRequestBody = { name: "name" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
-            .post("/clients/cimd/preview")
+            .post("/clients")
             .jsonBody(rawRequestBody)
             .respondWith()
             .statusCode(401)
@@ -581,21 +814,20 @@ describe("ClientsClient", () => {
             .build();
 
         await expect(async () => {
-            return await client.clients.previewCimdMetadata({
-                external_client_id: "x",
+            return await client.clients.create({
+                name: "name",
             });
         }).rejects.toThrow(Management.UnauthorizedError);
     });
 
-    test("previewCimdMetadata (4)", async () => {
+    test("create (4)", async () => {
         const server = mockServerPool.createServer();
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = { external_client_id: "x" };
+        const rawRequestBody = { name: "name" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
-            .post("/clients/cimd/preview")
+            .post("/clients")
             .jsonBody(rawRequestBody)
             .respondWith()
             .statusCode(403)
@@ -603,62 +835,62 @@ describe("ClientsClient", () => {
             .build();
 
         await expect(async () => {
-            return await client.clients.previewCimdMetadata({
-                external_client_id: "x",
+            return await client.clients.create({
+                name: "name",
             });
         }).rejects.toThrow(Management.ForbiddenError);
     });
 
-    test("previewCimdMetadata (5)", async () => {
+    test("create (5)", async () => {
         const server = mockServerPool.createServer();
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = { external_client_id: "x" };
+        const rawRequestBody = { name: "name" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
-            .post("/clients/cimd/preview")
+            .post("/clients")
             .jsonBody(rawRequestBody)
             .respondWith()
-            .statusCode(429)
+            .statusCode(409)
             .jsonBody(rawResponseBody)
             .build();
 
         await expect(async () => {
-            return await client.clients.previewCimdMetadata({
-                external_client_id: "x",
+            return await client.clients.create({
+                name: "name",
             });
-        }).rejects.toThrow(Management.TooManyRequestsError);
+        }).rejects.toThrow(Management.ConflictError);
     });
 
-    test("previewCimdMetadata (6)", async () => {
+    test("create (6)", async () => {
         const server = mockServerPool.createServer();
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = { external_client_id: "x" };
+        const rawRequestBody = { name: "name" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
-            .post("/clients/cimd/preview")
+            .post("/clients")
             .jsonBody(rawRequestBody)
             .respondWith()
-            .statusCode(500)
+            .statusCode(429)
             .jsonBody(rawResponseBody)
             .build();
 
         await expect(async () => {
-            return await client.clients.previewCimdMetadata({
-                external_client_id: "x",
+            return await client.clients.create({
+                name: "name",
             });
-        }).rejects.toThrow(Management.InternalServerError);
+        }).rejects.toThrow(Management.TooManyRequestsError);
     });
 
-    test("registerCimdClient (1)", async () => {
+    test("previewCimdMetadata (1)", async () => {
         const server = mockServerPool.createServer();
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { external_client_id: "external_client_id" };
         const rawResponseBody = {
             client_id: "client_id",
+            errors: ["errors"],
+            validation: { valid: true, violations: ["violations"], warnings: ["warnings"] },
             mapped_fields: {
                 external_client_id: "external_client_id",
                 name: "name",
@@ -673,30 +905,228 @@ describe("ClientsClient", () => {
                     private_key_jwt: { credentials: [{ credential_type: "credential_type", kid: "kid", alg: "alg" }] },
                 },
             },
-            validation: { valid: true, violations: ["violations"], warnings: ["warnings"] },
         };
-
         server
             .mockEndpoint()
-            .post("/clients/cimd/register")
+            .post("/clients/cimd/preview")
             .jsonBody(rawRequestBody)
             .respondWith()
             .statusCode(200)
             .jsonBody(rawResponseBody)
             .build();
 
-        const response = await client.clients.registerCimdClient({
+        const response = await client.clients.previewCimdMetadata({
             external_client_id: "external_client_id",
         });
-        expect(response).toEqual(rawResponseBody);
-    });
-
-    test("registerCimdClient (2)", async () => {
+        expect(response).toEqual({
+            client_id: "client_id",
+            errors: ["errors"],
+            validation: {
+                valid: true,
+                violations: ["violations"],
+                warnings: ["warnings"],
+            },
+            mapped_fields: {
+                external_client_id: "external_client_id",
+                name: "name",
+                app_type: "app_type",
+                callbacks: ["callbacks"],
+                logo_uri: "logo_uri",
+                description: "description",
+                grant_types: ["grant_types"],
+                token_endpoint_auth_method: "token_endpoint_auth_method",
+                jwks_uri: "jwks_uri",
+                client_authentication_methods: {
+                    private_key_jwt: {
+                        credentials: [
+                            {
+                                credential_type: "credential_type",
+                                kid: "kid",
+                                alg: "alg",
+                            },
+                        ],
+                    },
+                },
+            },
+        });
+    });
+
+    test("previewCimdMetadata (2)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+        const rawRequestBody = { external_client_id: "x" };
+        const rawResponseBody = { key: "value" };
+        server
+            .mockEndpoint()
+            .post("/clients/cimd/preview")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(400)
+            .jsonBody(rawResponseBody)
+            .build();
+
+        await expect(async () => {
+            return await client.clients.previewCimdMetadata({
+                external_client_id: "x",
+            });
+        }).rejects.toThrow(Management.BadRequestError);
+    });
+
+    test("previewCimdMetadata (3)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+        const rawRequestBody = { external_client_id: "x" };
+        const rawResponseBody = { key: "value" };
+        server
+            .mockEndpoint()
+            .post("/clients/cimd/preview")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(401)
+            .jsonBody(rawResponseBody)
+            .build();
+
+        await expect(async () => {
+            return await client.clients.previewCimdMetadata({
+                external_client_id: "x",
+            });
+        }).rejects.toThrow(Management.UnauthorizedError);
+    });
+
+    test("previewCimdMetadata (4)", async () => {
         const server = mockServerPool.createServer();
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { external_client_id: "x" };
         const rawResponseBody = { key: "value" };
+        server
+            .mockEndpoint()
+            .post("/clients/cimd/preview")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(403)
+            .jsonBody(rawResponseBody)
+            .build();
+
+        await expect(async () => {
+            return await client.clients.previewCimdMetadata({
+                external_client_id: "x",
+            });
+        }).rejects.toThrow(Management.ForbiddenError);
+    });
+
+    test("previewCimdMetadata (5)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+        const rawRequestBody = { external_client_id: "x" };
+        const rawResponseBody = { key: "value" };
+        server
+            .mockEndpoint()
+            .post("/clients/cimd/preview")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(429)
+            .jsonBody(rawResponseBody)
+            .build();
+
+        await expect(async () => {
+            return await client.clients.previewCimdMetadata({
+                external_client_id: "x",
+            });
+        }).rejects.toThrow(Management.TooManyRequestsError);
+    });
+
+    test("previewCimdMetadata (6)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+        const rawRequestBody = { external_client_id: "x" };
+        const rawResponseBody = { key: "value" };
+        server
+            .mockEndpoint()
+            .post("/clients/cimd/preview")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(500)
+            .jsonBody(rawResponseBody)
+            .build();
+
+        await expect(async () => {
+            return await client.clients.previewCimdMetadata({
+                external_client_id: "x",
+            });
+        }).rejects.toThrow(Management.InternalServerError);
+    });
+
+    test("registerCimdClient (1)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+        const rawRequestBody = { external_client_id: "external_client_id" };
+        const rawResponseBody = {
+            client_id: "client_id",
+            mapped_fields: {
+                external_client_id: "external_client_id",
+                name: "name",
+                app_type: "app_type",
+                callbacks: ["callbacks"],
+                logo_uri: "logo_uri",
+                description: "description",
+                grant_types: ["grant_types"],
+                token_endpoint_auth_method: "token_endpoint_auth_method",
+                jwks_uri: "jwks_uri",
+                client_authentication_methods: {
+                    private_key_jwt: { credentials: [{ credential_type: "credential_type", kid: "kid", alg: "alg" }] },
+                },
+            },
+            validation: { valid: true, violations: ["violations"], warnings: ["warnings"] },
+        };
+        server
+            .mockEndpoint()
+            .post("/clients/cimd/register")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(200)
+            .jsonBody(rawResponseBody)
+            .build();
+
+        const response = await client.clients.registerCimdClient({
+            external_client_id: "external_client_id",
+        });
+        expect(response).toEqual({
+            client_id: "client_id",
+            mapped_fields: {
+                external_client_id: "external_client_id",
+                name: "name",
+                app_type: "app_type",
+                callbacks: ["callbacks"],
+                logo_uri: "logo_uri",
+                description: "description",
+                grant_types: ["grant_types"],
+                token_endpoint_auth_method: "token_endpoint_auth_method",
+                jwks_uri: "jwks_uri",
+                client_authentication_methods: {
+                    private_key_jwt: {
+                        credentials: [
+                            {
+                                credential_type: "credential_type",
+                                kid: "kid",
+                                alg: "alg",
+                            },
+                        ],
+                    },
+                },
+            },
+            validation: {
+                valid: true,
+                violations: ["violations"],
+                warnings: ["warnings"],
+            },
+        });
+    });
 
+    test("registerCimdClient (2)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+        const rawRequestBody = { external_client_id: "x" };
+        const rawResponseBody = { key: "value" };
         server
             .mockEndpoint()
             .post("/clients/cimd/register")
@@ -718,7 +1148,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { external_client_id: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/cimd/register")
@@ -740,7 +1169,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { external_client_id: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/cimd/register")
@@ -762,7 +1190,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { external_client_id: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/cimd/register")
@@ -784,28 +1211,874 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { external_client_id: "x" };
         const rawResponseBody = { key: "value" };
+        server
+            .mockEndpoint()
+            .post("/clients/cimd/register")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(500)
+            .jsonBody(rawResponseBody)
+            .build();
+
+        await expect(async () => {
+            return await client.clients.registerCimdClient({
+                external_client_id: "x",
+            });
+        }).rejects.toThrow(Management.InternalServerError);
+    });
+
+    test("get (1)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
+        const rawResponseBody = {
+            client_id: "client_id",
+            tenant: "tenant",
+            name: "name",
+            description: "description",
+            global: true,
+            client_secret: "client_secret",
+            app_type: "native",
+            logo_uri: "logo_uri",
+            is_first_party: true,
+            oidc_conformant: true,
+            callbacks: ["callbacks"],
+            allowed_origins: ["allowed_origins"],
+            web_origins: ["web_origins"],
+            client_aliases: ["client_aliases"],
+            allowed_clients: ["allowed_clients"],
+            allowed_logout_urls: ["allowed_logout_urls"],
+            session_transfer: {
+                can_create_session_transfer_token: true,
+                enforce_cascade_revocation: true,
+                allowed_authentication_methods: ["cookie"],
+                enforce_device_binding: "ip",
+                allow_refresh_token: true,
+                enforce_online_refresh_tokens: true,
+            },
+            oidc_logout: {
+                backchannel_logout_urls: ["backchannel_logout_urls"],
+                backchannel_logout_initiators: { mode: "custom", selected_initiators: ["rp-logout"] },
+                backchannel_logout_session_metadata: { include: true },
+            },
+            grant_types: ["grant_types"],
+            jwt_configuration: { lifetime_in_seconds: 1, secret_encoded: true, scopes: { key: "value" }, alg: "HS256" },
+            signing_keys: [{ pkcs7: "pkcs7", cert: "cert", subject: "subject" }],
+            encryption_key: { pub: "pub", cert: "cert", subject: "subject" },
+            sso: true,
+            sso_disabled: true,
+            cross_origin_authentication: true,
+            cross_origin_loc: "cross_origin_loc",
+            custom_login_page_on: true,
+            custom_login_page: "custom_login_page",
+            custom_login_page_preview: "custom_login_page_preview",
+            form_template: "form_template",
+            addons: {
+                aws: { principal: "principal", role: "role", lifetime_in_seconds: 1 },
+                azure_blob: {
+                    accountName: "accountName",
+                    storageAccessKey: "storageAccessKey",
+                    containerName: "containerName",
+                    blobName: "blobName",
+                    expiration: 1,
+                    signedIdentifier: "signedIdentifier",
+                    blob_read: true,
+                    blob_write: true,
+                    blob_delete: true,
+                    container_read: true,
+                    container_write: true,
+                    container_delete: true,
+                    container_list: true,
+                },
+                azure_sb: {
+                    namespace: "namespace",
+                    sasKeyName: "sasKeyName",
+                    sasKey: "sasKey",
+                    entityPath: "entityPath",
+                    expiration: 1,
+                },
+                rms: { url: "url" },
+                mscrm: { url: "url" },
+                slack: { team: "team" },
+                sentry: { org_slug: "org_slug", base_url: "base_url" },
+                box: { key: "value" },
+                cloudbees: { key: "value" },
+                concur: { key: "value" },
+                dropbox: { key: "value" },
+                echosign: { domain: "domain" },
+                egnyte: { domain: "domain" },
+                firebase: {
+                    secret: "secret",
+                    private_key_id: "private_key_id",
+                    private_key: "private_key",
+                    client_email: "client_email",
+                    lifetime_in_seconds: 1,
+                },
+                newrelic: { account: "account" },
+                office365: { domain: "domain", connection: "connection" },
+                salesforce: { entity_id: "entity_id" },
+                salesforce_api: {
+                    clientid: "clientid",
+                    principal: "principal",
+                    communityName: "communityName",
+                    community_url_section: "community_url_section",
+                },
+                salesforce_sandbox_api: {
+                    clientid: "clientid",
+                    principal: "principal",
+                    communityName: "communityName",
+                    community_url_section: "community_url_section",
+                },
+                samlp: {
+                    mappings: { key: "value" },
+                    audience: "audience",
+                    recipient: "recipient",
+                    createUpnClaim: true,
+                    mapUnknownClaimsAsIs: true,
+                    passthroughClaimsWithNoMapping: true,
+                    mapIdentities: true,
+                    signatureAlgorithm: "signatureAlgorithm",
+                    digestAlgorithm: "digestAlgorithm",
+                    issuer: "issuer",
+                    destination: "destination",
+                    lifetimeInSeconds: 1,
+                    signResponse: true,
+                    nameIdentifierFormat: "nameIdentifierFormat",
+                    nameIdentifierProbes: ["nameIdentifierProbes"],
+                    authnContextClassRef: "authnContextClassRef",
+                },
+                layer: {
+                    providerId: "providerId",
+                    keyId: "keyId",
+                    privateKey: "privateKey",
+                    principal: "principal",
+                    expiration: 1,
+                },
+                sap_api: {
+                    clientid: "clientid",
+                    usernameAttribute: "usernameAttribute",
+                    tokenEndpointUrl: "tokenEndpointUrl",
+                    scope: "scope",
+                    servicePassword: "servicePassword",
+                    nameIdentifierFormat: "nameIdentifierFormat",
+                },
+                sharepoint: { url: "url", external_url: ["external_url"] },
+                springcm: { acsurl: "acsurl" },
+                wams: { masterkey: "masterkey" },
+                wsfed: { key: "value" },
+                zendesk: { accountName: "accountName" },
+                zoom: { account: "account" },
+                sso_integration: { name: "name", version: "version" },
+            },
+            token_endpoint_auth_method: "none",
+            is_token_endpoint_ip_header_trusted: true,
+            client_metadata: { key: "value" },
+            mobile: {
+                android: {
+                    app_package_name: "app_package_name",
+                    sha256_cert_fingerprints: ["sha256_cert_fingerprints"],
+                },
+                ios: { team_id: "team_id", app_bundle_identifier: "app_bundle_identifier" },
+            },
+            initiate_login_uri: "initiate_login_uri",
+            refresh_token: {
+                rotation_type: "rotating",
+                expiration_type: "expiring",
+                leeway: 1,
+                token_lifetime: 1,
+                infinite_token_lifetime: true,
+                idle_token_lifetime: 1,
+                infinite_idle_token_lifetime: true,
+                policies: [{ audience: "audience", scope: ["scope"] }],
+            },
+            default_organization: { organization_id: "organization_id", flows: ["client_credentials"] },
+            organization_usage: "deny",
+            organization_require_behavior: "no_prompt",
+            organization_discovery_methods: ["email"],
+            client_authentication_methods: {
+                private_key_jwt: { credentials: [{ id: "id" }] },
+                tls_client_auth: { credentials: [{ id: "id" }] },
+                self_signed_tls_client_auth: { credentials: [{ id: "id" }] },
+            },
+            require_pushed_authorization_requests: true,
+            require_proof_of_possession: true,
+            signed_request_object: { required: true, credentials: [{ id: "id" }] },
+            compliance_level: "none",
+            skip_non_verifiable_callback_uri_confirmation_prompt: true,
+            token_exchange: { allow_any_profile_of_type: ["custom_authentication"] },
+            par_request_expiry: 1,
+            token_quota: { client_credentials: { enforce: true, per_day: 1, per_hour: 1 } },
+            express_configuration: {
+                initiate_login_uri_template: "initiate_login_uri_template",
+                user_attribute_profile_id: "user_attribute_profile_id",
+                connection_profile_id: "connection_profile_id",
+                enable_client: true,
+                enable_organization: true,
+                linked_clients: [{ client_id: "client_id" }],
+                okta_oin_client_id: "okta_oin_client_id",
+                admin_login_domain: "admin_login_domain",
+                oin_submission_id: "oin_submission_id",
+            },
+            resource_server_identifier: "resource_server_identifier",
+            async_approval_notification_channels: ["guardian-push"],
+            external_metadata_type: "cimd",
+            external_metadata_created_by: "admin",
+            external_client_id: "external_client_id",
+            jwks_uri: "jwks_uri",
+        };
+        server.mockEndpoint().get("/clients/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
+
+        const response = await client.clients.get("id", {
+            fields: "fields",
+            include_fields: true,
+        });
+        expect(response).toEqual({
+            client_id: "client_id",
+            tenant: "tenant",
+            name: "name",
+            description: "description",
+            global: true,
+            client_secret: "client_secret",
+            app_type: "native",
+            logo_uri: "logo_uri",
+            is_first_party: true,
+            oidc_conformant: true,
+            callbacks: ["callbacks"],
+            allowed_origins: ["allowed_origins"],
+            web_origins: ["web_origins"],
+            client_aliases: ["client_aliases"],
+            allowed_clients: ["allowed_clients"],
+            allowed_logout_urls: ["allowed_logout_urls"],
+            session_transfer: {
+                can_create_session_transfer_token: true,
+                enforce_cascade_revocation: true,
+                allowed_authentication_methods: ["cookie"],
+                enforce_device_binding: "ip",
+                allow_refresh_token: true,
+                enforce_online_refresh_tokens: true,
+            },
+            oidc_logout: {
+                backchannel_logout_urls: ["backchannel_logout_urls"],
+                backchannel_logout_initiators: {
+                    mode: "custom",
+                    selected_initiators: ["rp-logout"],
+                },
+                backchannel_logout_session_metadata: {
+                    include: true,
+                },
+            },
+            grant_types: ["grant_types"],
+            jwt_configuration: {
+                lifetime_in_seconds: 1,
+                secret_encoded: true,
+                scopes: {
+                    key: "value",
+                },
+                alg: "HS256",
+            },
+            signing_keys: [
+                {
+                    pkcs7: "pkcs7",
+                    cert: "cert",
+                    subject: "subject",
+                },
+            ],
+            encryption_key: {
+                pub: "pub",
+                cert: "cert",
+                subject: "subject",
+            },
+            sso: true,
+            sso_disabled: true,
+            cross_origin_authentication: true,
+            cross_origin_loc: "cross_origin_loc",
+            custom_login_page_on: true,
+            custom_login_page: "custom_login_page",
+            custom_login_page_preview: "custom_login_page_preview",
+            form_template: "form_template",
+            addons: {
+                aws: {
+                    principal: "principal",
+                    role: "role",
+                    lifetime_in_seconds: 1,
+                },
+                azure_blob: {
+                    accountName: "accountName",
+                    storageAccessKey: "storageAccessKey",
+                    containerName: "containerName",
+                    blobName: "blobName",
+                    expiration: 1,
+                    signedIdentifier: "signedIdentifier",
+                    blob_read: true,
+                    blob_write: true,
+                    blob_delete: true,
+                    container_read: true,
+                    container_write: true,
+                    container_delete: true,
+                    container_list: true,
+                },
+                azure_sb: {
+                    namespace: "namespace",
+                    sasKeyName: "sasKeyName",
+                    sasKey: "sasKey",
+                    entityPath: "entityPath",
+                    expiration: 1,
+                },
+                rms: {
+                    url: "url",
+                },
+                mscrm: {
+                    url: "url",
+                },
+                slack: {
+                    team: "team",
+                },
+                sentry: {
+                    org_slug: "org_slug",
+                    base_url: "base_url",
+                },
+                box: {
+                    key: "value",
+                },
+                cloudbees: {
+                    key: "value",
+                },
+                concur: {
+                    key: "value",
+                },
+                dropbox: {
+                    key: "value",
+                },
+                echosign: {
+                    domain: "domain",
+                },
+                egnyte: {
+                    domain: "domain",
+                },
+                firebase: {
+                    secret: "secret",
+                    private_key_id: "private_key_id",
+                    private_key: "private_key",
+                    client_email: "client_email",
+                    lifetime_in_seconds: 1,
+                },
+                newrelic: {
+                    account: "account",
+                },
+                office365: {
+                    domain: "domain",
+                    connection: "connection",
+                },
+                salesforce: {
+                    entity_id: "entity_id",
+                },
+                salesforce_api: {
+                    clientid: "clientid",
+                    principal: "principal",
+                    communityName: "communityName",
+                    community_url_section: "community_url_section",
+                },
+                salesforce_sandbox_api: {
+                    clientid: "clientid",
+                    principal: "principal",
+                    communityName: "communityName",
+                    community_url_section: "community_url_section",
+                },
+                samlp: {
+                    mappings: {
+                        key: "value",
+                    },
+                    audience: "audience",
+                    recipient: "recipient",
+                    createUpnClaim: true,
+                    mapUnknownClaimsAsIs: true,
+                    passthroughClaimsWithNoMapping: true,
+                    mapIdentities: true,
+                    signatureAlgorithm: "signatureAlgorithm",
+                    digestAlgorithm: "digestAlgorithm",
+                    issuer: "issuer",
+                    destination: "destination",
+                    lifetimeInSeconds: 1,
+                    signResponse: true,
+                    nameIdentifierFormat: "nameIdentifierFormat",
+                    nameIdentifierProbes: ["nameIdentifierProbes"],
+                    authnContextClassRef: "authnContextClassRef",
+                },
+                layer: {
+                    providerId: "providerId",
+                    keyId: "keyId",
+                    privateKey: "privateKey",
+                    principal: "principal",
+                    expiration: 1,
+                },
+                sap_api: {
+                    clientid: "clientid",
+                    usernameAttribute: "usernameAttribute",
+                    tokenEndpointUrl: "tokenEndpointUrl",
+                    scope: "scope",
+                    servicePassword: "servicePassword",
+                    nameIdentifierFormat: "nameIdentifierFormat",
+                },
+                sharepoint: {
+                    url: "url",
+                    external_url: ["external_url"],
+                },
+                springcm: {
+                    acsurl: "acsurl",
+                },
+                wams: {
+                    masterkey: "masterkey",
+                },
+                wsfed: {
+                    key: "value",
+                },
+                zendesk: {
+                    accountName: "accountName",
+                },
+                zoom: {
+                    account: "account",
+                },
+                sso_integration: {
+                    name: "name",
+                    version: "version",
+                },
+            },
+            token_endpoint_auth_method: "none",
+            is_token_endpoint_ip_header_trusted: true,
+            client_metadata: {
+                key: "value",
+            },
+            mobile: {
+                android: {
+                    app_package_name: "app_package_name",
+                    sha256_cert_fingerprints: ["sha256_cert_fingerprints"],
+                },
+                ios: {
+                    team_id: "team_id",
+                    app_bundle_identifier: "app_bundle_identifier",
+                },
+            },
+            initiate_login_uri: "initiate_login_uri",
+            refresh_token: {
+                rotation_type: "rotating",
+                expiration_type: "expiring",
+                leeway: 1,
+                token_lifetime: 1,
+                infinite_token_lifetime: true,
+                idle_token_lifetime: 1,
+                infinite_idle_token_lifetime: true,
+                policies: [
+                    {
+                        audience: "audience",
+                        scope: ["scope"],
+                    },
+                ],
+            },
+            default_organization: {
+                organization_id: "organization_id",
+                flows: ["client_credentials"],
+            },
+            organization_usage: "deny",
+            organization_require_behavior: "no_prompt",
+            organization_discovery_methods: ["email"],
+            client_authentication_methods: {
+                private_key_jwt: {
+                    credentials: [
+                        {
+                            id: "id",
+                        },
+                    ],
+                },
+                tls_client_auth: {
+                    credentials: [
+                        {
+                            id: "id",
+                        },
+                    ],
+                },
+                self_signed_tls_client_auth: {
+                    credentials: [
+                        {
+                            id: "id",
+                        },
+                    ],
+                },
+            },
+            require_pushed_authorization_requests: true,
+            require_proof_of_possession: true,
+            signed_request_object: {
+                required: true,
+                credentials: [
+                    {
+                        id: "id",
+                    },
+                ],
+            },
+            compliance_level: "none",
+            skip_non_verifiable_callback_uri_confirmation_prompt: true,
+            token_exchange: {
+                allow_any_profile_of_type: ["custom_authentication"],
+            },
+            par_request_expiry: 1,
+            token_quota: {
+                client_credentials: {
+                    enforce: true,
+                    per_day: 1,
+                    per_hour: 1,
+                },
+            },
+            express_configuration: {
+                initiate_login_uri_template: "initiate_login_uri_template",
+                user_attribute_profile_id: "user_attribute_profile_id",
+                connection_profile_id: "connection_profile_id",
+                enable_client: true,
+                enable_organization: true,
+                linked_clients: [
+                    {
+                        client_id: "client_id",
+                    },
+                ],
+                okta_oin_client_id: "okta_oin_client_id",
+                admin_login_domain: "admin_login_domain",
+                oin_submission_id: "oin_submission_id",
+            },
+            resource_server_identifier: "resource_server_identifier",
+            async_approval_notification_channels: ["guardian-push"],
+            external_metadata_type: "cimd",
+            external_metadata_created_by: "admin",
+            external_client_id: "external_client_id",
+            jwks_uri: "jwks_uri",
+        });
+    });
+
+    test("get (2)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+
+        const rawResponseBody = { key: "value" };
+        server.mockEndpoint().get("/clients/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
+
+        await expect(async () => {
+            return await client.clients.get("id");
+        }).rejects.toThrow(Management.BadRequestError);
+    });
+
+    test("get (3)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+
+        const rawResponseBody = { key: "value" };
+        server.mockEndpoint().get("/clients/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
+
+        await expect(async () => {
+            return await client.clients.get("id");
+        }).rejects.toThrow(Management.UnauthorizedError);
+    });
+
+    test("get (4)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+
+        const rawResponseBody = { key: "value" };
+        server.mockEndpoint().get("/clients/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
+
+        await expect(async () => {
+            return await client.clients.get("id");
+        }).rejects.toThrow(Management.ForbiddenError);
+    });
+
+    test("get (5)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+
+        const rawResponseBody = { key: "value" };
+        server.mockEndpoint().get("/clients/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
+
+        await expect(async () => {
+            return await client.clients.get("id");
+        }).rejects.toThrow(Management.NotFoundError);
+    });
+
+    test("get (6)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+
+        const rawResponseBody = { key: "value" };
+        server.mockEndpoint().get("/clients/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
+
+        await expect(async () => {
+            return await client.clients.get("id");
+        }).rejects.toThrow(Management.TooManyRequestsError);
+    });
+
+    test("delete (1)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+
+        server.mockEndpoint().delete("/clients/id").respondWith().statusCode(200).build();
+
+        const response = await client.clients.delete("id");
+        expect(response).toEqual(undefined);
+    });
+
+    test("delete (2)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+
+        const rawResponseBody = { key: "value" };
+        server.mockEndpoint().delete("/clients/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
+
+        await expect(async () => {
+            return await client.clients.delete("id");
+        }).rejects.toThrow(Management.BadRequestError);
+    });
+
+    test("delete (3)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+
+        const rawResponseBody = { key: "value" };
+        server.mockEndpoint().delete("/clients/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
+
+        await expect(async () => {
+            return await client.clients.delete("id");
+        }).rejects.toThrow(Management.UnauthorizedError);
+    });
+
+    test("delete (4)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+
+        const rawResponseBody = { key: "value" };
+        server.mockEndpoint().delete("/clients/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
+
+        await expect(async () => {
+            return await client.clients.delete("id");
+        }).rejects.toThrow(Management.ForbiddenError);
+    });
+
+    test("delete (5)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+
+        const rawResponseBody = { key: "value" };
+        server.mockEndpoint().delete("/clients/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
+
+        await expect(async () => {
+            return await client.clients.delete("id");
+        }).rejects.toThrow(Management.TooManyRequestsError);
+    });
+
+    test("update (1)", async () => {
+        const server = mockServerPool.createServer();
+        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
+        const rawRequestBody = {};
+        const rawResponseBody = {
+            client_id: "client_id",
+            tenant: "tenant",
+            name: "name",
+            description: "description",
+            global: true,
+            client_secret: "client_secret",
+            app_type: "native",
+            logo_uri: "logo_uri",
+            is_first_party: true,
+            oidc_conformant: true,
+            callbacks: ["callbacks"],
+            allowed_origins: ["allowed_origins"],
+            web_origins: ["web_origins"],
+            client_aliases: ["client_aliases"],
+            allowed_clients: ["allowed_clients"],
+            allowed_logout_urls: ["allowed_logout_urls"],
+            session_transfer: {
+                can_create_session_transfer_token: true,
+                enforce_cascade_revocation: true,
+                allowed_authentication_methods: ["cookie"],
+                enforce_device_binding: "ip",
+                allow_refresh_token: true,
+                enforce_online_refresh_tokens: true,
+            },
+            oidc_logout: {
+                backchannel_logout_urls: ["backchannel_logout_urls"],
+                backchannel_logout_initiators: { mode: "custom", selected_initiators: ["rp-logout"] },
+                backchannel_logout_session_metadata: { include: true },
+            },
+            grant_types: ["grant_types"],
+            jwt_configuration: { lifetime_in_seconds: 1, secret_encoded: true, scopes: { key: "value" }, alg: "HS256" },
+            signing_keys: [{ pkcs7: "pkcs7", cert: "cert", subject: "subject" }],
+            encryption_key: { pub: "pub", cert: "cert", subject: "subject" },
+            sso: true,
+            sso_disabled: true,
+            cross_origin_authentication: true,
+            cross_origin_loc: "cross_origin_loc",
+            custom_login_page_on: true,
+            custom_login_page: "custom_login_page",
+            custom_login_page_preview: "custom_login_page_preview",
+            form_template: "form_template",
+            addons: {
+                aws: { principal: "principal", role: "role", lifetime_in_seconds: 1 },
+                azure_blob: {
+                    accountName: "accountName",
+                    storageAccessKey: "storageAccessKey",
+                    containerName: "containerName",
+                    blobName: "blobName",
+                    expiration: 1,
+                    signedIdentifier: "signedIdentifier",
+                    blob_read: true,
+                    blob_write: true,
+                    blob_delete: true,
+                    container_read: true,
+                    container_write: true,
+                    container_delete: true,
+                    container_list: true,
+                },
+                azure_sb: {
+                    namespace: "namespace",
+                    sasKeyName: "sasKeyName",
+                    sasKey: "sasKey",
+                    entityPath: "entityPath",
+                    expiration: 1,
+                },
+                rms: { url: "url" },
+                mscrm: { url: "url" },
+                slack: { team: "team" },
+                sentry: { org_slug: "org_slug", base_url: "base_url" },
+                box: { key: "value" },
+                cloudbees: { key: "value" },
+                concur: { key: "value" },
+                dropbox: { key: "value" },
+                echosign: { domain: "domain" },
+                egnyte: { domain: "domain" },
+                firebase: {
+                    secret: "secret",
+                    private_key_id: "private_key_id",
+                    private_key: "private_key",
+                    client_email: "client_email",
+                    lifetime_in_seconds: 1,
+                },
+                newrelic: { account: "account" },
+                office365: { domain: "domain", connection: "connection" },
+                salesforce: { entity_id: "entity_id" },
+                salesforce_api: {
+                    clientid: "clientid",
+                    principal: "principal",
+                    communityName: "communityName",
+                    community_url_section: "community_url_section",
+                },
+                salesforce_sandbox_api: {
+                    clientid: "clientid",
+                    principal: "principal",
+                    communityName: "communityName",
+                    community_url_section: "community_url_section",
+                },
+                samlp: {
+                    mappings: { key: "value" },
+                    audience: "audience",
+                    recipient: "recipient",
+                    createUpnClaim: true,
+                    mapUnknownClaimsAsIs: true,
+                    passthroughClaimsWithNoMapping: true,
+                    mapIdentities: true,
+                    signatureAlgorithm: "signatureAlgorithm",
+                    digestAlgorithm: "digestAlgorithm",
+                    issuer: "issuer",
+                    destination: "destination",
+                    lifetimeInSeconds: 1,
+                    signResponse: true,
+                    nameIdentifierFormat: "nameIdentifierFormat",
+                    nameIdentifierProbes: ["nameIdentifierProbes"],
+                    authnContextClassRef: "authnContextClassRef",
+                },
+                layer: {
+                    providerId: "providerId",
+                    keyId: "keyId",
+                    privateKey: "privateKey",
+                    principal: "principal",
+                    expiration: 1,
+                },
+                sap_api: {
+                    clientid: "clientid",
+                    usernameAttribute: "usernameAttribute",
+                    tokenEndpointUrl: "tokenEndpointUrl",
+                    scope: "scope",
+                    servicePassword: "servicePassword",
+                    nameIdentifierFormat: "nameIdentifierFormat",
+                },
+                sharepoint: { url: "url", external_url: ["external_url"] },
+                springcm: { acsurl: "acsurl" },
+                wams: { masterkey: "masterkey" },
+                wsfed: { key: "value" },
+                zendesk: { accountName: "accountName" },
+                zoom: { account: "account" },
+                sso_integration: { name: "name", version: "version" },
+            },
+            token_endpoint_auth_method: "none",
+            is_token_endpoint_ip_header_trusted: true,
+            client_metadata: { key: "value" },
+            mobile: {
+                android: {
+                    app_package_name: "app_package_name",
+                    sha256_cert_fingerprints: ["sha256_cert_fingerprints"],
+                },
+                ios: { team_id: "team_id", app_bundle_identifier: "app_bundle_identifier" },
+            },
+            initiate_login_uri: "initiate_login_uri",
+            refresh_token: {
+                rotation_type: "rotating",
+                expiration_type: "expiring",
+                leeway: 1,
+                token_lifetime: 1,
+                infinite_token_lifetime: true,
+                idle_token_lifetime: 1,
+                infinite_idle_token_lifetime: true,
+                policies: [{ audience: "audience", scope: ["scope"] }],
+            },
+            default_organization: { organization_id: "organization_id", flows: ["client_credentials"] },
+            organization_usage: "deny",
+            organization_require_behavior: "no_prompt",
+            organization_discovery_methods: ["email"],
+            client_authentication_methods: {
+                private_key_jwt: { credentials: [{ id: "id" }] },
+                tls_client_auth: { credentials: [{ id: "id" }] },
+                self_signed_tls_client_auth: { credentials: [{ id: "id" }] },
+            },
+            require_pushed_authorization_requests: true,
+            require_proof_of_possession: true,
+            signed_request_object: { required: true, credentials: [{ id: "id" }] },
+            compliance_level: "none",
+            skip_non_verifiable_callback_uri_confirmation_prompt: true,
+            token_exchange: { allow_any_profile_of_type: ["custom_authentication"] },
+            par_request_expiry: 1,
+            token_quota: { client_credentials: { enforce: true, per_day: 1, per_hour: 1 } },
+            express_configuration: {
+                initiate_login_uri_template: "initiate_login_uri_template",
+                user_attribute_profile_id: "user_attribute_profile_id",
+                connection_profile_id: "connection_profile_id",
+                enable_client: true,
+                enable_organization: true,
+                linked_clients: [{ client_id: "client_id" }],
+                okta_oin_client_id: "okta_oin_client_id",
+                admin_login_domain: "admin_login_domain",
+                oin_submission_id: "oin_submission_id",
+            },
+            resource_server_identifier: "resource_server_identifier",
+            async_approval_notification_channels: ["guardian-push"],
+            external_metadata_type: "cimd",
+            external_metadata_created_by: "admin",
+            external_client_id: "external_client_id",
+            jwks_uri: "jwks_uri",
+        };
         server
             .mockEndpoint()
-            .post("/clients/cimd/register")
+            .patch("/clients/id")
             .jsonBody(rawRequestBody)
             .respondWith()
-            .statusCode(500)
+            .statusCode(200)
             .jsonBody(rawResponseBody)
             .build();
 
-        await expect(async () => {
-            return await client.clients.registerCimdClient({
-                external_client_id: "x",
-            });
-        }).rejects.toThrow(Management.InternalServerError);
-    });
-
-    test("get (1)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-
-        const rawResponseBody = {
+        const response = await client.clients.update("id");
+        expect(response).toEqual({
             client_id: "client_id",
             tenant: "tenant",
             name: "name",
@@ -832,13 +2105,35 @@ describe("ClientsClient", () => {
             },
             oidc_logout: {
                 backchannel_logout_urls: ["backchannel_logout_urls"],
-                backchannel_logout_initiators: { mode: "custom", selected_initiators: ["rp-logout"] },
-                backchannel_logout_session_metadata: { include: true },
+                backchannel_logout_initiators: {
+                    mode: "custom",
+                    selected_initiators: ["rp-logout"],
+                },
+                backchannel_logout_session_metadata: {
+                    include: true,
+                },
             },
             grant_types: ["grant_types"],
-            jwt_configuration: { lifetime_in_seconds: 1, secret_encoded: true, scopes: { key: "value" }, alg: "HS256" },
-            signing_keys: [{ pkcs7: "pkcs7", cert: "cert", subject: "subject" }],
-            encryption_key: { pub: "pub", cert: "cert", subject: "subject" },
+            jwt_configuration: {
+                lifetime_in_seconds: 1,
+                secret_encoded: true,
+                scopes: {
+                    key: "value",
+                },
+                alg: "HS256",
+            },
+            signing_keys: [
+                {
+                    pkcs7: "pkcs7",
+                    cert: "cert",
+                    subject: "subject",
+                },
+            ],
+            encryption_key: {
+                pub: "pub",
+                cert: "cert",
+                subject: "subject",
+            },
             sso: true,
             sso_disabled: true,
             cross_origin_authentication: true,
@@ -848,7 +2143,11 @@ describe("ClientsClient", () => {
             custom_login_page_preview: "custom_login_page_preview",
             form_template: "form_template",
             addons: {
-                aws: { principal: "principal", role: "role", lifetime_in_seconds: 1 },
+                aws: {
+                    principal: "principal",
+                    role: "role",
+                    lifetime_in_seconds: 1,
+                },
                 azure_blob: {
                     accountName: "accountName",
                     storageAccessKey: "storageAccessKey",
@@ -871,16 +2170,37 @@ describe("ClientsClient", () => {
                     entityPath: "entityPath",
                     expiration: 1,
                 },
-                rms: { url: "url" },
-                mscrm: { url: "url" },
-                slack: { team: "team" },
-                sentry: { org_slug: "org_slug", base_url: "base_url" },
-                box: { key: "value" },
-                cloudbees: { key: "value" },
-                concur: { key: "value" },
-                dropbox: { key: "value" },
-                echosign: { domain: "domain" },
-                egnyte: { domain: "domain" },
+                rms: {
+                    url: "url",
+                },
+                mscrm: {
+                    url: "url",
+                },
+                slack: {
+                    team: "team",
+                },
+                sentry: {
+                    org_slug: "org_slug",
+                    base_url: "base_url",
+                },
+                box: {
+                    key: "value",
+                },
+                cloudbees: {
+                    key: "value",
+                },
+                concur: {
+                    key: "value",
+                },
+                dropbox: {
+                    key: "value",
+                },
+                echosign: {
+                    domain: "domain",
+                },
+                egnyte: {
+                    domain: "domain",
+                },
                 firebase: {
                     secret: "secret",
                     private_key_id: "private_key_id",
@@ -888,9 +2208,16 @@ describe("ClientsClient", () => {
                     client_email: "client_email",
                     lifetime_in_seconds: 1,
                 },
-                newrelic: { account: "account" },
-                office365: { domain: "domain", connection: "connection" },
-                salesforce: { entity_id: "entity_id" },
+                newrelic: {
+                    account: "account",
+                },
+                office365: {
+                    domain: "domain",
+                    connection: "connection",
+                },
+                salesforce: {
+                    entity_id: "entity_id",
+                },
                 salesforce_api: {
                     clientid: "clientid",
                     principal: "principal",
@@ -904,7 +2231,9 @@ describe("ClientsClient", () => {
                     community_url_section: "community_url_section",
                 },
                 samlp: {
-                    mappings: { key: "value" },
+                    mappings: {
+                        key: "value",
+                    },
                     audience: "audience",
                     recipient: "recipient",
                     createUpnClaim: true,
@@ -936,23 +2265,44 @@ describe("ClientsClient", () => {
                     servicePassword: "servicePassword",
                     nameIdentifierFormat: "nameIdentifierFormat",
                 },
-                sharepoint: { url: "url", external_url: ["external_url"] },
-                springcm: { acsurl: "acsurl" },
-                wams: { masterkey: "masterkey" },
-                wsfed: { key: "value" },
-                zendesk: { accountName: "accountName" },
-                zoom: { account: "account" },
-                sso_integration: { name: "name", version: "version" },
+                sharepoint: {
+                    url: "url",
+                    external_url: ["external_url"],
+                },
+                springcm: {
+                    acsurl: "acsurl",
+                },
+                wams: {
+                    masterkey: "masterkey",
+                },
+                wsfed: {
+                    key: "value",
+                },
+                zendesk: {
+                    accountName: "accountName",
+                },
+                zoom: {
+                    account: "account",
+                },
+                sso_integration: {
+                    name: "name",
+                    version: "version",
+                },
             },
             token_endpoint_auth_method: "none",
             is_token_endpoint_ip_header_trusted: true,
-            client_metadata: { key: "value" },
+            client_metadata: {
+                key: "value",
+            },
             mobile: {
                 android: {
                     app_package_name: "app_package_name",
                     sha256_cert_fingerprints: ["sha256_cert_fingerprints"],
                 },
-                ios: { team_id: "team_id", app_bundle_identifier: "app_bundle_identifier" },
+                ios: {
+                    team_id: "team_id",
+                    app_bundle_identifier: "app_bundle_identifier",
+                },
             },
             initiate_login_uri: "initiate_login_uri",
             refresh_token: {
@@ -963,32 +2313,77 @@ describe("ClientsClient", () => {
                 infinite_token_lifetime: true,
                 idle_token_lifetime: 1,
                 infinite_idle_token_lifetime: true,
-                policies: [{ audience: "audience", scope: ["scope"] }],
+                policies: [
+                    {
+                        audience: "audience",
+                        scope: ["scope"],
+                    },
+                ],
+            },
+            default_organization: {
+                organization_id: "organization_id",
+                flows: ["client_credentials"],
             },
-            default_organization: { organization_id: "organization_id", flows: ["client_credentials"] },
             organization_usage: "deny",
             organization_require_behavior: "no_prompt",
             organization_discovery_methods: ["email"],
             client_authentication_methods: {
-                private_key_jwt: { credentials: [{ id: "id" }] },
-                tls_client_auth: { credentials: [{ id: "id" }] },
-                self_signed_tls_client_auth: { credentials: [{ id: "id" }] },
+                private_key_jwt: {
+                    credentials: [
+                        {
+                            id: "id",
+                        },
+                    ],
+                },
+                tls_client_auth: {
+                    credentials: [
+                        {
+                            id: "id",
+                        },
+                    ],
+                },
+                self_signed_tls_client_auth: {
+                    credentials: [
+                        {
+                            id: "id",
+                        },
+                    ],
+                },
             },
             require_pushed_authorization_requests: true,
             require_proof_of_possession: true,
-            signed_request_object: { required: true, credentials: [{ id: "id" }] },
+            signed_request_object: {
+                required: true,
+                credentials: [
+                    {
+                        id: "id",
+                    },
+                ],
+            },
             compliance_level: "none",
             skip_non_verifiable_callback_uri_confirmation_prompt: true,
-            token_exchange: { allow_any_profile_of_type: ["custom_authentication"] },
+            token_exchange: {
+                allow_any_profile_of_type: ["custom_authentication"],
+            },
             par_request_expiry: 1,
-            token_quota: { client_credentials: { enforce: true, per_day: 1, per_hour: 1 } },
+            token_quota: {
+                client_credentials: {
+                    enforce: true,
+                    per_day: 1,
+                    per_hour: 1,
+                },
+            },
             express_configuration: {
                 initiate_login_uri_template: "initiate_login_uri_template",
                 user_attribute_profile_id: "user_attribute_profile_id",
                 connection_profile_id: "connection_profile_id",
                 enable_client: true,
                 enable_organization: true,
-                linked_clients: [{ client_id: "client_id" }],
+                linked_clients: [
+                    {
+                        client_id: "client_id",
+                    },
+                ],
                 okta_oin_client_id: "okta_oin_client_id",
                 admin_login_domain: "admin_login_domain",
                 oin_submission_id: "oin_submission_id",
@@ -999,148 +2394,108 @@ describe("ClientsClient", () => {
             external_metadata_created_by: "admin",
             external_client_id: "external_client_id",
             jwks_uri: "jwks_uri",
-        };
-
-        server.mockEndpoint().get("/clients/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
-
-        const response = await client.clients.get("id", {
-            fields: "fields",
-            include_fields: true,
         });
-        expect(response).toEqual(rawResponseBody);
     });
 
-    test("get (2)", async () => {
+    test("update (2)", async () => {
         const server = mockServerPool.createServer();
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-
+        const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
-        server.mockEndpoint().get("/clients/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
+        server
+            .mockEndpoint()
+            .patch("/clients/id")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(400)
+            .jsonBody(rawResponseBody)
+            .build();
 
         await expect(async () => {
-            return await client.clients.get("id");
+            return await client.clients.update("id");
         }).rejects.toThrow(Management.BadRequestError);
     });
 
-    test("get (3)", async () => {
+    test("update (3)", async () => {
         const server = mockServerPool.createServer();
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-
+        const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
-        server.mockEndpoint().get("/clients/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
+        server
+            .mockEndpoint()
+            .patch("/clients/id")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(401)
+            .jsonBody(rawResponseBody)
+            .build();
 
         await expect(async () => {
-            return await client.clients.get("id");
+            return await client.clients.update("id");
         }).rejects.toThrow(Management.UnauthorizedError);
     });
 
-    test("get (4)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-
-        const rawResponseBody = { key: "value" };
-
-        server.mockEndpoint().get("/clients/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
-
-        await expect(async () => {
-            return await client.clients.get("id");
-        }).rejects.toThrow(Management.ForbiddenError);
-    });
-
-    test("get (5)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-
-        const rawResponseBody = { key: "value" };
-
-        server.mockEndpoint().get("/clients/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
-
-        await expect(async () => {
-            return await client.clients.get("id");
-        }).rejects.toThrow(Management.NotFoundError);
-    });
-
-    test("get (6)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-
-        const rawResponseBody = { key: "value" };
-
-        server.mockEndpoint().get("/clients/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
-
-        await expect(async () => {
-            return await client.clients.get("id");
-        }).rejects.toThrow(Management.TooManyRequestsError);
-    });
-
-    test("delete (1)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-
-        server.mockEndpoint().delete("/clients/id").respondWith().statusCode(200).build();
-
-        const response = await client.clients.delete("id");
-        expect(response).toEqual(undefined);
-    });
-
-    test("delete (2)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-
-        const rawResponseBody = { key: "value" };
-
-        server.mockEndpoint().delete("/clients/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
-
-        await expect(async () => {
-            return await client.clients.delete("id");
-        }).rejects.toThrow(Management.BadRequestError);
-    });
-
-    test("delete (3)", async () => {
+    test("update (4)", async () => {
         const server = mockServerPool.createServer();
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-
+        const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
+        server
+            .mockEndpoint()
+            .patch("/clients/id")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(403)
+            .jsonBody(rawResponseBody)
+            .build();
 
-        server.mockEndpoint().delete("/clients/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
-
-        await expect(async () => {
-            return await client.clients.delete("id");
-        }).rejects.toThrow(Management.UnauthorizedError);
+        await expect(async () => {
+            return await client.clients.update("id");
+        }).rejects.toThrow(Management.ForbiddenError);
     });
 
-    test("delete (4)", async () => {
+    test("update (5)", async () => {
         const server = mockServerPool.createServer();
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-
+        const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
-        server.mockEndpoint().delete("/clients/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
+        server
+            .mockEndpoint()
+            .patch("/clients/id")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(404)
+            .jsonBody(rawResponseBody)
+            .build();
 
         await expect(async () => {
-            return await client.clients.delete("id");
-        }).rejects.toThrow(Management.ForbiddenError);
+            return await client.clients.update("id");
+        }).rejects.toThrow(Management.NotFoundError);
     });
 
-    test("delete (5)", async () => {
+    test("update (6)", async () => {
         const server = mockServerPool.createServer();
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-
+        const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
-        server.mockEndpoint().delete("/clients/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
+        server
+            .mockEndpoint()
+            .patch("/clients/id")
+            .jsonBody(rawRequestBody)
+            .respondWith()
+            .statusCode(429)
+            .jsonBody(rawResponseBody)
+            .build();
 
         await expect(async () => {
-            return await client.clients.delete("id");
+            return await client.clients.update("id");
         }).rejects.toThrow(Management.TooManyRequestsError);
     });
 
-    test("update (1)", async () => {
+    test("rotateSecret (1)", async () => {
         const server = mockServerPool.createServer();
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = {};
+
         const rawResponseBody = {
             client_id: "client_id",
             tenant: "tenant",
@@ -1336,125 +2691,16 @@ describe("ClientsClient", () => {
             external_client_id: "external_client_id",
             jwks_uri: "jwks_uri",
         };
-
         server
             .mockEndpoint()
-            .patch("/clients/id")
-            .jsonBody(rawRequestBody)
+            .post("/clients/id/rotate-secret")
             .respondWith()
             .statusCode(200)
             .jsonBody(rawResponseBody)
             .build();
 
-        const response = await client.clients.update("id");
-        expect(response).toEqual(rawResponseBody);
-    });
-
-    test("update (2)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = {};
-        const rawResponseBody = { key: "value" };
-
-        server
-            .mockEndpoint()
-            .patch("/clients/id")
-            .jsonBody(rawRequestBody)
-            .respondWith()
-            .statusCode(400)
-            .jsonBody(rawResponseBody)
-            .build();
-
-        await expect(async () => {
-            return await client.clients.update("id");
-        }).rejects.toThrow(Management.BadRequestError);
-    });
-
-    test("update (3)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = {};
-        const rawResponseBody = { key: "value" };
-
-        server
-            .mockEndpoint()
-            .patch("/clients/id")
-            .jsonBody(rawRequestBody)
-            .respondWith()
-            .statusCode(401)
-            .jsonBody(rawResponseBody)
-            .build();
-
-        await expect(async () => {
-            return await client.clients.update("id");
-        }).rejects.toThrow(Management.UnauthorizedError);
-    });
-
-    test("update (4)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = {};
-        const rawResponseBody = { key: "value" };
-
-        server
-            .mockEndpoint()
-            .patch("/clients/id")
-            .jsonBody(rawRequestBody)
-            .respondWith()
-            .statusCode(403)
-            .jsonBody(rawResponseBody)
-            .build();
-
-        await expect(async () => {
-            return await client.clients.update("id");
-        }).rejects.toThrow(Management.ForbiddenError);
-    });
-
-    test("update (5)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = {};
-        const rawResponseBody = { key: "value" };
-
-        server
-            .mockEndpoint()
-            .patch("/clients/id")
-            .jsonBody(rawRequestBody)
-            .respondWith()
-            .statusCode(404)
-            .jsonBody(rawResponseBody)
-            .build();
-
-        await expect(async () => {
-            return await client.clients.update("id");
-        }).rejects.toThrow(Management.NotFoundError);
-    });
-
-    test("update (6)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-        const rawRequestBody = {};
-        const rawResponseBody = { key: "value" };
-
-        server
-            .mockEndpoint()
-            .patch("/clients/id")
-            .jsonBody(rawRequestBody)
-            .respondWith()
-            .statusCode(429)
-            .jsonBody(rawResponseBody)
-            .build();
-
-        await expect(async () => {
-            return await client.clients.update("id");
-        }).rejects.toThrow(Management.TooManyRequestsError);
-    });
-
-    test("rotateSecret (1)", async () => {
-        const server = mockServerPool.createServer();
-        const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
-
-        const rawResponseBody = {
+        const response = await client.clients.rotateSecret("id");
+        expect(response).toEqual({
             client_id: "client_id",
             tenant: "tenant",
             name: "name",
@@ -1481,13 +2727,35 @@ describe("ClientsClient", () => {
             },
             oidc_logout: {
                 backchannel_logout_urls: ["backchannel_logout_urls"],
-                backchannel_logout_initiators: { mode: "custom", selected_initiators: ["rp-logout"] },
-                backchannel_logout_session_metadata: { include: true },
+                backchannel_logout_initiators: {
+                    mode: "custom",
+                    selected_initiators: ["rp-logout"],
+                },
+                backchannel_logout_session_metadata: {
+                    include: true,
+                },
             },
             grant_types: ["grant_types"],
-            jwt_configuration: { lifetime_in_seconds: 1, secret_encoded: true, scopes: { key: "value" }, alg: "HS256" },
-            signing_keys: [{ pkcs7: "pkcs7", cert: "cert", subject: "subject" }],
-            encryption_key: { pub: "pub", cert: "cert", subject: "subject" },
+            jwt_configuration: {
+                lifetime_in_seconds: 1,
+                secret_encoded: true,
+                scopes: {
+                    key: "value",
+                },
+                alg: "HS256",
+            },
+            signing_keys: [
+                {
+                    pkcs7: "pkcs7",
+                    cert: "cert",
+                    subject: "subject",
+                },
+            ],
+            encryption_key: {
+                pub: "pub",
+                cert: "cert",
+                subject: "subject",
+            },
             sso: true,
             sso_disabled: true,
             cross_origin_authentication: true,
@@ -1497,7 +2765,11 @@ describe("ClientsClient", () => {
             custom_login_page_preview: "custom_login_page_preview",
             form_template: "form_template",
             addons: {
-                aws: { principal: "principal", role: "role", lifetime_in_seconds: 1 },
+                aws: {
+                    principal: "principal",
+                    role: "role",
+                    lifetime_in_seconds: 1,
+                },
                 azure_blob: {
                     accountName: "accountName",
                     storageAccessKey: "storageAccessKey",
@@ -1520,16 +2792,37 @@ describe("ClientsClient", () => {
                     entityPath: "entityPath",
                     expiration: 1,
                 },
-                rms: { url: "url" },
-                mscrm: { url: "url" },
-                slack: { team: "team" },
-                sentry: { org_slug: "org_slug", base_url: "base_url" },
-                box: { key: "value" },
-                cloudbees: { key: "value" },
-                concur: { key: "value" },
-                dropbox: { key: "value" },
-                echosign: { domain: "domain" },
-                egnyte: { domain: "domain" },
+                rms: {
+                    url: "url",
+                },
+                mscrm: {
+                    url: "url",
+                },
+                slack: {
+                    team: "team",
+                },
+                sentry: {
+                    org_slug: "org_slug",
+                    base_url: "base_url",
+                },
+                box: {
+                    key: "value",
+                },
+                cloudbees: {
+                    key: "value",
+                },
+                concur: {
+                    key: "value",
+                },
+                dropbox: {
+                    key: "value",
+                },
+                echosign: {
+                    domain: "domain",
+                },
+                egnyte: {
+                    domain: "domain",
+                },
                 firebase: {
                     secret: "secret",
                     private_key_id: "private_key_id",
@@ -1537,9 +2830,16 @@ describe("ClientsClient", () => {
                     client_email: "client_email",
                     lifetime_in_seconds: 1,
                 },
-                newrelic: { account: "account" },
-                office365: { domain: "domain", connection: "connection" },
-                salesforce: { entity_id: "entity_id" },
+                newrelic: {
+                    account: "account",
+                },
+                office365: {
+                    domain: "domain",
+                    connection: "connection",
+                },
+                salesforce: {
+                    entity_id: "entity_id",
+                },
                 salesforce_api: {
                     clientid: "clientid",
                     principal: "principal",
@@ -1553,7 +2853,9 @@ describe("ClientsClient", () => {
                     community_url_section: "community_url_section",
                 },
                 samlp: {
-                    mappings: { key: "value" },
+                    mappings: {
+                        key: "value",
+                    },
                     audience: "audience",
                     recipient: "recipient",
                     createUpnClaim: true,
@@ -1585,23 +2887,44 @@ describe("ClientsClient", () => {
                     servicePassword: "servicePassword",
                     nameIdentifierFormat: "nameIdentifierFormat",
                 },
-                sharepoint: { url: "url", external_url: ["external_url"] },
-                springcm: { acsurl: "acsurl" },
-                wams: { masterkey: "masterkey" },
-                wsfed: { key: "value" },
-                zendesk: { accountName: "accountName" },
-                zoom: { account: "account" },
-                sso_integration: { name: "name", version: "version" },
+                sharepoint: {
+                    url: "url",
+                    external_url: ["external_url"],
+                },
+                springcm: {
+                    acsurl: "acsurl",
+                },
+                wams: {
+                    masterkey: "masterkey",
+                },
+                wsfed: {
+                    key: "value",
+                },
+                zendesk: {
+                    accountName: "accountName",
+                },
+                zoom: {
+                    account: "account",
+                },
+                sso_integration: {
+                    name: "name",
+                    version: "version",
+                },
             },
             token_endpoint_auth_method: "none",
             is_token_endpoint_ip_header_trusted: true,
-            client_metadata: { key: "value" },
+            client_metadata: {
+                key: "value",
+            },
             mobile: {
                 android: {
                     app_package_name: "app_package_name",
                     sha256_cert_fingerprints: ["sha256_cert_fingerprints"],
                 },
-                ios: { team_id: "team_id", app_bundle_identifier: "app_bundle_identifier" },
+                ios: {
+                    team_id: "team_id",
+                    app_bundle_identifier: "app_bundle_identifier",
+                },
             },
             initiate_login_uri: "initiate_login_uri",
             refresh_token: {
@@ -1612,32 +2935,77 @@ describe("ClientsClient", () => {
                 infinite_token_lifetime: true,
                 idle_token_lifetime: 1,
                 infinite_idle_token_lifetime: true,
-                policies: [{ audience: "audience", scope: ["scope"] }],
+                policies: [
+                    {
+                        audience: "audience",
+                        scope: ["scope"],
+                    },
+                ],
+            },
+            default_organization: {
+                organization_id: "organization_id",
+                flows: ["client_credentials"],
             },
-            default_organization: { organization_id: "organization_id", flows: ["client_credentials"] },
             organization_usage: "deny",
             organization_require_behavior: "no_prompt",
             organization_discovery_methods: ["email"],
             client_authentication_methods: {
-                private_key_jwt: { credentials: [{ id: "id" }] },
-                tls_client_auth: { credentials: [{ id: "id" }] },
-                self_signed_tls_client_auth: { credentials: [{ id: "id" }] },
+                private_key_jwt: {
+                    credentials: [
+                        {
+                            id: "id",
+                        },
+                    ],
+                },
+                tls_client_auth: {
+                    credentials: [
+                        {
+                            id: "id",
+                        },
+                    ],
+                },
+                self_signed_tls_client_auth: {
+                    credentials: [
+                        {
+                            id: "id",
+                        },
+                    ],
+                },
             },
             require_pushed_authorization_requests: true,
             require_proof_of_possession: true,
-            signed_request_object: { required: true, credentials: [{ id: "id" }] },
+            signed_request_object: {
+                required: true,
+                credentials: [
+                    {
+                        id: "id",
+                    },
+                ],
+            },
             compliance_level: "none",
             skip_non_verifiable_callback_uri_confirmation_prompt: true,
-            token_exchange: { allow_any_profile_of_type: ["custom_authentication"] },
+            token_exchange: {
+                allow_any_profile_of_type: ["custom_authentication"],
+            },
             par_request_expiry: 1,
-            token_quota: { client_credentials: { enforce: true, per_day: 1, per_hour: 1 } },
+            token_quota: {
+                client_credentials: {
+                    enforce: true,
+                    per_day: 1,
+                    per_hour: 1,
+                },
+            },
             express_configuration: {
                 initiate_login_uri_template: "initiate_login_uri_template",
                 user_attribute_profile_id: "user_attribute_profile_id",
                 connection_profile_id: "connection_profile_id",
                 enable_client: true,
                 enable_organization: true,
-                linked_clients: [{ client_id: "client_id" }],
+                linked_clients: [
+                    {
+                        client_id: "client_id",
+                    },
+                ],
                 okta_oin_client_id: "okta_oin_client_id",
                 admin_login_domain: "admin_login_domain",
                 oin_submission_id: "oin_submission_id",
@@ -1648,18 +3016,7 @@ describe("ClientsClient", () => {
             external_metadata_created_by: "admin",
             external_client_id: "external_client_id",
             jwks_uri: "jwks_uri",
-        };
-
-        server
-            .mockEndpoint()
-            .post("/clients/id/rotate-secret")
-            .respondWith()
-            .statusCode(200)
-            .jsonBody(rawResponseBody)
-            .build();
-
-        const response = await client.clients.rotateSecret("id");
-        expect(response).toEqual(rawResponseBody);
+        });
     });
 
     test("rotateSecret (2)", async () => {
@@ -1667,7 +3024,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/id/rotate-secret")
@@ -1686,7 +3042,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/id/rotate-secret")
@@ -1705,7 +3060,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/id/rotate-secret")
@@ -1724,7 +3078,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/id/rotate-secret")
@@ -1743,7 +3096,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/id/rotate-secret")
diff --git a/src/management/tests/wire/clients/connections.test.ts b/src/management/tests/wire/clients/connections.test.ts
index c297374bf7..4dbc07fe93 100644
--- a/src/management/tests/wire/clients/connections.test.ts
+++ b/src/management/tests/wire/clients/connections.test.ts
@@ -26,7 +26,6 @@ describe("ConnectionsClient", () => {
             ],
             next: "next",
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/clients/id/connections")
@@ -35,7 +34,29 @@ describe("ConnectionsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            connections: [
+                {
+                    name: "name",
+                    display_name: "display_name",
+                    options: {
+                        key: "value",
+                    },
+                    id: "id",
+                    strategy: "strategy",
+                    realms: ["realms"],
+                    is_domain_connection: true,
+                    show_as_button: true,
+                    authentication: {
+                        active: true,
+                    },
+                    connected_accounts: {
+                        active: true,
+                    },
+                },
+            ],
+            next: "next",
+        };
         const page = await client.clients.connections.get("id", {
             from: "from",
             take: 1,
@@ -54,7 +75,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/id/connections")
@@ -73,7 +93,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/id/connections")
@@ -92,7 +111,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/id/connections")
@@ -111,7 +129,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/id/connections")
@@ -130,7 +147,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/id/connections")
diff --git a/src/management/tests/wire/clients/credentials.test.ts b/src/management/tests/wire/clients/credentials.test.ts
index f4a3b2f00c..71d3cb899c 100644
--- a/src/management/tests/wire/clients/credentials.test.ts
+++ b/src/management/tests/wire/clients/credentials.test.ts
@@ -23,7 +23,6 @@ describe("CredentialsClient", () => {
                 expires_at: "2024-01-15T09:30:00Z",
             },
         ];
-
         server
             .mockEndpoint()
             .get("/clients/client_id/credentials")
@@ -33,7 +32,20 @@ describe("CredentialsClient", () => {
             .build();
 
         const response = await client.clients.credentials.list("client_id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                id: "id",
+                name: "name",
+                kid: "kid",
+                alg: "RS256",
+                credential_type: "public_key",
+                subject_dn: "subject_dn",
+                thumbprint_sha256: "thumbprint_sha256",
+                created_at: "2024-01-15T09:30:00Z",
+                updated_at: "2024-01-15T09:30:00Z",
+                expires_at: "2024-01-15T09:30:00Z",
+            },
+        ]);
     });
 
     test("list (2)", async () => {
@@ -41,7 +53,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/client_id/credentials")
@@ -60,7 +71,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/client_id/credentials")
@@ -79,7 +89,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/client_id/credentials")
@@ -98,7 +107,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/client_id/credentials")
@@ -128,7 +136,6 @@ describe("CredentialsClient", () => {
             updated_at: "2024-01-15T09:30:00Z",
             expires_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .post("/clients/client_id/credentials")
@@ -141,7 +148,18 @@ describe("CredentialsClient", () => {
         const response = await client.clients.credentials.create("client_id", {
             credential_type: "public_key",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            kid: "kid",
+            alg: "RS256",
+            credential_type: "public_key",
+            subject_dn: "subject_dn",
+            thumbprint_sha256: "thumbprint_sha256",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            expires_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("create (2)", async () => {
@@ -149,7 +167,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { credential_type: "public_key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/client_id/credentials")
@@ -171,7 +188,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { credential_type: "public_key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/client_id/credentials")
@@ -193,7 +209,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { credential_type: "public_key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/client_id/credentials")
@@ -215,7 +230,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { credential_type: "public_key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/client_id/credentials")
@@ -237,7 +251,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { credential_type: "public_key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/clients/client_id/credentials")
@@ -270,7 +283,6 @@ describe("CredentialsClient", () => {
             updated_at: "2024-01-15T09:30:00Z",
             expires_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .get("/clients/client_id/credentials/credential_id")
@@ -280,7 +292,18 @@ describe("CredentialsClient", () => {
             .build();
 
         const response = await client.clients.credentials.get("client_id", "credential_id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            kid: "kid",
+            alg: "RS256",
+            credential_type: "public_key",
+            subject_dn: "subject_dn",
+            thumbprint_sha256: "thumbprint_sha256",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            expires_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("get (2)", async () => {
@@ -288,7 +311,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/client_id/credentials/credential_id")
@@ -307,7 +329,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/client_id/credentials/credential_id")
@@ -326,7 +347,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/client_id/credentials/credential_id")
@@ -345,7 +365,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/clients/client_id/credentials/credential_id")
@@ -379,7 +398,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/clients/client_id/credentials/credential_id")
@@ -398,7 +416,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/clients/client_id/credentials/credential_id")
@@ -417,7 +434,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/clients/client_id/credentials/credential_id")
@@ -436,7 +452,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/clients/client_id/credentials/credential_id")
@@ -466,7 +481,6 @@ describe("CredentialsClient", () => {
             updated_at: "2024-01-15T09:30:00Z",
             expires_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .patch("/clients/client_id/credentials/credential_id")
@@ -477,7 +491,18 @@ describe("CredentialsClient", () => {
             .build();
 
         const response = await client.clients.credentials.update("client_id", "credential_id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            kid: "kid",
+            alg: "RS256",
+            credential_type: "public_key",
+            subject_dn: "subject_dn",
+            thumbprint_sha256: "thumbprint_sha256",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            expires_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("update (2)", async () => {
@@ -485,7 +510,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/clients/client_id/credentials/credential_id")
@@ -505,7 +529,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/clients/client_id/credentials/credential_id")
@@ -525,7 +548,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/clients/client_id/credentials/credential_id")
@@ -545,7 +567,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/clients/client_id/credentials/credential_id")
@@ -565,7 +586,6 @@ describe("CredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/clients/client_id/credentials/credential_id")
diff --git a/src/management/tests/wire/connectionProfiles.test.ts b/src/management/tests/wire/connectionProfiles.test.ts
index 8489c267aa..cc0fe8af86 100644
--- a/src/management/tests/wire/connectionProfiles.test.ts
+++ b/src/management/tests/wire/connectionProfiles.test.ts
@@ -20,7 +20,6 @@ describe("ConnectionProfilesClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/connection-profiles")
@@ -29,7 +28,17 @@ describe("ConnectionProfilesClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            next: "next",
+            connection_profiles: [
+                {
+                    id: "id",
+                    name: "name",
+                    connection_name_prefix_template: "connection_name_prefix_template",
+                    enabled_features: ["scim"],
+                },
+            ],
+        };
         const page = await client.connectionProfiles.list({
             from: "from",
             take: 1,
@@ -46,7 +55,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles")
@@ -65,7 +73,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles")
@@ -84,7 +91,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles")
@@ -103,7 +109,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles")
@@ -138,7 +143,6 @@ describe("ConnectionProfilesClient", () => {
                 samlp: { enabled_features: ["scim"] },
             },
         };
-
         server
             .mockEndpoint()
             .post("/connection-profiles")
@@ -151,7 +155,42 @@ describe("ConnectionProfilesClient", () => {
         const response = await client.connectionProfiles.create({
             name: "name",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            organization: {
+                show_as_button: "none",
+                assign_membership_on_login: "none",
+            },
+            connection_name_prefix_template: "connection_name_prefix_template",
+            enabled_features: ["scim"],
+            strategy_overrides: {
+                pingfederate: {
+                    enabled_features: ["scim"],
+                },
+                ad: {
+                    enabled_features: ["scim"],
+                },
+                adfs: {
+                    enabled_features: ["scim"],
+                },
+                waad: {
+                    enabled_features: ["scim"],
+                },
+                "google-apps": {
+                    enabled_features: ["scim"],
+                },
+                okta: {
+                    enabled_features: ["scim"],
+                },
+                oidc: {
+                    enabled_features: ["scim"],
+                },
+                samlp: {
+                    enabled_features: ["scim"],
+                },
+            },
+        });
     });
 
     test("create (2)", async () => {
@@ -159,7 +198,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connection-profiles")
@@ -181,7 +219,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connection-profiles")
@@ -203,7 +240,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connection-profiles")
@@ -225,7 +261,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connection-profiles")
@@ -247,7 +282,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connection-profiles")
@@ -269,7 +303,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { connection_profile_templates: [{ id: "id", display_name: "display_name" }] };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/templates")
@@ -279,7 +312,14 @@ describe("ConnectionProfilesClient", () => {
             .build();
 
         const response = await client.connectionProfiles.listTemplates();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            connection_profile_templates: [
+                {
+                    id: "id",
+                    display_name: "display_name",
+                },
+            ],
+        });
     });
 
     test("listTemplates (2)", async () => {
@@ -287,7 +327,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/templates")
@@ -306,7 +345,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/templates")
@@ -325,7 +363,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/templates")
@@ -353,7 +390,6 @@ describe("ConnectionProfilesClient", () => {
                 enabled_features: ["scim"],
             },
         };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/templates/id")
@@ -363,7 +399,19 @@ describe("ConnectionProfilesClient", () => {
             .build();
 
         const response = await client.connectionProfiles.getTemplate("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            display_name: "display_name",
+            template: {
+                name: "name",
+                organization: {
+                    show_as_button: "none",
+                    assign_membership_on_login: "none",
+                },
+                connection_name_prefix_template: "connection_name_prefix_template",
+                enabled_features: ["scim"],
+            },
+        });
     });
 
     test("getTemplate (2)", async () => {
@@ -371,7 +419,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/templates/id")
@@ -390,7 +437,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/templates/id")
@@ -409,7 +455,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/templates/id")
@@ -428,7 +473,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/templates/id")
@@ -463,7 +507,6 @@ describe("ConnectionProfilesClient", () => {
                 samlp: { enabled_features: ["scim"] },
             },
         };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/id")
@@ -473,7 +516,42 @@ describe("ConnectionProfilesClient", () => {
             .build();
 
         const response = await client.connectionProfiles.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            organization: {
+                show_as_button: "none",
+                assign_membership_on_login: "none",
+            },
+            connection_name_prefix_template: "connection_name_prefix_template",
+            enabled_features: ["scim"],
+            strategy_overrides: {
+                pingfederate: {
+                    enabled_features: ["scim"],
+                },
+                ad: {
+                    enabled_features: ["scim"],
+                },
+                adfs: {
+                    enabled_features: ["scim"],
+                },
+                waad: {
+                    enabled_features: ["scim"],
+                },
+                "google-apps": {
+                    enabled_features: ["scim"],
+                },
+                okta: {
+                    enabled_features: ["scim"],
+                },
+                oidc: {
+                    enabled_features: ["scim"],
+                },
+                samlp: {
+                    enabled_features: ["scim"],
+                },
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -481,7 +559,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/id")
@@ -500,7 +577,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/id")
@@ -519,7 +595,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/id")
@@ -538,7 +613,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connection-profiles/id")
@@ -567,7 +641,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connection-profiles/id")
@@ -586,7 +659,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connection-profiles/id")
@@ -605,7 +677,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connection-profiles/id")
@@ -640,7 +711,6 @@ describe("ConnectionProfilesClient", () => {
                 samlp: { enabled_features: ["scim"] },
             },
         };
-
         server
             .mockEndpoint()
             .patch("/connection-profiles/id")
@@ -651,7 +721,42 @@ describe("ConnectionProfilesClient", () => {
             .build();
 
         const response = await client.connectionProfiles.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            organization: {
+                show_as_button: "none",
+                assign_membership_on_login: "none",
+            },
+            connection_name_prefix_template: "connection_name_prefix_template",
+            enabled_features: ["scim"],
+            strategy_overrides: {
+                pingfederate: {
+                    enabled_features: ["scim"],
+                },
+                ad: {
+                    enabled_features: ["scim"],
+                },
+                adfs: {
+                    enabled_features: ["scim"],
+                },
+                waad: {
+                    enabled_features: ["scim"],
+                },
+                "google-apps": {
+                    enabled_features: ["scim"],
+                },
+                okta: {
+                    enabled_features: ["scim"],
+                },
+                oidc: {
+                    enabled_features: ["scim"],
+                },
+                samlp: {
+                    enabled_features: ["scim"],
+                },
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -659,7 +764,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connection-profiles/id")
@@ -679,7 +783,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connection-profiles/id")
@@ -699,7 +802,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connection-profiles/id")
@@ -719,7 +821,6 @@ describe("ConnectionProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connection-profiles/id")
diff --git a/src/management/tests/wire/connections.test.ts b/src/management/tests/wire/connections.test.ts
index d91cec90eb..66cab1f9e7 100644
--- a/src/management/tests/wire/connections.test.ts
+++ b/src/management/tests/wire/connections.test.ts
@@ -26,7 +26,6 @@ describe("ConnectionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/connections")
@@ -35,7 +34,29 @@ describe("ConnectionsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            next: "next",
+            connections: [
+                {
+                    name: "name",
+                    display_name: "display_name",
+                    options: {
+                        key: "value",
+                    },
+                    id: "id",
+                    strategy: "strategy",
+                    realms: ["realms"],
+                    is_domain_connection: true,
+                    show_as_button: true,
+                    authentication: {
+                        active: true,
+                    },
+                    connected_accounts: {
+                        active: true,
+                    },
+                },
+            ],
+        };
         const page = await client.connections.list({
             from: "from",
             take: 1,
@@ -55,7 +76,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/connections").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -68,7 +88,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/connections").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -81,7 +100,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/connections").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -94,7 +112,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/connections").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -120,7 +137,6 @@ describe("ConnectionsClient", () => {
             authentication: { active: true },
             connected_accounts: { active: true, cross_app_access: true },
         };
-
         server
             .mockEndpoint()
             .post("/connections")
@@ -134,7 +150,29 @@ describe("ConnectionsClient", () => {
             name: "name",
             strategy: "ad",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            name: "name",
+            display_name: "display_name",
+            options: {
+                key: "value",
+            },
+            id: "id",
+            strategy: "strategy",
+            realms: ["realms"],
+            enabled_clients: ["enabled_clients"],
+            is_domain_connection: true,
+            show_as_button: true,
+            metadata: {
+                key: "value",
+            },
+            authentication: {
+                active: true,
+            },
+            connected_accounts: {
+                active: true,
+                cross_app_access: true,
+            },
+        });
     });
 
     test("create (2)", async () => {
@@ -142,7 +180,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name", strategy: "ad" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections")
@@ -165,7 +202,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name", strategy: "ad" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections")
@@ -188,7 +224,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name", strategy: "ad" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections")
@@ -211,7 +246,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name", strategy: "ad" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections")
@@ -234,7 +268,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name", strategy: "ad" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections")
@@ -270,14 +303,35 @@ describe("ConnectionsClient", () => {
             authentication: { active: true },
             connected_accounts: { active: true, cross_app_access: true },
         };
-
         server.mockEndpoint().get("/connections/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.connections.get("id", {
             fields: "fields",
             include_fields: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            name: "name",
+            display_name: "display_name",
+            options: {
+                key: "value",
+            },
+            id: "id",
+            strategy: "strategy",
+            realms: ["realms"],
+            enabled_clients: ["enabled_clients"],
+            is_domain_connection: true,
+            show_as_button: true,
+            metadata: {
+                key: "value",
+            },
+            authentication: {
+                active: true,
+            },
+            connected_accounts: {
+                active: true,
+                cross_app_access: true,
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -285,7 +339,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/connections/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -298,7 +351,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/connections/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -311,7 +363,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/connections/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -324,7 +375,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/connections/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -337,7 +387,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/connections/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -360,7 +409,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/connections/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -373,7 +421,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/connections/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -386,7 +433,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/connections/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -399,7 +445,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/connections/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -425,7 +470,6 @@ describe("ConnectionsClient", () => {
             authentication: { active: true },
             connected_accounts: { active: true, cross_app_access: true },
         };
-
         server
             .mockEndpoint()
             .patch("/connections/id")
@@ -436,7 +480,29 @@ describe("ConnectionsClient", () => {
             .build();
 
         const response = await client.connections.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            name: "name",
+            display_name: "display_name",
+            options: {
+                key: "value",
+            },
+            id: "id",
+            strategy: "strategy",
+            realms: ["realms"],
+            enabled_clients: ["enabled_clients"],
+            is_domain_connection: true,
+            show_as_button: true,
+            metadata: {
+                key: "value",
+            },
+            authentication: {
+                active: true,
+            },
+            connected_accounts: {
+                active: true,
+                cross_app_access: true,
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -444,7 +510,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id")
@@ -464,7 +529,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id")
@@ -484,7 +548,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id")
@@ -504,7 +567,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id")
@@ -524,7 +586,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id")
@@ -544,7 +605,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id")
@@ -574,7 +634,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/status")
@@ -593,7 +652,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/status")
@@ -612,7 +670,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/status")
@@ -631,7 +688,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/status")
@@ -650,7 +706,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/status")
diff --git a/src/management/tests/wire/connections/clients.test.ts b/src/management/tests/wire/connections/clients.test.ts
index b44f9ac7a8..8e5eb76582 100644
--- a/src/management/tests/wire/connections/clients.test.ts
+++ b/src/management/tests/wire/connections/clients.test.ts
@@ -10,7 +10,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { clients: [{ client_id: "client_id" }], next: "next" };
-
         server
             .mockEndpoint({ once: false })
             .get("/connections/id/clients")
@@ -19,7 +18,14 @@ describe("ClientsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            clients: [
+                {
+                    client_id: "client_id",
+                },
+            ],
+            next: "next",
+        };
         const page = await client.connections.clients.get("id", {
             take: 1,
             from: "from",
@@ -36,7 +42,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/clients")
@@ -55,7 +60,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/clients")
@@ -74,7 +78,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/clients")
@@ -93,7 +96,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/clients")
@@ -112,7 +114,6 @@ describe("ClientsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/clients")
@@ -156,7 +157,6 @@ describe("ClientsClient", () => {
             { client_id: "client_id", status: true },
         ];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id/clients")
@@ -188,7 +188,6 @@ describe("ClientsClient", () => {
             { client_id: "client_id", status: true },
         ];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id/clients")
@@ -220,7 +219,6 @@ describe("ClientsClient", () => {
             { client_id: "client_id", status: true },
         ];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id/clients")
@@ -252,7 +250,6 @@ describe("ClientsClient", () => {
             { client_id: "client_id", status: true },
         ];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id/clients")
@@ -284,7 +281,6 @@ describe("ClientsClient", () => {
             { client_id: "client_id", status: true },
         ];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id/clients")
diff --git a/src/management/tests/wire/connections/directoryProvisioning.test.ts b/src/management/tests/wire/connections/directoryProvisioning.test.ts
index d8095fa163..a38279d47a 100644
--- a/src/management/tests/wire/connections/directoryProvisioning.test.ts
+++ b/src/management/tests/wire/connections/directoryProvisioning.test.ts
@@ -27,7 +27,6 @@ describe("DirectoryProvisioningClient", () => {
             ],
             next: "next",
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/connections-directory-provisionings")
@@ -36,7 +35,29 @@ describe("DirectoryProvisioningClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            directory_provisionings: [
+                {
+                    connection_id: "connection_id",
+                    connection_name: "connection_name",
+                    strategy: "strategy",
+                    mapping: [
+                        {
+                            auth0: "auth0",
+                            idp: "idp",
+                        },
+                    ],
+                    synchronize_automatically: true,
+                    synchronize_groups: "all",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                    last_synchronization_at: "2024-01-15T09:30:00Z",
+                    last_synchronization_status: "last_synchronization_status",
+                    last_synchronization_error: "last_synchronization_error",
+                },
+            ],
+            next: "next",
+        };
         const page = await client.connections.directoryProvisioning.list({
             from: "from",
             take: 1,
@@ -53,7 +74,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections-directory-provisionings")
@@ -72,7 +92,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections-directory-provisionings")
@@ -91,7 +110,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections-directory-provisionings")
@@ -110,7 +128,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections-directory-provisionings")
@@ -141,7 +158,6 @@ describe("DirectoryProvisioningClient", () => {
             last_synchronization_status: "last_synchronization_status",
             last_synchronization_error: "last_synchronization_error",
         };
-
         server
             .mockEndpoint()
             .get("/connections/id/directory-provisioning")
@@ -151,7 +167,24 @@ describe("DirectoryProvisioningClient", () => {
             .build();
 
         const response = await client.connections.directoryProvisioning.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            connection_id: "connection_id",
+            connection_name: "connection_name",
+            strategy: "strategy",
+            mapping: [
+                {
+                    auth0: "auth0",
+                    idp: "idp",
+                },
+            ],
+            synchronize_automatically: true,
+            synchronize_groups: "all",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            last_synchronization_at: "2024-01-15T09:30:00Z",
+            last_synchronization_status: "last_synchronization_status",
+            last_synchronization_error: "last_synchronization_error",
+        });
     });
 
     test("get (2)", async () => {
@@ -159,7 +192,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/directory-provisioning")
@@ -178,7 +210,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/directory-provisioning")
@@ -197,7 +228,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/directory-provisioning")
@@ -216,7 +246,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/directory-provisioning")
@@ -235,7 +264,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/directory-provisioning")
@@ -266,7 +294,6 @@ describe("DirectoryProvisioningClient", () => {
             last_synchronization_status: "last_synchronization_status",
             last_synchronization_error: "last_synchronization_error",
         };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning")
@@ -276,7 +303,24 @@ describe("DirectoryProvisioningClient", () => {
             .build();
 
         const response = await client.connections.directoryProvisioning.create("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            connection_id: "connection_id",
+            connection_name: "connection_name",
+            strategy: "strategy",
+            mapping: [
+                {
+                    auth0: "auth0",
+                    idp: "idp",
+                },
+            ],
+            synchronize_automatically: true,
+            synchronize_groups: "all",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            last_synchronization_at: "2024-01-15T09:30:00Z",
+            last_synchronization_status: "last_synchronization_status",
+            last_synchronization_error: "last_synchronization_error",
+        });
     });
 
     test("create (2)", async () => {
@@ -284,7 +328,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning")
@@ -303,7 +346,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning")
@@ -322,7 +364,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning")
@@ -341,7 +382,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning")
@@ -360,7 +400,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning")
@@ -379,7 +418,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning")
@@ -408,7 +446,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/directory-provisioning")
@@ -427,7 +464,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/directory-provisioning")
@@ -446,7 +482,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/directory-provisioning")
@@ -465,7 +500,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/directory-provisioning")
@@ -484,7 +518,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/directory-provisioning")
@@ -515,7 +548,6 @@ describe("DirectoryProvisioningClient", () => {
             last_synchronization_status: "last_synchronization_status",
             last_synchronization_error: "last_synchronization_error",
         };
-
         server
             .mockEndpoint()
             .patch("/connections/id/directory-provisioning")
@@ -525,7 +557,24 @@ describe("DirectoryProvisioningClient", () => {
             .build();
 
         const response = await client.connections.directoryProvisioning.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            connection_id: "connection_id",
+            connection_name: "connection_name",
+            strategy: "strategy",
+            mapping: [
+                {
+                    auth0: "auth0",
+                    idp: "idp",
+                },
+            ],
+            synchronize_automatically: true,
+            synchronize_groups: "all",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            last_synchronization_at: "2024-01-15T09:30:00Z",
+            last_synchronization_status: "last_synchronization_status",
+            last_synchronization_error: "last_synchronization_error",
+        });
     });
 
     test("update (2)", async () => {
@@ -533,7 +582,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id/directory-provisioning")
@@ -552,7 +600,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id/directory-provisioning")
@@ -571,7 +618,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id/directory-provisioning")
@@ -590,7 +636,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id/directory-provisioning")
@@ -609,7 +654,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id/directory-provisioning")
@@ -628,7 +672,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { mapping: [{ auth0: "auth0", idp: "idp" }] };
-
         server
             .mockEndpoint()
             .get("/connections/id/directory-provisioning/default-mapping")
@@ -638,7 +681,14 @@ describe("DirectoryProvisioningClient", () => {
             .build();
 
         const response = await client.connections.directoryProvisioning.getDefaultMapping("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            mapping: [
+                {
+                    auth0: "auth0",
+                    idp: "idp",
+                },
+            ],
+        });
     });
 
     test("getDefaultMapping (2)", async () => {
@@ -646,7 +696,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/directory-provisioning/default-mapping")
@@ -665,7 +714,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/directory-provisioning/default-mapping")
@@ -684,7 +732,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/directory-provisioning/default-mapping")
@@ -703,7 +750,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/directory-provisioning/default-mapping")
@@ -722,7 +768,6 @@ describe("DirectoryProvisioningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/directory-provisioning/default-mapping")
diff --git a/src/management/tests/wire/connections/directoryProvisioning/synchronizations.test.ts b/src/management/tests/wire/connections/directoryProvisioning/synchronizations.test.ts
index bee407bd0a..8dde6faef8 100644
--- a/src/management/tests/wire/connections/directoryProvisioning/synchronizations.test.ts
+++ b/src/management/tests/wire/connections/directoryProvisioning/synchronizations.test.ts
@@ -14,7 +14,6 @@ describe("SynchronizationsClient", () => {
             synchronization_id: "synchronization_id",
             status: "status",
         };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning/synchronizations")
@@ -24,7 +23,11 @@ describe("SynchronizationsClient", () => {
             .build();
 
         const response = await client.connections.directoryProvisioning.synchronizations.create("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            connection_id: "connection_id",
+            synchronization_id: "synchronization_id",
+            status: "status",
+        });
     });
 
     test("create (2)", async () => {
@@ -32,7 +35,6 @@ describe("SynchronizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning/synchronizations")
@@ -51,7 +53,6 @@ describe("SynchronizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning/synchronizations")
@@ -70,7 +71,6 @@ describe("SynchronizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning/synchronizations")
@@ -89,7 +89,6 @@ describe("SynchronizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning/synchronizations")
@@ -108,7 +107,6 @@ describe("SynchronizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning/synchronizations")
@@ -127,7 +125,6 @@ describe("SynchronizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/directory-provisioning/synchronizations")
diff --git a/src/management/tests/wire/connections/keys.test.ts b/src/management/tests/wire/connections/keys.test.ts
index dd44c61def..597cc68e1a 100644
--- a/src/management/tests/wire/connections/keys.test.ts
+++ b/src/management/tests/wire/connections/keys.test.ts
@@ -25,7 +25,6 @@ describe("KeysClient", () => {
                 subject_dn: "subject_dn",
             },
         ];
-
         server
             .mockEndpoint()
             .get("/connections/id/keys")
@@ -35,7 +34,22 @@ describe("KeysClient", () => {
             .build();
 
         const response = await client.connections.keys.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                kid: "kid",
+                cert: "cert",
+                pkcs: "pkcs",
+                current: true,
+                next: true,
+                previous: true,
+                current_since: "current_since",
+                fingerprint: "fingerprint",
+                thumbprint: "thumbprint",
+                algorithm: "algorithm",
+                key_use: "encryption",
+                subject_dn: "subject_dn",
+            },
+        ]);
     });
 
     test("get (2)", async () => {
@@ -43,7 +57,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/keys")
@@ -62,7 +75,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/keys")
@@ -81,7 +93,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/keys")
@@ -100,7 +111,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/keys")
@@ -119,7 +129,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/keys")
@@ -152,7 +161,6 @@ describe("KeysClient", () => {
                 subject_dn: "subject_dn",
             },
         ];
-
         server
             .mockEndpoint()
             .post("/connections/id/keys")
@@ -162,7 +170,21 @@ describe("KeysClient", () => {
             .build();
 
         const response = await client.connections.keys.create("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                kid: "kid",
+                cert: "cert",
+                pkcs: "pkcs",
+                current: true,
+                next: true,
+                current_since: "current_since",
+                fingerprint: "fingerprint",
+                thumbprint: "thumbprint",
+                algorithm: "algorithm",
+                key_use: "encryption",
+                subject_dn: "subject_dn",
+            },
+        ]);
     });
 
     test("create (2)", async () => {
@@ -170,7 +192,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/keys")
@@ -189,7 +210,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/keys")
@@ -208,7 +228,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/keys")
@@ -227,7 +246,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/keys")
@@ -246,7 +264,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/keys")
@@ -265,7 +282,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/keys")
@@ -294,7 +310,6 @@ describe("KeysClient", () => {
             key_use: "encryption",
             subject_dn: "subject_dn",
         };
-
         server
             .mockEndpoint()
             .post("/connections/id/keys/rotate")
@@ -304,7 +319,17 @@ describe("KeysClient", () => {
             .build();
 
         const response = await client.connections.keys.rotate("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            kid: "kid",
+            cert: "cert",
+            pkcs: "pkcs",
+            next: true,
+            fingerprint: "fingerprint",
+            thumbprint: "thumbprint",
+            algorithm: "algorithm",
+            key_use: "encryption",
+            subject_dn: "subject_dn",
+        });
     });
 
     test("rotate (2)", async () => {
@@ -312,7 +337,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/keys/rotate")
@@ -331,7 +355,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/keys/rotate")
@@ -350,7 +373,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/keys/rotate")
@@ -369,7 +391,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/keys/rotate")
@@ -388,7 +409,6 @@ describe("KeysClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/keys/rotate")
diff --git a/src/management/tests/wire/connections/scimConfiguration.test.ts b/src/management/tests/wire/connections/scimConfiguration.test.ts
index 99b86bb32e..d4cba8a812 100644
--- a/src/management/tests/wire/connections/scimConfiguration.test.ts
+++ b/src/management/tests/wire/connections/scimConfiguration.test.ts
@@ -24,7 +24,6 @@ describe("ScimConfigurationClient", () => {
             ],
             next: "next",
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/connections-scim-configurations")
@@ -33,7 +32,21 @@ describe("ScimConfigurationClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            scim_configurations: [
+                {
+                    connection_id: "connection_id",
+                    connection_name: "connection_name",
+                    strategy: "strategy",
+                    tenant_name: "tenant_name",
+                    user_id_attribute: "user_id_attribute",
+                    mapping: [{}],
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_on: "2024-01-15T09:30:00Z",
+                },
+            ],
+            next: "next",
+        };
         const page = await client.connections.scimConfiguration.list({
             from: "from",
             take: 1,
@@ -50,7 +63,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections-scim-configurations")
@@ -69,7 +81,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections-scim-configurations")
@@ -88,7 +99,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections-scim-configurations")
@@ -107,7 +117,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections-scim-configurations")
@@ -135,7 +144,6 @@ describe("ScimConfigurationClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_on: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .get("/connections/id/scim-configuration")
@@ -145,7 +153,21 @@ describe("ScimConfigurationClient", () => {
             .build();
 
         const response = await client.connections.scimConfiguration.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            connection_id: "connection_id",
+            connection_name: "connection_name",
+            strategy: "strategy",
+            tenant_name: "tenant_name",
+            user_id_attribute: "user_id_attribute",
+            mapping: [
+                {
+                    auth0: "auth0",
+                    scim: "scim",
+                },
+            ],
+            created_at: "2024-01-15T09:30:00Z",
+            updated_on: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("get (2)", async () => {
@@ -153,7 +175,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/scim-configuration")
@@ -172,7 +193,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/scim-configuration")
@@ -200,7 +220,6 @@ describe("ScimConfigurationClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_on: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .post("/connections/id/scim-configuration")
@@ -210,7 +229,21 @@ describe("ScimConfigurationClient", () => {
             .build();
 
         const response = await client.connections.scimConfiguration.create("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            connection_id: "connection_id",
+            connection_name: "connection_name",
+            strategy: "strategy",
+            tenant_name: "tenant_name",
+            user_id_attribute: "user_id_attribute",
+            mapping: [
+                {
+                    auth0: "auth0",
+                    scim: "scim",
+                },
+            ],
+            created_at: "2024-01-15T09:30:00Z",
+            updated_on: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("create (2)", async () => {
@@ -218,7 +251,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/scim-configuration")
@@ -237,7 +269,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/scim-configuration")
@@ -266,7 +297,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/scim-configuration")
@@ -285,7 +315,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/scim-configuration")
@@ -313,7 +342,6 @@ describe("ScimConfigurationClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_on: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .patch("/connections/id/scim-configuration")
@@ -327,7 +355,21 @@ describe("ScimConfigurationClient", () => {
             user_id_attribute: "user_id_attribute",
             mapping: [{}],
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            connection_id: "connection_id",
+            connection_name: "connection_name",
+            strategy: "strategy",
+            tenant_name: "tenant_name",
+            user_id_attribute: "user_id_attribute",
+            mapping: [
+                {
+                    auth0: "auth0",
+                    scim: "scim",
+                },
+            ],
+            created_at: "2024-01-15T09:30:00Z",
+            updated_on: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("update (2)", async () => {
@@ -335,7 +377,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id_attribute: "user_id_attribute", mapping: [{}, {}] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id/scim-configuration")
@@ -358,7 +399,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id_attribute: "user_id_attribute", mapping: [{}, {}] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/connections/id/scim-configuration")
@@ -381,7 +421,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { mapping: [{ auth0: "auth0", scim: "scim" }] };
-
         server
             .mockEndpoint()
             .get("/connections/id/scim-configuration/default-mapping")
@@ -391,7 +430,14 @@ describe("ScimConfigurationClient", () => {
             .build();
 
         const response = await client.connections.scimConfiguration.getDefaultMapping("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            mapping: [
+                {
+                    auth0: "auth0",
+                    scim: "scim",
+                },
+            ],
+        });
     });
 
     test("getDefaultMapping (2)", async () => {
@@ -399,7 +445,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/scim-configuration/default-mapping")
@@ -418,7 +463,6 @@ describe("ScimConfigurationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/scim-configuration/default-mapping")
diff --git a/src/management/tests/wire/connections/scimConfiguration/tokens.test.ts b/src/management/tests/wire/connections/scimConfiguration/tokens.test.ts
index 944675f1d2..07a592af11 100644
--- a/src/management/tests/wire/connections/scimConfiguration/tokens.test.ts
+++ b/src/management/tests/wire/connections/scimConfiguration/tokens.test.ts
@@ -18,7 +18,6 @@ describe("TokensClient", () => {
                 last_used_at: "last_used_at",
             },
         ];
-
         server
             .mockEndpoint()
             .get("/connections/id/scim-configuration/tokens")
@@ -28,7 +27,15 @@ describe("TokensClient", () => {
             .build();
 
         const response = await client.connections.scimConfiguration.tokens.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                token_id: "token_id",
+                scopes: ["scopes"],
+                created_at: "created_at",
+                valid_until: "valid_until",
+                last_used_at: "last_used_at",
+            },
+        ]);
     });
 
     test("get (2)", async () => {
@@ -36,7 +43,6 @@ describe("TokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/scim-configuration/tokens")
@@ -55,7 +61,6 @@ describe("TokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/connections/id/scim-configuration/tokens")
@@ -80,7 +85,6 @@ describe("TokensClient", () => {
             created_at: "created_at",
             valid_until: "valid_until",
         };
-
         server
             .mockEndpoint()
             .post("/connections/id/scim-configuration/tokens")
@@ -91,7 +95,13 @@ describe("TokensClient", () => {
             .build();
 
         const response = await client.connections.scimConfiguration.tokens.create("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            token_id: "token_id",
+            token: "token",
+            scopes: ["scopes"],
+            created_at: "created_at",
+            valid_until: "valid_until",
+        });
     });
 
     test("create (2)", async () => {
@@ -99,7 +109,6 @@ describe("TokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/scim-configuration/tokens")
@@ -119,7 +128,6 @@ describe("TokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/scim-configuration/tokens")
@@ -139,7 +147,6 @@ describe("TokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/connections/id/scim-configuration/tokens")
@@ -174,7 +181,6 @@ describe("TokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/scim-configuration/tokens/tokenId")
@@ -193,7 +199,6 @@ describe("TokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/scim-configuration/tokens/tokenId")
diff --git a/src/management/tests/wire/connections/users.test.ts b/src/management/tests/wire/connections/users.test.ts
index e63227f4e4..d7fb9690c3 100644
--- a/src/management/tests/wire/connections/users.test.ts
+++ b/src/management/tests/wire/connections/users.test.ts
@@ -22,7 +22,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/users")
@@ -43,7 +42,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/users")
@@ -64,7 +62,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/users")
@@ -85,7 +82,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/connections/id/users")
diff --git a/src/management/tests/wire/customDomains.test.ts b/src/management/tests/wire/customDomains.test.ts
index 9c1e5512c7..b650d9977e 100644
--- a/src/management/tests/wire/customDomains.test.ts
+++ b/src/management/tests/wire/customDomains.test.ts
@@ -36,7 +36,6 @@ describe("CustomDomainsClient", () => {
                 relying_party_identifier: "relying_party_identifier",
             },
         ];
-
         server.mockEndpoint().get("/custom-domains").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.customDomains.list({
@@ -45,7 +44,40 @@ describe("CustomDomainsClient", () => {
             include_fields: true,
             sort: "sort",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                custom_domain_id: "custom_domain_id",
+                domain: "domain",
+                primary: true,
+                is_default: true,
+                status: "pending_verification",
+                type: "auth0_managed_certs",
+                origin_domain_name: "origin_domain_name",
+                verification: {
+                    methods: [
+                        {
+                            name: "cname",
+                            record: "record",
+                        },
+                    ],
+                    status: "verified",
+                    error_msg: "error_msg",
+                    last_verified_at: "last_verified_at",
+                },
+                custom_client_ip_header: "custom_client_ip_header",
+                tls_policy: "tls_policy",
+                domain_metadata: {
+                    key: "value",
+                },
+                certificate: {
+                    status: "provisioning",
+                    error_msg: "error_msg",
+                    certificate_authority: "letsencrypt",
+                    renews_before: "renews_before",
+                },
+                relying_party_identifier: "relying_party_identifier",
+            },
+        ]);
     });
 
     test("list (2)", async () => {
@@ -53,7 +85,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/custom-domains").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -66,7 +97,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/custom-domains").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -79,7 +109,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/custom-domains").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -115,7 +144,6 @@ describe("CustomDomainsClient", () => {
             },
             relying_party_identifier: "relying_party_identifier",
         };
-
         server
             .mockEndpoint()
             .post("/custom-domains")
@@ -129,7 +157,37 @@ describe("CustomDomainsClient", () => {
             domain: "domain",
             type: "auth0_managed_certs",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            custom_domain_id: "custom_domain_id",
+            domain: "domain",
+            primary: true,
+            is_default: true,
+            status: "pending_verification",
+            type: "auth0_managed_certs",
+            verification: {
+                methods: [
+                    {
+                        name: "cname",
+                        record: "record",
+                    },
+                ],
+                status: "verified",
+                error_msg: "error_msg",
+                last_verified_at: "last_verified_at",
+            },
+            custom_client_ip_header: "custom_client_ip_header",
+            tls_policy: "tls_policy",
+            domain_metadata: {
+                key: "value",
+            },
+            certificate: {
+                status: "provisioning",
+                error_msg: "error_msg",
+                certificate_authority: "letsencrypt",
+                renews_before: "renews_before",
+            },
+            relying_party_identifier: "relying_party_identifier",
+        });
     });
 
     test("create (2)", async () => {
@@ -137,7 +195,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "domain", type: "auth0_managed_certs" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains")
@@ -160,7 +217,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "domain", type: "auth0_managed_certs" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains")
@@ -183,7 +239,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "domain", type: "auth0_managed_certs" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains")
@@ -206,7 +261,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "domain", type: "auth0_managed_certs" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains")
@@ -229,7 +283,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "domain", type: "auth0_managed_certs" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains")
@@ -276,7 +329,6 @@ describe("CustomDomainsClient", () => {
             },
             relying_party_identifier: "relying_party_identifier",
         };
-
         server
             .mockEndpoint()
             .get("/custom-domains/default")
@@ -286,7 +338,38 @@ describe("CustomDomainsClient", () => {
             .build();
 
         const response = await client.customDomains.getDefault();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            custom_domain_id: "custom_domain_id",
+            domain: "domain",
+            primary: true,
+            is_default: true,
+            status: "pending_verification",
+            type: "auth0_managed_certs",
+            origin_domain_name: "origin_domain_name",
+            verification: {
+                methods: [
+                    {
+                        name: "cname",
+                        record: "record",
+                    },
+                ],
+                status: "verified",
+                error_msg: "error_msg",
+                last_verified_at: "last_verified_at",
+            },
+            custom_client_ip_header: "custom_client_ip_header",
+            tls_policy: "tls_policy",
+            domain_metadata: {
+                key: "value",
+            },
+            certificate: {
+                status: "provisioning",
+                error_msg: "error_msg",
+                certificate_authority: "letsencrypt",
+                renews_before: "renews_before",
+            },
+            relying_party_identifier: "relying_party_identifier",
+        });
     });
 
     test("getDefault (2)", async () => {
@@ -294,7 +377,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/custom-domains/default")
@@ -313,7 +395,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/custom-domains/default")
@@ -332,7 +413,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/custom-domains/default")
@@ -375,7 +455,6 @@ describe("CustomDomainsClient", () => {
             },
             relying_party_identifier: "relying_party_identifier",
         };
-
         server
             .mockEndpoint()
             .patch("/custom-domains/default")
@@ -388,7 +467,38 @@ describe("CustomDomainsClient", () => {
         const response = await client.customDomains.setDefault({
             domain: "domain",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            custom_domain_id: "custom_domain_id",
+            domain: "domain",
+            primary: true,
+            is_default: true,
+            status: "pending_verification",
+            type: "auth0_managed_certs",
+            origin_domain_name: "origin_domain_name",
+            verification: {
+                methods: [
+                    {
+                        name: "cname",
+                        record: "record",
+                    },
+                ],
+                status: "verified",
+                error_msg: "error_msg",
+                last_verified_at: "last_verified_at",
+            },
+            custom_client_ip_header: "custom_client_ip_header",
+            tls_policy: "tls_policy",
+            domain_metadata: {
+                key: "value",
+            },
+            certificate: {
+                status: "provisioning",
+                error_msg: "error_msg",
+                certificate_authority: "letsencrypt",
+                renews_before: "renews_before",
+            },
+            relying_party_identifier: "relying_party_identifier",
+        });
     });
 
     test("setDefault (2)", async () => {
@@ -396,7 +506,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/custom-domains/default")
@@ -418,7 +527,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/custom-domains/default")
@@ -464,11 +572,41 @@ describe("CustomDomainsClient", () => {
             },
             relying_party_identifier: "relying_party_identifier",
         };
-
         server.mockEndpoint().get("/custom-domains/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.customDomains.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            custom_domain_id: "custom_domain_id",
+            domain: "domain",
+            primary: true,
+            is_default: true,
+            status: "pending_verification",
+            type: "auth0_managed_certs",
+            origin_domain_name: "origin_domain_name",
+            verification: {
+                methods: [
+                    {
+                        name: "cname",
+                        record: "record",
+                    },
+                ],
+                status: "verified",
+                error_msg: "error_msg",
+                last_verified_at: "last_verified_at",
+            },
+            custom_client_ip_header: "custom_client_ip_header",
+            tls_policy: "tls_policy",
+            domain_metadata: {
+                key: "value",
+            },
+            certificate: {
+                status: "provisioning",
+                error_msg: "error_msg",
+                certificate_authority: "letsencrypt",
+                renews_before: "renews_before",
+            },
+            relying_party_identifier: "relying_party_identifier",
+        });
     });
 
     test("get (2)", async () => {
@@ -476,7 +614,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/custom-domains/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -489,7 +626,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/custom-domains/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -502,7 +638,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/custom-domains/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -515,7 +650,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/custom-domains/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -528,7 +662,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/custom-domains/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -551,7 +684,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/custom-domains/id")
@@ -570,7 +702,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/custom-domains/id")
@@ -589,7 +720,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/custom-domains/id")
@@ -608,7 +738,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/custom-domains/id")
@@ -650,7 +779,6 @@ describe("CustomDomainsClient", () => {
             },
             relying_party_identifier: "relying_party_identifier",
         };
-
         server
             .mockEndpoint()
             .patch("/custom-domains/id")
@@ -661,7 +789,37 @@ describe("CustomDomainsClient", () => {
             .build();
 
         const response = await client.customDomains.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            custom_domain_id: "custom_domain_id",
+            domain: "domain",
+            primary: true,
+            is_default: true,
+            status: "pending_verification",
+            type: "auth0_managed_certs",
+            verification: {
+                methods: [
+                    {
+                        name: "cname",
+                        record: "record",
+                    },
+                ],
+                status: "verified",
+                error_msg: "error_msg",
+                last_verified_at: "last_verified_at",
+            },
+            custom_client_ip_header: "custom_client_ip_header",
+            tls_policy: "tls_policy",
+            domain_metadata: {
+                key: "value",
+            },
+            certificate: {
+                status: "provisioning",
+                error_msg: "error_msg",
+                certificate_authority: "letsencrypt",
+                renews_before: "renews_before",
+            },
+            relying_party_identifier: "relying_party_identifier",
+        });
     });
 
     test("update (2)", async () => {
@@ -669,7 +827,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/custom-domains/id")
@@ -689,7 +846,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/custom-domains/id")
@@ -709,7 +865,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/custom-domains/id")
@@ -729,7 +884,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/custom-domains/id")
@@ -749,7 +903,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { success: true, message: "message" };
-
         server
             .mockEndpoint()
             .post("/custom-domains/id/test")
@@ -759,7 +912,10 @@ describe("CustomDomainsClient", () => {
             .build();
 
         const response = await client.customDomains.test("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            success: true,
+            message: "message",
+        });
     });
 
     test("test (2)", async () => {
@@ -767,7 +923,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains/id/test")
@@ -786,7 +941,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains/id/test")
@@ -805,7 +959,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains/id/test")
@@ -824,7 +977,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains/id/test")
@@ -843,7 +995,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains/id/test")
@@ -885,7 +1036,6 @@ describe("CustomDomainsClient", () => {
                 renews_before: "renews_before",
             },
         };
-
         server
             .mockEndpoint()
             .post("/custom-domains/id/verify")
@@ -895,7 +1045,37 @@ describe("CustomDomainsClient", () => {
             .build();
 
         const response = await client.customDomains.verify("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            custom_domain_id: "custom_domain_id",
+            domain: "domain",
+            primary: true,
+            status: "pending_verification",
+            type: "auth0_managed_certs",
+            cname_api_key: "cname_api_key",
+            origin_domain_name: "origin_domain_name",
+            verification: {
+                methods: [
+                    {
+                        name: "cname",
+                        record: "record",
+                    },
+                ],
+                status: "verified",
+                error_msg: "error_msg",
+                last_verified_at: "last_verified_at",
+            },
+            custom_client_ip_header: "custom_client_ip_header",
+            tls_policy: "tls_policy",
+            domain_metadata: {
+                key: "value",
+            },
+            certificate: {
+                status: "provisioning",
+                error_msg: "error_msg",
+                certificate_authority: "letsencrypt",
+                renews_before: "renews_before",
+            },
+        });
     });
 
     test("verify (2)", async () => {
@@ -903,7 +1083,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains/id/verify")
@@ -922,7 +1101,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains/id/verify")
@@ -941,7 +1119,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains/id/verify")
@@ -960,7 +1137,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains/id/verify")
@@ -979,7 +1155,6 @@ describe("CustomDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/custom-domains/id/verify")
diff --git a/src/management/tests/wire/deviceCredentials.test.ts b/src/management/tests/wire/deviceCredentials.test.ts
index 4aa62fd9c2..81cd3ed2c6 100644
--- a/src/management/tests/wire/deviceCredentials.test.ts
+++ b/src/management/tests/wire/deviceCredentials.test.ts
@@ -24,7 +24,6 @@ describe("DeviceCredentialsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/device-credentials")
@@ -33,7 +32,21 @@ describe("DeviceCredentialsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            device_credentials: [
+                {
+                    id: "id",
+                    device_name: "device_name",
+                    device_id: "device_id",
+                    type: "public_key",
+                    user_id: "user_id",
+                    client_id: "client_id",
+                },
+            ],
+        };
         const page = await client.deviceCredentials.list({
             page: 1,
             per_page: 1,
@@ -56,7 +69,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/device-credentials")
@@ -75,7 +87,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/device-credentials")
@@ -94,7 +105,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/device-credentials")
@@ -113,7 +123,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/device-credentials")
@@ -137,7 +146,6 @@ describe("DeviceCredentialsClient", () => {
             device_id: "device_id",
         };
         const rawResponseBody = { id: "id" };
-
         server
             .mockEndpoint()
             .post("/device-credentials")
@@ -153,7 +161,9 @@ describe("DeviceCredentialsClient", () => {
             value: "value",
             device_id: "device_id",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+        });
     });
 
     test("createPublicKey (2)", async () => {
@@ -161,7 +171,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { device_name: "x", type: "public_key", value: "x", device_id: "device_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/device-credentials")
@@ -186,7 +195,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { device_name: "x", type: "public_key", value: "x", device_id: "device_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/device-credentials")
@@ -211,7 +219,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { device_name: "x", type: "public_key", value: "x", device_id: "device_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/device-credentials")
@@ -236,7 +243,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { device_name: "x", type: "public_key", value: "x", device_id: "device_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/device-credentials")
@@ -261,7 +267,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { device_name: "x", type: "public_key", value: "x", device_id: "device_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/device-credentials")
@@ -296,7 +301,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/device-credentials/id")
@@ -315,7 +319,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/device-credentials/id")
@@ -334,7 +337,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/device-credentials/id")
@@ -353,7 +355,6 @@ describe("DeviceCredentialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/device-credentials/id")
diff --git a/src/management/tests/wire/emailTemplates.test.ts b/src/management/tests/wire/emailTemplates.test.ts
index f097b2631a..c93b6ec314 100644
--- a/src/management/tests/wire/emailTemplates.test.ts
+++ b/src/management/tests/wire/emailTemplates.test.ts
@@ -20,7 +20,6 @@ describe("EmailTemplatesClient", () => {
             includeEmailInRedirect: true,
             enabled: true,
         };
-
         server
             .mockEndpoint()
             .post("/email-templates")
@@ -33,7 +32,17 @@ describe("EmailTemplatesClient", () => {
         const response = await client.emailTemplates.create({
             template: "verify_email",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            template: "verify_email",
+            body: "body",
+            from: "from",
+            resultUrl: "resultUrl",
+            subject: "subject",
+            syntax: "syntax",
+            urlLifetimeInSeconds: 1.1,
+            includeEmailInRedirect: true,
+            enabled: true,
+        });
     });
 
     test("create (2)", async () => {
@@ -41,7 +50,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { template: "verify_email" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/email-templates")
@@ -63,7 +71,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { template: "verify_email" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/email-templates")
@@ -85,7 +92,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { template: "verify_email" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/email-templates")
@@ -107,7 +113,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { template: "verify_email" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/email-templates")
@@ -129,7 +134,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { template: "verify_email" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/email-templates")
@@ -161,7 +165,6 @@ describe("EmailTemplatesClient", () => {
             includeEmailInRedirect: true,
             enabled: true,
         };
-
         server
             .mockEndpoint()
             .get("/email-templates/verify_email")
@@ -171,7 +174,17 @@ describe("EmailTemplatesClient", () => {
             .build();
 
         const response = await client.emailTemplates.get("verify_email");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            template: "verify_email",
+            body: "body",
+            from: "from",
+            resultUrl: "resultUrl",
+            subject: "subject",
+            syntax: "syntax",
+            urlLifetimeInSeconds: 1.1,
+            includeEmailInRedirect: true,
+            enabled: true,
+        });
     });
 
     test("get (2)", async () => {
@@ -179,7 +192,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/email-templates/verify_email")
@@ -198,7 +210,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/email-templates/verify_email")
@@ -217,7 +228,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/email-templates/verify_email")
@@ -236,7 +246,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/email-templates/verify_email")
@@ -265,7 +274,6 @@ describe("EmailTemplatesClient", () => {
             includeEmailInRedirect: true,
             enabled: true,
         };
-
         server
             .mockEndpoint()
             .put("/email-templates/verify_email")
@@ -278,7 +286,17 @@ describe("EmailTemplatesClient", () => {
         const response = await client.emailTemplates.set("verify_email", {
             template: "verify_email",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            template: "verify_email",
+            body: "body",
+            from: "from",
+            resultUrl: "resultUrl",
+            subject: "subject",
+            syntax: "syntax",
+            urlLifetimeInSeconds: 1.1,
+            includeEmailInRedirect: true,
+            enabled: true,
+        });
     });
 
     test("set (2)", async () => {
@@ -286,7 +304,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { template: "verify_email" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/email-templates/verify_email")
@@ -308,7 +325,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { template: "verify_email" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/email-templates/verify_email")
@@ -330,7 +346,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { template: "verify_email" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/email-templates/verify_email")
@@ -352,7 +367,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { template: "verify_email" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/email-templates/verify_email")
@@ -374,7 +388,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { template: "verify_email" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/email-templates/verify_email")
@@ -406,7 +419,6 @@ describe("EmailTemplatesClient", () => {
             includeEmailInRedirect: true,
             enabled: true,
         };
-
         server
             .mockEndpoint()
             .patch("/email-templates/verify_email")
@@ -417,7 +429,17 @@ describe("EmailTemplatesClient", () => {
             .build();
 
         const response = await client.emailTemplates.update("verify_email");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            template: "verify_email",
+            body: "body",
+            from: "from",
+            resultUrl: "resultUrl",
+            subject: "subject",
+            syntax: "syntax",
+            urlLifetimeInSeconds: 1.1,
+            includeEmailInRedirect: true,
+            enabled: true,
+        });
     });
 
     test("update (2)", async () => {
@@ -425,7 +447,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/email-templates/verify_email")
@@ -445,7 +466,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/email-templates/verify_email")
@@ -465,7 +485,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/email-templates/verify_email")
@@ -485,7 +504,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/email-templates/verify_email")
@@ -505,7 +523,6 @@ describe("EmailTemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/email-templates/verify_email")
diff --git a/src/management/tests/wire/emails/provider.test.ts b/src/management/tests/wire/emails/provider.test.ts
index 1242512f29..9e2a5d9c8d 100644
--- a/src/management/tests/wire/emails/provider.test.ts
+++ b/src/management/tests/wire/emails/provider.test.ts
@@ -22,14 +22,27 @@ describe("ProviderClient", () => {
             },
             settings: { key: "value" },
         };
-
         server.mockEndpoint().get("/emails/provider").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.emails.provider.get({
             fields: "fields",
             include_fields: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            name: "name",
+            enabled: true,
+            default_from_address: "default_from_address",
+            credentials: {
+                api_user: "api_user",
+                region: "region",
+                smtp_host: "smtp_host",
+                smtp_port: 1,
+                smtp_user: "smtp_user",
+            },
+            settings: {
+                key: "value",
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -37,7 +50,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/emails/provider").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -50,7 +62,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/emails/provider").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -63,7 +74,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/emails/provider").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -76,7 +86,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/emails/provider").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -89,7 +98,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/emails/provider").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -114,7 +122,6 @@ describe("ProviderClient", () => {
             },
             settings: { key: "value" },
         };
-
         server
             .mockEndpoint()
             .post("/emails/provider")
@@ -130,7 +137,21 @@ describe("ProviderClient", () => {
                 api_key: "api_key",
             },
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            name: "name",
+            enabled: true,
+            default_from_address: "default_from_address",
+            credentials: {
+                api_user: "api_user",
+                region: "region",
+                smtp_host: "smtp_host",
+                smtp_port: 1,
+                smtp_user: "smtp_user",
+            },
+            settings: {
+                key: "value",
+            },
+        });
     });
 
     test("create (2)", async () => {
@@ -138,7 +159,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "mailgun", credentials: { api_key: "x" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/emails/provider")
@@ -163,7 +183,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "mailgun", credentials: { api_key: "x" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/emails/provider")
@@ -188,7 +207,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "mailgun", credentials: { api_key: "x" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/emails/provider")
@@ -213,7 +231,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "mailgun", credentials: { api_key: "x" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/emails/provider")
@@ -238,7 +255,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "mailgun", credentials: { api_key: "x" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/emails/provider")
@@ -273,7 +289,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/emails/provider")
@@ -292,7 +307,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/emails/provider")
@@ -311,7 +325,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/emails/provider")
@@ -330,7 +343,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/emails/provider")
@@ -349,7 +361,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/emails/provider")
@@ -380,7 +391,6 @@ describe("ProviderClient", () => {
             },
             settings: { key: "value" },
         };
-
         server
             .mockEndpoint()
             .patch("/emails/provider")
@@ -391,7 +401,21 @@ describe("ProviderClient", () => {
             .build();
 
         const response = await client.emails.provider.update();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            name: "name",
+            enabled: true,
+            default_from_address: "default_from_address",
+            credentials: {
+                api_user: "api_user",
+                region: "region",
+                smtp_host: "smtp_host",
+                smtp_port: 1,
+                smtp_user: "smtp_user",
+            },
+            settings: {
+                key: "value",
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -399,7 +423,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/emails/provider")
@@ -419,7 +442,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/emails/provider")
@@ -439,7 +461,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/emails/provider")
@@ -459,7 +480,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/emails/provider")
@@ -479,7 +499,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/emails/provider")
@@ -499,7 +518,6 @@ describe("ProviderClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/emails/provider")
diff --git a/src/management/tests/wire/eventStreams.test.ts b/src/management/tests/wire/eventStreams.test.ts
index 7158402c93..b8f2ce2d76 100644
--- a/src/management/tests/wire/eventStreams.test.ts
+++ b/src/management/tests/wire/eventStreams.test.ts
@@ -29,7 +29,6 @@ describe("EventStreamsClient", () => {
             ],
             next: "next",
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/event-streams")
@@ -38,7 +37,29 @@ describe("EventStreamsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            eventStreams: [
+                {
+                    id: "id",
+                    name: "name",
+                    subscriptions: [{}],
+                    destination: {
+                        type: "webhook",
+                        configuration: {
+                            webhook_endpoint: "webhook_endpoint",
+                            webhook_authorization: {
+                                method: "basic",
+                                username: "username",
+                            },
+                        },
+                    },
+                    status: "enabled",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            next: "next",
+        };
         const page = await client.eventStreams.list({
             from: "from",
             take: 1,
@@ -55,7 +76,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/event-streams").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -68,7 +88,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/event-streams").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -81,7 +100,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/event-streams").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -94,7 +112,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/event-streams").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -129,7 +146,6 @@ describe("EventStreamsClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .post("/event-streams")
@@ -151,7 +167,28 @@ describe("EventStreamsClient", () => {
                 },
             },
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            subscriptions: [
+                {
+                    event_type: "event_type",
+                },
+            ],
+            destination: {
+                type: "webhook",
+                configuration: {
+                    webhook_endpoint: "webhook_endpoint",
+                    webhook_authorization: {
+                        method: "basic",
+                        username: "username",
+                    },
+                },
+            },
+            status: "enabled",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("create (2)", async () => {
@@ -167,7 +204,6 @@ describe("EventStreamsClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams")
@@ -206,7 +242,6 @@ describe("EventStreamsClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams")
@@ -245,7 +280,6 @@ describe("EventStreamsClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams")
@@ -284,7 +318,6 @@ describe("EventStreamsClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams")
@@ -323,7 +356,6 @@ describe("EventStreamsClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams")
@@ -368,11 +400,31 @@ describe("EventStreamsClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server.mockEndpoint().get("/event-streams/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.eventStreams.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            subscriptions: [
+                {
+                    event_type: "event_type",
+                },
+            ],
+            destination: {
+                type: "webhook",
+                configuration: {
+                    webhook_endpoint: "webhook_endpoint",
+                    webhook_authorization: {
+                        method: "basic",
+                        username: "username",
+                    },
+                },
+            },
+            status: "enabled",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("get (2)", async () => {
@@ -380,7 +432,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/event-streams/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -393,7 +444,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/event-streams/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -406,7 +456,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/event-streams/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -419,7 +468,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/event-streams/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -442,7 +490,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/event-streams/id")
@@ -461,7 +508,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/event-streams/id")
@@ -480,7 +526,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/event-streams/id")
@@ -499,7 +544,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/event-streams/id")
@@ -532,7 +576,6 @@ describe("EventStreamsClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .patch("/event-streams/id")
@@ -543,7 +586,28 @@ describe("EventStreamsClient", () => {
             .build();
 
         const response = await client.eventStreams.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            subscriptions: [
+                {
+                    event_type: "event_type",
+                },
+            ],
+            destination: {
+                type: "webhook",
+                configuration: {
+                    webhook_endpoint: "webhook_endpoint",
+                    webhook_authorization: {
+                        method: "basic",
+                        username: "username",
+                    },
+                },
+            },
+            status: "enabled",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("update (2)", async () => {
@@ -551,7 +615,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/event-streams/id")
@@ -571,7 +634,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/event-streams/id")
@@ -591,7 +653,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/event-streams/id")
@@ -611,7 +672,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/event-streams/id")
@@ -645,7 +705,6 @@ describe("EventStreamsClient", () => {
                 data: "data",
             },
         };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/test")
@@ -658,7 +717,27 @@ describe("EventStreamsClient", () => {
         const response = await client.eventStreams.test("id", {
             event_type: "user.created",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            event_stream_id: "event_stream_id",
+            status: "failed",
+            event_type: "user.created",
+            attempts: [
+                {
+                    status: "failed",
+                    timestamp: "2024-01-15T09:30:00Z",
+                    error_message: "error_message",
+                },
+            ],
+            event: {
+                id: "id",
+                source: "source",
+                specversion: "specversion",
+                type: "type",
+                time: "2024-01-15T09:30:00Z",
+                data: "data",
+            },
+        });
     });
 
     test("test (2)", async () => {
@@ -666,7 +745,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { event_type: "user.created" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/test")
@@ -688,7 +766,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { event_type: "user.created" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/test")
@@ -710,7 +787,6 @@ describe("EventStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { event_type: "user.created" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/test")
diff --git a/src/management/tests/wire/eventStreams/deliveries.test.ts b/src/management/tests/wire/eventStreams/deliveries.test.ts
index 8df4675ba2..03717b3ae0 100644
--- a/src/management/tests/wire/eventStreams/deliveries.test.ts
+++ b/src/management/tests/wire/eventStreams/deliveries.test.ts
@@ -26,7 +26,6 @@ describe("DeliveriesClient", () => {
                 },
             },
         ];
-
         server
             .mockEndpoint()
             .get("/event-streams/id/deliveries")
@@ -43,7 +42,28 @@ describe("DeliveriesClient", () => {
             from: "from",
             take: 1,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                id: "id",
+                event_stream_id: "event_stream_id",
+                status: "failed",
+                event_type: "user.created",
+                attempts: [
+                    {
+                        status: "failed",
+                        timestamp: "2024-01-15T09:30:00Z",
+                    },
+                ],
+                event: {
+                    id: "id",
+                    source: "source",
+                    specversion: "specversion",
+                    type: "type",
+                    time: "2024-01-15T09:30:00Z",
+                    data: "data",
+                },
+            },
+        ]);
     });
 
     test("list (2)", async () => {
@@ -51,7 +71,6 @@ describe("DeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/event-streams/id/deliveries")
@@ -70,7 +89,6 @@ describe("DeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/event-streams/id/deliveries")
@@ -89,7 +107,6 @@ describe("DeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/event-streams/id/deliveries")
@@ -108,7 +125,6 @@ describe("DeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/event-streams/id/deliveries")
@@ -127,7 +143,6 @@ describe("DeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/event-streams/id/deliveries")
@@ -160,7 +175,6 @@ describe("DeliveriesClient", () => {
                 data: "data",
             },
         };
-
         server
             .mockEndpoint()
             .get("/event-streams/id/deliveries/event_id")
@@ -170,7 +184,27 @@ describe("DeliveriesClient", () => {
             .build();
 
         const response = await client.eventStreams.deliveries.getHistory("id", "event_id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            event_stream_id: "event_stream_id",
+            status: "failed",
+            event_type: "user.created",
+            attempts: [
+                {
+                    status: "failed",
+                    timestamp: "2024-01-15T09:30:00Z",
+                    error_message: "error_message",
+                },
+            ],
+            event: {
+                id: "id",
+                source: "source",
+                specversion: "specversion",
+                type: "type",
+                time: "2024-01-15T09:30:00Z",
+                data: "data",
+            },
+        });
     });
 
     test("getHistory (2)", async () => {
@@ -178,7 +212,6 @@ describe("DeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/event-streams/id/deliveries/event_id")
@@ -197,7 +230,6 @@ describe("DeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/event-streams/id/deliveries/event_id")
@@ -216,7 +248,6 @@ describe("DeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/event-streams/id/deliveries/event_id")
@@ -235,7 +266,6 @@ describe("DeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/event-streams/id/deliveries/event_id")
diff --git a/src/management/tests/wire/eventStreams/redeliveries.test.ts b/src/management/tests/wire/eventStreams/redeliveries.test.ts
index 426ca48a7c..fe23f4fe70 100644
--- a/src/management/tests/wire/eventStreams/redeliveries.test.ts
+++ b/src/management/tests/wire/eventStreams/redeliveries.test.ts
@@ -15,7 +15,6 @@ describe("RedeliveriesClient", () => {
             statuses: ["failed"],
             event_types: ["user.created"],
         };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/redeliver")
@@ -26,7 +25,12 @@ describe("RedeliveriesClient", () => {
             .build();
 
         const response = await client.eventStreams.redeliveries.create("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            date_from: "2024-01-15T09:30:00Z",
+            date_to: "2024-01-15T09:30:00Z",
+            statuses: ["failed"],
+            event_types: ["user.created"],
+        });
     });
 
     test("create (2)", async () => {
@@ -34,7 +38,6 @@ describe("RedeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/redeliver")
@@ -54,7 +57,6 @@ describe("RedeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/redeliver")
@@ -74,7 +76,6 @@ describe("RedeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/redeliver")
@@ -94,7 +95,6 @@ describe("RedeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/redeliver")
@@ -114,7 +114,6 @@ describe("RedeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/redeliver")
@@ -144,7 +143,6 @@ describe("RedeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/redeliver/event_id")
@@ -163,7 +161,6 @@ describe("RedeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/redeliver/event_id")
@@ -182,7 +179,6 @@ describe("RedeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/redeliver/event_id")
@@ -201,7 +197,6 @@ describe("RedeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/redeliver/event_id")
@@ -220,7 +215,6 @@ describe("RedeliveriesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/event-streams/id/redeliver/event_id")
diff --git a/src/management/tests/wire/flows.test.ts b/src/management/tests/wire/flows.test.ts
index 3d85cc7b8c..04951226b7 100644
--- a/src/management/tests/wire/flows.test.ts
+++ b/src/management/tests/wire/flows.test.ts
@@ -23,7 +23,6 @@ describe("FlowsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/flows")
@@ -32,7 +31,20 @@ describe("FlowsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            flows: [
+                {
+                    id: "id",
+                    name: "name",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                    executed_at: "executed_at",
+                },
+            ],
+        };
         const page = await client.flows.list({
             page: 1,
             per_page: 1,
@@ -51,7 +63,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/flows")
@@ -70,7 +81,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/flows")
@@ -89,7 +99,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/flows")
@@ -108,7 +117,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/flows")
@@ -144,7 +152,6 @@ describe("FlowsClient", () => {
             updated_at: "2024-01-15T09:30:00Z",
             executed_at: "executed_at",
         };
-
         server
             .mockEndpoint()
             .post("/flows")
@@ -157,7 +164,27 @@ describe("FlowsClient", () => {
         const response = await client.flows.create({
             name: "name",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            actions: [
+                {
+                    id: "id",
+                    alias: "alias",
+                    type: "ACTIVECAMPAIGN",
+                    action: "LIST_CONTACTS",
+                    allow_failure: true,
+                    mask_output: true,
+                    params: {
+                        connection_id: "connection_id",
+                        email: "email",
+                    },
+                },
+            ],
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            executed_at: "executed_at",
+        });
     });
 
     test("create (2)", async () => {
@@ -165,7 +192,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/flows")
@@ -187,7 +213,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/flows")
@@ -209,7 +234,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/flows")
@@ -231,7 +255,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/flows")
@@ -270,11 +293,30 @@ describe("FlowsClient", () => {
             updated_at: "2024-01-15T09:30:00Z",
             executed_at: "executed_at",
         };
-
         server.mockEndpoint().get("/flows/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.flows.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            actions: [
+                {
+                    id: "id",
+                    alias: "alias",
+                    type: "ACTIVECAMPAIGN",
+                    action: "LIST_CONTACTS",
+                    allow_failure: true,
+                    mask_output: true,
+                    params: {
+                        connection_id: "connection_id",
+                        email: "email",
+                    },
+                },
+            ],
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            executed_at: "executed_at",
+        });
     });
 
     test("get (2)", async () => {
@@ -282,7 +324,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/flows/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -295,7 +336,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/flows/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -308,7 +348,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/flows/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -321,7 +360,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/flows/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -334,7 +372,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/flows/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -357,7 +394,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/flows/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -370,7 +406,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/flows/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -383,7 +418,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/flows/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -396,7 +430,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/flows/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -409,7 +442,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/flows/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -439,7 +471,6 @@ describe("FlowsClient", () => {
             updated_at: "2024-01-15T09:30:00Z",
             executed_at: "executed_at",
         };
-
         server
             .mockEndpoint()
             .patch("/flows/id")
@@ -450,7 +481,27 @@ describe("FlowsClient", () => {
             .build();
 
         const response = await client.flows.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            actions: [
+                {
+                    id: "id",
+                    alias: "alias",
+                    type: "ACTIVECAMPAIGN",
+                    action: "LIST_CONTACTS",
+                    allow_failure: true,
+                    mask_output: true,
+                    params: {
+                        connection_id: "connection_id",
+                        email: "email",
+                    },
+                },
+            ],
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            executed_at: "executed_at",
+        });
     });
 
     test("update (2)", async () => {
@@ -458,7 +509,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/flows/id")
@@ -478,7 +528,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/flows/id")
@@ -498,7 +547,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/flows/id")
@@ -518,7 +566,6 @@ describe("FlowsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/flows/id")
diff --git a/src/management/tests/wire/flows/executions.test.ts b/src/management/tests/wire/flows/executions.test.ts
index f2050cc603..09ce671c7f 100644
--- a/src/management/tests/wire/flows/executions.test.ts
+++ b/src/management/tests/wire/flows/executions.test.ts
@@ -24,7 +24,6 @@ describe("ExecutionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/flows/flow_id/executions")
@@ -33,7 +32,21 @@ describe("ExecutionsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            next: "next",
+            executions: [
+                {
+                    id: "id",
+                    trace_id: "trace_id",
+                    journey_id: "journey_id",
+                    status: "status",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                    started_at: "2024-01-15T09:30:00Z",
+                    ended_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+        };
         const page = await client.flows.executions.list("flow_id", {
             from: "from",
             take: 1,
@@ -50,7 +63,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/flow_id/executions")
@@ -69,7 +81,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/flow_id/executions")
@@ -88,7 +99,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/flow_id/executions")
@@ -107,7 +117,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/flow_id/executions")
@@ -136,7 +145,6 @@ describe("ExecutionsClient", () => {
             started_at: "2024-01-15T09:30:00Z",
             ended_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .get("/flows/flow_id/executions/execution_id")
@@ -146,7 +154,19 @@ describe("ExecutionsClient", () => {
             .build();
 
         const response = await client.flows.executions.get("flow_id", "execution_id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            trace_id: "trace_id",
+            journey_id: "journey_id",
+            status: "status",
+            debug: {
+                key: "value",
+            },
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            started_at: "2024-01-15T09:30:00Z",
+            ended_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("get (2)", async () => {
@@ -154,7 +174,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/flow_id/executions/execution_id")
@@ -173,7 +192,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/flow_id/executions/execution_id")
@@ -192,7 +210,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/flow_id/executions/execution_id")
@@ -211,7 +228,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/flow_id/executions/execution_id")
@@ -240,7 +256,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/flows/flow_id/executions/execution_id")
@@ -259,7 +274,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/flows/flow_id/executions/execution_id")
@@ -278,7 +292,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/flows/flow_id/executions/execution_id")
@@ -297,7 +310,6 @@ describe("ExecutionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/flows/flow_id/executions/execution_id")
diff --git a/src/management/tests/wire/flows/vault/connections.test.ts b/src/management/tests/wire/flows/vault/connections.test.ts
index d7775c2397..39d91b8afe 100644
--- a/src/management/tests/wire/flows/vault/connections.test.ts
+++ b/src/management/tests/wire/flows/vault/connections.test.ts
@@ -27,7 +27,6 @@ describe("ConnectionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/flows/vault/connections")
@@ -36,7 +35,24 @@ describe("ConnectionsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            connections: [
+                {
+                    id: "id",
+                    app_id: "app_id",
+                    name: "name",
+                    account_name: "account_name",
+                    ready: true,
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                    refreshed_at: "2024-01-15T09:30:00Z",
+                    fingerprint: "fingerprint",
+                },
+            ],
+        };
         const page = await client.flows.vault.connections.list({
             page: 1,
             per_page: 1,
@@ -54,7 +70,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/flows/vault/connections")
@@ -73,7 +88,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/flows/vault/connections")
@@ -92,7 +106,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/flows/vault/connections")
@@ -111,7 +124,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/flows/vault/connections")
@@ -145,7 +157,6 @@ describe("ConnectionsClient", () => {
             refreshed_at: "2024-01-15T09:30:00Z",
             fingerprint: "fingerprint",
         };
-
         server
             .mockEndpoint()
             .post("/flows/vault/connections")
@@ -164,7 +175,18 @@ describe("ConnectionsClient", () => {
                 base_url: "base_url",
             },
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            app_id: "app_id",
+            environment: "environment",
+            name: "name",
+            account_name: "account_name",
+            ready: true,
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            refreshed_at: "2024-01-15T09:30:00Z",
+            fingerprint: "fingerprint",
+        });
     });
 
     test("create (2)", async () => {
@@ -176,7 +198,6 @@ describe("ConnectionsClient", () => {
             setup: { type: "API_KEY", api_key: "api_key", base_url: "base_url" },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/flows/vault/connections")
@@ -208,7 +229,6 @@ describe("ConnectionsClient", () => {
             setup: { type: "API_KEY", api_key: "api_key", base_url: "base_url" },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/flows/vault/connections")
@@ -240,7 +260,6 @@ describe("ConnectionsClient", () => {
             setup: { type: "API_KEY", api_key: "api_key", base_url: "base_url" },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/flows/vault/connections")
@@ -272,7 +291,6 @@ describe("ConnectionsClient", () => {
             setup: { type: "API_KEY", api_key: "api_key", base_url: "base_url" },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/flows/vault/connections")
@@ -311,7 +329,6 @@ describe("ConnectionsClient", () => {
             refreshed_at: "2024-01-15T09:30:00Z",
             fingerprint: "fingerprint",
         };
-
         server
             .mockEndpoint()
             .get("/flows/vault/connections/id")
@@ -321,7 +338,18 @@ describe("ConnectionsClient", () => {
             .build();
 
         const response = await client.flows.vault.connections.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            app_id: "app_id",
+            environment: "environment",
+            name: "name",
+            account_name: "account_name",
+            ready: true,
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            refreshed_at: "2024-01-15T09:30:00Z",
+            fingerprint: "fingerprint",
+        });
     });
 
     test("get (2)", async () => {
@@ -329,7 +357,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/vault/connections/id")
@@ -348,7 +375,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/vault/connections/id")
@@ -367,7 +393,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/vault/connections/id")
@@ -386,7 +411,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/vault/connections/id")
@@ -405,7 +429,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/flows/vault/connections/id")
@@ -434,7 +457,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/flows/vault/connections/id")
@@ -453,7 +475,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/flows/vault/connections/id")
@@ -472,7 +493,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/flows/vault/connections/id")
@@ -491,7 +511,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/flows/vault/connections/id")
@@ -521,7 +540,6 @@ describe("ConnectionsClient", () => {
             refreshed_at: "2024-01-15T09:30:00Z",
             fingerprint: "fingerprint",
         };
-
         server
             .mockEndpoint()
             .patch("/flows/vault/connections/id")
@@ -532,7 +550,18 @@ describe("ConnectionsClient", () => {
             .build();
 
         const response = await client.flows.vault.connections.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            app_id: "app_id",
+            environment: "environment",
+            name: "name",
+            account_name: "account_name",
+            ready: true,
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            refreshed_at: "2024-01-15T09:30:00Z",
+            fingerprint: "fingerprint",
+        });
     });
 
     test("update (2)", async () => {
@@ -540,7 +569,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/flows/vault/connections/id")
@@ -560,7 +588,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/flows/vault/connections/id")
@@ -580,7 +607,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/flows/vault/connections/id")
@@ -600,7 +626,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/flows/vault/connections/id")
@@ -620,7 +645,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/flows/vault/connections/id")
diff --git a/src/management/tests/wire/forms.test.ts b/src/management/tests/wire/forms.test.ts
index 709875165e..e8ee48b048 100644
--- a/src/management/tests/wire/forms.test.ts
+++ b/src/management/tests/wire/forms.test.ts
@@ -24,7 +24,6 @@ describe("FormsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/forms")
@@ -33,7 +32,21 @@ describe("FormsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            forms: [
+                {
+                    id: "id",
+                    name: "name",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                    embedded_at: "embedded_at",
+                    submitted_at: "submitted_at",
+                },
+            ],
+        };
         const page = await client.forms.list({
             page: 1,
             per_page: 1,
@@ -51,7 +64,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/forms")
@@ -70,7 +82,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/forms")
@@ -89,7 +100,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/forms")
@@ -108,7 +118,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/forms")
@@ -148,7 +157,6 @@ describe("FormsClient", () => {
             embedded_at: "embedded_at",
             submitted_at: "submitted_at",
         };
-
         server
             .mockEndpoint()
             .post("/forms")
@@ -161,7 +169,74 @@ describe("FormsClient", () => {
         const response = await client.forms.create({
             name: "name",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            messages: {
+                errors: {
+                    key: "value",
+                },
+                custom: {
+                    key: "value",
+                },
+            },
+            languages: {
+                primary: "primary",
+                default: "default",
+            },
+            translations: {
+                key: {
+                    key: "value",
+                },
+            },
+            nodes: [
+                {
+                    id: "id",
+                    type: "FLOW",
+                    coordinates: {
+                        x: 1,
+                        y: 1,
+                    },
+                    alias: "alias",
+                    config: {
+                        flow_id: "flow_id",
+                    },
+                },
+            ],
+            start: {
+                hidden_fields: [
+                    {
+                        key: "key",
+                    },
+                ],
+                next_node: "$ending",
+                coordinates: {
+                    x: 1,
+                    y: 1,
+                },
+            },
+            ending: {
+                redirection: {
+                    delay: 1,
+                    target: "target",
+                },
+                after_submit: {
+                    flow_id: "flow_id",
+                },
+                coordinates: {
+                    x: 1,
+                    y: 1,
+                },
+                resume_flow: true,
+            },
+            style: {
+                css: "css",
+            },
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            embedded_at: "embedded_at",
+            submitted_at: "submitted_at",
+        });
     });
 
     test("create (2)", async () => {
@@ -169,7 +244,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/forms")
@@ -191,7 +265,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/forms")
@@ -213,7 +286,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/forms")
@@ -235,7 +307,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/forms")
@@ -278,11 +349,77 @@ describe("FormsClient", () => {
             embedded_at: "embedded_at",
             submitted_at: "submitted_at",
         };
-
         server.mockEndpoint().get("/forms/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.forms.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            messages: {
+                errors: {
+                    key: "value",
+                },
+                custom: {
+                    key: "value",
+                },
+            },
+            languages: {
+                primary: "primary",
+                default: "default",
+            },
+            translations: {
+                key: {
+                    key: "value",
+                },
+            },
+            nodes: [
+                {
+                    id: "id",
+                    type: "FLOW",
+                    coordinates: {
+                        x: 1,
+                        y: 1,
+                    },
+                    alias: "alias",
+                    config: {
+                        flow_id: "flow_id",
+                    },
+                },
+            ],
+            start: {
+                hidden_fields: [
+                    {
+                        key: "key",
+                    },
+                ],
+                next_node: "$ending",
+                coordinates: {
+                    x: 1,
+                    y: 1,
+                },
+            },
+            ending: {
+                redirection: {
+                    delay: 1,
+                    target: "target",
+                },
+                after_submit: {
+                    flow_id: "flow_id",
+                },
+                coordinates: {
+                    x: 1,
+                    y: 1,
+                },
+                resume_flow: true,
+            },
+            style: {
+                css: "css",
+            },
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            embedded_at: "embedded_at",
+            submitted_at: "submitted_at",
+        });
     });
 
     test("get (2)", async () => {
@@ -290,7 +427,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/forms/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -303,7 +439,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/forms/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -316,7 +451,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/forms/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -329,7 +463,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/forms/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -342,7 +475,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/forms/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -365,7 +497,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/forms/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -378,7 +509,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/forms/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -391,7 +521,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/forms/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -404,7 +533,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/forms/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -438,7 +566,6 @@ describe("FormsClient", () => {
             embedded_at: "embedded_at",
             submitted_at: "submitted_at",
         };
-
         server
             .mockEndpoint()
             .patch("/forms/id")
@@ -449,7 +576,74 @@ describe("FormsClient", () => {
             .build();
 
         const response = await client.forms.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            messages: {
+                errors: {
+                    key: "value",
+                },
+                custom: {
+                    key: "value",
+                },
+            },
+            languages: {
+                primary: "primary",
+                default: "default",
+            },
+            translations: {
+                key: {
+                    key: "value",
+                },
+            },
+            nodes: [
+                {
+                    id: "id",
+                    type: "FLOW",
+                    coordinates: {
+                        x: 1,
+                        y: 1,
+                    },
+                    alias: "alias",
+                    config: {
+                        flow_id: "flow_id",
+                    },
+                },
+            ],
+            start: {
+                hidden_fields: [
+                    {
+                        key: "key",
+                    },
+                ],
+                next_node: "$ending",
+                coordinates: {
+                    x: 1,
+                    y: 1,
+                },
+            },
+            ending: {
+                redirection: {
+                    delay: 1,
+                    target: "target",
+                },
+                after_submit: {
+                    flow_id: "flow_id",
+                },
+                coordinates: {
+                    x: 1,
+                    y: 1,
+                },
+                resume_flow: true,
+            },
+            style: {
+                css: "css",
+            },
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            embedded_at: "embedded_at",
+            submitted_at: "submitted_at",
+        });
     });
 
     test("update (2)", async () => {
@@ -457,7 +651,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/forms/id")
@@ -477,7 +670,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/forms/id")
@@ -497,7 +689,6 @@ describe("FormsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/forms/id")
diff --git a/src/management/tests/wire/groups.test.ts b/src/management/tests/wire/groups.test.ts
index 3e735c20cb..af7a713263 100644
--- a/src/management/tests/wire/groups.test.ts
+++ b/src/management/tests/wire/groups.test.ts
@@ -26,7 +26,6 @@ describe("GroupsClient", () => {
             limit: 1.1,
             total: 1.1,
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/groups")
@@ -35,7 +34,23 @@ describe("GroupsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            groups: [
+                {
+                    id: "id",
+                    name: "name",
+                    external_id: "external_id",
+                    connection_id: "connection_id",
+                    tenant_name: "tenant_name",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            next: "next",
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+        };
         const page = await client.groups.list({
             connection_id: "connection_id",
             name: "name",
@@ -57,7 +72,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -70,7 +84,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -83,7 +96,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -96,7 +108,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -117,11 +128,18 @@ describe("GroupsClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server.mockEndpoint().get("/groups/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.groups.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            external_id: "external_id",
+            connection_id: "connection_id",
+            tenant_name: "tenant_name",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("get (2)", async () => {
@@ -129,7 +147,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -142,7 +159,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -155,7 +171,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -168,7 +183,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -181,7 +195,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -204,7 +217,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/groups/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -217,7 +229,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/groups/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -230,7 +241,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/groups/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -243,7 +253,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/groups/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
diff --git a/src/management/tests/wire/groups/members.test.ts b/src/management/tests/wire/groups/members.test.ts
index fefd465f91..becd6eda16 100644
--- a/src/management/tests/wire/groups/members.test.ts
+++ b/src/management/tests/wire/groups/members.test.ts
@@ -21,7 +21,6 @@ describe("MembersClient", () => {
             ],
             next: "next",
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/groups/id/members")
@@ -30,7 +29,18 @@ describe("MembersClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            members: [
+                {
+                    id: "id",
+                    member_type: "user",
+                    type: "connection",
+                    connection_id: "connection_id",
+                    created_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            next: "next",
+        };
         const page = await client.groups.members.get("id", {
             fields: "fields",
             include_fields: true,
@@ -49,7 +59,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups/id/members").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -62,7 +71,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups/id/members").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -75,7 +83,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups/id/members").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -88,7 +95,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/groups/id/members").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
diff --git a/src/management/tests/wire/guardian/enrollments.test.ts b/src/management/tests/wire/guardian/enrollments.test.ts
index 5172ba5153..6b7f079d02 100644
--- a/src/management/tests/wire/guardian/enrollments.test.ts
+++ b/src/management/tests/wire/guardian/enrollments.test.ts
@@ -10,7 +10,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "user_id" };
         const rawResponseBody = { ticket_id: "ticket_id", ticket_url: "ticket_url" };
-
         server
             .mockEndpoint()
             .post("/guardian/enrollments/ticket")
@@ -23,7 +22,10 @@ describe("EnrollmentsClient", () => {
         const response = await client.guardian.enrollments.createTicket({
             user_id: "user_id",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            ticket_id: "ticket_id",
+            ticket_url: "ticket_url",
+        });
     });
 
     test("createTicket (2)", async () => {
@@ -31,7 +33,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "user_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/guardian/enrollments/ticket")
@@ -53,7 +54,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "user_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/guardian/enrollments/ticket")
@@ -75,7 +75,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "user_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/guardian/enrollments/ticket")
@@ -97,7 +96,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "user_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/guardian/enrollments/ticket")
@@ -127,7 +125,6 @@ describe("EnrollmentsClient", () => {
             enrolled_at: "enrolled_at",
             last_auth: "last_auth",
         };
-
         server
             .mockEndpoint()
             .get("/guardian/enrollments/id")
@@ -137,7 +134,15 @@ describe("EnrollmentsClient", () => {
             .build();
 
         const response = await client.guardian.enrollments.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            status: "pending",
+            name: "name",
+            identifier: "identifier",
+            phone_number: "phone_number",
+            enrolled_at: "enrolled_at",
+            last_auth: "last_auth",
+        });
     });
 
     test("get (2)", async () => {
@@ -145,7 +150,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/enrollments/id")
@@ -164,7 +168,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/enrollments/id")
@@ -183,7 +186,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/enrollments/id")
@@ -212,7 +214,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/guardian/enrollments/id")
@@ -231,7 +232,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/guardian/enrollments/id")
@@ -250,7 +250,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/guardian/enrollments/id")
diff --git a/src/management/tests/wire/guardian/factors.test.ts b/src/management/tests/wire/guardian/factors.test.ts
index 0a2fdf6060..4358e51ffb 100644
--- a/src/management/tests/wire/guardian/factors.test.ts
+++ b/src/management/tests/wire/guardian/factors.test.ts
@@ -10,11 +10,16 @@ describe("FactorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = [{ enabled: true, trial_expired: true, name: "push-notification" }];
-
         server.mockEndpoint().get("/guardian/factors").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.guardian.factors.list();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                enabled: true,
+                trial_expired: true,
+                name: "push-notification",
+            },
+        ]);
     });
 
     test("list (2)", async () => {
@@ -22,7 +27,6 @@ describe("FactorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/guardian/factors").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -35,7 +39,6 @@ describe("FactorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/guardian/factors").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -48,7 +51,6 @@ describe("FactorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/guardian/factors").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -61,7 +63,6 @@ describe("FactorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { enabled: true };
         const rawResponseBody = { enabled: true };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification")
@@ -74,7 +75,9 @@ describe("FactorsClient", () => {
         const response = await client.guardian.factors.set("push-notification", {
             enabled: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enabled: true,
+        });
     });
 
     test("set (2)", async () => {
@@ -82,7 +85,6 @@ describe("FactorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { enabled: true };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification")
@@ -104,7 +106,6 @@ describe("FactorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { enabled: true };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification")
@@ -126,7 +127,6 @@ describe("FactorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { enabled: true };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification")
diff --git a/src/management/tests/wire/guardian/factors/duo/settings.test.ts b/src/management/tests/wire/guardian/factors/duo/settings.test.ts
index e6a2624095..f183ceb2f8 100644
--- a/src/management/tests/wire/guardian/factors/duo/settings.test.ts
+++ b/src/management/tests/wire/guardian/factors/duo/settings.test.ts
@@ -10,7 +10,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { ikey: "ikey", skey: "skey", host: "host" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/duo/settings")
@@ -20,7 +19,11 @@ describe("SettingsClient", () => {
             .build();
 
         const response = await client.guardian.factors.duo.settings.get();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            ikey: "ikey",
+            skey: "skey",
+            host: "host",
+        });
     });
 
     test("get (2)", async () => {
@@ -28,7 +31,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/duo/settings")
@@ -47,7 +49,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/duo/settings")
@@ -66,7 +67,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/duo/settings")
@@ -85,7 +85,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { ikey: "ikey", skey: "skey", host: "host" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/duo/settings")
@@ -96,7 +95,11 @@ describe("SettingsClient", () => {
             .build();
 
         const response = await client.guardian.factors.duo.settings.set();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            ikey: "ikey",
+            skey: "skey",
+            host: "host",
+        });
     });
 
     test("set (2)", async () => {
@@ -104,7 +107,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/duo/settings")
@@ -124,7 +126,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/duo/settings")
@@ -144,7 +145,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/duo/settings")
@@ -164,7 +164,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { ikey: "ikey", skey: "skey", host: "host" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/duo/settings")
@@ -175,7 +174,11 @@ describe("SettingsClient", () => {
             .build();
 
         const response = await client.guardian.factors.duo.settings.update();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            ikey: "ikey",
+            skey: "skey",
+            host: "host",
+        });
     });
 
     test("update (2)", async () => {
@@ -183,7 +186,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/duo/settings")
@@ -203,7 +205,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/duo/settings")
@@ -223,7 +224,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/duo/settings")
diff --git a/src/management/tests/wire/guardian/factors/phone.test.ts b/src/management/tests/wire/guardian/factors/phone.test.ts
index 24121b40a8..48f6f25a28 100644
--- a/src/management/tests/wire/guardian/factors/phone.test.ts
+++ b/src/management/tests/wire/guardian/factors/phone.test.ts
@@ -10,7 +10,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { message_types: ["sms"] };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/message-types")
@@ -20,7 +19,9 @@ describe("PhoneClient", () => {
             .build();
 
         const response = await client.guardian.factors.phone.getMessageTypes();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            message_types: ["sms"],
+        });
     });
 
     test("getMessageTypes (2)", async () => {
@@ -28,7 +29,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/message-types")
@@ -47,7 +47,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/message-types")
@@ -66,7 +65,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/message-types")
@@ -85,7 +83,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { message_types: ["sms"] };
         const rawResponseBody = { message_types: ["sms"] };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/message-types")
@@ -98,7 +95,9 @@ describe("PhoneClient", () => {
         const response = await client.guardian.factors.phone.setMessageTypes({
             message_types: ["sms"],
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            message_types: ["sms"],
+        });
     });
 
     test("setMessageTypes (2)", async () => {
@@ -106,7 +105,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { message_types: ["sms", "sms"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/message-types")
@@ -128,7 +126,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { message_types: ["sms", "sms"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/message-types")
@@ -150,7 +147,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { message_types: ["sms", "sms"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/message-types")
@@ -172,7 +168,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { message_types: ["sms", "sms"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/message-types")
@@ -199,7 +194,6 @@ describe("PhoneClient", () => {
             auth_token: "auth_token",
             sid: "sid",
         };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/providers/twilio")
@@ -209,7 +203,12 @@ describe("PhoneClient", () => {
             .build();
 
         const response = await client.guardian.factors.phone.getTwilioProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            from: "from",
+            messaging_service_sid: "messaging_service_sid",
+            auth_token: "auth_token",
+            sid: "sid",
+        });
     });
 
     test("getTwilioProvider (2)", async () => {
@@ -217,7 +216,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/providers/twilio")
@@ -236,7 +234,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/providers/twilio")
@@ -255,7 +252,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/providers/twilio")
@@ -279,7 +275,6 @@ describe("PhoneClient", () => {
             auth_token: "auth_token",
             sid: "sid",
         };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/providers/twilio")
@@ -290,7 +285,12 @@ describe("PhoneClient", () => {
             .build();
 
         const response = await client.guardian.factors.phone.setTwilioProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            from: "from",
+            messaging_service_sid: "messaging_service_sid",
+            auth_token: "auth_token",
+            sid: "sid",
+        });
     });
 
     test("setTwilioProvider (2)", async () => {
@@ -298,7 +298,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/providers/twilio")
@@ -318,7 +317,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/providers/twilio")
@@ -338,7 +336,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/providers/twilio")
@@ -358,7 +355,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { provider: "auth0" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/selected-provider")
@@ -368,7 +364,9 @@ describe("PhoneClient", () => {
             .build();
 
         const response = await client.guardian.factors.phone.getSelectedProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            provider: "auth0",
+        });
     });
 
     test("getSelectedProvider (2)", async () => {
@@ -376,7 +374,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/selected-provider")
@@ -395,7 +392,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/selected-provider")
@@ -414,7 +410,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/selected-provider")
@@ -433,7 +428,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { provider: "auth0" };
         const rawResponseBody = { provider: "auth0" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/selected-provider")
@@ -446,7 +440,9 @@ describe("PhoneClient", () => {
         const response = await client.guardian.factors.phone.setProvider({
             provider: "auth0",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            provider: "auth0",
+        });
     });
 
     test("setProvider (2)", async () => {
@@ -454,7 +450,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { provider: "auth0" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/selected-provider")
@@ -476,7 +471,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { provider: "auth0" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/selected-provider")
@@ -498,7 +492,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { provider: "auth0" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/selected-provider")
@@ -523,7 +516,6 @@ describe("PhoneClient", () => {
             enrollment_message: "enrollment_message",
             verification_message: "verification_message",
         };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/templates")
@@ -533,7 +525,10 @@ describe("PhoneClient", () => {
             .build();
 
         const response = await client.guardian.factors.phone.getTemplates();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enrollment_message: "enrollment_message",
+            verification_message: "verification_message",
+        });
     });
 
     test("getTemplates (2)", async () => {
@@ -541,7 +536,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/templates")
@@ -560,7 +554,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/templates")
@@ -579,7 +572,6 @@ describe("PhoneClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/phone/templates")
@@ -604,7 +596,6 @@ describe("PhoneClient", () => {
             enrollment_message: "enrollment_message",
             verification_message: "verification_message",
         };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/templates")
@@ -618,7 +609,10 @@ describe("PhoneClient", () => {
             enrollment_message: "enrollment_message",
             verification_message: "verification_message",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enrollment_message: "enrollment_message",
+            verification_message: "verification_message",
+        });
     });
 
     test("setTemplates (2)", async () => {
@@ -630,7 +624,6 @@ describe("PhoneClient", () => {
             verification_message: "{{code}} is your verification code for {{tenant.friendly_name}}",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/templates")
@@ -658,7 +651,6 @@ describe("PhoneClient", () => {
             verification_message: "{{code}} is your verification code for {{tenant.friendly_name}}",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/templates")
@@ -686,7 +678,6 @@ describe("PhoneClient", () => {
             verification_message: "{{code}} is your verification code for {{tenant.friendly_name}}",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/phone/templates")
diff --git a/src/management/tests/wire/guardian/factors/pushNotification.test.ts b/src/management/tests/wire/guardian/factors/pushNotification.test.ts
index d5cb3c8902..e25fd885ff 100644
--- a/src/management/tests/wire/guardian/factors/pushNotification.test.ts
+++ b/src/management/tests/wire/guardian/factors/pushNotification.test.ts
@@ -10,7 +10,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { bundle_id: "bundle_id", sandbox: true, enabled: true };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/push-notification/providers/apns")
@@ -20,7 +19,11 @@ describe("PushNotificationClient", () => {
             .build();
 
         const response = await client.guardian.factors.pushNotification.getApnsProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            bundle_id: "bundle_id",
+            sandbox: true,
+            enabled: true,
+        });
     });
 
     test("getApnsProvider (2)", async () => {
@@ -28,7 +31,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/push-notification/providers/apns")
@@ -47,7 +49,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/push-notification/providers/apns")
@@ -66,7 +67,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/push-notification/providers/apns")
@@ -85,7 +85,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { sandbox: true, bundle_id: "bundle_id" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/apns")
@@ -96,7 +95,10 @@ describe("PushNotificationClient", () => {
             .build();
 
         const response = await client.guardian.factors.pushNotification.setApnsProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            sandbox: true,
+            bundle_id: "bundle_id",
+        });
     });
 
     test("setApnsProvider (2)", async () => {
@@ -104,7 +106,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/apns")
@@ -124,7 +125,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/apns")
@@ -144,7 +144,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/apns")
@@ -164,7 +163,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { sandbox: true, bundle_id: "bundle_id" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/apns")
@@ -175,7 +173,10 @@ describe("PushNotificationClient", () => {
             .build();
 
         const response = await client.guardian.factors.pushNotification.updateApnsProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            sandbox: true,
+            bundle_id: "bundle_id",
+        });
     });
 
     test("updateApnsProvider (2)", async () => {
@@ -183,7 +184,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/apns")
@@ -203,7 +203,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/apns")
@@ -223,7 +222,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/apns")
@@ -243,7 +241,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/fcm")
@@ -254,7 +251,9 @@ describe("PushNotificationClient", () => {
             .build();
 
         const response = await client.guardian.factors.pushNotification.setFcmProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            key: "value",
+        });
     });
 
     test("setFcmProvider (2)", async () => {
@@ -262,7 +261,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/fcm")
@@ -282,7 +280,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/fcm")
@@ -302,7 +299,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/fcm")
@@ -322,7 +318,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/fcm")
@@ -333,7 +328,9 @@ describe("PushNotificationClient", () => {
             .build();
 
         const response = await client.guardian.factors.pushNotification.updateFcmProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            key: "value",
+        });
     });
 
     test("updateFcmProvider (2)", async () => {
@@ -341,7 +338,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/fcm")
@@ -361,7 +357,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/fcm")
@@ -381,7 +376,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/fcm")
@@ -401,7 +395,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/fcmv1")
@@ -412,7 +405,9 @@ describe("PushNotificationClient", () => {
             .build();
 
         const response = await client.guardian.factors.pushNotification.setFcmv1Provider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            key: "value",
+        });
     });
 
     test("setFcmv1Provider (2)", async () => {
@@ -420,7 +415,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/fcmv1")
@@ -440,7 +434,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/fcmv1")
@@ -460,7 +453,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/fcmv1")
@@ -480,7 +472,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/fcmv1")
@@ -491,7 +482,9 @@ describe("PushNotificationClient", () => {
             .build();
 
         const response = await client.guardian.factors.pushNotification.updateFcmv1Provider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            key: "value",
+        });
     });
 
     test("updateFcmv1Provider (2)", async () => {
@@ -499,7 +492,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/fcmv1")
@@ -519,7 +511,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/fcmv1")
@@ -539,7 +530,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/fcmv1")
@@ -565,7 +555,6 @@ describe("PushNotificationClient", () => {
             sns_apns_platform_application_arn: "sns_apns_platform_application_arn",
             sns_gcm_platform_application_arn: "sns_gcm_platform_application_arn",
         };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/push-notification/providers/sns")
@@ -575,7 +564,13 @@ describe("PushNotificationClient", () => {
             .build();
 
         const response = await client.guardian.factors.pushNotification.getSnsProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            aws_access_key_id: "aws_access_key_id",
+            aws_secret_access_key: "aws_secret_access_key",
+            aws_region: "aws_region",
+            sns_apns_platform_application_arn: "sns_apns_platform_application_arn",
+            sns_gcm_platform_application_arn: "sns_gcm_platform_application_arn",
+        });
     });
 
     test("getSnsProvider (2)", async () => {
@@ -583,7 +578,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/push-notification/providers/sns")
@@ -602,7 +596,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/push-notification/providers/sns")
@@ -621,7 +614,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/push-notification/providers/sns")
@@ -646,7 +638,6 @@ describe("PushNotificationClient", () => {
             sns_apns_platform_application_arn: "sns_apns_platform_application_arn",
             sns_gcm_platform_application_arn: "sns_gcm_platform_application_arn",
         };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/sns")
@@ -657,7 +648,13 @@ describe("PushNotificationClient", () => {
             .build();
 
         const response = await client.guardian.factors.pushNotification.setSnsProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            aws_access_key_id: "aws_access_key_id",
+            aws_secret_access_key: "aws_secret_access_key",
+            aws_region: "aws_region",
+            sns_apns_platform_application_arn: "sns_apns_platform_application_arn",
+            sns_gcm_platform_application_arn: "sns_gcm_platform_application_arn",
+        });
     });
 
     test("setSnsProvider (2)", async () => {
@@ -665,7 +662,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/sns")
@@ -685,7 +681,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/sns")
@@ -705,7 +700,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/providers/sns")
@@ -731,7 +725,6 @@ describe("PushNotificationClient", () => {
             sns_apns_platform_application_arn: "sns_apns_platform_application_arn",
             sns_gcm_platform_application_arn: "sns_gcm_platform_application_arn",
         };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/sns")
@@ -742,7 +735,13 @@ describe("PushNotificationClient", () => {
             .build();
 
         const response = await client.guardian.factors.pushNotification.updateSnsProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            aws_access_key_id: "aws_access_key_id",
+            aws_secret_access_key: "aws_secret_access_key",
+            aws_region: "aws_region",
+            sns_apns_platform_application_arn: "sns_apns_platform_application_arn",
+            sns_gcm_platform_application_arn: "sns_gcm_platform_application_arn",
+        });
     });
 
     test("updateSnsProvider (2)", async () => {
@@ -750,7 +749,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/sns")
@@ -770,7 +768,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/sns")
@@ -790,7 +787,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/guardian/factors/push-notification/providers/sns")
@@ -810,7 +806,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { provider: "guardian" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/push-notification/selected-provider")
@@ -820,7 +815,9 @@ describe("PushNotificationClient", () => {
             .build();
 
         const response = await client.guardian.factors.pushNotification.getSelectedProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            provider: "guardian",
+        });
     });
 
     test("getSelectedProvider (2)", async () => {
@@ -828,7 +825,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/push-notification/selected-provider")
@@ -847,7 +843,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/push-notification/selected-provider")
@@ -866,7 +861,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/push-notification/selected-provider")
@@ -885,7 +879,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { provider: "guardian" };
         const rawResponseBody = { provider: "guardian" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/selected-provider")
@@ -898,7 +891,9 @@ describe("PushNotificationClient", () => {
         const response = await client.guardian.factors.pushNotification.setProvider({
             provider: "guardian",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            provider: "guardian",
+        });
     });
 
     test("setProvider (2)", async () => {
@@ -906,7 +901,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { provider: "guardian" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/selected-provider")
@@ -928,7 +922,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { provider: "guardian" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/selected-provider")
@@ -950,7 +943,6 @@ describe("PushNotificationClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { provider: "guardian" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/push-notification/selected-provider")
diff --git a/src/management/tests/wire/guardian/factors/sms.test.ts b/src/management/tests/wire/guardian/factors/sms.test.ts
index 2ab7dbdee9..7551e5ecb9 100644
--- a/src/management/tests/wire/guardian/factors/sms.test.ts
+++ b/src/management/tests/wire/guardian/factors/sms.test.ts
@@ -15,7 +15,6 @@ describe("SmsClient", () => {
             auth_token: "auth_token",
             sid: "sid",
         };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/sms/providers/twilio")
@@ -25,7 +24,12 @@ describe("SmsClient", () => {
             .build();
 
         const response = await client.guardian.factors.sms.getTwilioProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            from: "from",
+            messaging_service_sid: "messaging_service_sid",
+            auth_token: "auth_token",
+            sid: "sid",
+        });
     });
 
     test("getTwilioProvider (2)", async () => {
@@ -33,7 +37,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/sms/providers/twilio")
@@ -52,7 +55,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/sms/providers/twilio")
@@ -71,7 +73,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/sms/providers/twilio")
@@ -95,7 +96,6 @@ describe("SmsClient", () => {
             auth_token: "auth_token",
             sid: "sid",
         };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/sms/providers/twilio")
@@ -106,7 +106,12 @@ describe("SmsClient", () => {
             .build();
 
         const response = await client.guardian.factors.sms.setTwilioProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            from: "from",
+            messaging_service_sid: "messaging_service_sid",
+            auth_token: "auth_token",
+            sid: "sid",
+        });
     });
 
     test("setTwilioProvider (2)", async () => {
@@ -114,7 +119,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/sms/providers/twilio")
@@ -134,7 +138,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/sms/providers/twilio")
@@ -154,7 +157,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/sms/providers/twilio")
@@ -174,7 +176,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { provider: "auth0" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/sms/selected-provider")
@@ -184,7 +185,9 @@ describe("SmsClient", () => {
             .build();
 
         const response = await client.guardian.factors.sms.getSelectedProvider();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            provider: "auth0",
+        });
     });
 
     test("getSelectedProvider (2)", async () => {
@@ -192,7 +195,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/sms/selected-provider")
@@ -211,7 +213,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/sms/selected-provider")
@@ -230,7 +231,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/sms/selected-provider")
@@ -249,7 +249,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { provider: "auth0" };
         const rawResponseBody = { provider: "auth0" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/sms/selected-provider")
@@ -262,7 +261,9 @@ describe("SmsClient", () => {
         const response = await client.guardian.factors.sms.setProvider({
             provider: "auth0",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            provider: "auth0",
+        });
     });
 
     test("setProvider (2)", async () => {
@@ -270,7 +271,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { provider: "auth0" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/sms/selected-provider")
@@ -292,7 +292,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { provider: "auth0" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/sms/selected-provider")
@@ -314,7 +313,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { provider: "auth0" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/sms/selected-provider")
@@ -339,7 +337,6 @@ describe("SmsClient", () => {
             enrollment_message: "enrollment_message",
             verification_message: "verification_message",
         };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/sms/templates")
@@ -349,7 +346,10 @@ describe("SmsClient", () => {
             .build();
 
         const response = await client.guardian.factors.sms.getTemplates();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enrollment_message: "enrollment_message",
+            verification_message: "verification_message",
+        });
     });
 
     test("getTemplates (2)", async () => {
@@ -357,7 +357,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/sms/templates")
@@ -376,7 +375,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/sms/templates")
@@ -395,7 +393,6 @@ describe("SmsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/guardian/factors/sms/templates")
@@ -420,7 +417,6 @@ describe("SmsClient", () => {
             enrollment_message: "enrollment_message",
             verification_message: "verification_message",
         };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/sms/templates")
@@ -434,7 +430,10 @@ describe("SmsClient", () => {
             enrollment_message: "enrollment_message",
             verification_message: "verification_message",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enrollment_message: "enrollment_message",
+            verification_message: "verification_message",
+        });
     });
 
     test("setTemplates (2)", async () => {
@@ -446,7 +445,6 @@ describe("SmsClient", () => {
             verification_message: "{{code}} is your verification code for {{tenant.friendly_name}}",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/sms/templates")
@@ -474,7 +472,6 @@ describe("SmsClient", () => {
             verification_message: "{{code}} is your verification code for {{tenant.friendly_name}}",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/sms/templates")
@@ -502,7 +499,6 @@ describe("SmsClient", () => {
             verification_message: "{{code}} is your verification code for {{tenant.friendly_name}}",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/factors/sms/templates")
diff --git a/src/management/tests/wire/guardian/policies.test.ts b/src/management/tests/wire/guardian/policies.test.ts
index 6d9ab6c6aa..4763b62b42 100644
--- a/src/management/tests/wire/guardian/policies.test.ts
+++ b/src/management/tests/wire/guardian/policies.test.ts
@@ -10,11 +10,10 @@ describe("PoliciesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = ["all-applications"];
-
         server.mockEndpoint().get("/guardian/policies").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.guardian.policies.list();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual(["all-applications"]);
     });
 
     test("list (2)", async () => {
@@ -22,7 +21,6 @@ describe("PoliciesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/guardian/policies").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -35,7 +33,6 @@ describe("PoliciesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/guardian/policies").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -48,7 +45,6 @@ describe("PoliciesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/guardian/policies").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -61,7 +57,6 @@ describe("PoliciesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = ["all-applications"];
         const rawResponseBody = ["all-applications"];
-
         server
             .mockEndpoint()
             .put("/guardian/policies")
@@ -72,7 +67,7 @@ describe("PoliciesClient", () => {
             .build();
 
         const response = await client.guardian.policies.set(["all-applications"]);
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual(["all-applications"]);
     });
 
     test("set (2)", async () => {
@@ -80,7 +75,6 @@ describe("PoliciesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = ["all-applications", "all-applications"];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/policies")
@@ -100,7 +94,6 @@ describe("PoliciesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = ["all-applications", "all-applications"];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/policies")
@@ -120,7 +113,6 @@ describe("PoliciesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = ["all-applications", "all-applications"];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/guardian/policies")
diff --git a/src/management/tests/wire/hooks.test.ts b/src/management/tests/wire/hooks.test.ts
index 464b71c32c..0125e105b8 100644
--- a/src/management/tests/wire/hooks.test.ts
+++ b/src/management/tests/wire/hooks.test.ts
@@ -24,7 +24,6 @@ describe("HooksClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/hooks")
@@ -33,7 +32,23 @@ describe("HooksClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            hooks: [
+                {
+                    triggerId: "triggerId",
+                    id: "id",
+                    name: "name",
+                    enabled: true,
+                    script: "script",
+                    dependencies: {
+                        key: "value",
+                    },
+                },
+            ],
+        };
         const page = await client.hooks.list({
             page: 1,
             per_page: 1,
@@ -54,7 +69,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/hooks")
@@ -73,7 +87,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/hooks")
@@ -92,7 +105,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/hooks")
@@ -111,7 +123,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/hooks")
@@ -130,7 +141,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/hooks")
@@ -156,7 +166,6 @@ describe("HooksClient", () => {
             script: "script",
             dependencies: { key: "value" },
         };
-
         server
             .mockEndpoint()
             .post("/hooks")
@@ -171,7 +180,16 @@ describe("HooksClient", () => {
             script: "script",
             triggerId: "credentials-exchange",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            triggerId: "triggerId",
+            id: "id",
+            name: "name",
+            enabled: true,
+            script: "script",
+            dependencies: {
+                key: "value",
+            },
+        });
     });
 
     test("create (2)", async () => {
@@ -183,7 +201,6 @@ describe("HooksClient", () => {
             triggerId: "credentials-exchange",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/hooks")
@@ -211,7 +228,6 @@ describe("HooksClient", () => {
             triggerId: "credentials-exchange",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/hooks")
@@ -239,7 +255,6 @@ describe("HooksClient", () => {
             triggerId: "credentials-exchange",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/hooks")
@@ -267,7 +282,6 @@ describe("HooksClient", () => {
             triggerId: "credentials-exchange",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/hooks")
@@ -295,7 +309,6 @@ describe("HooksClient", () => {
             triggerId: "credentials-exchange",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/hooks")
@@ -326,13 +339,21 @@ describe("HooksClient", () => {
             script: "script",
             dependencies: { key: "value" },
         };
-
         server.mockEndpoint().get("/hooks/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.hooks.get("id", {
             fields: "fields",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            triggerId: "triggerId",
+            id: "id",
+            name: "name",
+            enabled: true,
+            script: "script",
+            dependencies: {
+                key: "value",
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -340,7 +361,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/hooks/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -353,7 +373,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/hooks/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -366,7 +385,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/hooks/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -379,7 +397,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/hooks/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -392,7 +409,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/hooks/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -415,7 +431,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/hooks/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -428,7 +443,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/hooks/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -441,7 +455,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/hooks/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -454,7 +467,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/hooks/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -474,7 +486,6 @@ describe("HooksClient", () => {
             script: "script",
             dependencies: { key: "value" },
         };
-
         server
             .mockEndpoint()
             .patch("/hooks/id")
@@ -485,7 +496,16 @@ describe("HooksClient", () => {
             .build();
 
         const response = await client.hooks.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            triggerId: "triggerId",
+            id: "id",
+            name: "name",
+            enabled: true,
+            script: "script",
+            dependencies: {
+                key: "value",
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -493,7 +513,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/hooks/id")
@@ -513,7 +532,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/hooks/id")
@@ -533,7 +551,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/hooks/id")
@@ -553,7 +570,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/hooks/id")
@@ -573,7 +589,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/hooks/id")
@@ -593,7 +608,6 @@ describe("HooksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/hooks/id")
diff --git a/src/management/tests/wire/hooks/secrets.test.ts b/src/management/tests/wire/hooks/secrets.test.ts
index dad5d20593..ae08e08a5b 100644
--- a/src/management/tests/wire/hooks/secrets.test.ts
+++ b/src/management/tests/wire/hooks/secrets.test.ts
@@ -10,11 +10,12 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/hooks/id/secrets").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.hooks.secrets.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            key: "value",
+        });
     });
 
     test("get (2)", async () => {
@@ -22,7 +23,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/hooks/id/secrets").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -35,7 +35,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/hooks/id/secrets").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -48,7 +47,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/hooks/id/secrets").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -61,7 +59,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/hooks/id/secrets").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -74,7 +71,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/hooks/id/secrets").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -100,7 +96,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/hooks/id/secrets")
@@ -122,7 +117,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/hooks/id/secrets")
@@ -144,7 +138,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/hooks/id/secrets")
@@ -166,7 +159,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/hooks/id/secrets")
@@ -188,7 +180,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/hooks/id/secrets")
@@ -227,7 +218,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = ["string", "string"];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/hooks/id/secrets")
@@ -247,7 +237,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = ["string", "string"];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/hooks/id/secrets")
@@ -267,7 +256,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = ["string", "string"];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/hooks/id/secrets")
@@ -287,7 +275,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = ["string", "string"];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/hooks/id/secrets")
@@ -320,7 +307,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/hooks/id/secrets")
@@ -342,7 +328,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/hooks/id/secrets")
@@ -364,7 +349,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/hooks/id/secrets")
@@ -386,7 +370,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/hooks/id/secrets")
@@ -408,7 +391,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/hooks/id/secrets")
@@ -430,7 +412,6 @@ describe("SecretsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/hooks/id/secrets")
diff --git a/src/management/tests/wire/jobs.test.ts b/src/management/tests/wire/jobs.test.ts
index 38db02375d..d28f7f70d6 100644
--- a/src/management/tests/wire/jobs.test.ts
+++ b/src/management/tests/wire/jobs.test.ts
@@ -22,11 +22,27 @@ describe("JobsClient", () => {
             status_details: "status_details",
             summary: { failed: 1, updated: 1, inserted: 1, total: 1 },
         };
-
         server.mockEndpoint().get("/jobs/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.jobs.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            status: "status",
+            type: "type",
+            created_at: "created_at",
+            id: "id",
+            connection_id: "connection_id",
+            location: "location",
+            percentage_done: 1,
+            time_left_seconds: 1,
+            format: "json",
+            status_details: "status_details",
+            summary: {
+                failed: 1,
+                updated: 1,
+                inserted: 1,
+                total: 1,
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -34,7 +50,6 @@ describe("JobsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/jobs/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -47,7 +62,6 @@ describe("JobsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/jobs/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -60,7 +74,6 @@ describe("JobsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/jobs/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -73,7 +86,6 @@ describe("JobsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/jobs/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -86,7 +98,6 @@ describe("JobsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/jobs/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
diff --git a/src/management/tests/wire/jobs/errors.test.ts b/src/management/tests/wire/jobs/errors.test.ts
index 37f4be1abb..2f67d2eac5 100644
--- a/src/management/tests/wire/jobs/errors.test.ts
+++ b/src/management/tests/wire/jobs/errors.test.ts
@@ -10,11 +10,17 @@ describe("ErrorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = [{ user: { key: "value" }, errors: [{}] }];
-
         server.mockEndpoint().get("/jobs/id/errors").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.jobs.errors.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                user: {
+                    key: "value",
+                },
+                errors: [{}],
+            },
+        ]);
     });
 
     test("get (2)", async () => {
@@ -22,7 +28,6 @@ describe("ErrorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/jobs/id/errors").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -35,7 +40,6 @@ describe("ErrorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/jobs/id/errors").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -48,7 +52,6 @@ describe("ErrorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/jobs/id/errors").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -61,7 +64,6 @@ describe("ErrorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/jobs/id/errors").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -74,7 +76,6 @@ describe("ErrorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/jobs/id/errors").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
diff --git a/src/management/tests/wire/jobs/usersExports.test.ts b/src/management/tests/wire/jobs/usersExports.test.ts
index d1399eb254..5b01398d77 100644
--- a/src/management/tests/wire/jobs/usersExports.test.ts
+++ b/src/management/tests/wire/jobs/usersExports.test.ts
@@ -19,7 +19,6 @@ describe("UsersExportsClient", () => {
             limit: 1,
             fields: [{ name: "name", export_as: "export_as" }],
         };
-
         server
             .mockEndpoint()
             .post("/jobs/users-exports")
@@ -30,7 +29,21 @@ describe("UsersExportsClient", () => {
             .build();
 
         const response = await client.jobs.usersExports.create();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            status: "status",
+            type: "type",
+            created_at: "created_at",
+            id: "id",
+            connection_id: "connection_id",
+            format: "json",
+            limit: 1,
+            fields: [
+                {
+                    name: "name",
+                    export_as: "export_as",
+                },
+            ],
+        });
     });
 
     test("create (2)", async () => {
@@ -38,7 +51,6 @@ describe("UsersExportsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/jobs/users-exports")
@@ -58,7 +70,6 @@ describe("UsersExportsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/jobs/users-exports")
@@ -78,7 +89,6 @@ describe("UsersExportsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/jobs/users-exports")
@@ -98,7 +108,6 @@ describe("UsersExportsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/jobs/users-exports")
diff --git a/src/management/tests/wire/jobs/verificationEmail.test.ts b/src/management/tests/wire/jobs/verificationEmail.test.ts
index ce994658b7..0540793918 100644
--- a/src/management/tests/wire/jobs/verificationEmail.test.ts
+++ b/src/management/tests/wire/jobs/verificationEmail.test.ts
@@ -10,7 +10,6 @@ describe("VerificationEmailClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "user_id" };
         const rawResponseBody = { status: "status", type: "type", created_at: "created_at", id: "id" };
-
         server
             .mockEndpoint()
             .post("/jobs/verification-email")
@@ -23,7 +22,12 @@ describe("VerificationEmailClient", () => {
         const response = await client.jobs.verificationEmail.create({
             user_id: "user_id",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            status: "status",
+            type: "type",
+            created_at: "created_at",
+            id: "id",
+        });
     });
 
     test("create (2)", async () => {
@@ -31,7 +35,6 @@ describe("VerificationEmailClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "google-oauth2|1234" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/jobs/verification-email")
@@ -53,7 +56,6 @@ describe("VerificationEmailClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "google-oauth2|1234" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/jobs/verification-email")
@@ -75,7 +77,6 @@ describe("VerificationEmailClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "google-oauth2|1234" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/jobs/verification-email")
@@ -97,7 +98,6 @@ describe("VerificationEmailClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "google-oauth2|1234" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/jobs/verification-email")
diff --git a/src/management/tests/wire/keys/customSigning.test.ts b/src/management/tests/wire/keys/customSigning.test.ts
index 0ffcb12856..9d6d90ccd0 100644
--- a/src/management/tests/wire/keys/customSigning.test.ts
+++ b/src/management/tests/wire/keys/customSigning.test.ts
@@ -29,7 +29,6 @@ describe("CustomSigningClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .get("/keys/custom-signing")
@@ -39,7 +38,26 @@ describe("CustomSigningClient", () => {
             .build();
 
         const response = await client.keys.customSigning.get();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            keys: [
+                {
+                    kty: "EC",
+                    kid: "kid",
+                    use: "sig",
+                    key_ops: ["verify"],
+                    alg: "RS256",
+                    n: "n",
+                    e: "e",
+                    crv: "P-256",
+                    x: "x",
+                    y: "y",
+                    x5u: "x5u",
+                    x5c: ["x5c"],
+                    x5t: "x5t",
+                    "x5t#S256": "x5t#S256",
+                },
+            ],
+        });
     });
 
     test("get (2)", async () => {
@@ -47,7 +65,6 @@ describe("CustomSigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/keys/custom-signing")
@@ -66,7 +83,6 @@ describe("CustomSigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/keys/custom-signing")
@@ -85,7 +101,6 @@ describe("CustomSigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/keys/custom-signing")
@@ -104,7 +119,6 @@ describe("CustomSigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/keys/custom-signing")
@@ -142,7 +156,6 @@ describe("CustomSigningClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .put("/keys/custom-signing")
@@ -159,7 +172,26 @@ describe("CustomSigningClient", () => {
                 },
             ],
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            keys: [
+                {
+                    kty: "EC",
+                    kid: "kid",
+                    use: "sig",
+                    key_ops: ["verify"],
+                    alg: "RS256",
+                    n: "n",
+                    e: "e",
+                    crv: "P-256",
+                    x: "x",
+                    y: "y",
+                    x5u: "x5u",
+                    x5c: ["x5c"],
+                    x5t: "x5t",
+                    "x5t#S256": "x5t#S256",
+                },
+            ],
+        });
     });
 
     test("set (2)", async () => {
@@ -167,7 +199,6 @@ describe("CustomSigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { keys: [{ kty: "EC" }, { kty: "EC" }] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/keys/custom-signing")
@@ -196,7 +227,6 @@ describe("CustomSigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { keys: [{ kty: "EC" }, { kty: "EC" }] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/keys/custom-signing")
@@ -225,7 +255,6 @@ describe("CustomSigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { keys: [{ kty: "EC" }, { kty: "EC" }] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/keys/custom-signing")
@@ -254,7 +283,6 @@ describe("CustomSigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { keys: [{ kty: "EC" }, { kty: "EC" }] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/keys/custom-signing")
@@ -293,7 +321,6 @@ describe("CustomSigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/keys/custom-signing")
@@ -312,7 +339,6 @@ describe("CustomSigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/keys/custom-signing")
@@ -331,7 +357,6 @@ describe("CustomSigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/keys/custom-signing")
diff --git a/src/management/tests/wire/keys/encryption.test.ts b/src/management/tests/wire/keys/encryption.test.ts
index 8bf0ba3414..c0b6a0dd6c 100644
--- a/src/management/tests/wire/keys/encryption.test.ts
+++ b/src/management/tests/wire/keys/encryption.test.ts
@@ -25,7 +25,6 @@ describe("EncryptionClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/keys/encryption")
@@ -34,7 +33,22 @@ describe("EncryptionClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1,
+            limit: 1,
+            total: 1,
+            keys: [
+                {
+                    kid: "kid",
+                    type: "customer-provided-root-key",
+                    state: "pre-activation",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                    parent_kid: "parent_kid",
+                    public_key: "public_key",
+                },
+            ],
+        };
         const page = await client.keys.encryption.list({
             page: 1,
             per_page: 1,
@@ -52,7 +66,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/keys/encryption")
@@ -71,7 +84,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/keys/encryption")
@@ -90,7 +102,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/keys/encryption")
@@ -109,7 +120,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/keys/encryption")
@@ -136,7 +146,6 @@ describe("EncryptionClient", () => {
             parent_kid: "parent_kid",
             public_key: "public_key",
         };
-
         server
             .mockEndpoint()
             .post("/keys/encryption")
@@ -149,7 +158,15 @@ describe("EncryptionClient", () => {
         const response = await client.keys.encryption.create({
             type: "customer-provided-root-key",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            kid: "kid",
+            type: "customer-provided-root-key",
+            state: "pre-activation",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            parent_kid: "parent_kid",
+            public_key: "public_key",
+        });
     });
 
     test("create (2)", async () => {
@@ -157,7 +174,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "customer-provided-root-key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption")
@@ -179,7 +195,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "customer-provided-root-key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption")
@@ -201,7 +216,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "customer-provided-root-key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption")
@@ -223,7 +237,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "customer-provided-root-key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption")
@@ -245,7 +258,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "customer-provided-root-key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption")
@@ -277,7 +289,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/rekey")
@@ -296,7 +307,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/rekey")
@@ -315,7 +325,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/rekey")
@@ -342,7 +351,6 @@ describe("EncryptionClient", () => {
             parent_kid: "parent_kid",
             public_key: "public_key",
         };
-
         server
             .mockEndpoint()
             .get("/keys/encryption/kid")
@@ -352,7 +360,15 @@ describe("EncryptionClient", () => {
             .build();
 
         const response = await client.keys.encryption.get("kid");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            kid: "kid",
+            type: "customer-provided-root-key",
+            state: "pre-activation",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            parent_kid: "parent_kid",
+            public_key: "public_key",
+        });
     });
 
     test("get (2)", async () => {
@@ -360,7 +376,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/keys/encryption/kid")
@@ -379,7 +394,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/keys/encryption/kid")
@@ -398,7 +412,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/keys/encryption/kid")
@@ -417,7 +430,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/keys/encryption/kid")
@@ -436,7 +448,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/keys/encryption/kid")
@@ -463,7 +474,6 @@ describe("EncryptionClient", () => {
             parent_kid: "parent_kid",
             public_key: "public_key",
         };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/kid")
@@ -476,7 +486,15 @@ describe("EncryptionClient", () => {
         const response = await client.keys.encryption.import("kid", {
             wrapped_key: "wrapped_key",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            kid: "kid",
+            type: "customer-provided-root-key",
+            state: "pre-activation",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            parent_kid: "parent_kid",
+            public_key: "public_key",
+        });
     });
 
     test("import (2)", async () => {
@@ -484,7 +502,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { wrapped_key: "wrapped_key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/kid")
@@ -506,7 +523,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { wrapped_key: "wrapped_key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/kid")
@@ -528,7 +544,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { wrapped_key: "wrapped_key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/kid")
@@ -550,7 +565,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { wrapped_key: "wrapped_key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/kid")
@@ -572,7 +586,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { wrapped_key: "wrapped_key" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/kid")
@@ -604,7 +617,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/keys/encryption/kid")
@@ -623,7 +635,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/keys/encryption/kid")
@@ -642,7 +653,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/keys/encryption/kid")
@@ -661,7 +671,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/keys/encryption/kid")
@@ -680,7 +689,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { public_key: "public_key", algorithm: "CKM_RSA_AES_KEY_WRAP" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/kid/wrapping-key")
@@ -690,7 +698,10 @@ describe("EncryptionClient", () => {
             .build();
 
         const response = await client.keys.encryption.createPublicWrappingKey("kid");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            public_key: "public_key",
+            algorithm: "CKM_RSA_AES_KEY_WRAP",
+        });
     });
 
     test("createPublicWrappingKey (2)", async () => {
@@ -698,7 +709,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/kid/wrapping-key")
@@ -717,7 +727,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/kid/wrapping-key")
@@ -736,7 +745,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/kid/wrapping-key")
@@ -755,7 +763,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/kid/wrapping-key")
@@ -774,7 +781,6 @@ describe("EncryptionClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/encryption/kid/wrapping-key")
diff --git a/src/management/tests/wire/keys/signing.test.ts b/src/management/tests/wire/keys/signing.test.ts
index b8ad7cce1c..e49f6ae07e 100644
--- a/src/management/tests/wire/keys/signing.test.ts
+++ b/src/management/tests/wire/keys/signing.test.ts
@@ -25,11 +25,25 @@ describe("SigningClient", () => {
                 revoked_at: "revoked_at",
             },
         ];
-
         server.mockEndpoint().get("/keys/signing").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.keys.signing.list();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                kid: "kid",
+                cert: "cert",
+                pkcs7: "pkcs7",
+                current: true,
+                next: true,
+                previous: true,
+                current_since: "current_since",
+                current_until: "current_until",
+                fingerprint: "fingerprint",
+                thumbprint: "thumbprint",
+                revoked: true,
+                revoked_at: "revoked_at",
+            },
+        ]);
     });
 
     test("list (2)", async () => {
@@ -37,7 +51,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/keys/signing").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -50,7 +63,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/keys/signing").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -63,7 +75,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/keys/signing").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -76,7 +87,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/keys/signing").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -89,7 +99,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { cert: "cert", kid: "kid" };
-
         server
             .mockEndpoint()
             .post("/keys/signing/rotate")
@@ -99,7 +108,10 @@ describe("SigningClient", () => {
             .build();
 
         const response = await client.keys.signing.rotate();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            cert: "cert",
+            kid: "kid",
+        });
     });
 
     test("rotate (2)", async () => {
@@ -107,7 +119,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/signing/rotate")
@@ -126,7 +137,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/signing/rotate")
@@ -145,7 +155,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/keys/signing/rotate")
@@ -177,11 +186,23 @@ describe("SigningClient", () => {
             revoked: true,
             revoked_at: "revoked_at",
         };
-
         server.mockEndpoint().get("/keys/signing/kid").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.keys.signing.get("kid");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            kid: "kid",
+            cert: "cert",
+            pkcs7: "pkcs7",
+            current: true,
+            next: true,
+            previous: true,
+            current_since: "current_since",
+            current_until: "current_until",
+            fingerprint: "fingerprint",
+            thumbprint: "thumbprint",
+            revoked: true,
+            revoked_at: "revoked_at",
+        });
     });
 
     test("get (2)", async () => {
@@ -189,7 +210,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/keys/signing/kid").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -202,7 +222,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/keys/signing/kid").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -215,7 +234,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/keys/signing/kid").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -228,7 +246,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/keys/signing/kid").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -241,7 +258,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { cert: "cert", kid: "kid" };
-
         server
             .mockEndpoint()
             .put("/keys/signing/kid/revoke")
@@ -251,7 +267,10 @@ describe("SigningClient", () => {
             .build();
 
         const response = await client.keys.signing.revoke("kid");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            cert: "cert",
+            kid: "kid",
+        });
     });
 
     test("revoke (2)", async () => {
@@ -259,7 +278,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/keys/signing/kid/revoke")
@@ -278,7 +296,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/keys/signing/kid/revoke")
@@ -297,7 +314,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/keys/signing/kid/revoke")
@@ -316,7 +332,6 @@ describe("SigningClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/keys/signing/kid/revoke")
diff --git a/src/management/tests/wire/logStreams.test.ts b/src/management/tests/wire/logStreams.test.ts
index ff0c0bb47b..3b8fa4cd61 100644
--- a/src/management/tests/wire/logStreams.test.ts
+++ b/src/management/tests/wire/logStreams.test.ts
@@ -27,11 +27,31 @@ describe("LogStreamsClient", () => {
                 },
             },
         ];
-
         server.mockEndpoint().get("/log-streams").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.logStreams.list();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                id: "id",
+                name: "name",
+                status: "active",
+                type: "http",
+                isPriority: true,
+                filters: [{}],
+                pii_config: {
+                    log_fields: ["first_name"],
+                    method: "mask",
+                    algorithm: "xxhash",
+                },
+                sink: {
+                    httpAuthorization: "httpAuthorization",
+                    httpContentFormat: "JSONARRAY",
+                    httpContentType: "httpContentType",
+                    httpEndpoint: "httpEndpoint",
+                    httpCustomHeaders: [{}],
+                },
+            },
+        ]);
     });
 
     test("list (2)", async () => {
@@ -39,7 +59,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/log-streams").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -52,7 +71,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/log-streams").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -65,7 +83,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/log-streams").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -78,7 +95,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/log-streams").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -106,7 +122,6 @@ describe("LogStreamsClient", () => {
                 httpCustomHeaders: [{}],
             },
         };
-
         server
             .mockEndpoint()
             .post("/log-streams")
@@ -122,7 +137,31 @@ describe("LogStreamsClient", () => {
                 httpEndpoint: "httpEndpoint",
             },
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            status: "active",
+            type: "http",
+            isPriority: true,
+            filters: [
+                {
+                    type: "category",
+                    name: "auth.login.fail",
+                },
+            ],
+            pii_config: {
+                log_fields: ["first_name"],
+                method: "mask",
+                algorithm: "xxhash",
+            },
+            sink: {
+                httpAuthorization: "httpAuthorization",
+                httpContentFormat: "JSONARRAY",
+                httpContentType: "httpContentType",
+                httpEndpoint: "httpEndpoint",
+                httpCustomHeaders: [{}],
+            },
+        });
     });
 
     test("create (2)", async () => {
@@ -130,7 +169,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "http", sink: { httpEndpoint: "httpEndpoint" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/log-streams")
@@ -155,7 +193,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "http", sink: { httpEndpoint: "httpEndpoint" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/log-streams")
@@ -180,7 +217,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "http", sink: { httpEndpoint: "httpEndpoint" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/log-streams")
@@ -205,7 +241,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "http", sink: { httpEndpoint: "httpEndpoint" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/log-streams")
@@ -230,7 +265,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "http", sink: { httpEndpoint: "httpEndpoint" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/log-streams")
@@ -270,11 +304,34 @@ describe("LogStreamsClient", () => {
                 httpCustomHeaders: [{}],
             },
         };
-
         server.mockEndpoint().get("/log-streams/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.logStreams.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            status: "active",
+            type: "http",
+            isPriority: true,
+            filters: [
+                {
+                    type: "category",
+                    name: "auth.login.fail",
+                },
+            ],
+            pii_config: {
+                log_fields: ["first_name"],
+                method: "mask",
+                algorithm: "xxhash",
+            },
+            sink: {
+                httpAuthorization: "httpAuthorization",
+                httpContentFormat: "JSONARRAY",
+                httpContentType: "httpContentType",
+                httpEndpoint: "httpEndpoint",
+                httpCustomHeaders: [{}],
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -282,7 +339,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/log-streams/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -295,7 +351,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/log-streams/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -308,7 +363,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/log-streams/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -321,7 +375,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/log-streams/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -344,7 +397,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/log-streams/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -357,7 +409,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/log-streams/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -370,7 +421,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/log-streams/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -383,7 +433,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/log-streams/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -396,7 +445,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/log-streams/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -424,7 +472,6 @@ describe("LogStreamsClient", () => {
                 httpCustomHeaders: [{}],
             },
         };
-
         server
             .mockEndpoint()
             .patch("/log-streams/id")
@@ -435,7 +482,31 @@ describe("LogStreamsClient", () => {
             .build();
 
         const response = await client.logStreams.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            status: "active",
+            type: "http",
+            isPriority: true,
+            filters: [
+                {
+                    type: "category",
+                    name: "auth.login.fail",
+                },
+            ],
+            pii_config: {
+                log_fields: ["first_name"],
+                method: "mask",
+                algorithm: "xxhash",
+            },
+            sink: {
+                httpAuthorization: "httpAuthorization",
+                httpContentFormat: "JSONARRAY",
+                httpContentType: "httpContentType",
+                httpEndpoint: "httpEndpoint",
+                httpCustomHeaders: [{}],
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -443,7 +514,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/log-streams/id")
@@ -463,7 +533,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/log-streams/id")
@@ -483,7 +552,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/log-streams/id")
@@ -503,7 +571,6 @@ describe("LogStreamsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/log-streams/id")
diff --git a/src/management/tests/wire/logs.test.ts b/src/management/tests/wire/logs.test.ts
index d350a80884..0e97811bc4 100644
--- a/src/management/tests/wire/logs.test.ts
+++ b/src/management/tests/wire/logs.test.ts
@@ -38,7 +38,6 @@ describe("LogsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/logs")
@@ -47,7 +46,37 @@ describe("LogsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            length: 1.1,
+            total: 1.1,
+            logs: [
+                {
+                    date: "date",
+                    type: "type",
+                    description: "description",
+                    connection: "connection",
+                    connection_id: "connection_id",
+                    client_id: "client_id",
+                    client_name: "client_name",
+                    ip: "ip",
+                    hostname: "hostname",
+                    user_id: "user_id",
+                    user_name: "user_name",
+                    audience: "audience",
+                    scope: "scope",
+                    strategy: "strategy",
+                    strategy_type: "strategy_type",
+                    log_id: "log_id",
+                    isMobile: true,
+                    details: {
+                        key: "value",
+                    },
+                    user_agent: "user_agent",
+                },
+            ],
+        };
         const page = await client.logs.list({
             page: 1,
             per_page: 1,
@@ -69,7 +98,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/logs")
@@ -88,7 +116,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/logs")
@@ -107,7 +134,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/logs")
@@ -126,7 +152,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/logs")
@@ -176,11 +201,46 @@ describe("LogsClient", () => {
                 continent_code: "continent_code",
             },
         };
-
         server.mockEndpoint().get("/logs/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.logs.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            date: "date",
+            type: "type",
+            description: "description",
+            connection: "connection",
+            connection_id: "connection_id",
+            client_id: "client_id",
+            client_name: "client_name",
+            ip: "ip",
+            hostname: "hostname",
+            user_id: "user_id",
+            user_name: "user_name",
+            audience: "audience",
+            scope: "scope",
+            strategy: "strategy",
+            strategy_type: "strategy_type",
+            log_id: "log_id",
+            isMobile: true,
+            details: {
+                key: "value",
+            },
+            user_agent: "user_agent",
+            security_context: {
+                ja3: "ja3",
+                ja4: "ja4",
+            },
+            location_info: {
+                country_code: "country_code",
+                country_code3: "country_code3",
+                country_name: "country_name",
+                city_name: "city_name",
+                latitude: 1.1,
+                longitude: 1.1,
+                time_zone: "time_zone",
+                continent_code: "continent_code",
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -188,7 +248,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/logs/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -201,7 +260,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/logs/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -214,7 +272,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/logs/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -227,7 +284,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/logs/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -240,7 +296,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/logs/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
diff --git a/src/management/tests/wire/networkAcls.test.ts b/src/management/tests/wire/networkAcls.test.ts
index 7718e3c5fe..8f02ab2247 100644
--- a/src/management/tests/wire/networkAcls.test.ts
+++ b/src/management/tests/wire/networkAcls.test.ts
@@ -25,7 +25,6 @@ describe("NetworkAclsClient", () => {
             limit: 1.1,
             total: 1.1,
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/network-acls")
@@ -34,7 +33,25 @@ describe("NetworkAclsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            network_acls: [
+                {
+                    id: "id",
+                    description: "description",
+                    active: true,
+                    priority: 1.1,
+                    rule: {
+                        action: {},
+                        scope: "management",
+                    },
+                    created_at: "created_at",
+                    updated_at: "updated_at",
+                },
+            ],
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+        };
         const page = await client.networkAcls.list({
             page: 1,
             per_page: 1,
@@ -52,7 +69,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/network-acls")
@@ -71,7 +87,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/network-acls")
@@ -90,7 +105,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/network-acls")
@@ -109,7 +123,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/network-acls")
@@ -146,7 +159,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { description: "description", active: true, rule: { action: {}, scope: "management" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/network-acls")
@@ -173,7 +185,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { description: "description", active: true, rule: { action: {}, scope: "management" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/network-acls")
@@ -200,7 +211,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { description: "description", active: true, rule: { action: {}, scope: "management" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/network-acls")
@@ -227,7 +237,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { description: "description", active: true, rule: { action: {}, scope: "management" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/network-acls")
@@ -254,7 +263,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { description: "description", active: true, rule: { action: {}, scope: "management" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/network-acls")
@@ -281,7 +289,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { description: "description", active: true, rule: { action: {}, scope: "management" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/network-acls")
@@ -347,11 +354,55 @@ describe("NetworkAclsClient", () => {
             created_at: "created_at",
             updated_at: "updated_at",
         };
-
         server.mockEndpoint().get("/network-acls/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.networkAcls.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            description: "description",
+            active: true,
+            priority: 1.1,
+            rule: {
+                action: {
+                    block: true,
+                    allow: true,
+                    log: true,
+                    redirect: true,
+                    redirect_uri: "redirect_uri",
+                },
+                match: {
+                    asns: [1],
+                    auth0_managed: ["auth0_managed"],
+                    geo_country_codes: ["geo_country_codes"],
+                    geo_subdivision_codes: ["geo_subdivision_codes"],
+                    ipv4_cidrs: ["ipv4_cidrs"],
+                    ipv6_cidrs: ["ipv6_cidrs"],
+                    ja3_fingerprints: ["ja3_fingerprints"],
+                    ja4_fingerprints: ["ja4_fingerprints"],
+                    user_agents: ["user_agents"],
+                    hostnames: ["hostnames"],
+                    connecting_ipv4_cidrs: ["connecting_ipv4_cidrs"],
+                    connecting_ipv6_cidrs: ["connecting_ipv6_cidrs"],
+                },
+                not_match: {
+                    asns: [1],
+                    auth0_managed: ["auth0_managed"],
+                    geo_country_codes: ["geo_country_codes"],
+                    geo_subdivision_codes: ["geo_subdivision_codes"],
+                    ipv4_cidrs: ["ipv4_cidrs"],
+                    ipv6_cidrs: ["ipv6_cidrs"],
+                    ja3_fingerprints: ["ja3_fingerprints"],
+                    ja4_fingerprints: ["ja4_fingerprints"],
+                    user_agents: ["user_agents"],
+                    hostnames: ["hostnames"],
+                    connecting_ipv4_cidrs: ["connecting_ipv4_cidrs"],
+                    connecting_ipv6_cidrs: ["connecting_ipv6_cidrs"],
+                },
+                scope: "management",
+            },
+            created_at: "created_at",
+            updated_at: "updated_at",
+        });
     });
 
     test("get (2)", async () => {
@@ -359,7 +410,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/network-acls/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -372,7 +422,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/network-acls/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -385,7 +434,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/network-acls/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -398,7 +446,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/network-acls/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -450,7 +497,6 @@ describe("NetworkAclsClient", () => {
             created_at: "created_at",
             updated_at: "updated_at",
         };
-
         server
             .mockEndpoint()
             .put("/network-acls/id")
@@ -468,7 +514,52 @@ describe("NetworkAclsClient", () => {
                 scope: "management",
             },
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            description: "description",
+            active: true,
+            priority: 1.1,
+            rule: {
+                action: {
+                    block: true,
+                    allow: true,
+                    log: true,
+                    redirect: true,
+                    redirect_uri: "redirect_uri",
+                },
+                match: {
+                    asns: [1],
+                    auth0_managed: ["auth0_managed"],
+                    geo_country_codes: ["geo_country_codes"],
+                    geo_subdivision_codes: ["geo_subdivision_codes"],
+                    ipv4_cidrs: ["ipv4_cidrs"],
+                    ipv6_cidrs: ["ipv6_cidrs"],
+                    ja3_fingerprints: ["ja3_fingerprints"],
+                    ja4_fingerprints: ["ja4_fingerprints"],
+                    user_agents: ["user_agents"],
+                    hostnames: ["hostnames"],
+                    connecting_ipv4_cidrs: ["connecting_ipv4_cidrs"],
+                    connecting_ipv6_cidrs: ["connecting_ipv6_cidrs"],
+                },
+                not_match: {
+                    asns: [1],
+                    auth0_managed: ["auth0_managed"],
+                    geo_country_codes: ["geo_country_codes"],
+                    geo_subdivision_codes: ["geo_subdivision_codes"],
+                    ipv4_cidrs: ["ipv4_cidrs"],
+                    ipv6_cidrs: ["ipv6_cidrs"],
+                    ja3_fingerprints: ["ja3_fingerprints"],
+                    ja4_fingerprints: ["ja4_fingerprints"],
+                    user_agents: ["user_agents"],
+                    hostnames: ["hostnames"],
+                    connecting_ipv4_cidrs: ["connecting_ipv4_cidrs"],
+                    connecting_ipv6_cidrs: ["connecting_ipv6_cidrs"],
+                },
+                scope: "management",
+            },
+            created_at: "created_at",
+            updated_at: "updated_at",
+        });
     });
 
     test("set (2)", async () => {
@@ -476,7 +567,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { description: "description", active: true, rule: { action: {}, scope: "management" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/network-acls/id")
@@ -503,7 +593,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { description: "description", active: true, rule: { action: {}, scope: "management" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/network-acls/id")
@@ -530,7 +619,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { description: "description", active: true, rule: { action: {}, scope: "management" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/network-acls/id")
@@ -557,7 +645,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { description: "description", active: true, rule: { action: {}, scope: "management" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/network-acls/id")
@@ -584,7 +671,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { description: "description", active: true, rule: { action: {}, scope: "management" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/network-acls/id")
@@ -621,7 +707,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/network-acls/id")
@@ -640,7 +725,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/network-acls/id")
@@ -659,7 +743,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/network-acls/id")
@@ -678,7 +761,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/network-acls/id")
@@ -697,7 +779,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/network-acls/id")
@@ -755,7 +836,6 @@ describe("NetworkAclsClient", () => {
             created_at: "created_at",
             updated_at: "updated_at",
         };
-
         server
             .mockEndpoint()
             .patch("/network-acls/id")
@@ -766,7 +846,52 @@ describe("NetworkAclsClient", () => {
             .build();
 
         const response = await client.networkAcls.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            description: "description",
+            active: true,
+            priority: 1.1,
+            rule: {
+                action: {
+                    block: true,
+                    allow: true,
+                    log: true,
+                    redirect: true,
+                    redirect_uri: "redirect_uri",
+                },
+                match: {
+                    asns: [1],
+                    auth0_managed: ["auth0_managed"],
+                    geo_country_codes: ["geo_country_codes"],
+                    geo_subdivision_codes: ["geo_subdivision_codes"],
+                    ipv4_cidrs: ["ipv4_cidrs"],
+                    ipv6_cidrs: ["ipv6_cidrs"],
+                    ja3_fingerprints: ["ja3_fingerprints"],
+                    ja4_fingerprints: ["ja4_fingerprints"],
+                    user_agents: ["user_agents"],
+                    hostnames: ["hostnames"],
+                    connecting_ipv4_cidrs: ["connecting_ipv4_cidrs"],
+                    connecting_ipv6_cidrs: ["connecting_ipv6_cidrs"],
+                },
+                not_match: {
+                    asns: [1],
+                    auth0_managed: ["auth0_managed"],
+                    geo_country_codes: ["geo_country_codes"],
+                    geo_subdivision_codes: ["geo_subdivision_codes"],
+                    ipv4_cidrs: ["ipv4_cidrs"],
+                    ipv6_cidrs: ["ipv6_cidrs"],
+                    ja3_fingerprints: ["ja3_fingerprints"],
+                    ja4_fingerprints: ["ja4_fingerprints"],
+                    user_agents: ["user_agents"],
+                    hostnames: ["hostnames"],
+                    connecting_ipv4_cidrs: ["connecting_ipv4_cidrs"],
+                    connecting_ipv6_cidrs: ["connecting_ipv6_cidrs"],
+                },
+                scope: "management",
+            },
+            created_at: "created_at",
+            updated_at: "updated_at",
+        });
     });
 
     test("update (2)", async () => {
@@ -774,7 +899,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/network-acls/id")
@@ -794,7 +918,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/network-acls/id")
@@ -814,7 +937,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/network-acls/id")
@@ -834,7 +956,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/network-acls/id")
@@ -854,7 +975,6 @@ describe("NetworkAclsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/network-acls/id")
diff --git a/src/management/tests/wire/organizations.test.ts b/src/management/tests/wire/organizations.test.ts
index 3d6a830289..425c1074ec 100644
--- a/src/management/tests/wire/organizations.test.ts
+++ b/src/management/tests/wire/organizations.test.ts
@@ -15,7 +15,6 @@ describe("OrganizationsClient", () => {
                 { id: "id", name: "name", display_name: "display_name", token_quota: { client_credentials: {} } },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations")
@@ -24,7 +23,19 @@ describe("OrganizationsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            next: "next",
+            organizations: [
+                {
+                    id: "id",
+                    name: "name",
+                    display_name: "display_name",
+                    token_quota: {
+                        client_credentials: {},
+                    },
+                },
+            ],
+        };
         const page = await client.organizations.list({
             from: "from",
             take: 1,
@@ -42,7 +53,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/organizations").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -55,7 +65,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/organizations").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -68,7 +77,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/organizations").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -81,7 +89,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/organizations").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -109,7 +116,6 @@ describe("OrganizationsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .post("/organizations")
@@ -122,7 +128,36 @@ describe("OrganizationsClient", () => {
         const response = await client.organizations.create({
             name: "name",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            display_name: "display_name",
+            branding: {
+                logo_url: "logo_url",
+                colors: {
+                    primary: "primary",
+                    page_background: "page_background",
+                },
+            },
+            metadata: {
+                key: "value",
+            },
+            token_quota: {
+                client_credentials: {
+                    enforce: true,
+                    per_day: 1,
+                    per_hour: 1,
+                },
+            },
+            enabled_connections: [
+                {
+                    connection_id: "connection_id",
+                    assign_membership_on_login: true,
+                    show_as_button: true,
+                    is_signup_enabled: true,
+                },
+            ],
+        });
     });
 
     test("create (2)", async () => {
@@ -130,7 +165,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "organization-1" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations")
@@ -152,7 +186,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "organization-1" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations")
@@ -174,7 +207,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "organization-1" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations")
@@ -196,7 +228,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "organization-1" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations")
@@ -218,7 +249,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "organization-1" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations")
@@ -247,7 +277,6 @@ describe("OrganizationsClient", () => {
             metadata: { key: "value" },
             token_quota: { client_credentials: { enforce: true, per_day: 1, per_hour: 1 } },
         };
-
         server
             .mockEndpoint()
             .get("/organizations/name/name")
@@ -257,7 +286,28 @@ describe("OrganizationsClient", () => {
             .build();
 
         const response = await client.organizations.getByName("name");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            display_name: "display_name",
+            branding: {
+                logo_url: "logo_url",
+                colors: {
+                    primary: "primary",
+                    page_background: "page_background",
+                },
+            },
+            metadata: {
+                key: "value",
+            },
+            token_quota: {
+                client_credentials: {
+                    enforce: true,
+                    per_day: 1,
+                    per_hour: 1,
+                },
+            },
+        });
     });
 
     test("getByName (2)", async () => {
@@ -265,7 +315,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/name/name")
@@ -284,7 +333,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/name/name")
@@ -303,7 +351,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/name/name")
@@ -322,7 +369,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/name/name")
@@ -348,11 +394,31 @@ describe("OrganizationsClient", () => {
             metadata: { key: "value" },
             token_quota: { client_credentials: { enforce: true, per_day: 1, per_hour: 1 } },
         };
-
         server.mockEndpoint().get("/organizations/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.organizations.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            display_name: "display_name",
+            branding: {
+                logo_url: "logo_url",
+                colors: {
+                    primary: "primary",
+                    page_background: "page_background",
+                },
+            },
+            metadata: {
+                key: "value",
+            },
+            token_quota: {
+                client_credentials: {
+                    enforce: true,
+                    per_day: 1,
+                    per_hour: 1,
+                },
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -360,7 +426,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/organizations/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -373,7 +438,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/organizations/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -386,7 +450,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/organizations/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -399,7 +462,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/organizations/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -422,7 +484,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id")
@@ -441,7 +502,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id")
@@ -460,7 +520,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id")
@@ -479,7 +538,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id")
@@ -498,7 +556,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id")
@@ -524,7 +581,6 @@ describe("OrganizationsClient", () => {
             metadata: { key: "value" },
             token_quota: { client_credentials: { enforce: true, per_day: 1, per_hour: 1 } },
         };
-
         server
             .mockEndpoint()
             .patch("/organizations/id")
@@ -535,7 +591,28 @@ describe("OrganizationsClient", () => {
             .build();
 
         const response = await client.organizations.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            display_name: "display_name",
+            branding: {
+                logo_url: "logo_url",
+                colors: {
+                    primary: "primary",
+                    page_background: "page_background",
+                },
+            },
+            metadata: {
+                key: "value",
+            },
+            token_quota: {
+                client_credentials: {
+                    enforce: true,
+                    per_day: 1,
+                    per_hour: 1,
+                },
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -543,7 +620,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id")
@@ -563,7 +639,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id")
@@ -583,7 +658,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id")
@@ -603,7 +677,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id")
diff --git a/src/management/tests/wire/organizations/clientGrants.test.ts b/src/management/tests/wire/organizations/clientGrants.test.ts
index dcba904ce2..5d44d0f335 100644
--- a/src/management/tests/wire/organizations/clientGrants.test.ts
+++ b/src/management/tests/wire/organizations/clientGrants.test.ts
@@ -24,7 +24,6 @@ describe("ClientGrantsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/client-grants")
@@ -33,7 +32,21 @@ describe("ClientGrantsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            client_grants: [
+                {
+                    id: "id",
+                    client_id: "client_id",
+                    audience: "audience",
+                    scope: ["scope"],
+                    organization_usage: "deny",
+                    allow_any_organization: true,
+                },
+            ],
+        };
         const page = await client.organizations.clientGrants.list("id", {
             audience: "audience",
             client_id: "client_id",
@@ -53,7 +66,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/client-grants")
@@ -72,7 +84,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/client-grants")
@@ -91,7 +102,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/client-grants")
@@ -110,7 +120,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/client-grants")
@@ -136,7 +145,6 @@ describe("ClientGrantsClient", () => {
             organization_usage: "deny",
             allow_any_organization: true,
         };
-
         server
             .mockEndpoint()
             .post("/organizations/id/client-grants")
@@ -149,7 +157,14 @@ describe("ClientGrantsClient", () => {
         const response = await client.organizations.clientGrants.create("id", {
             grant_id: "grant_id",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            client_id: "client_id",
+            audience: "audience",
+            scope: ["scope"],
+            organization_usage: "deny",
+            allow_any_organization: true,
+        });
     });
 
     test("create (2)", async () => {
@@ -157,7 +172,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { grant_id: "grant_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/client-grants")
@@ -179,7 +193,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { grant_id: "grant_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/client-grants")
@@ -201,7 +214,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { grant_id: "grant_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/client-grants")
@@ -223,7 +235,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { grant_id: "grant_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/client-grants")
@@ -245,7 +256,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { grant_id: "grant_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/client-grants")
@@ -267,7 +277,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { grant_id: "grant_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/client-grants")
@@ -299,7 +308,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/client-grants/grant_id")
@@ -318,7 +326,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/client-grants/grant_id")
@@ -337,7 +344,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/client-grants/grant_id")
@@ -356,7 +362,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/client-grants/grant_id")
@@ -375,7 +380,6 @@ describe("ClientGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/client-grants/grant_id")
diff --git a/src/management/tests/wire/organizations/connections.test.ts b/src/management/tests/wire/organizations/connections.test.ts
index e35dd5fc18..287aee4af7 100644
--- a/src/management/tests/wire/organizations/connections.test.ts
+++ b/src/management/tests/wire/organizations/connections.test.ts
@@ -25,7 +25,6 @@ describe("ConnectionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/connections")
@@ -34,7 +33,22 @@ describe("ConnectionsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            connections: [
+                {
+                    organization_connection_name: "organization_connection_name",
+                    assign_membership_on_login: true,
+                    show_as_button: true,
+                    is_signup_enabled: true,
+                    organization_access_level: "none",
+                    is_enabled: true,
+                    connection_id: "connection_id",
+                },
+            ],
+        };
         const page = await client.organizations.connections.list("id", {
             page: 1,
             per_page: 1,
@@ -53,7 +67,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/connections")
@@ -72,7 +85,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/connections")
@@ -91,7 +103,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/connections")
@@ -110,7 +121,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/connections")
@@ -138,7 +148,6 @@ describe("ConnectionsClient", () => {
             connection_id: "connection_id",
             connection: { name: "name", strategy: "strategy" },
         };
-
         server
             .mockEndpoint()
             .post("/organizations/id/connections")
@@ -151,7 +160,19 @@ describe("ConnectionsClient", () => {
         const response = await client.organizations.connections.create("id", {
             connection_id: "connection_id",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            organization_connection_name: "organization_connection_name",
+            assign_membership_on_login: true,
+            show_as_button: true,
+            is_signup_enabled: true,
+            organization_access_level: "none",
+            is_enabled: true,
+            connection_id: "connection_id",
+            connection: {
+                name: "name",
+                strategy: "strategy",
+            },
+        });
     });
 
     test("create (2)", async () => {
@@ -159,7 +180,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection_id: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/connections")
@@ -181,7 +201,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection_id: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/connections")
@@ -203,7 +222,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection_id: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/connections")
@@ -225,7 +243,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection_id: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/connections")
@@ -247,7 +264,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection_id: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/connections")
@@ -278,7 +294,6 @@ describe("ConnectionsClient", () => {
             connection_id: "connection_id",
             connection: { name: "name", strategy: "strategy" },
         };
-
         server
             .mockEndpoint()
             .get("/organizations/id/connections/connection_id")
@@ -288,7 +303,19 @@ describe("ConnectionsClient", () => {
             .build();
 
         const response = await client.organizations.connections.get("id", "connection_id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            organization_connection_name: "organization_connection_name",
+            assign_membership_on_login: true,
+            show_as_button: true,
+            is_signup_enabled: true,
+            organization_access_level: "none",
+            is_enabled: true,
+            connection_id: "connection_id",
+            connection: {
+                name: "name",
+                strategy: "strategy",
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -296,7 +323,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/connections/connection_id")
@@ -315,7 +341,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/connections/connection_id")
@@ -334,7 +359,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/connections/connection_id")
@@ -353,7 +377,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/connections/connection_id")
@@ -387,7 +410,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/connections/connection_id")
@@ -406,7 +428,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/connections/connection_id")
@@ -425,7 +446,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/connections/connection_id")
@@ -453,7 +473,6 @@ describe("ConnectionsClient", () => {
             connection_id: "connection_id",
             connection: { name: "name", strategy: "strategy" },
         };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/connections/connection_id")
@@ -464,7 +483,19 @@ describe("ConnectionsClient", () => {
             .build();
 
         const response = await client.organizations.connections.update("id", "connection_id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            organization_connection_name: "organization_connection_name",
+            assign_membership_on_login: true,
+            show_as_button: true,
+            is_signup_enabled: true,
+            organization_access_level: "none",
+            is_enabled: true,
+            connection_id: "connection_id",
+            connection: {
+                name: "name",
+                strategy: "strategy",
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -472,7 +503,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/connections/connection_id")
@@ -492,7 +522,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/connections/connection_id")
@@ -512,7 +541,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/connections/connection_id")
@@ -532,7 +560,6 @@ describe("ConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/connections/connection_id")
diff --git a/src/management/tests/wire/organizations/discoveryDomains.test.ts b/src/management/tests/wire/organizations/discoveryDomains.test.ts
index de65e67bb8..b0b732aa6e 100644
--- a/src/management/tests/wire/organizations/discoveryDomains.test.ts
+++ b/src/management/tests/wire/organizations/discoveryDomains.test.ts
@@ -22,7 +22,6 @@ describe("DiscoveryDomainsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/discovery-domains")
@@ -31,7 +30,19 @@ describe("DiscoveryDomainsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            next: "next",
+            domains: [
+                {
+                    id: "id",
+                    domain: "domain",
+                    status: "pending",
+                    use_for_organization_discovery: true,
+                    verification_txt: "verification_txt",
+                    verification_host: "verification_host",
+                },
+            ],
+        };
         const page = await client.organizations.discoveryDomains.list("id", {
             from: "from",
             take: 1,
@@ -48,7 +59,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains")
@@ -67,7 +77,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains")
@@ -86,7 +95,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains")
@@ -105,7 +113,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains")
@@ -124,7 +131,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains")
@@ -150,7 +156,6 @@ describe("DiscoveryDomainsClient", () => {
             verification_txt: "verification_txt",
             verification_host: "verification_host",
         };
-
         server
             .mockEndpoint()
             .post("/organizations/id/discovery-domains")
@@ -163,7 +168,14 @@ describe("DiscoveryDomainsClient", () => {
         const response = await client.organizations.discoveryDomains.create("id", {
             domain: "domain",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            domain: "domain",
+            status: "pending",
+            use_for_organization_discovery: true,
+            verification_txt: "verification_txt",
+            verification_host: "verification_host",
+        });
     });
 
     test("create (2)", async () => {
@@ -171,7 +183,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "foo" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/discovery-domains")
@@ -193,7 +204,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "foo" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/discovery-domains")
@@ -215,7 +225,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "foo" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/discovery-domains")
@@ -237,7 +246,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "foo" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/discovery-domains")
@@ -259,7 +267,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "foo" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/discovery-domains")
@@ -281,7 +288,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { domain: "foo" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/discovery-domains")
@@ -310,7 +316,6 @@ describe("DiscoveryDomainsClient", () => {
             verification_txt: "verification_txt",
             verification_host: "verification_host",
         };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains/name/discovery_domain")
@@ -320,7 +325,14 @@ describe("DiscoveryDomainsClient", () => {
             .build();
 
         const response = await client.organizations.discoveryDomains.getByName("id", "discovery_domain");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            domain: "domain",
+            status: "pending",
+            use_for_organization_discovery: true,
+            verification_txt: "verification_txt",
+            verification_host: "verification_host",
+        });
     });
 
     test("getByName (2)", async () => {
@@ -328,7 +340,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains/name/discovery_domain")
@@ -347,7 +358,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains/name/discovery_domain")
@@ -366,7 +376,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains/name/discovery_domain")
@@ -385,7 +394,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains/name/discovery_domain")
@@ -404,7 +412,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains/name/discovery_domain")
@@ -430,7 +437,6 @@ describe("DiscoveryDomainsClient", () => {
             verification_txt: "verification_txt",
             verification_host: "verification_host",
         };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains/discovery_domain_id")
@@ -440,7 +446,14 @@ describe("DiscoveryDomainsClient", () => {
             .build();
 
         const response = await client.organizations.discoveryDomains.get("id", "discovery_domain_id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            domain: "domain",
+            status: "pending",
+            use_for_organization_discovery: true,
+            verification_txt: "verification_txt",
+            verification_host: "verification_host",
+        });
     });
 
     test("get (2)", async () => {
@@ -448,7 +461,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains/discovery_domain_id")
@@ -467,7 +479,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains/discovery_domain_id")
@@ -486,7 +497,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains/discovery_domain_id")
@@ -505,7 +515,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains/discovery_domain_id")
@@ -524,7 +533,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/discovery-domains/discovery_domain_id")
@@ -558,7 +566,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/discovery-domains/discovery_domain_id")
@@ -577,7 +584,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/discovery-domains/discovery_domain_id")
@@ -596,7 +602,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/discovery-domains/discovery_domain_id")
@@ -615,7 +620,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/discovery-domains/discovery_domain_id")
@@ -641,7 +645,6 @@ describe("DiscoveryDomainsClient", () => {
             verification_txt: "verification_txt",
             verification_host: "verification_host",
         };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/discovery-domains/discovery_domain_id")
@@ -652,7 +655,14 @@ describe("DiscoveryDomainsClient", () => {
             .build();
 
         const response = await client.organizations.discoveryDomains.update("id", "discovery_domain_id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            domain: "domain",
+            status: "pending",
+            use_for_organization_discovery: true,
+            verification_txt: "verification_txt",
+            verification_host: "verification_host",
+        });
     });
 
     test("update (2)", async () => {
@@ -660,7 +670,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/discovery-domains/discovery_domain_id")
@@ -680,7 +689,6 @@ describe("DiscoveryDomainsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/discovery-domains/discovery_domain_id")
diff --git a/src/management/tests/wire/organizations/enabledConnections.test.ts b/src/management/tests/wire/organizations/enabledConnections.test.ts
index cd92233761..37fc046bc4 100644
--- a/src/management/tests/wire/organizations/enabledConnections.test.ts
+++ b/src/management/tests/wire/organizations/enabledConnections.test.ts
@@ -22,7 +22,6 @@ describe("EnabledConnectionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/enabled_connections")
@@ -31,7 +30,19 @@ describe("EnabledConnectionsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            enabled_connections: [
+                {
+                    connection_id: "connection_id",
+                    assign_membership_on_login: true,
+                    show_as_button: true,
+                    is_signup_enabled: true,
+                },
+            ],
+        };
         const page = await client.organizations.enabledConnections.list("id", {
             page: 1,
             per_page: 1,
@@ -49,7 +60,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/enabled_connections")
@@ -68,7 +78,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/enabled_connections")
@@ -87,7 +96,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/enabled_connections")
@@ -106,7 +114,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/enabled_connections")
@@ -131,7 +138,6 @@ describe("EnabledConnectionsClient", () => {
             is_signup_enabled: true,
             connection: { name: "name", strategy: "strategy" },
         };
-
         server
             .mockEndpoint()
             .post("/organizations/id/enabled_connections")
@@ -144,7 +150,16 @@ describe("EnabledConnectionsClient", () => {
         const response = await client.organizations.enabledConnections.add("id", {
             connection_id: "connection_id",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            connection_id: "connection_id",
+            assign_membership_on_login: true,
+            show_as_button: true,
+            is_signup_enabled: true,
+            connection: {
+                name: "name",
+                strategy: "strategy",
+            },
+        });
     });
 
     test("add (2)", async () => {
@@ -152,7 +167,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection_id: "connection_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/enabled_connections")
@@ -174,7 +188,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection_id: "connection_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/enabled_connections")
@@ -196,7 +209,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection_id: "connection_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/enabled_connections")
@@ -218,7 +230,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection_id: "connection_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/enabled_connections")
@@ -246,7 +257,6 @@ describe("EnabledConnectionsClient", () => {
             is_signup_enabled: true,
             connection: { name: "name", strategy: "strategy" },
         };
-
         server
             .mockEndpoint()
             .get("/organizations/id/enabled_connections/connectionId")
@@ -256,7 +266,16 @@ describe("EnabledConnectionsClient", () => {
             .build();
 
         const response = await client.organizations.enabledConnections.get("id", "connectionId");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            connection_id: "connection_id",
+            assign_membership_on_login: true,
+            show_as_button: true,
+            is_signup_enabled: true,
+            connection: {
+                name: "name",
+                strategy: "strategy",
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -264,7 +283,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/enabled_connections/connectionId")
@@ -283,7 +301,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/enabled_connections/connectionId")
@@ -302,7 +319,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/enabled_connections/connectionId")
@@ -336,7 +352,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/enabled_connections/connectionId")
@@ -355,7 +370,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/enabled_connections/connectionId")
@@ -374,7 +388,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/enabled_connections/connectionId")
@@ -393,7 +406,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/enabled_connections/connectionId")
@@ -418,7 +430,6 @@ describe("EnabledConnectionsClient", () => {
             is_signup_enabled: true,
             connection: { name: "name", strategy: "strategy" },
         };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/enabled_connections/connectionId")
@@ -429,7 +440,16 @@ describe("EnabledConnectionsClient", () => {
             .build();
 
         const response = await client.organizations.enabledConnections.update("id", "connectionId");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            connection_id: "connection_id",
+            assign_membership_on_login: true,
+            show_as_button: true,
+            is_signup_enabled: true,
+            connection: {
+                name: "name",
+                strategy: "strategy",
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -437,7 +457,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/enabled_connections/connectionId")
@@ -457,7 +476,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/enabled_connections/connectionId")
@@ -477,7 +495,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/enabled_connections/connectionId")
@@ -497,7 +514,6 @@ describe("EnabledConnectionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/organizations/id/enabled_connections/connectionId")
diff --git a/src/management/tests/wire/organizations/invitations.test.ts b/src/management/tests/wire/organizations/invitations.test.ts
index 14a4c6169e..18ce40d0ea 100644
--- a/src/management/tests/wire/organizations/invitations.test.ts
+++ b/src/management/tests/wire/organizations/invitations.test.ts
@@ -30,7 +30,6 @@ describe("InvitationsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/invitations")
@@ -39,7 +38,35 @@ describe("InvitationsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            invitations: [
+                {
+                    id: "id",
+                    organization_id: "organization_id",
+                    inviter: {
+                        name: "name",
+                    },
+                    invitee: {
+                        email: "email",
+                    },
+                    invitation_url: "invitation_url",
+                    created_at: "2024-01-15T09:30:00Z",
+                    expires_at: "2024-01-15T09:30:00Z",
+                    client_id: "client_id",
+                    connection_id: "connection_id",
+                    app_metadata: {
+                        key: "value",
+                    },
+                    user_metadata: {
+                        key: "value",
+                    },
+                    roles: ["roles"],
+                    ticket_id: "ticket_id",
+                },
+            ],
+        };
         const page = await client.organizations.invitations.list("id", {
             page: 1,
             per_page: 1,
@@ -60,7 +87,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/invitations")
@@ -79,7 +105,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/invitations")
@@ -98,7 +123,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/invitations")
@@ -117,7 +141,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/invitations")
@@ -136,7 +159,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/invitations")
@@ -169,7 +191,6 @@ describe("InvitationsClient", () => {
             roles: ["roles"],
             ticket_id: "ticket_id",
         };
-
         server
             .mockEndpoint()
             .post("/organizations/id/invitations")
@@ -188,7 +209,29 @@ describe("InvitationsClient", () => {
             },
             client_id: "client_id",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            organization_id: "organization_id",
+            inviter: {
+                name: "name",
+            },
+            invitee: {
+                email: "email",
+            },
+            invitation_url: "invitation_url",
+            created_at: "2024-01-15T09:30:00Z",
+            expires_at: "2024-01-15T09:30:00Z",
+            client_id: "client_id",
+            connection_id: "connection_id",
+            app_metadata: {
+                key: "value",
+            },
+            user_metadata: {
+                key: "value",
+            },
+            roles: ["roles"],
+            ticket_id: "ticket_id",
+        });
     });
 
     test("create (2)", async () => {
@@ -200,7 +243,6 @@ describe("InvitationsClient", () => {
             client_id: "AaiyAPdpYdesoKnqjj8HJqRn4T5titww",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/invitations")
@@ -232,7 +274,6 @@ describe("InvitationsClient", () => {
             client_id: "AaiyAPdpYdesoKnqjj8HJqRn4T5titww",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/invitations")
@@ -264,7 +305,6 @@ describe("InvitationsClient", () => {
             client_id: "AaiyAPdpYdesoKnqjj8HJqRn4T5titww",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/invitations")
@@ -296,7 +336,6 @@ describe("InvitationsClient", () => {
             client_id: "AaiyAPdpYdesoKnqjj8HJqRn4T5titww",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/invitations")
@@ -328,7 +367,6 @@ describe("InvitationsClient", () => {
             client_id: "AaiyAPdpYdesoKnqjj8HJqRn4T5titww",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/invitations")
@@ -370,7 +408,6 @@ describe("InvitationsClient", () => {
             roles: ["roles"],
             ticket_id: "ticket_id",
         };
-
         server
             .mockEndpoint()
             .get("/organizations/id/invitations/invitation_id")
@@ -383,7 +420,29 @@ describe("InvitationsClient", () => {
             fields: "fields",
             include_fields: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            organization_id: "organization_id",
+            inviter: {
+                name: "name",
+            },
+            invitee: {
+                email: "email",
+            },
+            invitation_url: "invitation_url",
+            created_at: "2024-01-15T09:30:00Z",
+            expires_at: "2024-01-15T09:30:00Z",
+            client_id: "client_id",
+            connection_id: "connection_id",
+            app_metadata: {
+                key: "value",
+            },
+            user_metadata: {
+                key: "value",
+            },
+            roles: ["roles"],
+            ticket_id: "ticket_id",
+        });
     });
 
     test("get (2)", async () => {
@@ -391,7 +450,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/invitations/invitation_id")
@@ -410,7 +468,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/invitations/invitation_id")
@@ -429,7 +486,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/invitations/invitation_id")
@@ -448,7 +504,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/invitations/invitation_id")
@@ -467,7 +522,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/invitations/invitation_id")
@@ -501,7 +555,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/invitations/invitation_id")
@@ -520,7 +573,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/invitations/invitation_id")
@@ -539,7 +591,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/invitations/invitation_id")
@@ -558,7 +609,6 @@ describe("InvitationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/invitations/invitation_id")
diff --git a/src/management/tests/wire/organizations/members.test.ts b/src/management/tests/wire/organizations/members.test.ts
index 8c7b5980b0..787ad54856 100644
--- a/src/management/tests/wire/organizations/members.test.ts
+++ b/src/management/tests/wire/organizations/members.test.ts
@@ -13,7 +13,6 @@ describe("MembersClient", () => {
             next: "next",
             members: [{ user_id: "user_id", picture: "picture", name: "name", email: "email", roles: [{}] }],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/members")
@@ -22,7 +21,18 @@ describe("MembersClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            next: "next",
+            members: [
+                {
+                    user_id: "user_id",
+                    picture: "picture",
+                    name: "name",
+                    email: "email",
+                    roles: [{}],
+                },
+            ],
+        };
         const page = await client.organizations.members.list("id", {
             from: "from",
             take: 1,
@@ -41,7 +51,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/members")
@@ -60,7 +69,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/members")
@@ -79,7 +87,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/members")
@@ -98,7 +105,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/organizations/id/members")
@@ -136,7 +142,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { members: ["members", "members"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/members")
@@ -158,7 +163,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { members: ["members", "members"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/members")
@@ -180,7 +184,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { members: ["members", "members"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/members")
@@ -202,7 +205,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { members: ["members", "members"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/members")
@@ -243,7 +245,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { members: ["members", "members"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/members")
@@ -265,7 +266,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { members: ["members", "members"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/members")
@@ -287,7 +287,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { members: ["members", "members"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/members")
@@ -309,7 +308,6 @@ describe("MembersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { members: ["members", "members"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/members")
diff --git a/src/management/tests/wire/organizations/members/roles.test.ts b/src/management/tests/wire/organizations/members/roles.test.ts
index 24a906ab86..39e81ee225 100644
--- a/src/management/tests/wire/organizations/members/roles.test.ts
+++ b/src/management/tests/wire/organizations/members/roles.test.ts
@@ -15,7 +15,6 @@ describe("RolesClient", () => {
             total: 1.1,
             roles: [{ id: "id", name: "name", description: "description" }],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/members/user_id/roles")
@@ -24,7 +23,18 @@ describe("RolesClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            roles: [
+                {
+                    id: "id",
+                    name: "name",
+                    description: "description",
+                },
+            ],
+        };
         const page = await client.organizations.members.roles.list("id", "user_id", {
             page: 1,
             per_page: 1,
@@ -42,7 +52,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/members/user_id/roles")
@@ -61,7 +70,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/members/user_id/roles")
@@ -80,7 +88,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/members/user_id/roles")
@@ -99,7 +106,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/organizations/id/members/user_id/roles")
@@ -137,7 +143,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/members/user_id/roles")
@@ -159,7 +164,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/members/user_id/roles")
@@ -181,7 +185,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/members/user_id/roles")
@@ -203,7 +206,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/members/user_id/roles")
@@ -225,7 +227,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/organizations/id/members/user_id/roles")
@@ -266,7 +267,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/members/user_id/roles")
@@ -288,7 +288,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/members/user_id/roles")
@@ -310,7 +309,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/members/user_id/roles")
@@ -332,7 +330,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/organizations/id/members/user_id/roles")
diff --git a/src/management/tests/wire/prompts.test.ts b/src/management/tests/wire/prompts.test.ts
index 2d4ca004f7..e507373915 100644
--- a/src/management/tests/wire/prompts.test.ts
+++ b/src/management/tests/wire/prompts.test.ts
@@ -14,11 +14,14 @@ describe("PromptsClient", () => {
             identifier_first: true,
             webauthn_platform_first_factor: true,
         };
-
         server.mockEndpoint().get("/prompts").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.prompts.getSettings();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            universal_login_experience: "new",
+            identifier_first: true,
+            webauthn_platform_first_factor: true,
+        });
     });
 
     test("getSettings (2)", async () => {
@@ -26,7 +29,6 @@ describe("PromptsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/prompts").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -39,7 +41,6 @@ describe("PromptsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/prompts").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -52,7 +53,6 @@ describe("PromptsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/prompts").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -69,7 +69,6 @@ describe("PromptsClient", () => {
             identifier_first: true,
             webauthn_platform_first_factor: true,
         };
-
         server
             .mockEndpoint()
             .patch("/prompts")
@@ -80,7 +79,11 @@ describe("PromptsClient", () => {
             .build();
 
         const response = await client.prompts.updateSettings();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            universal_login_experience: "new",
+            identifier_first: true,
+            webauthn_platform_first_factor: true,
+        });
     });
 
     test("updateSettings (2)", async () => {
@@ -88,7 +91,6 @@ describe("PromptsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts")
@@ -108,7 +110,6 @@ describe("PromptsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts")
@@ -128,7 +129,6 @@ describe("PromptsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts")
@@ -148,7 +148,6 @@ describe("PromptsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts")
diff --git a/src/management/tests/wire/prompts/customText.test.ts b/src/management/tests/wire/prompts/customText.test.ts
index b48fdcb530..d2699e483d 100644
--- a/src/management/tests/wire/prompts/customText.test.ts
+++ b/src/management/tests/wire/prompts/customText.test.ts
@@ -10,7 +10,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/custom-text/am")
@@ -20,7 +19,9 @@ describe("CustomTextClient", () => {
             .build();
 
         const response = await client.prompts.customText.get("login", "am");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            key: "value",
+        });
     });
 
     test("get (2)", async () => {
@@ -28,7 +29,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/custom-text/am")
@@ -47,7 +47,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/custom-text/am")
@@ -66,7 +65,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/custom-text/am")
@@ -85,7 +83,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/custom-text/am")
@@ -104,7 +101,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/custom-text/am")
@@ -142,7 +138,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: { key: "value" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/prompts/login/custom-text/am")
@@ -166,7 +161,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: { key: "value" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/prompts/login/custom-text/am")
@@ -190,7 +184,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: { key: "value" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/prompts/login/custom-text/am")
@@ -214,7 +207,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: { key: "value" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/prompts/login/custom-text/am")
diff --git a/src/management/tests/wire/prompts/partials.test.ts b/src/management/tests/wire/prompts/partials.test.ts
index 1be881cb6b..abedaa440a 100644
--- a/src/management/tests/wire/prompts/partials.test.ts
+++ b/src/management/tests/wire/prompts/partials.test.ts
@@ -10,7 +10,6 @@ describe("PartialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/partials")
@@ -20,7 +19,9 @@ describe("PartialsClient", () => {
             .build();
 
         const response = await client.prompts.partials.get("login");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            key: "value",
+        });
     });
 
     test("get (2)", async () => {
@@ -28,7 +29,6 @@ describe("PartialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/partials")
@@ -47,7 +47,6 @@ describe("PartialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/partials")
@@ -66,7 +65,6 @@ describe("PartialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/partials")
@@ -85,7 +83,6 @@ describe("PartialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/partials")
@@ -104,7 +101,6 @@ describe("PartialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/partials")
@@ -142,7 +138,6 @@ describe("PartialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: { key: "value" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/prompts/login/partials")
@@ -166,7 +161,6 @@ describe("PartialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: { key: "value" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/prompts/login/partials")
@@ -190,7 +184,6 @@ describe("PartialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: { key: "value" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/prompts/login/partials")
@@ -214,7 +207,6 @@ describe("PartialsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: { key: "value" } };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/prompts/login/partials")
diff --git a/src/management/tests/wire/prompts/rendering.test.ts b/src/management/tests/wire/prompts/rendering.test.ts
index cf696f6e68..373015fe3b 100644
--- a/src/management/tests/wire/prompts/rendering.test.ts
+++ b/src/management/tests/wire/prompts/rendering.test.ts
@@ -26,7 +26,6 @@ describe("RenderingClient", () => {
             limit: 1.1,
             total: 1.1,
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/prompts/rendering")
@@ -35,7 +34,23 @@ describe("RenderingClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            configs: [
+                {
+                    tenant: "tenant",
+                    prompt: "prompt",
+                    screen: "screen",
+                    rendering_mode: "advanced",
+                    context_configuration: ["branding.settings"],
+                    default_head_tags_disabled: true,
+                    use_page_template: true,
+                    head_tags: [{}],
+                },
+            ],
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+        };
         const page = await client.prompts.rendering.list({
             fields: "fields",
             include_fields: true,
@@ -58,7 +73,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/prompts/rendering")
@@ -77,7 +91,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/prompts/rendering")
@@ -96,7 +109,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/prompts/rendering")
@@ -115,7 +127,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/prompts/rendering")
@@ -134,7 +145,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/prompts/rendering")
@@ -165,7 +175,6 @@ describe("RenderingClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint()
             .patch("/prompts/rendering")
@@ -183,7 +192,19 @@ describe("RenderingClient", () => {
                 },
             ],
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            configs: [
+                {
+                    prompt: "login",
+                    screen: "login",
+                    rendering_mode: "advanced",
+                    context_configuration: ["branding.settings"],
+                    default_head_tags_disabled: true,
+                    use_page_template: true,
+                    head_tags: [{}],
+                },
+            ],
+        });
     });
 
     test("bulkUpdate (2)", async () => {
@@ -196,7 +217,6 @@ describe("RenderingClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts/rendering")
@@ -232,7 +252,6 @@ describe("RenderingClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts/rendering")
@@ -268,7 +287,6 @@ describe("RenderingClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts/rendering")
@@ -304,7 +322,6 @@ describe("RenderingClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts/rendering")
@@ -340,7 +357,6 @@ describe("RenderingClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts/rendering")
@@ -386,7 +402,6 @@ describe("RenderingClient", () => {
                 domains: [{ id: "id" }],
             },
         };
-
         server
             .mockEndpoint()
             .get("/prompts/login/screen/login/rendering")
@@ -396,7 +411,42 @@ describe("RenderingClient", () => {
             .build();
 
         const response = await client.prompts.rendering.get("login", "login");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            tenant: "tenant",
+            prompt: "prompt",
+            screen: "screen",
+            rendering_mode: "advanced",
+            context_configuration: ["branding.settings"],
+            default_head_tags_disabled: true,
+            use_page_template: true,
+            head_tags: [
+                {
+                    tag: "tag",
+                    attributes: {
+                        key: "value",
+                    },
+                    content: "content",
+                },
+            ],
+            filters: {
+                match_type: "includes_any",
+                clients: [
+                    {
+                        id: "id",
+                    },
+                ],
+                organizations: [
+                    {
+                        id: "id",
+                    },
+                ],
+                domains: [
+                    {
+                        id: "id",
+                    },
+                ],
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -404,7 +454,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/screen/login/rendering")
@@ -423,7 +472,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/screen/login/rendering")
@@ -442,7 +490,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/screen/login/rendering")
@@ -461,7 +508,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/screen/login/rendering")
@@ -480,7 +526,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/screen/login/rendering")
@@ -499,7 +544,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/prompts/login/screen/login/rendering")
@@ -530,7 +574,6 @@ describe("RenderingClient", () => {
                 domains: [{ id: "id" }],
             },
         };
-
         server
             .mockEndpoint()
             .patch("/prompts/login/screen/login/rendering")
@@ -541,7 +584,39 @@ describe("RenderingClient", () => {
             .build();
 
         const response = await client.prompts.rendering.update("login", "login");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            rendering_mode: "advanced",
+            context_configuration: ["branding.settings"],
+            default_head_tags_disabled: true,
+            use_page_template: true,
+            head_tags: [
+                {
+                    tag: "tag",
+                    attributes: {
+                        key: "value",
+                    },
+                    content: "content",
+                },
+            ],
+            filters: {
+                match_type: "includes_any",
+                clients: [
+                    {
+                        id: "id",
+                    },
+                ],
+                organizations: [
+                    {
+                        id: "id",
+                    },
+                ],
+                domains: [
+                    {
+                        id: "id",
+                    },
+                ],
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -549,7 +624,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts/login/screen/login/rendering")
@@ -569,7 +643,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts/login/screen/login/rendering")
@@ -589,7 +662,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts/login/screen/login/rendering")
@@ -609,7 +681,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts/login/screen/login/rendering")
@@ -629,7 +700,6 @@ describe("RenderingClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/prompts/login/screen/login/rendering")
diff --git a/src/management/tests/wire/refreshTokens.test.ts b/src/management/tests/wire/refreshTokens.test.ts
index 5646b3008e..f829175cb2 100644
--- a/src/management/tests/wire/refreshTokens.test.ts
+++ b/src/management/tests/wire/refreshTokens.test.ts
@@ -27,7 +27,6 @@ describe("RefreshTokensClient", () => {
             ],
             next: "next",
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/refresh-tokens")
@@ -36,7 +35,26 @@ describe("RefreshTokensClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            refresh_tokens: [
+                {
+                    id: "id",
+                    user_id: "user_id",
+                    created_at: "2024-01-15T09:30:00Z",
+                    idle_expires_at: "2024-01-15T09:30:00Z",
+                    expires_at: "2024-01-15T09:30:00Z",
+                    client_id: "client_id",
+                    session_id: "session_id",
+                    rotating: true,
+                    resource_servers: [{}],
+                    refresh_token_metadata: {
+                        key: "value",
+                    },
+                    last_exchanged_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            next: "next",
+        };
         const page = await client.refreshTokens.list({
             user_id: "user_id",
             client_id: "client_id",
@@ -57,7 +75,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/refresh-tokens").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -72,7 +89,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/refresh-tokens").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -87,7 +103,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/refresh-tokens").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -102,7 +117,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/refresh-tokens").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -117,7 +131,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/refresh-tokens").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -152,11 +165,37 @@ describe("RefreshTokensClient", () => {
             refresh_token_metadata: { key: "value" },
             last_exchanged_at: "2024-01-15T09:30:00Z",
         };
-
         server.mockEndpoint().get("/refresh-tokens/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.refreshTokens.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            user_id: "user_id",
+            created_at: "2024-01-15T09:30:00Z",
+            idle_expires_at: "2024-01-15T09:30:00Z",
+            expires_at: "2024-01-15T09:30:00Z",
+            device: {
+                initial_ip: "initial_ip",
+                initial_asn: "initial_asn",
+                initial_user_agent: "initial_user_agent",
+                last_ip: "last_ip",
+                last_asn: "last_asn",
+                last_user_agent: "last_user_agent",
+            },
+            client_id: "client_id",
+            session_id: "session_id",
+            rotating: true,
+            resource_servers: [
+                {
+                    audience: "audience",
+                    scopes: "scopes",
+                },
+            ],
+            refresh_token_metadata: {
+                key: "value",
+            },
+            last_exchanged_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("get (2)", async () => {
@@ -164,7 +203,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/refresh-tokens/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -177,7 +215,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/refresh-tokens/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -190,7 +227,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/refresh-tokens/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -203,7 +239,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/refresh-tokens/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -226,7 +261,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/refresh-tokens/id")
@@ -245,7 +279,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/refresh-tokens/id")
@@ -264,7 +297,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/refresh-tokens/id")
@@ -283,7 +315,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/refresh-tokens/id")
@@ -322,7 +353,6 @@ describe("RefreshTokensClient", () => {
             refresh_token_metadata: { key: "value" },
             last_exchanged_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .patch("/refresh-tokens/id")
@@ -333,7 +363,34 @@ describe("RefreshTokensClient", () => {
             .build();
 
         const response = await client.refreshTokens.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            user_id: "user_id",
+            created_at: "2024-01-15T09:30:00Z",
+            idle_expires_at: "2024-01-15T09:30:00Z",
+            expires_at: "2024-01-15T09:30:00Z",
+            device: {
+                initial_ip: "initial_ip",
+                initial_asn: "initial_asn",
+                initial_user_agent: "initial_user_agent",
+                last_ip: "last_ip",
+                last_asn: "last_asn",
+                last_user_agent: "last_user_agent",
+            },
+            client_id: "client_id",
+            session_id: "session_id",
+            rotating: true,
+            resource_servers: [
+                {
+                    audience: "audience",
+                    scopes: "scopes",
+                },
+            ],
+            refresh_token_metadata: {
+                key: "value",
+            },
+            last_exchanged_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("update (2)", async () => {
@@ -341,7 +398,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/refresh-tokens/id")
@@ -361,7 +417,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/refresh-tokens/id")
@@ -381,7 +436,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/refresh-tokens/id")
@@ -401,7 +455,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/refresh-tokens/id")
@@ -421,7 +474,6 @@ describe("RefreshTokensClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/refresh-tokens/id")
diff --git a/src/management/tests/wire/resourceServers.test.ts b/src/management/tests/wire/resourceServers.test.ts
index f1195fc9f6..f3f7bba16f 100644
--- a/src/management/tests/wire/resourceServers.test.ts
+++ b/src/management/tests/wire/resourceServers.test.ts
@@ -39,7 +39,6 @@ describe("ResourceServersClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/resource-servers")
@@ -48,7 +47,46 @@ describe("ResourceServersClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            resource_servers: [
+                {
+                    id: "id",
+                    name: "name",
+                    is_system: true,
+                    identifier: "identifier",
+                    scopes: [
+                        {
+                            value: "value",
+                        },
+                    ],
+                    signing_alg: "HS256",
+                    signing_secret: "signing_secret",
+                    allow_offline_access: true,
+                    allow_online_access: true,
+                    skip_consent_for_verifiable_first_party_clients: true,
+                    token_lifetime: 1,
+                    token_lifetime_for_web: 1,
+                    enforce_policies: true,
+                    token_dialect: "access_token",
+                    token_encryption: {
+                        format: "compact-nested-jwe",
+                        encryption_key: {
+                            alg: "RSA-OAEP-256",
+                            pem: "pem",
+                        },
+                    },
+                    consent_policy: "transactional-authorization-with-mfa",
+                    proof_of_possession: {
+                        mechanism: "mtls",
+                        required: true,
+                    },
+                    client_id: "client_id",
+                },
+            ],
+        };
         const page = await client.resourceServers.list({
             page: 1,
             per_page: 1,
@@ -67,7 +105,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/resource-servers")
@@ -86,7 +123,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/resource-servers")
@@ -105,7 +141,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/resource-servers")
@@ -124,7 +159,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/resource-servers")
@@ -167,7 +201,6 @@ describe("ResourceServersClient", () => {
             subject_type_authorization: { user: { policy: "allow_all" }, client: { policy: "deny_all" } },
             client_id: "client_id",
         };
-
         server
             .mockEndpoint()
             .post("/resource-servers")
@@ -180,7 +213,56 @@ describe("ResourceServersClient", () => {
         const response = await client.resourceServers.create({
             identifier: "identifier",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            is_system: true,
+            identifier: "identifier",
+            scopes: [
+                {
+                    value: "value",
+                    description: "description",
+                },
+            ],
+            signing_alg: "HS256",
+            signing_secret: "signing_secret",
+            allow_offline_access: true,
+            allow_online_access: true,
+            skip_consent_for_verifiable_first_party_clients: true,
+            token_lifetime: 1,
+            token_lifetime_for_web: 1,
+            enforce_policies: true,
+            token_dialect: "access_token",
+            token_encryption: {
+                format: "compact-nested-jwe",
+                encryption_key: {
+                    name: "name",
+                    alg: "RSA-OAEP-256",
+                    kid: "kid",
+                    pem: "pem",
+                },
+            },
+            consent_policy: "transactional-authorization-with-mfa",
+            authorization_details: [
+                {
+                    key: "value",
+                },
+            ],
+            proof_of_possession: {
+                mechanism: "mtls",
+                required: true,
+                required_for: "public_clients",
+            },
+            subject_type_authorization: {
+                user: {
+                    policy: "allow_all",
+                },
+                client: {
+                    policy: "deny_all",
+                },
+            },
+            client_id: "client_id",
+        });
     });
 
     test("create (2)", async () => {
@@ -188,7 +270,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { identifier: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/resource-servers")
@@ -210,7 +291,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { identifier: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/resource-servers")
@@ -232,7 +312,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { identifier: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/resource-servers")
@@ -254,7 +333,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { identifier: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/resource-servers")
@@ -276,7 +354,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { identifier: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/resource-servers")
@@ -322,7 +399,6 @@ describe("ResourceServersClient", () => {
             subject_type_authorization: { user: { policy: "allow_all" }, client: { policy: "deny_all" } },
             client_id: "client_id",
         };
-
         server
             .mockEndpoint()
             .get("/resource-servers/id")
@@ -334,7 +410,56 @@ describe("ResourceServersClient", () => {
         const response = await client.resourceServers.get("id", {
             include_fields: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            is_system: true,
+            identifier: "identifier",
+            scopes: [
+                {
+                    value: "value",
+                    description: "description",
+                },
+            ],
+            signing_alg: "HS256",
+            signing_secret: "signing_secret",
+            allow_offline_access: true,
+            allow_online_access: true,
+            skip_consent_for_verifiable_first_party_clients: true,
+            token_lifetime: 1,
+            token_lifetime_for_web: 1,
+            enforce_policies: true,
+            token_dialect: "access_token",
+            token_encryption: {
+                format: "compact-nested-jwe",
+                encryption_key: {
+                    name: "name",
+                    alg: "RSA-OAEP-256",
+                    kid: "kid",
+                    pem: "pem",
+                },
+            },
+            consent_policy: "transactional-authorization-with-mfa",
+            authorization_details: [
+                {
+                    key: "value",
+                },
+            ],
+            proof_of_possession: {
+                mechanism: "mtls",
+                required: true,
+                required_for: "public_clients",
+            },
+            subject_type_authorization: {
+                user: {
+                    policy: "allow_all",
+                },
+                client: {
+                    policy: "deny_all",
+                },
+            },
+            client_id: "client_id",
+        });
     });
 
     test("get (2)", async () => {
@@ -342,7 +467,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/resource-servers/id")
@@ -361,7 +485,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/resource-servers/id")
@@ -380,7 +503,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/resource-servers/id")
@@ -399,7 +521,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/resource-servers/id")
@@ -418,7 +539,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/resource-servers/id")
@@ -447,7 +567,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/resource-servers/id")
@@ -466,7 +585,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/resource-servers/id")
@@ -485,7 +603,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/resource-servers/id")
@@ -504,7 +621,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/resource-servers/id")
@@ -547,7 +663,6 @@ describe("ResourceServersClient", () => {
             subject_type_authorization: { user: { policy: "allow_all" }, client: { policy: "deny_all" } },
             client_id: "client_id",
         };
-
         server
             .mockEndpoint()
             .patch("/resource-servers/id")
@@ -558,7 +673,56 @@ describe("ResourceServersClient", () => {
             .build();
 
         const response = await client.resourceServers.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            is_system: true,
+            identifier: "identifier",
+            scopes: [
+                {
+                    value: "value",
+                    description: "description",
+                },
+            ],
+            signing_alg: "HS256",
+            signing_secret: "signing_secret",
+            allow_offline_access: true,
+            allow_online_access: true,
+            skip_consent_for_verifiable_first_party_clients: true,
+            token_lifetime: 1,
+            token_lifetime_for_web: 1,
+            enforce_policies: true,
+            token_dialect: "access_token",
+            token_encryption: {
+                format: "compact-nested-jwe",
+                encryption_key: {
+                    name: "name",
+                    alg: "RSA-OAEP-256",
+                    kid: "kid",
+                    pem: "pem",
+                },
+            },
+            consent_policy: "transactional-authorization-with-mfa",
+            authorization_details: [
+                {
+                    key: "value",
+                },
+            ],
+            proof_of_possession: {
+                mechanism: "mtls",
+                required: true,
+                required_for: "public_clients",
+            },
+            subject_type_authorization: {
+                user: {
+                    policy: "allow_all",
+                },
+                client: {
+                    policy: "deny_all",
+                },
+            },
+            client_id: "client_id",
+        });
     });
 
     test("update (2)", async () => {
@@ -566,7 +730,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/resource-servers/id")
@@ -586,7 +749,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/resource-servers/id")
@@ -606,7 +768,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/resource-servers/id")
@@ -626,7 +787,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/resource-servers/id")
@@ -646,7 +806,6 @@ describe("ResourceServersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/resource-servers/id")
diff --git a/src/management/tests/wire/riskAssessments/settings.test.ts b/src/management/tests/wire/riskAssessments/settings.test.ts
index 25a02b1675..14973df950 100644
--- a/src/management/tests/wire/riskAssessments/settings.test.ts
+++ b/src/management/tests/wire/riskAssessments/settings.test.ts
@@ -10,7 +10,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { enabled: true };
-
         server
             .mockEndpoint()
             .get("/risk-assessments/settings")
@@ -20,7 +19,9 @@ describe("SettingsClient", () => {
             .build();
 
         const response = await client.riskAssessments.settings.get();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enabled: true,
+        });
     });
 
     test("get (2)", async () => {
@@ -28,7 +29,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/risk-assessments/settings")
@@ -47,7 +47,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/risk-assessments/settings")
@@ -66,7 +65,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/risk-assessments/settings")
@@ -85,7 +83,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/risk-assessments/settings")
@@ -104,7 +101,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { enabled: true };
         const rawResponseBody = { enabled: true };
-
         server
             .mockEndpoint()
             .patch("/risk-assessments/settings")
@@ -117,7 +113,9 @@ describe("SettingsClient", () => {
         const response = await client.riskAssessments.settings.update({
             enabled: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            enabled: true,
+        });
     });
 
     test("update (2)", async () => {
@@ -125,7 +123,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { enabled: true };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/risk-assessments/settings")
@@ -147,7 +144,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { enabled: true };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/risk-assessments/settings")
@@ -169,7 +165,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { enabled: true };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/risk-assessments/settings")
@@ -191,7 +186,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { enabled: true };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/risk-assessments/settings")
@@ -213,7 +207,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { enabled: true };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/risk-assessments/settings")
diff --git a/src/management/tests/wire/riskAssessments/settings/newDevice.test.ts b/src/management/tests/wire/riskAssessments/settings/newDevice.test.ts
index bd15676491..23accd8c6b 100644
--- a/src/management/tests/wire/riskAssessments/settings/newDevice.test.ts
+++ b/src/management/tests/wire/riskAssessments/settings/newDevice.test.ts
@@ -10,7 +10,6 @@ describe("NewDeviceClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { remember_for: 1 };
-
         server
             .mockEndpoint()
             .get("/risk-assessments/settings/new-device")
@@ -20,7 +19,9 @@ describe("NewDeviceClient", () => {
             .build();
 
         const response = await client.riskAssessments.settings.newDevice.get();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            remember_for: 1,
+        });
     });
 
     test("get (2)", async () => {
@@ -28,7 +29,6 @@ describe("NewDeviceClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/risk-assessments/settings/new-device")
@@ -47,7 +47,6 @@ describe("NewDeviceClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/risk-assessments/settings/new-device")
@@ -66,7 +65,6 @@ describe("NewDeviceClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/risk-assessments/settings/new-device")
@@ -85,7 +83,6 @@ describe("NewDeviceClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/risk-assessments/settings/new-device")
@@ -104,7 +101,6 @@ describe("NewDeviceClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { remember_for: 1 };
         const rawResponseBody = { remember_for: 1 };
-
         server
             .mockEndpoint()
             .patch("/risk-assessments/settings/new-device")
@@ -117,7 +113,9 @@ describe("NewDeviceClient", () => {
         const response = await client.riskAssessments.settings.newDevice.update({
             remember_for: 1,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            remember_for: 1,
+        });
     });
 
     test("update (2)", async () => {
@@ -125,7 +123,6 @@ describe("NewDeviceClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { remember_for: 365 };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/risk-assessments/settings/new-device")
@@ -147,7 +144,6 @@ describe("NewDeviceClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { remember_for: 365 };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/risk-assessments/settings/new-device")
@@ -169,7 +165,6 @@ describe("NewDeviceClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { remember_for: 365 };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/risk-assessments/settings/new-device")
@@ -191,7 +186,6 @@ describe("NewDeviceClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { remember_for: 365 };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/risk-assessments/settings/new-device")
@@ -213,7 +207,6 @@ describe("NewDeviceClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { remember_for: 365 };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/risk-assessments/settings/new-device")
diff --git a/src/management/tests/wire/roles.test.ts b/src/management/tests/wire/roles.test.ts
index b4308f2a0d..c12613a123 100644
--- a/src/management/tests/wire/roles.test.ts
+++ b/src/management/tests/wire/roles.test.ts
@@ -15,7 +15,6 @@ describe("RolesClient", () => {
             total: 1.1,
             roles: [{ id: "id", name: "name", description: "description" }],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/roles")
@@ -24,7 +23,18 @@ describe("RolesClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            roles: [
+                {
+                    id: "id",
+                    name: "name",
+                    description: "description",
+                },
+            ],
+        };
         const page = await client.roles.list({
             per_page: 1,
             page: 1,
@@ -43,7 +53,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/roles")
@@ -62,7 +71,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/roles")
@@ -81,7 +89,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/roles")
@@ -100,7 +107,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/roles")
@@ -119,7 +125,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name" };
         const rawResponseBody = { id: "id", name: "name", description: "description" };
-
         server
             .mockEndpoint()
             .post("/roles")
@@ -132,7 +137,11 @@ describe("RolesClient", () => {
         const response = await client.roles.create({
             name: "name",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            description: "description",
+        });
     });
 
     test("create (2)", async () => {
@@ -140,7 +149,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles")
@@ -162,7 +170,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles")
@@ -184,7 +191,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles")
@@ -206,7 +212,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles")
@@ -228,7 +233,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles")
@@ -250,11 +254,14 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { id: "id", name: "name", description: "description" };
-
         server.mockEndpoint().get("/roles/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.roles.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            description: "description",
+        });
     });
 
     test("get (2)", async () => {
@@ -262,7 +269,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/roles/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -275,7 +281,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/roles/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -288,7 +293,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/roles/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -301,7 +305,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/roles/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -314,7 +317,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/roles/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -337,7 +339,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/roles/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -350,7 +351,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/roles/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -363,7 +363,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/roles/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -376,7 +375,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/roles/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -389,7 +387,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/roles/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -402,7 +399,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { id: "id", name: "name", description: "description" };
-
         server
             .mockEndpoint()
             .patch("/roles/id")
@@ -413,7 +409,11 @@ describe("RolesClient", () => {
             .build();
 
         const response = await client.roles.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            description: "description",
+        });
     });
 
     test("update (2)", async () => {
@@ -421,7 +421,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/roles/id")
@@ -441,7 +440,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/roles/id")
@@ -461,7 +459,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/roles/id")
@@ -481,7 +478,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/roles/id")
diff --git a/src/management/tests/wire/roles/permissions.test.ts b/src/management/tests/wire/roles/permissions.test.ts
index c8db76a437..ec56f5cbc2 100644
--- a/src/management/tests/wire/roles/permissions.test.ts
+++ b/src/management/tests/wire/roles/permissions.test.ts
@@ -22,7 +22,6 @@ describe("PermissionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/roles/id/permissions")
@@ -31,7 +30,19 @@ describe("PermissionsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            permissions: [
+                {
+                    resource_server_identifier: "resource_server_identifier",
+                    permission_name: "permission_name",
+                    resource_server_name: "resource_server_name",
+                    description: "description",
+                },
+            ],
+        };
         const page = await client.roles.permissions.list("id", {
             per_page: 1,
             page: 1,
@@ -49,7 +60,6 @@ describe("PermissionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/roles/id/permissions")
@@ -68,7 +78,6 @@ describe("PermissionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/roles/id/permissions")
@@ -87,7 +96,6 @@ describe("PermissionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/roles/id/permissions")
@@ -106,7 +114,6 @@ describe("PermissionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/roles/id/permissions")
@@ -125,7 +132,6 @@ describe("PermissionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/roles/id/permissions")
@@ -177,7 +183,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles/id/permissions")
@@ -213,7 +218,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles/id/permissions")
@@ -249,7 +253,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles/id/permissions")
@@ -285,7 +288,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles/id/permissions")
@@ -349,7 +351,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/roles/id/permissions")
@@ -385,7 +386,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/roles/id/permissions")
@@ -421,7 +421,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/roles/id/permissions")
@@ -457,7 +456,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/roles/id/permissions")
diff --git a/src/management/tests/wire/roles/users.test.ts b/src/management/tests/wire/roles/users.test.ts
index f5bbc1e076..4e185627b5 100644
--- a/src/management/tests/wire/roles/users.test.ts
+++ b/src/management/tests/wire/roles/users.test.ts
@@ -13,7 +13,6 @@ describe("UsersClient", () => {
             next: "next",
             users: [{ user_id: "user_id", picture: "picture", name: "name", email: "email" }],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/roles/id/users")
@@ -22,7 +21,17 @@ describe("UsersClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            next: "next",
+            users: [
+                {
+                    user_id: "user_id",
+                    picture: "picture",
+                    name: "name",
+                    email: "email",
+                },
+            ],
+        };
         const page = await client.roles.users.list("id", {
             from: "from",
             take: 1,
@@ -39,7 +48,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/roles/id/users").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -52,7 +60,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/roles/id/users").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -65,7 +72,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/roles/id/users").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -78,7 +84,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/roles/id/users").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -91,7 +96,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/roles/id/users").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -117,7 +121,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { users: ["users", "users"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles/id/users")
@@ -139,7 +142,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { users: ["users", "users"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles/id/users")
@@ -161,7 +163,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { users: ["users", "users"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles/id/users")
@@ -183,7 +184,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { users: ["users", "users"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles/id/users")
@@ -205,7 +205,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { users: ["users", "users"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/roles/id/users")
diff --git a/src/management/tests/wire/rules.test.ts b/src/management/tests/wire/rules.test.ts
index 9f5566b5ce..e88ab1893d 100644
--- a/src/management/tests/wire/rules.test.ts
+++ b/src/management/tests/wire/rules.test.ts
@@ -15,7 +15,6 @@ describe("RulesClient", () => {
             total: 1.1,
             rules: [{ name: "name", id: "id", enabled: true, script: "script", order: 1.1, stage: "stage" }],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/rules")
@@ -24,7 +23,21 @@ describe("RulesClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            rules: [
+                {
+                    name: "name",
+                    id: "id",
+                    enabled: true,
+                    script: "script",
+                    order: 1.1,
+                    stage: "stage",
+                },
+            ],
+        };
         const page = await client.rules.list({
             page: 1,
             per_page: 1,
@@ -45,7 +58,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/rules")
@@ -64,7 +76,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/rules")
@@ -83,7 +94,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/rules")
@@ -102,7 +112,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/rules")
@@ -121,7 +130,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/rules")
@@ -140,7 +148,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "name", script: "script" };
         const rawResponseBody = { name: "name", id: "id", enabled: true, script: "script", order: 1.1, stage: "stage" };
-
         server
             .mockEndpoint()
             .post("/rules")
@@ -154,7 +161,14 @@ describe("RulesClient", () => {
             name: "name",
             script: "script",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            name: "name",
+            id: "id",
+            enabled: true,
+            script: "script",
+            order: 1.1,
+            stage: "stage",
+        });
     });
 
     test("create (2)", async () => {
@@ -165,7 +179,6 @@ describe("RulesClient", () => {
             script: "function (user, context, callback) {\n  callback(null, user, context);\n}",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/rules")
@@ -191,7 +204,6 @@ describe("RulesClient", () => {
             script: "function (user, context, callback) {\n  callback(null, user, context);\n}",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/rules")
@@ -217,7 +229,6 @@ describe("RulesClient", () => {
             script: "function (user, context, callback) {\n  callback(null, user, context);\n}",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/rules")
@@ -243,7 +254,6 @@ describe("RulesClient", () => {
             script: "function (user, context, callback) {\n  callback(null, user, context);\n}",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/rules")
@@ -269,7 +279,6 @@ describe("RulesClient", () => {
             script: "function (user, context, callback) {\n  callback(null, user, context);\n}",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/rules")
@@ -292,14 +301,20 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { name: "name", id: "id", enabled: true, script: "script", order: 1.1, stage: "stage" };
-
         server.mockEndpoint().get("/rules/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.rules.get("id", {
             fields: "fields",
             include_fields: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            name: "name",
+            id: "id",
+            enabled: true,
+            script: "script",
+            order: 1.1,
+            stage: "stage",
+        });
     });
 
     test("get (2)", async () => {
@@ -307,7 +322,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/rules/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -320,7 +334,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/rules/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -333,7 +346,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/rules/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -346,7 +358,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/rules/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -359,7 +370,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/rules/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -382,7 +392,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/rules/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -395,7 +404,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/rules/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -408,7 +416,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/rules/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -421,7 +428,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/rules/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -434,7 +440,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { name: "name", id: "id", enabled: true, script: "script", order: 1.1, stage: "stage" };
-
         server
             .mockEndpoint()
             .patch("/rules/id")
@@ -445,7 +450,14 @@ describe("RulesClient", () => {
             .build();
 
         const response = await client.rules.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            name: "name",
+            id: "id",
+            enabled: true,
+            script: "script",
+            order: 1.1,
+            stage: "stage",
+        });
     });
 
     test("update (2)", async () => {
@@ -453,7 +465,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/rules/id")
@@ -473,7 +484,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/rules/id")
@@ -493,7 +503,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/rules/id")
@@ -513,7 +522,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/rules/id")
@@ -533,7 +541,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/rules/id")
@@ -553,7 +560,6 @@ describe("RulesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/rules/id")
diff --git a/src/management/tests/wire/rulesConfigs.test.ts b/src/management/tests/wire/rulesConfigs.test.ts
index 9ba35044b3..e458da646b 100644
--- a/src/management/tests/wire/rulesConfigs.test.ts
+++ b/src/management/tests/wire/rulesConfigs.test.ts
@@ -10,11 +10,14 @@ describe("RulesConfigsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = [{ key: "key" }];
-
         server.mockEndpoint().get("/rules-configs").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.rulesConfigs.list();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                key: "key",
+            },
+        ]);
     });
 
     test("list (2)", async () => {
@@ -22,7 +25,6 @@ describe("RulesConfigsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/rules-configs").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -35,7 +37,6 @@ describe("RulesConfigsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/rules-configs").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -48,7 +49,6 @@ describe("RulesConfigsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/rules-configs").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -61,7 +61,6 @@ describe("RulesConfigsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { value: "value" };
         const rawResponseBody = { key: "key", value: "value" };
-
         server
             .mockEndpoint()
             .put("/rules-configs/key")
@@ -74,7 +73,10 @@ describe("RulesConfigsClient", () => {
         const response = await client.rulesConfigs.set("key", {
             value: "value",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            key: "key",
+            value: "value",
+        });
     });
 
     test("set (2)", async () => {
@@ -82,7 +84,6 @@ describe("RulesConfigsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { value: "MY_RULES_CONFIG_VALUE" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/rules-configs/key")
@@ -104,7 +105,6 @@ describe("RulesConfigsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { value: "MY_RULES_CONFIG_VALUE" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/rules-configs/key")
@@ -126,7 +126,6 @@ describe("RulesConfigsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { value: "MY_RULES_CONFIG_VALUE" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/rules-configs/key")
@@ -158,7 +157,6 @@ describe("RulesConfigsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/rules-configs/key")
@@ -177,7 +175,6 @@ describe("RulesConfigsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/rules-configs/key")
@@ -196,7 +193,6 @@ describe("RulesConfigsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/rules-configs/key")
diff --git a/src/management/tests/wire/selfServiceProfiles.test.ts b/src/management/tests/wire/selfServiceProfiles.test.ts
index a710702b6c..94678784be 100644
--- a/src/management/tests/wire/selfServiceProfiles.test.ts
+++ b/src/management/tests/wire/selfServiceProfiles.test.ts
@@ -26,7 +26,6 @@ describe("SelfServiceProfilesClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/self-service-profiles")
@@ -35,7 +34,29 @@ describe("SelfServiceProfilesClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            self_service_profiles: [
+                {
+                    id: "id",
+                    name: "name",
+                    description: "description",
+                    user_attributes: [
+                        {
+                            name: "name",
+                            description: "description",
+                            is_optional: true,
+                        },
+                    ],
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                    allowed_strategies: ["oidc"],
+                    user_attribute_profile_id: "user_attribute_profile_id",
+                },
+            ],
+        };
         const page = await client.selfServiceProfiles.list({
             page: 1,
             per_page: 1,
@@ -53,7 +74,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/self-service-profiles")
@@ -72,7 +92,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/self-service-profiles")
@@ -91,7 +110,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/self-service-profiles")
@@ -110,7 +128,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/self-service-profiles")
@@ -139,7 +156,6 @@ describe("SelfServiceProfilesClient", () => {
             allowed_strategies: ["oidc"],
             user_attribute_profile_id: "user_attribute_profile_id",
         };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles")
@@ -152,7 +168,28 @@ describe("SelfServiceProfilesClient", () => {
         const response = await client.selfServiceProfiles.create({
             name: "name",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            description: "description",
+            user_attributes: [
+                {
+                    name: "name",
+                    description: "description",
+                    is_optional: true,
+                },
+            ],
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            branding: {
+                logo_url: "logo_url",
+                colors: {
+                    primary: "primary",
+                },
+            },
+            allowed_strategies: ["oidc"],
+            user_attribute_profile_id: "user_attribute_profile_id",
+        });
     });
 
     test("create (2)", async () => {
@@ -160,7 +197,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles")
@@ -182,7 +218,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles")
@@ -204,7 +239,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles")
@@ -226,7 +260,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles")
@@ -248,7 +281,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles")
@@ -270,7 +302,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { name: "x" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles")
@@ -302,7 +333,6 @@ describe("SelfServiceProfilesClient", () => {
             allowed_strategies: ["oidc"],
             user_attribute_profile_id: "user_attribute_profile_id",
         };
-
         server
             .mockEndpoint()
             .get("/self-service-profiles/id")
@@ -312,7 +342,28 @@ describe("SelfServiceProfilesClient", () => {
             .build();
 
         const response = await client.selfServiceProfiles.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            description: "description",
+            user_attributes: [
+                {
+                    name: "name",
+                    description: "description",
+                    is_optional: true,
+                },
+            ],
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            branding: {
+                logo_url: "logo_url",
+                colors: {
+                    primary: "primary",
+                },
+            },
+            allowed_strategies: ["oidc"],
+            user_attribute_profile_id: "user_attribute_profile_id",
+        });
     });
 
     test("get (2)", async () => {
@@ -320,7 +371,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/self-service-profiles/id")
@@ -339,7 +389,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/self-service-profiles/id")
@@ -358,7 +407,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/self-service-profiles/id")
@@ -377,7 +425,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/self-service-profiles/id")
@@ -396,7 +443,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/self-service-profiles/id")
@@ -415,7 +461,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/self-service-profiles/id")
@@ -444,7 +489,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/self-service-profiles/id")
@@ -463,7 +507,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/self-service-profiles/id")
@@ -482,7 +525,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/self-service-profiles/id")
@@ -501,7 +543,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/self-service-profiles/id")
@@ -520,7 +561,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/self-service-profiles/id")
@@ -549,7 +589,6 @@ describe("SelfServiceProfilesClient", () => {
             allowed_strategies: ["oidc"],
             user_attribute_profile_id: "user_attribute_profile_id",
         };
-
         server
             .mockEndpoint()
             .patch("/self-service-profiles/id")
@@ -560,7 +599,28 @@ describe("SelfServiceProfilesClient", () => {
             .build();
 
         const response = await client.selfServiceProfiles.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            description: "description",
+            user_attributes: [
+                {
+                    name: "name",
+                    description: "description",
+                    is_optional: true,
+                },
+            ],
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            branding: {
+                logo_url: "logo_url",
+                colors: {
+                    primary: "primary",
+                },
+            },
+            allowed_strategies: ["oidc"],
+            user_attribute_profile_id: "user_attribute_profile_id",
+        });
     });
 
     test("update (2)", async () => {
@@ -568,7 +628,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/self-service-profiles/id")
@@ -588,7 +647,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/self-service-profiles/id")
@@ -608,7 +666,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/self-service-profiles/id")
@@ -628,7 +685,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/self-service-profiles/id")
@@ -648,7 +704,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/self-service-profiles/id")
@@ -668,7 +723,6 @@ describe("SelfServiceProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/self-service-profiles/id")
diff --git a/src/management/tests/wire/selfServiceProfiles/customText.test.ts b/src/management/tests/wire/selfServiceProfiles/customText.test.ts
index b4bd02b10b..11f35683f8 100644
--- a/src/management/tests/wire/selfServiceProfiles/customText.test.ts
+++ b/src/management/tests/wire/selfServiceProfiles/customText.test.ts
@@ -10,7 +10,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/self-service-profiles/id/custom-text/en/get-started")
@@ -20,7 +19,9 @@ describe("CustomTextClient", () => {
             .build();
 
         const response = await client.selfServiceProfiles.customText.list("id", "en", "get-started");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            key: "value",
+        });
     });
 
     test("list (2)", async () => {
@@ -28,7 +29,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/self-service-profiles/id/custom-text/en/get-started")
@@ -47,7 +47,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/self-service-profiles/id/custom-text/en/get-started")
@@ -66,7 +65,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/self-service-profiles/id/custom-text/en/get-started")
@@ -85,7 +83,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/self-service-profiles/id/custom-text/en/get-started")
@@ -104,7 +101,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { key: "value" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/self-service-profiles/id/custom-text/en/get-started")
@@ -117,7 +113,9 @@ describe("CustomTextClient", () => {
         const response = await client.selfServiceProfiles.customText.set("id", "en", "get-started", {
             key: "value",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            key: "value",
+        });
     });
 
     test("set (2)", async () => {
@@ -125,7 +123,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/self-service-profiles/id/custom-text/en/get-started")
@@ -147,7 +144,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/self-service-profiles/id/custom-text/en/get-started")
@@ -169,7 +165,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/self-service-profiles/id/custom-text/en/get-started")
@@ -191,7 +186,6 @@ describe("CustomTextClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { string: "string" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/self-service-profiles/id/custom-text/en/get-started")
diff --git a/src/management/tests/wire/selfServiceProfiles/ssoTicket.test.ts b/src/management/tests/wire/selfServiceProfiles/ssoTicket.test.ts
index 05a9d04224..dcdb912163 100644
--- a/src/management/tests/wire/selfServiceProfiles/ssoTicket.test.ts
+++ b/src/management/tests/wire/selfServiceProfiles/ssoTicket.test.ts
@@ -10,7 +10,6 @@ describe("SsoTicketClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { ticket: "ticket" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles/id/sso-ticket")
@@ -21,7 +20,9 @@ describe("SsoTicketClient", () => {
             .build();
 
         const response = await client.selfServiceProfiles.ssoTicket.create("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            ticket: "ticket",
+        });
     });
 
     test("create (2)", async () => {
@@ -29,7 +30,6 @@ describe("SsoTicketClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles/id/sso-ticket")
@@ -49,7 +49,6 @@ describe("SsoTicketClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles/id/sso-ticket")
@@ -69,7 +68,6 @@ describe("SsoTicketClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles/id/sso-ticket")
@@ -89,7 +87,6 @@ describe("SsoTicketClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles/id/sso-ticket")
@@ -124,7 +121,6 @@ describe("SsoTicketClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles/profileId/sso-ticket/id/revoke")
@@ -143,7 +139,6 @@ describe("SsoTicketClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles/profileId/sso-ticket/id/revoke")
@@ -162,7 +157,6 @@ describe("SsoTicketClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/self-service-profiles/profileId/sso-ticket/id/revoke")
diff --git a/src/management/tests/wire/sessions.test.ts b/src/management/tests/wire/sessions.test.ts
index 4bc976b9bb..124f0a5886 100644
--- a/src/management/tests/wire/sessions.test.ts
+++ b/src/management/tests/wire/sessions.test.ts
@@ -31,11 +31,41 @@ describe("SessionsClient", () => {
             cookie: { mode: "non-persistent" },
             session_metadata: { key: "value" },
         };
-
         server.mockEndpoint().get("/sessions/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.sessions.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            user_id: "user_id",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            authenticated_at: "2024-01-15T09:30:00Z",
+            idle_expires_at: "2024-01-15T09:30:00Z",
+            expires_at: "2024-01-15T09:30:00Z",
+            last_interacted_at: "2024-01-15T09:30:00Z",
+            device: {
+                initial_user_agent: "initial_user_agent",
+                initial_ip: "initial_ip",
+                initial_asn: "initial_asn",
+                last_user_agent: "last_user_agent",
+                last_ip: "last_ip",
+                last_asn: "last_asn",
+            },
+            clients: [
+                {
+                    client_id: "client_id",
+                },
+            ],
+            authentication: {
+                methods: [{}],
+            },
+            cookie: {
+                mode: "non-persistent",
+            },
+            session_metadata: {
+                key: "value",
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -43,7 +73,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/sessions/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -56,7 +85,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/sessions/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -69,7 +97,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/sessions/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -82,7 +109,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/sessions/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -105,7 +131,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/sessions/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -118,7 +143,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/sessions/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -131,7 +155,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/sessions/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -144,7 +167,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/sessions/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -178,7 +200,6 @@ describe("SessionsClient", () => {
             cookie: { mode: "non-persistent" },
             session_metadata: { key: "value" },
         };
-
         server
             .mockEndpoint()
             .patch("/sessions/id")
@@ -189,7 +210,38 @@ describe("SessionsClient", () => {
             .build();
 
         const response = await client.sessions.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            user_id: "user_id",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+            authenticated_at: "2024-01-15T09:30:00Z",
+            idle_expires_at: "2024-01-15T09:30:00Z",
+            expires_at: "2024-01-15T09:30:00Z",
+            last_interacted_at: "2024-01-15T09:30:00Z",
+            device: {
+                initial_user_agent: "initial_user_agent",
+                initial_ip: "initial_ip",
+                initial_asn: "initial_asn",
+                last_user_agent: "last_user_agent",
+                last_ip: "last_ip",
+                last_asn: "last_asn",
+            },
+            clients: [
+                {
+                    client_id: "client_id",
+                },
+            ],
+            authentication: {
+                methods: [{}],
+            },
+            cookie: {
+                mode: "non-persistent",
+            },
+            session_metadata: {
+                key: "value",
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -197,7 +249,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/sessions/id")
@@ -217,7 +268,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/sessions/id")
@@ -237,7 +287,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/sessions/id")
@@ -257,7 +306,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/sessions/id")
@@ -277,7 +325,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/sessions/id")
@@ -307,7 +354,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/sessions/id/revoke")
@@ -326,7 +372,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/sessions/id/revoke")
@@ -345,7 +390,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/sessions/id/revoke")
@@ -364,7 +408,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/sessions/id/revoke")
@@ -383,7 +426,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/sessions/id/revoke")
diff --git a/src/management/tests/wire/stats.test.ts b/src/management/tests/wire/stats.test.ts
index 4a59a4da34..aa85086410 100644
--- a/src/management/tests/wire/stats.test.ts
+++ b/src/management/tests/wire/stats.test.ts
@@ -10,7 +10,6 @@ describe("StatsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = 1.1;
-
         server
             .mockEndpoint()
             .get("/stats/active-users")
@@ -20,7 +19,7 @@ describe("StatsClient", () => {
             .build();
 
         const response = await client.stats.getActiveUsersCount();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual(1.1);
     });
 
     test("getActiveUsersCount (2)", async () => {
@@ -28,7 +27,6 @@ describe("StatsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/stats/active-users")
@@ -47,7 +45,6 @@ describe("StatsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/stats/active-users")
@@ -66,7 +63,6 @@ describe("StatsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/stats/active-users")
@@ -94,14 +90,22 @@ describe("StatsClient", () => {
                 created_at: "created_at",
             },
         ];
-
         server.mockEndpoint().get("/stats/daily").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.stats.getDaily({
             from: "from",
             to: "to",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                date: "date",
+                logins: 1,
+                signups: 1,
+                leaked_passwords: 1,
+                updated_at: "updated_at",
+                created_at: "created_at",
+            },
+        ]);
     });
 
     test("getDaily (2)", async () => {
@@ -109,7 +113,6 @@ describe("StatsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/stats/daily").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -122,7 +125,6 @@ describe("StatsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/stats/daily").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -135,7 +137,6 @@ describe("StatsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/stats/daily").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -148,7 +149,6 @@ describe("StatsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/stats/daily").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
diff --git a/src/management/tests/wire/supplementalSignals.test.ts b/src/management/tests/wire/supplementalSignals.test.ts
index 26f8b0893d..3c3ca1ec99 100644
--- a/src/management/tests/wire/supplementalSignals.test.ts
+++ b/src/management/tests/wire/supplementalSignals.test.ts
@@ -10,7 +10,6 @@ describe("SupplementalSignalsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { akamai_enabled: true };
-
         server
             .mockEndpoint()
             .get("/supplemental-signals")
@@ -20,7 +19,9 @@ describe("SupplementalSignalsClient", () => {
             .build();
 
         const response = await client.supplementalSignals.get();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            akamai_enabled: true,
+        });
     });
 
     test("get (2)", async () => {
@@ -28,7 +29,6 @@ describe("SupplementalSignalsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/supplemental-signals")
@@ -47,7 +47,6 @@ describe("SupplementalSignalsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/supplemental-signals")
@@ -66,7 +65,6 @@ describe("SupplementalSignalsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/supplemental-signals")
@@ -85,7 +83,6 @@ describe("SupplementalSignalsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/supplemental-signals")
@@ -104,7 +101,6 @@ describe("SupplementalSignalsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { akamai_enabled: true };
         const rawResponseBody = { akamai_enabled: true };
-
         server
             .mockEndpoint()
             .patch("/supplemental-signals")
@@ -117,7 +113,9 @@ describe("SupplementalSignalsClient", () => {
         const response = await client.supplementalSignals.patch({
             akamai_enabled: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            akamai_enabled: true,
+        });
     });
 
     test("patch (2)", async () => {
@@ -125,7 +123,6 @@ describe("SupplementalSignalsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { akamai_enabled: true };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/supplemental-signals")
@@ -147,7 +144,6 @@ describe("SupplementalSignalsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { akamai_enabled: true };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/supplemental-signals")
@@ -169,7 +165,6 @@ describe("SupplementalSignalsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { akamai_enabled: true };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/supplemental-signals")
@@ -191,7 +186,6 @@ describe("SupplementalSignalsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { akamai_enabled: true };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/supplemental-signals")
diff --git a/src/management/tests/wire/tenants/settings.test.ts b/src/management/tests/wire/tenants/settings.test.ts
index cbb568d6ec..3d26dd4216 100644
--- a/src/management/tests/wire/tenants/settings.test.ts
+++ b/src/management/tests/wire/tenants/settings.test.ts
@@ -76,14 +76,107 @@ describe("SettingsClient", () => {
             phone_consolidated_experience: true,
             enable_ai_guide: true,
         };
-
         server.mockEndpoint().get("/tenants/settings").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.tenants.settings.get({
             fields: "fields",
             include_fields: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            change_password: {
+                enabled: true,
+                html: "html",
+            },
+            guardian_mfa_page: {
+                enabled: true,
+                html: "html",
+            },
+            default_audience: "default_audience",
+            default_directory: "default_directory",
+            error_page: {
+                html: "html",
+                show_log_link: true,
+                url: "url",
+            },
+            device_flow: {
+                charset: "base20",
+                mask: "mask",
+            },
+            default_token_quota: {
+                clients: {
+                    client_credentials: {},
+                },
+                organizations: {
+                    client_credentials: {},
+                },
+            },
+            flags: {
+                change_pwd_flow_v1: true,
+                enable_apis_section: true,
+                disable_impersonation: true,
+                enable_client_connections: true,
+                enable_pipeline2: true,
+                allow_legacy_delegation_grant_types: true,
+                allow_legacy_ro_grant_types: true,
+                allow_legacy_tokeninfo_endpoint: true,
+                enable_legacy_profile: true,
+                enable_idtoken_api2: true,
+                enable_public_signup_user_exists_error: true,
+                enable_sso: true,
+                allow_changing_enable_sso: true,
+                disable_clickjack_protection_headers: true,
+                no_disclose_enterprise_connections: true,
+                enforce_client_authentication_on_passwordless_start: true,
+                enable_adfs_waad_email_verification: true,
+                revoke_refresh_token_grant: true,
+                dashboard_log_streams_next: true,
+                dashboard_insights_view: true,
+                disable_fields_map_fix: true,
+                mfa_show_factor_list_on_enrollment: true,
+                remove_alg_from_jwks: true,
+                improved_signup_bot_detection_in_classic: true,
+                genai_trial: true,
+                enable_dynamic_client_registration: true,
+                disable_management_api_sms_obfuscation: true,
+                trust_azure_adfs_email_verified_connection_property: true,
+                custom_domains_provisioning: true,
+            },
+            friendly_name: "friendly_name",
+            picture_url: "picture_url",
+            support_email: "support_email",
+            support_url: "support_url",
+            allowed_logout_urls: ["allowed_logout_urls"],
+            session_lifetime: 1.1,
+            idle_session_lifetime: 1.1,
+            ephemeral_session_lifetime: 1.1,
+            idle_ephemeral_session_lifetime: 1.1,
+            sandbox_version: "sandbox_version",
+            legacy_sandbox_version: "legacy_sandbox_version",
+            sandbox_versions_available: ["sandbox_versions_available"],
+            default_redirection_uri: "default_redirection_uri",
+            enabled_locales: ["am"],
+            session_cookie: {
+                mode: "persistent",
+            },
+            sessions: {
+                oidc_logout_prompt_enabled: true,
+            },
+            oidc_logout: {
+                rp_logout_end_session_endpoint_discovery: true,
+            },
+            allow_organization_name_in_authentication_api: true,
+            customize_mfa_in_postlogin_action: true,
+            acr_values_supported: ["acr_values_supported"],
+            mtls: {
+                enable_endpoint_aliases: true,
+            },
+            pushed_authorization_requests_supported: true,
+            authorization_response_iss_parameter_supported: true,
+            skip_non_verifiable_callback_uri_confirmation_prompt: true,
+            resource_parameter_profile: "audience",
+            phone_consolidated_experience: true,
+            enable_ai_guide: true,
+        });
     });
 
     test("get (2)", async () => {
@@ -91,7 +184,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/tenants/settings").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -104,7 +196,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/tenants/settings").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -117,7 +208,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/tenants/settings").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -130,7 +220,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/tenants/settings").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -209,7 +298,6 @@ describe("SettingsClient", () => {
             phone_consolidated_experience: true,
             enable_ai_guide: true,
         };
-
         server
             .mockEndpoint()
             .patch("/tenants/settings")
@@ -220,7 +308,101 @@ describe("SettingsClient", () => {
             .build();
 
         const response = await client.tenants.settings.update();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            change_password: {
+                enabled: true,
+                html: "html",
+            },
+            guardian_mfa_page: {
+                enabled: true,
+                html: "html",
+            },
+            default_audience: "default_audience",
+            default_directory: "default_directory",
+            error_page: {
+                html: "html",
+                show_log_link: true,
+                url: "url",
+            },
+            device_flow: {
+                charset: "base20",
+                mask: "mask",
+            },
+            default_token_quota: {
+                clients: {
+                    client_credentials: {},
+                },
+                organizations: {
+                    client_credentials: {},
+                },
+            },
+            flags: {
+                change_pwd_flow_v1: true,
+                enable_apis_section: true,
+                disable_impersonation: true,
+                enable_client_connections: true,
+                enable_pipeline2: true,
+                allow_legacy_delegation_grant_types: true,
+                allow_legacy_ro_grant_types: true,
+                allow_legacy_tokeninfo_endpoint: true,
+                enable_legacy_profile: true,
+                enable_idtoken_api2: true,
+                enable_public_signup_user_exists_error: true,
+                enable_sso: true,
+                allow_changing_enable_sso: true,
+                disable_clickjack_protection_headers: true,
+                no_disclose_enterprise_connections: true,
+                enforce_client_authentication_on_passwordless_start: true,
+                enable_adfs_waad_email_verification: true,
+                revoke_refresh_token_grant: true,
+                dashboard_log_streams_next: true,
+                dashboard_insights_view: true,
+                disable_fields_map_fix: true,
+                mfa_show_factor_list_on_enrollment: true,
+                remove_alg_from_jwks: true,
+                improved_signup_bot_detection_in_classic: true,
+                genai_trial: true,
+                enable_dynamic_client_registration: true,
+                disable_management_api_sms_obfuscation: true,
+                trust_azure_adfs_email_verified_connection_property: true,
+                custom_domains_provisioning: true,
+            },
+            friendly_name: "friendly_name",
+            picture_url: "picture_url",
+            support_email: "support_email",
+            support_url: "support_url",
+            allowed_logout_urls: ["allowed_logout_urls"],
+            session_lifetime: 1.1,
+            idle_session_lifetime: 1.1,
+            ephemeral_session_lifetime: 1.1,
+            idle_ephemeral_session_lifetime: 1.1,
+            sandbox_version: "sandbox_version",
+            legacy_sandbox_version: "legacy_sandbox_version",
+            sandbox_versions_available: ["sandbox_versions_available"],
+            default_redirection_uri: "default_redirection_uri",
+            enabled_locales: ["am"],
+            session_cookie: {
+                mode: "persistent",
+            },
+            sessions: {
+                oidc_logout_prompt_enabled: true,
+            },
+            oidc_logout: {
+                rp_logout_end_session_endpoint_discovery: true,
+            },
+            allow_organization_name_in_authentication_api: true,
+            customize_mfa_in_postlogin_action: true,
+            acr_values_supported: ["acr_values_supported"],
+            mtls: {
+                enable_endpoint_aliases: true,
+            },
+            pushed_authorization_requests_supported: true,
+            authorization_response_iss_parameter_supported: true,
+            skip_non_verifiable_callback_uri_confirmation_prompt: true,
+            resource_parameter_profile: "audience",
+            phone_consolidated_experience: true,
+            enable_ai_guide: true,
+        });
     });
 
     test("update (2)", async () => {
@@ -228,7 +410,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/tenants/settings")
@@ -248,7 +429,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/tenants/settings")
@@ -268,7 +448,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/tenants/settings")
@@ -288,7 +467,6 @@ describe("SettingsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/tenants/settings")
diff --git a/src/management/tests/wire/tickets.test.ts b/src/management/tests/wire/tickets.test.ts
index cb16d62997..ae978bd9fa 100644
--- a/src/management/tests/wire/tickets.test.ts
+++ b/src/management/tests/wire/tickets.test.ts
@@ -10,7 +10,6 @@ describe("TicketsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "user_id" };
         const rawResponseBody = { ticket: "ticket" };
-
         server
             .mockEndpoint()
             .post("/tickets/email-verification")
@@ -23,7 +22,9 @@ describe("TicketsClient", () => {
         const response = await client.tickets.verifyEmail({
             user_id: "user_id",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            ticket: "ticket",
+        });
     });
 
     test("verifyEmail (2)", async () => {
@@ -31,7 +32,6 @@ describe("TicketsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "user_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/tickets/email-verification")
@@ -53,7 +53,6 @@ describe("TicketsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "user_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/tickets/email-verification")
@@ -75,7 +74,6 @@ describe("TicketsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "user_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/tickets/email-verification")
@@ -97,7 +95,6 @@ describe("TicketsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "user_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/tickets/email-verification")
@@ -119,7 +116,6 @@ describe("TicketsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { user_id: "user_id" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/tickets/email-verification")
@@ -141,7 +137,6 @@ describe("TicketsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { ticket: "ticket" };
-
         server
             .mockEndpoint()
             .post("/tickets/password-change")
@@ -152,7 +147,9 @@ describe("TicketsClient", () => {
             .build();
 
         const response = await client.tickets.changePassword();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            ticket: "ticket",
+        });
     });
 
     test("changePassword (2)", async () => {
@@ -160,7 +157,6 @@ describe("TicketsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/tickets/password-change")
@@ -180,7 +176,6 @@ describe("TicketsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/tickets/password-change")
@@ -200,7 +195,6 @@ describe("TicketsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/tickets/password-change")
@@ -220,7 +214,6 @@ describe("TicketsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/tickets/password-change")
@@ -240,7 +233,6 @@ describe("TicketsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/tickets/password-change")
diff --git a/src/management/tests/wire/tokenExchangeProfiles.test.ts b/src/management/tests/wire/tokenExchangeProfiles.test.ts
index 5e509fb210..b7a3fb5f42 100644
--- a/src/management/tests/wire/tokenExchangeProfiles.test.ts
+++ b/src/management/tests/wire/tokenExchangeProfiles.test.ts
@@ -23,7 +23,6 @@ describe("TokenExchangeProfilesClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/token-exchange-profiles")
@@ -32,7 +31,20 @@ describe("TokenExchangeProfilesClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            next: "next",
+            token_exchange_profiles: [
+                {
+                    id: "id",
+                    name: "name",
+                    subject_token_type: "subject_token_type",
+                    action_id: "action_id",
+                    type: "custom_authentication",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+        };
         const page = await client.tokenExchangeProfiles.list({
             from: "from",
             take: 1,
@@ -49,7 +61,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/token-exchange-profiles")
@@ -68,7 +79,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/token-exchange-profiles")
@@ -87,7 +97,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/token-exchange-profiles")
@@ -106,7 +115,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/token-exchange-profiles")
@@ -138,7 +146,6 @@ describe("TokenExchangeProfilesClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .post("/token-exchange-profiles")
@@ -154,7 +161,15 @@ describe("TokenExchangeProfilesClient", () => {
             action_id: "action_id",
             type: "custom_authentication",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            subject_token_type: "subject_token_type",
+            action_id: "action_id",
+            type: "custom_authentication",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("create (2)", async () => {
@@ -167,7 +182,6 @@ describe("TokenExchangeProfilesClient", () => {
             type: "custom_authentication",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/token-exchange-profiles")
@@ -197,7 +211,6 @@ describe("TokenExchangeProfilesClient", () => {
             type: "custom_authentication",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/token-exchange-profiles")
@@ -227,7 +240,6 @@ describe("TokenExchangeProfilesClient", () => {
             type: "custom_authentication",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/token-exchange-profiles")
@@ -257,7 +269,6 @@ describe("TokenExchangeProfilesClient", () => {
             type: "custom_authentication",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/token-exchange-profiles")
@@ -287,7 +298,6 @@ describe("TokenExchangeProfilesClient", () => {
             type: "custom_authentication",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/token-exchange-profiles")
@@ -320,7 +330,6 @@ describe("TokenExchangeProfilesClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .get("/token-exchange-profiles/id")
@@ -330,7 +339,15 @@ describe("TokenExchangeProfilesClient", () => {
             .build();
 
         const response = await client.tokenExchangeProfiles.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            subject_token_type: "subject_token_type",
+            action_id: "action_id",
+            type: "custom_authentication",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("get (2)", async () => {
@@ -338,7 +355,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/token-exchange-profiles/id")
@@ -357,7 +373,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/token-exchange-profiles/id")
@@ -376,7 +391,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/token-exchange-profiles/id")
@@ -395,7 +409,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/token-exchange-profiles/id")
@@ -414,7 +427,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/token-exchange-profiles/id")
@@ -443,7 +455,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/token-exchange-profiles/id")
@@ -462,7 +473,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/token-exchange-profiles/id")
@@ -481,7 +491,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/token-exchange-profiles/id")
@@ -517,7 +526,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/token-exchange-profiles/id")
@@ -537,7 +545,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/token-exchange-profiles/id")
@@ -557,7 +564,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/token-exchange-profiles/id")
@@ -577,7 +583,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/token-exchange-profiles/id")
@@ -597,7 +602,6 @@ describe("TokenExchangeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/token-exchange-profiles/id")
diff --git a/src/management/tests/wire/userAttributeProfiles.test.ts b/src/management/tests/wire/userAttributeProfiles.test.ts
index baf31ad538..d0c71ed1a3 100644
--- a/src/management/tests/wire/userAttributeProfiles.test.ts
+++ b/src/management/tests/wire/userAttributeProfiles.test.ts
@@ -26,7 +26,6 @@ describe("UserAttributeProfilesClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/user-attribute-profiles")
@@ -35,7 +34,23 @@ describe("UserAttributeProfilesClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            next: "next",
+            user_attribute_profiles: [
+                {
+                    id: "id",
+                    name: "name",
+                    user_attributes: {
+                        key: {
+                            description: "description",
+                            label: "label",
+                            profile_required: true,
+                            auth0_mapping: "auth0_mapping",
+                        },
+                    },
+                },
+            ],
+        };
         const page = await client.userAttributeProfiles.list({
             from: "from",
             take: 1,
@@ -52,7 +67,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles")
@@ -71,7 +85,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles")
@@ -90,7 +103,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles")
@@ -109,7 +121,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles")
@@ -153,7 +164,6 @@ describe("UserAttributeProfilesClient", () => {
                 },
             },
         };
-
         server
             .mockEndpoint()
             .post("/user-attribute-profiles")
@@ -174,7 +184,28 @@ describe("UserAttributeProfilesClient", () => {
                 },
             },
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            user_id: {
+                oidc_mapping: "sub",
+                saml_mapping: ["saml_mapping"],
+                scim_mapping: "scim_mapping",
+            },
+            user_attributes: {
+                key: {
+                    description: "description",
+                    label: "label",
+                    profile_required: true,
+                    auth0_mapping: "auth0_mapping",
+                    oidc_mapping: {
+                        mapping: "mapping",
+                    },
+                    saml_mapping: ["saml_mapping"],
+                    scim_mapping: "scim_mapping",
+                },
+            },
+        });
     });
 
     test("create (2)", async () => {
@@ -187,7 +218,6 @@ describe("UserAttributeProfilesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/user-attribute-profiles")
@@ -222,7 +252,6 @@ describe("UserAttributeProfilesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/user-attribute-profiles")
@@ -257,7 +286,6 @@ describe("UserAttributeProfilesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/user-attribute-profiles")
@@ -292,7 +320,6 @@ describe("UserAttributeProfilesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/user-attribute-profiles")
@@ -327,7 +354,6 @@ describe("UserAttributeProfilesClient", () => {
             },
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/user-attribute-profiles")
@@ -357,7 +383,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { user_attribute_profile_templates: [{ id: "id", display_name: "display_name" }] };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/templates")
@@ -367,7 +392,14 @@ describe("UserAttributeProfilesClient", () => {
             .build();
 
         const response = await client.userAttributeProfiles.listTemplates();
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            user_attribute_profile_templates: [
+                {
+                    id: "id",
+                    display_name: "display_name",
+                },
+            ],
+        });
     });
 
     test("listTemplates (2)", async () => {
@@ -375,7 +407,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/templates")
@@ -394,7 +425,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/templates")
@@ -413,7 +443,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/templates")
@@ -447,7 +476,6 @@ describe("UserAttributeProfilesClient", () => {
                 },
             },
         };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/templates/id")
@@ -457,7 +485,26 @@ describe("UserAttributeProfilesClient", () => {
             .build();
 
         const response = await client.userAttributeProfiles.getTemplate("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            display_name: "display_name",
+            template: {
+                name: "name",
+                user_id: {
+                    oidc_mapping: "sub",
+                    saml_mapping: ["saml_mapping"],
+                    scim_mapping: "scim_mapping",
+                },
+                user_attributes: {
+                    key: {
+                        description: "description",
+                        label: "label",
+                        profile_required: true,
+                        auth0_mapping: "auth0_mapping",
+                    },
+                },
+            },
+        });
     });
 
     test("getTemplate (2)", async () => {
@@ -465,7 +512,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/templates/id")
@@ -484,7 +530,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/templates/id")
@@ -503,7 +548,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/templates/id")
@@ -522,7 +566,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/templates/id")
@@ -556,7 +599,6 @@ describe("UserAttributeProfilesClient", () => {
                 },
             },
         };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/id")
@@ -566,7 +608,28 @@ describe("UserAttributeProfilesClient", () => {
             .build();
 
         const response = await client.userAttributeProfiles.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            user_id: {
+                oidc_mapping: "sub",
+                saml_mapping: ["saml_mapping"],
+                scim_mapping: "scim_mapping",
+            },
+            user_attributes: {
+                key: {
+                    description: "description",
+                    label: "label",
+                    profile_required: true,
+                    auth0_mapping: "auth0_mapping",
+                    oidc_mapping: {
+                        mapping: "mapping",
+                    },
+                    saml_mapping: ["saml_mapping"],
+                    scim_mapping: "scim_mapping",
+                },
+            },
+        });
     });
 
     test("get (2)", async () => {
@@ -574,7 +637,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/id")
@@ -593,7 +655,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/id")
@@ -612,7 +673,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/id")
@@ -631,7 +691,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/user-attribute-profiles/id")
@@ -660,7 +719,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/user-attribute-profiles/id")
@@ -679,7 +737,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/user-attribute-profiles/id")
@@ -698,7 +755,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/user-attribute-profiles/id")
@@ -732,7 +788,6 @@ describe("UserAttributeProfilesClient", () => {
                 },
             },
         };
-
         server
             .mockEndpoint()
             .patch("/user-attribute-profiles/id")
@@ -743,7 +798,28 @@ describe("UserAttributeProfilesClient", () => {
             .build();
 
         const response = await client.userAttributeProfiles.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            user_id: {
+                oidc_mapping: "sub",
+                saml_mapping: ["saml_mapping"],
+                scim_mapping: "scim_mapping",
+            },
+            user_attributes: {
+                key: {
+                    description: "description",
+                    label: "label",
+                    profile_required: true,
+                    auth0_mapping: "auth0_mapping",
+                    oidc_mapping: {
+                        mapping: "mapping",
+                    },
+                    saml_mapping: ["saml_mapping"],
+                    scim_mapping: "scim_mapping",
+                },
+            },
+        });
     });
 
     test("update (2)", async () => {
@@ -751,7 +827,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/user-attribute-profiles/id")
@@ -771,7 +846,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/user-attribute-profiles/id")
@@ -791,7 +865,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/user-attribute-profiles/id")
@@ -811,7 +884,6 @@ describe("UserAttributeProfilesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/user-attribute-profiles/id")
diff --git a/src/management/tests/wire/userBlocks.test.ts b/src/management/tests/wire/userBlocks.test.ts
index c2508239a9..957a5edf6a 100644
--- a/src/management/tests/wire/userBlocks.test.ts
+++ b/src/management/tests/wire/userBlocks.test.ts
@@ -10,14 +10,21 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { blocked_for: [{ identifier: "identifier", ip: "ip", connection: "connection" }] };
-
         server.mockEndpoint().get("/user-blocks").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.userBlocks.listByIdentifier({
             identifier: "identifier",
             consider_brute_force_enablement: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            blocked_for: [
+                {
+                    identifier: "identifier",
+                    ip: "ip",
+                    connection: "connection",
+                },
+            ],
+        });
     });
 
     test("listByIdentifier (2)", async () => {
@@ -25,7 +32,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/user-blocks").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -40,7 +46,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/user-blocks").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -55,7 +60,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/user-blocks").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -70,7 +74,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/user-blocks").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -97,7 +100,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/user-blocks").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -112,7 +114,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/user-blocks").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -127,7 +128,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/user-blocks").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -142,7 +142,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/user-blocks").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -157,13 +156,20 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { blocked_for: [{ identifier: "identifier", ip: "ip", connection: "connection" }] };
-
         server.mockEndpoint().get("/user-blocks/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.userBlocks.list("id", {
             consider_brute_force_enablement: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            blocked_for: [
+                {
+                    identifier: "identifier",
+                    ip: "ip",
+                    connection: "connection",
+                },
+            ],
+        });
     });
 
     test("list (2)", async () => {
@@ -171,7 +177,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/user-blocks/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -184,7 +189,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/user-blocks/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -197,7 +201,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/user-blocks/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -210,7 +213,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/user-blocks/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -223,7 +225,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/user-blocks/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -246,7 +247,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/user-blocks/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -259,7 +259,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/user-blocks/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -272,7 +271,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/user-blocks/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -285,7 +283,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/user-blocks/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -298,7 +295,6 @@ describe("UserBlocksClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/user-blocks/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
diff --git a/src/management/tests/wire/userGrants.test.ts b/src/management/tests/wire/userGrants.test.ts
index 18b9a28f9b..d46a88c85e 100644
--- a/src/management/tests/wire/userGrants.test.ts
+++ b/src/management/tests/wire/userGrants.test.ts
@@ -15,7 +15,6 @@ describe("UserGrantsClient", () => {
             total: 1.1,
             grants: [{ id: "id", clientID: "clientID", user_id: "user_id", audience: "audience", scope: ["scope"] }],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/grants")
@@ -24,7 +23,20 @@ describe("UserGrantsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            grants: [
+                {
+                    id: "id",
+                    clientID: "clientID",
+                    user_id: "user_id",
+                    audience: "audience",
+                    scope: ["scope"],
+                },
+            ],
+        };
         const page = await client.userGrants.list({
             per_page: 1,
             page: 1,
@@ -45,7 +57,6 @@ describe("UserGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/grants")
@@ -64,7 +75,6 @@ describe("UserGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/grants")
@@ -83,7 +93,6 @@ describe("UserGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/grants")
@@ -114,7 +123,6 @@ describe("UserGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/grants").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -129,7 +137,6 @@ describe("UserGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/grants").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -144,7 +151,6 @@ describe("UserGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/grants").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -169,7 +175,6 @@ describe("UserGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/grants/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -182,7 +187,6 @@ describe("UserGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/grants/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -195,7 +199,6 @@ describe("UserGrantsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/grants/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
diff --git a/src/management/tests/wire/users.test.ts b/src/management/tests/wire/users.test.ts
index 16bb954499..a6281fccbd 100644
--- a/src/management/tests/wire/users.test.ts
+++ b/src/management/tests/wire/users.test.ts
@@ -40,7 +40,6 @@ describe("UsersClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/users")
@@ -49,7 +48,41 @@ describe("UsersClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            length: 1.1,
+            total: 1.1,
+            users: [
+                {
+                    user_id: "user_id",
+                    email: "email",
+                    email_verified: true,
+                    username: "username",
+                    phone_number: "phone_number",
+                    phone_verified: true,
+                    created_at: "created_at",
+                    updated_at: "updated_at",
+                    identities: [{}],
+                    app_metadata: {
+                        key: "value",
+                    },
+                    user_metadata: {
+                        key: "value",
+                    },
+                    picture: "picture",
+                    name: "name",
+                    nickname: "nickname",
+                    multifactor: ["multifactor"],
+                    last_ip: "last_ip",
+                    last_login: "last_login",
+                    logins_count: 1,
+                    blocked: true,
+                    given_name: "given_name",
+                    family_name: "family_name",
+                },
+            ],
+        };
         const page = await client.users.list({
             page: 1,
             per_page: 1,
@@ -74,7 +107,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users")
@@ -93,7 +125,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users")
@@ -112,7 +143,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users")
@@ -131,7 +161,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users")
@@ -150,7 +179,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users")
@@ -201,7 +229,6 @@ describe("UsersClient", () => {
             given_name: "given_name",
             family_name: "family_name",
         };
-
         server
             .mockEndpoint()
             .post("/users")
@@ -214,7 +241,43 @@ describe("UsersClient", () => {
         const response = await client.users.create({
             connection: "connection",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            user_id: "user_id",
+            email: "email",
+            email_verified: true,
+            username: "username",
+            phone_number: "phone_number",
+            phone_verified: true,
+            created_at: "created_at",
+            updated_at: "updated_at",
+            identities: [
+                {
+                    connection: "connection",
+                    user_id: "user_id",
+                    provider: "ad",
+                    isSocial: true,
+                    access_token: "access_token",
+                    access_token_secret: "access_token_secret",
+                    refresh_token: "refresh_token",
+                },
+            ],
+            app_metadata: {
+                key: "value",
+            },
+            user_metadata: {
+                key: "value",
+            },
+            picture: "picture",
+            name: "name",
+            nickname: "nickname",
+            multifactor: ["multifactor"],
+            last_ip: "last_ip",
+            last_login: "last_login",
+            logins_count: 1,
+            blocked: true,
+            given_name: "given_name",
+            family_name: "family_name",
+        });
     });
 
     test("create (2)", async () => {
@@ -222,7 +285,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection: "Initial-Connection" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users")
@@ -244,7 +306,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection: "Initial-Connection" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users")
@@ -266,7 +327,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection: "Initial-Connection" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users")
@@ -288,7 +348,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection: "Initial-Connection" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users")
@@ -310,7 +369,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection: "Initial-Connection" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users")
@@ -356,7 +414,6 @@ describe("UsersClient", () => {
                 family_name: "family_name",
             },
         ];
-
         server.mockEndpoint().get("/users-by-email").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.users.listUsersByEmail({
@@ -364,7 +421,35 @@ describe("UsersClient", () => {
             include_fields: true,
             email: "email",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                user_id: "user_id",
+                email: "email",
+                email_verified: true,
+                username: "username",
+                phone_number: "phone_number",
+                phone_verified: true,
+                created_at: "created_at",
+                updated_at: "updated_at",
+                identities: [{}],
+                app_metadata: {
+                    key: "value",
+                },
+                user_metadata: {
+                    key: "value",
+                },
+                picture: "picture",
+                name: "name",
+                nickname: "nickname",
+                multifactor: ["multifactor"],
+                last_ip: "last_ip",
+                last_login: "last_login",
+                logins_count: 1,
+                blocked: true,
+                given_name: "given_name",
+                family_name: "family_name",
+            },
+        ]);
     });
 
     test("listUsersByEmail (2)", async () => {
@@ -372,7 +457,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users-by-email").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -387,7 +471,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users-by-email").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -402,7 +485,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users-by-email").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -417,7 +499,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users-by-email").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -464,14 +545,49 @@ describe("UsersClient", () => {
             given_name: "given_name",
             family_name: "family_name",
         };
-
         server.mockEndpoint().get("/users/id").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
 
         const response = await client.users.get("id", {
             fields: "fields",
             include_fields: true,
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            user_id: "user_id",
+            email: "email",
+            email_verified: true,
+            username: "username",
+            phone_number: "phone_number",
+            phone_verified: true,
+            created_at: "created_at",
+            updated_at: "updated_at",
+            identities: [
+                {
+                    connection: "connection",
+                    user_id: "user_id",
+                    provider: "ad",
+                    isSocial: true,
+                    access_token: "access_token",
+                    access_token_secret: "access_token_secret",
+                    refresh_token: "refresh_token",
+                },
+            ],
+            app_metadata: {
+                key: "value",
+            },
+            user_metadata: {
+                key: "value",
+            },
+            picture: "picture",
+            name: "name",
+            nickname: "nickname",
+            multifactor: ["multifactor"],
+            last_ip: "last_ip",
+            last_login: "last_login",
+            logins_count: 1,
+            blocked: true,
+            given_name: "given_name",
+            family_name: "family_name",
+        });
     });
 
     test("get (2)", async () => {
@@ -479,7 +595,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -492,7 +607,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -505,7 +619,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -518,7 +631,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users/id").respondWith().statusCode(404).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -531,7 +643,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -554,7 +665,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/users/id").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -567,7 +677,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/users/id").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -580,7 +689,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/users/id").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -593,7 +701,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().delete("/users/id").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -638,7 +745,6 @@ describe("UsersClient", () => {
             given_name: "given_name",
             family_name: "family_name",
         };
-
         server
             .mockEndpoint()
             .patch("/users/id")
@@ -649,7 +755,43 @@ describe("UsersClient", () => {
             .build();
 
         const response = await client.users.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            user_id: "user_id",
+            email: "email",
+            email_verified: true,
+            username: "username",
+            phone_number: "phone_number",
+            phone_verified: true,
+            created_at: "created_at",
+            updated_at: "updated_at",
+            identities: [
+                {
+                    connection: "connection",
+                    user_id: "user_id",
+                    provider: "ad",
+                    isSocial: true,
+                    access_token: "access_token",
+                    access_token_secret: "access_token_secret",
+                    refresh_token: "refresh_token",
+                },
+            ],
+            app_metadata: {
+                key: "value",
+            },
+            user_metadata: {
+                key: "value",
+            },
+            picture: "picture",
+            name: "name",
+            nickname: "nickname",
+            multifactor: ["multifactor"],
+            last_ip: "last_ip",
+            last_login: "last_login",
+            logins_count: 1,
+            blocked: true,
+            given_name: "given_name",
+            family_name: "family_name",
+        });
     });
 
     test("update (2)", async () => {
@@ -657,7 +799,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/users/id")
@@ -677,7 +818,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/users/id")
@@ -697,7 +837,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/users/id")
@@ -717,7 +856,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/users/id")
@@ -737,7 +875,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/users/id")
@@ -757,7 +894,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { recovery_code: "recovery_code" };
-
         server
             .mockEndpoint()
             .post("/users/id/recovery-code-regeneration")
@@ -767,7 +903,9 @@ describe("UsersClient", () => {
             .build();
 
         const response = await client.users.regenerateRecoveryCode("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            recovery_code: "recovery_code",
+        });
     });
 
     test("regenerateRecoveryCode (2)", async () => {
@@ -775,7 +913,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/recovery-code-regeneration")
@@ -794,7 +931,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/recovery-code-regeneration")
@@ -813,7 +949,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/recovery-code-regeneration")
@@ -832,7 +967,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/recovery-code-regeneration")
@@ -868,7 +1002,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/revoke-access")
@@ -888,7 +1021,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/revoke-access")
@@ -908,7 +1040,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/revoke-access")
@@ -928,7 +1059,6 @@ describe("UsersClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/revoke-access")
diff --git a/src/management/tests/wire/users/authenticationMethods.test.ts b/src/management/tests/wire/users/authenticationMethods.test.ts
index 2ccaeb149f..0b60e422fe 100644
--- a/src/management/tests/wire/users/authenticationMethods.test.ts
+++ b/src/management/tests/wire/users/authenticationMethods.test.ts
@@ -38,7 +38,6 @@ describe("AuthenticationMethodsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/authentication-methods")
@@ -47,7 +46,35 @@ describe("AuthenticationMethodsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            authenticators: [
+                {
+                    id: "id",
+                    type: "recovery-code",
+                    confirmed: true,
+                    name: "name",
+                    authentication_methods: [{}],
+                    preferred_authentication_method: "voice",
+                    link_id: "link_id",
+                    phone_number: "phone_number",
+                    email: "email",
+                    key_id: "key_id",
+                    public_key: "public_key",
+                    created_at: "2024-01-15T09:30:00Z",
+                    enrolled_at: "2024-01-15T09:30:00Z",
+                    last_auth_at: "2024-01-15T09:30:00Z",
+                    credential_device_type: "credential_device_type",
+                    credential_backed_up: true,
+                    identity_user_id: "identity_user_id",
+                    user_agent: "user_agent",
+                    aaguid: "aaguid",
+                    relying_party_identifier: "relying_party_identifier",
+                },
+            ],
+        };
         const page = await client.users.authenticationMethods.list("id", {
             page: 1,
             per_page: 1,
@@ -65,7 +92,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/authentication-methods")
@@ -84,7 +110,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/authentication-methods")
@@ -103,7 +128,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/authentication-methods")
@@ -122,7 +146,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/authentication-methods")
@@ -141,7 +164,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/authentication-methods")
@@ -174,7 +196,6 @@ describe("AuthenticationMethodsClient", () => {
             relying_party_identifier: "relying_party_identifier",
             created_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .post("/users/id/authentication-methods")
@@ -187,7 +208,26 @@ describe("AuthenticationMethodsClient", () => {
         const response = await client.users.authenticationMethods.create("id", {
             type: "phone",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            type: "phone",
+            name: "name",
+            totp_secret: "totp_secret",
+            phone_number: "phone_number",
+            email: "email",
+            authentication_methods: [
+                {
+                    type: "totp",
+                    id: "id",
+                },
+            ],
+            preferred_authentication_method: "voice",
+            key_id: "key_id",
+            public_key: "public_key",
+            aaguid: "aaguid",
+            relying_party_identifier: "relying_party_identifier",
+            created_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("create (2)", async () => {
@@ -195,7 +235,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "phone" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/authentication-methods")
@@ -217,7 +256,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "phone" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/authentication-methods")
@@ -239,7 +277,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "phone" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/authentication-methods")
@@ -261,7 +298,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "phone" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/authentication-methods")
@@ -283,7 +319,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "phone" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/authentication-methods")
@@ -305,7 +340,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { type: "phone" };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/authentication-methods")
@@ -343,7 +377,6 @@ describe("AuthenticationMethodsClient", () => {
                 created_at: "2024-01-15T09:30:00Z",
             },
         ];
-
         server
             .mockEndpoint()
             .put("/users/id/authentication-methods")
@@ -358,7 +391,23 @@ describe("AuthenticationMethodsClient", () => {
                 type: "phone",
             },
         ]);
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                id: "id",
+                type: "phone",
+                name: "name",
+                totp_secret: "totp_secret",
+                phone_number: "phone_number",
+                email: "email",
+                authentication_methods: [{}],
+                preferred_authentication_method: "voice",
+                key_id: "key_id",
+                public_key: "public_key",
+                aaguid: "aaguid",
+                relying_party_identifier: "relying_party_identifier",
+                created_at: "2024-01-15T09:30:00Z",
+            },
+        ]);
     });
 
     test("set (2)", async () => {
@@ -366,7 +415,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = [{ type: "phone" }, { type: "phone" }];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/users/id/authentication-methods")
@@ -393,7 +441,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = [{ type: "phone" }, { type: "phone" }];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/users/id/authentication-methods")
@@ -420,7 +467,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = [{ type: "phone" }, { type: "phone" }];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/users/id/authentication-methods")
@@ -447,7 +493,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = [{ type: "phone" }, { type: "phone" }];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/users/id/authentication-methods")
@@ -474,7 +519,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = [{ type: "phone" }, { type: "phone" }];
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .put("/users/id/authentication-methods")
@@ -511,7 +555,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authentication-methods")
@@ -530,7 +573,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authentication-methods")
@@ -549,7 +591,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authentication-methods")
@@ -568,7 +609,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authentication-methods")
@@ -608,7 +648,6 @@ describe("AuthenticationMethodsClient", () => {
             aaguid: "aaguid",
             relying_party_identifier: "relying_party_identifier",
         };
-
         server
             .mockEndpoint()
             .get("/users/id/authentication-methods/authentication_method_id")
@@ -618,7 +657,33 @@ describe("AuthenticationMethodsClient", () => {
             .build();
 
         const response = await client.users.authenticationMethods.get("id", "authentication_method_id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            type: "recovery-code",
+            confirmed: true,
+            name: "name",
+            authentication_methods: [
+                {
+                    type: "totp",
+                    id: "id",
+                },
+            ],
+            preferred_authentication_method: "voice",
+            link_id: "link_id",
+            phone_number: "phone_number",
+            email: "email",
+            key_id: "key_id",
+            public_key: "public_key",
+            created_at: "2024-01-15T09:30:00Z",
+            enrolled_at: "2024-01-15T09:30:00Z",
+            last_auth_at: "2024-01-15T09:30:00Z",
+            credential_device_type: "credential_device_type",
+            credential_backed_up: true,
+            identity_user_id: "identity_user_id",
+            user_agent: "user_agent",
+            aaguid: "aaguid",
+            relying_party_identifier: "relying_party_identifier",
+        });
     });
 
     test("get (2)", async () => {
@@ -626,7 +691,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/authentication-methods/authentication_method_id")
@@ -645,7 +709,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/authentication-methods/authentication_method_id")
@@ -664,7 +727,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/authentication-methods/authentication_method_id")
@@ -683,7 +745,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/authentication-methods/authentication_method_id")
@@ -702,7 +763,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/authentication-methods/authentication_method_id")
@@ -736,7 +796,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authentication-methods/authentication_method_id")
@@ -755,7 +814,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authentication-methods/authentication_method_id")
@@ -774,7 +832,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authentication-methods/authentication_method_id")
@@ -793,7 +850,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authentication-methods/authentication_method_id")
@@ -812,7 +868,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authentication-methods/authentication_method_id")
@@ -845,7 +900,6 @@ describe("AuthenticationMethodsClient", () => {
             relying_party_identifier: "relying_party_identifier",
             created_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .patch("/users/id/authentication-methods/authentication_method_id")
@@ -856,7 +910,26 @@ describe("AuthenticationMethodsClient", () => {
             .build();
 
         const response = await client.users.authenticationMethods.update("id", "authentication_method_id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            type: "phone",
+            name: "name",
+            totp_secret: "totp_secret",
+            phone_number: "phone_number",
+            email: "email",
+            authentication_methods: [
+                {
+                    type: "totp",
+                    id: "id",
+                },
+            ],
+            preferred_authentication_method: "voice",
+            key_id: "key_id",
+            public_key: "public_key",
+            aaguid: "aaguid",
+            relying_party_identifier: "relying_party_identifier",
+            created_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("update (2)", async () => {
@@ -864,7 +937,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/users/id/authentication-methods/authentication_method_id")
@@ -884,7 +956,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/users/id/authentication-methods/authentication_method_id")
@@ -904,7 +975,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/users/id/authentication-methods/authentication_method_id")
@@ -924,7 +994,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/users/id/authentication-methods/authentication_method_id")
@@ -944,7 +1013,6 @@ describe("AuthenticationMethodsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/users/id/authentication-methods/authentication_method_id")
diff --git a/src/management/tests/wire/users/authenticators.test.ts b/src/management/tests/wire/users/authenticators.test.ts
index 0520d06f19..eed297e041 100644
--- a/src/management/tests/wire/users/authenticators.test.ts
+++ b/src/management/tests/wire/users/authenticators.test.ts
@@ -20,7 +20,6 @@ describe("AuthenticatorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authenticators")
@@ -39,7 +38,6 @@ describe("AuthenticatorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authenticators")
@@ -58,7 +56,6 @@ describe("AuthenticatorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authenticators")
@@ -77,7 +74,6 @@ describe("AuthenticatorsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/authenticators")
diff --git a/src/management/tests/wire/users/connectedAccounts.test.ts b/src/management/tests/wire/users/connectedAccounts.test.ts
index 3311fbc63e..4209ecc8ba 100644
--- a/src/management/tests/wire/users/connectedAccounts.test.ts
+++ b/src/management/tests/wire/users/connectedAccounts.test.ts
@@ -24,7 +24,6 @@ describe("ConnectedAccountsClient", () => {
             ],
             next: "next",
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/connected-accounts")
@@ -33,7 +32,21 @@ describe("ConnectedAccountsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            connected_accounts: [
+                {
+                    id: "id",
+                    connection: "connection",
+                    connection_id: "connection_id",
+                    strategy: "strategy",
+                    access_type: "offline",
+                    scopes: ["scopes"],
+                    created_at: "2024-01-15T09:30:00Z",
+                    expires_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            next: "next",
+        };
         const page = await client.users.connectedAccounts.list("id", {
             from: "from",
             take: 1,
@@ -50,7 +63,6 @@ describe("ConnectedAccountsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/connected-accounts")
@@ -69,7 +81,6 @@ describe("ConnectedAccountsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/connected-accounts")
@@ -88,7 +99,6 @@ describe("ConnectedAccountsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/connected-accounts")
@@ -107,7 +117,6 @@ describe("ConnectedAccountsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/connected-accounts")
diff --git a/src/management/tests/wire/users/enrollments.test.ts b/src/management/tests/wire/users/enrollments.test.ts
index be650e99d4..7ad73205de 100644
--- a/src/management/tests/wire/users/enrollments.test.ts
+++ b/src/management/tests/wire/users/enrollments.test.ts
@@ -22,7 +22,6 @@ describe("EnrollmentsClient", () => {
                 last_auth: "2024-01-15T09:30:00Z",
             },
         ];
-
         server
             .mockEndpoint()
             .get("/users/id/enrollments")
@@ -32,7 +31,19 @@ describe("EnrollmentsClient", () => {
             .build();
 
         const response = await client.users.enrollments.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                id: "id",
+                status: "pending",
+                type: "type",
+                name: "name",
+                identifier: "identifier",
+                phone_number: "phone_number",
+                auth_method: "authenticator",
+                enrolled_at: "2024-01-15T09:30:00Z",
+                last_auth: "2024-01-15T09:30:00Z",
+            },
+        ]);
     });
 
     test("get (2)", async () => {
@@ -40,7 +51,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/enrollments")
@@ -59,7 +69,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/enrollments")
@@ -78,7 +87,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/enrollments")
@@ -97,7 +105,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/enrollments")
@@ -116,7 +123,6 @@ describe("EnrollmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/enrollments")
diff --git a/src/management/tests/wire/users/federatedConnectionsTokensets.test.ts b/src/management/tests/wire/users/federatedConnectionsTokensets.test.ts
index 4bc14d6580..dddb7acfee 100644
--- a/src/management/tests/wire/users/federatedConnectionsTokensets.test.ts
+++ b/src/management/tests/wire/users/federatedConnectionsTokensets.test.ts
@@ -19,7 +19,6 @@ describe("FederatedConnectionsTokensetsClient", () => {
                 last_used_at: "2024-01-15T09:30:00Z",
             },
         ];
-
         server
             .mockEndpoint()
             .get("/users/id/federated-connections-tokensets")
@@ -29,7 +28,16 @@ describe("FederatedConnectionsTokensetsClient", () => {
             .build();
 
         const response = await client.users.federatedConnectionsTokensets.list("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                id: "id",
+                connection: "connection",
+                scope: "scope",
+                expires_at: "2024-01-15T09:30:00Z",
+                issued_at: "2024-01-15T09:30:00Z",
+                last_used_at: "2024-01-15T09:30:00Z",
+            },
+        ]);
     });
 
     test("list (2)", async () => {
@@ -37,7 +45,6 @@ describe("FederatedConnectionsTokensetsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/federated-connections-tokensets")
@@ -56,7 +63,6 @@ describe("FederatedConnectionsTokensetsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/federated-connections-tokensets")
@@ -75,7 +81,6 @@ describe("FederatedConnectionsTokensetsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/federated-connections-tokensets")
@@ -94,7 +99,6 @@ describe("FederatedConnectionsTokensetsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/id/federated-connections-tokensets")
@@ -128,7 +132,6 @@ describe("FederatedConnectionsTokensetsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/federated-connections-tokensets/tokenset_id")
@@ -147,7 +150,6 @@ describe("FederatedConnectionsTokensetsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/federated-connections-tokensets/tokenset_id")
@@ -166,7 +168,6 @@ describe("FederatedConnectionsTokensetsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/federated-connections-tokensets/tokenset_id")
@@ -185,7 +186,6 @@ describe("FederatedConnectionsTokensetsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/federated-connections-tokensets/tokenset_id")
diff --git a/src/management/tests/wire/users/groups.test.ts b/src/management/tests/wire/users/groups.test.ts
index b37b94e1f1..55577ae8c6 100644
--- a/src/management/tests/wire/users/groups.test.ts
+++ b/src/management/tests/wire/users/groups.test.ts
@@ -27,7 +27,6 @@ describe("GroupsClient", () => {
             limit: 1.1,
             total: 1.1,
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/groups")
@@ -36,7 +35,24 @@ describe("GroupsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            groups: [
+                {
+                    id: "id",
+                    name: "name",
+                    external_id: "external_id",
+                    connection_id: "connection_id",
+                    tenant_name: "tenant_name",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                    membership_created_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            next: "next",
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+        };
         const page = await client.users.groups.get("id", {
             fields: "fields",
             include_fields: true,
@@ -55,7 +71,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users/id/groups").respondWith().statusCode(400).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -68,7 +83,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users/id/groups").respondWith().statusCode(401).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -81,7 +95,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users/id/groups").respondWith().statusCode(403).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
@@ -94,7 +107,6 @@ describe("GroupsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server.mockEndpoint().get("/users/id/groups").respondWith().statusCode(429).jsonBody(rawResponseBody).build();
 
         await expect(async () => {
diff --git a/src/management/tests/wire/users/identities.test.ts b/src/management/tests/wire/users/identities.test.ts
index d3f0ca69a4..f49d486d31 100644
--- a/src/management/tests/wire/users/identities.test.ts
+++ b/src/management/tests/wire/users/identities.test.ts
@@ -30,7 +30,6 @@ describe("IdentitiesClient", () => {
                 refresh_token: "refresh_token",
             },
         ];
-
         server
             .mockEndpoint()
             .post("/users/id/identities")
@@ -41,7 +40,27 @@ describe("IdentitiesClient", () => {
             .build();
 
         const response = await client.users.identities.link("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                connection: "connection",
+                user_id: "user_id",
+                provider: "provider",
+                profileData: {
+                    email: "email",
+                    email_verified: true,
+                    name: "name",
+                    username: "username",
+                    given_name: "given_name",
+                    phone_number: "phone_number",
+                    phone_verified: true,
+                    family_name: "family_name",
+                },
+                isSocial: true,
+                access_token: "access_token",
+                access_token_secret: "access_token_secret",
+                refresh_token: "refresh_token",
+            },
+        ]);
     });
 
     test("link (2)", async () => {
@@ -49,7 +68,6 @@ describe("IdentitiesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/identities")
@@ -69,7 +87,6 @@ describe("IdentitiesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/identities")
@@ -89,7 +106,6 @@ describe("IdentitiesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/identities")
@@ -109,7 +125,6 @@ describe("IdentitiesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/identities")
@@ -129,7 +144,6 @@ describe("IdentitiesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/identities")
@@ -169,7 +183,6 @@ describe("IdentitiesClient", () => {
                 },
             },
         ];
-
         server
             .mockEndpoint()
             .delete("/users/id/identities/ad/user_id")
@@ -179,7 +192,27 @@ describe("IdentitiesClient", () => {
             .build();
 
         const response = await client.users.identities.delete("id", "ad", "user_id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual([
+            {
+                connection: "connection",
+                user_id: "user_id",
+                provider: "provider",
+                isSocial: true,
+                access_token: "access_token",
+                access_token_secret: "access_token_secret",
+                refresh_token: "refresh_token",
+                profileData: {
+                    email: "email",
+                    email_verified: true,
+                    name: "name",
+                    username: "username",
+                    given_name: "given_name",
+                    phone_number: "phone_number",
+                    phone_verified: true,
+                    family_name: "family_name",
+                },
+            },
+        ]);
     });
 
     test("delete (2)", async () => {
@@ -187,7 +220,6 @@ describe("IdentitiesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/identities/ad/user_id")
@@ -206,7 +238,6 @@ describe("IdentitiesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/identities/ad/user_id")
@@ -225,7 +256,6 @@ describe("IdentitiesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/identities/ad/user_id")
@@ -244,7 +274,6 @@ describe("IdentitiesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/identities/ad/user_id")
diff --git a/src/management/tests/wire/users/logs.test.ts b/src/management/tests/wire/users/logs.test.ts
index 16429d276a..efd827b1c6 100644
--- a/src/management/tests/wire/users/logs.test.ts
+++ b/src/management/tests/wire/users/logs.test.ts
@@ -38,7 +38,6 @@ describe("LogsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/logs")
@@ -47,7 +46,37 @@ describe("LogsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            length: 1.1,
+            total: 1.1,
+            logs: [
+                {
+                    date: "date",
+                    type: "type",
+                    description: "description",
+                    connection: "connection",
+                    connection_id: "connection_id",
+                    client_id: "client_id",
+                    client_name: "client_name",
+                    ip: "ip",
+                    hostname: "hostname",
+                    user_id: "user_id",
+                    user_name: "user_name",
+                    audience: "audience",
+                    scope: "scope",
+                    strategy: "strategy",
+                    strategy_type: "strategy_type",
+                    log_id: "log_id",
+                    isMobile: true,
+                    details: {
+                        key: "value",
+                    },
+                    user_agent: "user_agent",
+                },
+            ],
+        };
         const page = await client.users.logs.list("id", {
             page: 1,
             per_page: 1,
@@ -66,7 +95,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/logs")
@@ -85,7 +113,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/logs")
@@ -104,7 +131,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/logs")
@@ -123,7 +149,6 @@ describe("LogsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/logs")
diff --git a/src/management/tests/wire/users/multifactor.test.ts b/src/management/tests/wire/users/multifactor.test.ts
index a932e23d18..db5439d01f 100644
--- a/src/management/tests/wire/users/multifactor.test.ts
+++ b/src/management/tests/wire/users/multifactor.test.ts
@@ -25,7 +25,6 @@ describe("MultifactorClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/multifactor/actions/invalidate-remember-browser")
@@ -44,7 +43,6 @@ describe("MultifactorClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/multifactor/actions/invalidate-remember-browser")
@@ -63,7 +61,6 @@ describe("MultifactorClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/multifactor/actions/invalidate-remember-browser")
@@ -92,7 +89,6 @@ describe("MultifactorClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/multifactor/duo")
@@ -111,7 +107,6 @@ describe("MultifactorClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/multifactor/duo")
@@ -130,7 +125,6 @@ describe("MultifactorClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/multifactor/duo")
@@ -149,7 +143,6 @@ describe("MultifactorClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/multifactor/duo")
@@ -168,7 +161,6 @@ describe("MultifactorClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/multifactor/duo")
diff --git a/src/management/tests/wire/users/organizations.test.ts b/src/management/tests/wire/users/organizations.test.ts
index bb614f92c9..6d8823c362 100644
--- a/src/management/tests/wire/users/organizations.test.ts
+++ b/src/management/tests/wire/users/organizations.test.ts
@@ -17,7 +17,6 @@ describe("OrganizationsClient", () => {
                 { id: "id", name: "name", display_name: "display_name", token_quota: { client_credentials: {} } },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/organizations")
@@ -26,7 +25,21 @@ describe("OrganizationsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            organizations: [
+                {
+                    id: "id",
+                    name: "name",
+                    display_name: "display_name",
+                    token_quota: {
+                        client_credentials: {},
+                    },
+                },
+            ],
+        };
         const page = await client.users.organizations.list("id", {
             page: 1,
             per_page: 1,
@@ -44,7 +57,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/organizations")
@@ -63,7 +75,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/organizations")
@@ -82,7 +93,6 @@ describe("OrganizationsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/organizations")
diff --git a/src/management/tests/wire/users/permissions.test.ts b/src/management/tests/wire/users/permissions.test.ts
index 1c87618cd6..0456d8d751 100644
--- a/src/management/tests/wire/users/permissions.test.ts
+++ b/src/management/tests/wire/users/permissions.test.ts
@@ -22,7 +22,6 @@ describe("PermissionsClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/permissions")
@@ -31,7 +30,19 @@ describe("PermissionsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            permissions: [
+                {
+                    resource_server_identifier: "resource_server_identifier",
+                    permission_name: "permission_name",
+                    resource_server_name: "resource_server_name",
+                    description: "description",
+                },
+            ],
+        };
         const page = await client.users.permissions.list("id", {
             per_page: 1,
             page: 1,
@@ -49,7 +60,6 @@ describe("PermissionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/permissions")
@@ -68,7 +78,6 @@ describe("PermissionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/permissions")
@@ -87,7 +96,6 @@ describe("PermissionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/permissions")
@@ -106,7 +114,6 @@ describe("PermissionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/permissions")
@@ -125,7 +132,6 @@ describe("PermissionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/permissions")
@@ -177,7 +183,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/permissions")
@@ -213,7 +218,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/permissions")
@@ -249,7 +253,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/permissions")
@@ -285,7 +288,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/permissions")
@@ -349,7 +351,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/permissions")
@@ -385,7 +386,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/permissions")
@@ -421,7 +421,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/permissions")
@@ -457,7 +456,6 @@ describe("PermissionsClient", () => {
             ],
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/permissions")
diff --git a/src/management/tests/wire/users/refreshToken.test.ts b/src/management/tests/wire/users/refreshToken.test.ts
index 680dafefd9..33befd2711 100644
--- a/src/management/tests/wire/users/refreshToken.test.ts
+++ b/src/management/tests/wire/users/refreshToken.test.ts
@@ -27,7 +27,6 @@ describe("RefreshTokenClient", () => {
             ],
             next: "next",
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/user_id/refresh-tokens")
@@ -36,7 +35,26 @@ describe("RefreshTokenClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            tokens: [
+                {
+                    id: "id",
+                    user_id: "user_id",
+                    created_at: "2024-01-15T09:30:00Z",
+                    idle_expires_at: "2024-01-15T09:30:00Z",
+                    expires_at: "2024-01-15T09:30:00Z",
+                    client_id: "client_id",
+                    session_id: "session_id",
+                    rotating: true,
+                    resource_servers: [{}],
+                    refresh_token_metadata: {
+                        key: "value",
+                    },
+                    last_exchanged_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+            next: "next",
+        };
         const page = await client.users.refreshToken.list("user_id", {
             from: "from",
             take: 1,
@@ -53,7 +71,6 @@ describe("RefreshTokenClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/user_id/refresh-tokens")
@@ -72,7 +89,6 @@ describe("RefreshTokenClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/user_id/refresh-tokens")
@@ -91,7 +107,6 @@ describe("RefreshTokenClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/user_id/refresh-tokens")
@@ -110,7 +125,6 @@ describe("RefreshTokenClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/user_id/refresh-tokens")
@@ -139,7 +153,6 @@ describe("RefreshTokenClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/user_id/refresh-tokens")
@@ -158,7 +171,6 @@ describe("RefreshTokenClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/user_id/refresh-tokens")
@@ -177,7 +189,6 @@ describe("RefreshTokenClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/user_id/refresh-tokens")
@@ -196,7 +207,6 @@ describe("RefreshTokenClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/user_id/refresh-tokens")
@@ -215,7 +225,6 @@ describe("RefreshTokenClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/user_id/refresh-tokens")
diff --git a/src/management/tests/wire/users/riskAssessments.test.ts b/src/management/tests/wire/users/riskAssessments.test.ts
index 3a551404c2..cbdc1dea54 100644
--- a/src/management/tests/wire/users/riskAssessments.test.ts
+++ b/src/management/tests/wire/users/riskAssessments.test.ts
@@ -30,7 +30,6 @@ describe("RiskAssessmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection: "x", assessors: ["new-device", "new-device"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/risk-assessments/clear")
@@ -53,7 +52,6 @@ describe("RiskAssessmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection: "x", assessors: ["new-device", "new-device"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/risk-assessments/clear")
@@ -76,7 +74,6 @@ describe("RiskAssessmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection: "x", assessors: ["new-device", "new-device"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/risk-assessments/clear")
@@ -99,7 +96,6 @@ describe("RiskAssessmentsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { connection: "x", assessors: ["new-device", "new-device"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/risk-assessments/clear")
diff --git a/src/management/tests/wire/users/roles.test.ts b/src/management/tests/wire/users/roles.test.ts
index 58d80e0e2f..9a12bd5698 100644
--- a/src/management/tests/wire/users/roles.test.ts
+++ b/src/management/tests/wire/users/roles.test.ts
@@ -15,7 +15,6 @@ describe("RolesClient", () => {
             total: 1.1,
             roles: [{ id: "id", name: "name", description: "description" }],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/roles")
@@ -24,7 +23,18 @@ describe("RolesClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            start: 1.1,
+            limit: 1.1,
+            total: 1.1,
+            roles: [
+                {
+                    id: "id",
+                    name: "name",
+                    description: "description",
+                },
+            ],
+        };
         const page = await client.users.roles.list("id", {
             per_page: 1,
             page: 1,
@@ -42,7 +52,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/roles")
@@ -61,7 +70,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/roles")
@@ -80,7 +88,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/id/roles")
@@ -112,7 +119,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/roles")
@@ -134,7 +140,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/roles")
@@ -156,7 +161,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/roles")
@@ -178,7 +182,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/users/id/roles")
@@ -213,7 +216,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/roles")
@@ -235,7 +237,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/roles")
@@ -257,7 +258,6 @@ describe("RolesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = { roles: ["roles", "roles"] };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/id/roles")
diff --git a/src/management/tests/wire/users/sessions.test.ts b/src/management/tests/wire/users/sessions.test.ts
index 3007b61a8f..2f7bc49beb 100644
--- a/src/management/tests/wire/users/sessions.test.ts
+++ b/src/management/tests/wire/users/sessions.test.ts
@@ -26,7 +26,6 @@ describe("SessionsClient", () => {
             ],
             next: "next",
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/users/user_id/sessions")
@@ -35,7 +34,25 @@ describe("SessionsClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            sessions: [
+                {
+                    id: "id",
+                    user_id: "user_id",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                    authenticated_at: "2024-01-15T09:30:00Z",
+                    idle_expires_at: "2024-01-15T09:30:00Z",
+                    expires_at: "2024-01-15T09:30:00Z",
+                    last_interacted_at: "2024-01-15T09:30:00Z",
+                    clients: [{}],
+                    session_metadata: {
+                        key: "value",
+                    },
+                },
+            ],
+            next: "next",
+        };
         const page = await client.users.sessions.list("user_id", {
             from: "from",
             take: 1,
@@ -52,7 +69,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/user_id/sessions")
@@ -71,7 +87,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/user_id/sessions")
@@ -90,7 +105,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/user_id/sessions")
@@ -109,7 +123,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/users/user_id/sessions")
@@ -138,7 +151,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/user_id/sessions")
@@ -157,7 +169,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/user_id/sessions")
@@ -176,7 +187,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/user_id/sessions")
@@ -195,7 +205,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/user_id/sessions")
@@ -214,7 +223,6 @@ describe("SessionsClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/users/user_id/sessions")
diff --git a/src/management/tests/wire/verifiableCredentials/verification/templates.test.ts b/src/management/tests/wire/verifiableCredentials/verification/templates.test.ts
index c4ccb4eb98..a33d0f2582 100644
--- a/src/management/tests/wire/verifiableCredentials/verification/templates.test.ts
+++ b/src/management/tests/wire/verifiableCredentials/verification/templates.test.ts
@@ -25,7 +25,6 @@ describe("TemplatesClient", () => {
                 },
             ],
         };
-
         server
             .mockEndpoint({ once: false })
             .get("/verifiable-credentials/verification/templates")
@@ -34,7 +33,26 @@ describe("TemplatesClient", () => {
             .jsonBody(rawResponseBody)
             .build();
 
-        const expected = rawResponseBody;
+        const expected = {
+            next: "next",
+            templates: [
+                {
+                    id: "id",
+                    name: "name",
+                    type: "type",
+                    dialect: "dialect",
+                    presentation: {
+                        "org.iso.18013.5.1.mDL": {
+                            "org.iso.18013.5.1": {},
+                        },
+                    },
+                    custom_certificate_authority: "custom_certificate_authority",
+                    well_known_trusted_issuers: "well_known_trusted_issuers",
+                    created_at: "2024-01-15T09:30:00Z",
+                    updated_at: "2024-01-15T09:30:00Z",
+                },
+            ],
+        };
         const page = await client.verifiableCredentials.verification.templates.list({
             from: "from",
             take: 1,
@@ -51,7 +69,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/verifiable-credentials/verification/templates")
@@ -70,7 +87,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/verifiable-credentials/verification/templates")
@@ -89,7 +105,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/verifiable-credentials/verification/templates")
@@ -108,7 +123,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/verifiable-credentials/verification/templates")
@@ -143,7 +157,6 @@ describe("TemplatesClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .post("/verifiable-credentials/verification/templates")
@@ -164,7 +177,21 @@ describe("TemplatesClient", () => {
             },
             well_known_trusted_issuers: "well_known_trusted_issuers",
         });
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            type: "type",
+            dialect: "dialect",
+            presentation: {
+                "org.iso.18013.5.1.mDL": {
+                    "org.iso.18013.5.1": {},
+                },
+            },
+            custom_certificate_authority: "custom_certificate_authority",
+            well_known_trusted_issuers: "well_known_trusted_issuers",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("create (2)", async () => {
@@ -178,7 +205,6 @@ describe("TemplatesClient", () => {
             well_known_trusted_issuers: "x",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/verifiable-credentials/verification/templates")
@@ -214,7 +240,6 @@ describe("TemplatesClient", () => {
             well_known_trusted_issuers: "x",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/verifiable-credentials/verification/templates")
@@ -250,7 +275,6 @@ describe("TemplatesClient", () => {
             well_known_trusted_issuers: "x",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/verifiable-credentials/verification/templates")
@@ -286,7 +310,6 @@ describe("TemplatesClient", () => {
             well_known_trusted_issuers: "x",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/verifiable-credentials/verification/templates")
@@ -322,7 +345,6 @@ describe("TemplatesClient", () => {
             well_known_trusted_issuers: "x",
         };
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .post("/verifiable-credentials/verification/templates")
@@ -362,7 +384,6 @@ describe("TemplatesClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .get("/verifiable-credentials/verification/templates/id")
@@ -372,7 +393,21 @@ describe("TemplatesClient", () => {
             .build();
 
         const response = await client.verifiableCredentials.verification.templates.get("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            type: "type",
+            dialect: "dialect",
+            presentation: {
+                "org.iso.18013.5.1.mDL": {
+                    "org.iso.18013.5.1": {},
+                },
+            },
+            custom_certificate_authority: "custom_certificate_authority",
+            well_known_trusted_issuers: "well_known_trusted_issuers",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("get (2)", async () => {
@@ -380,7 +415,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/verifiable-credentials/verification/templates/id")
@@ -399,7 +433,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/verifiable-credentials/verification/templates/id")
@@ -418,7 +451,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/verifiable-credentials/verification/templates/id")
@@ -437,7 +469,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/verifiable-credentials/verification/templates/id")
@@ -456,7 +487,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .get("/verifiable-credentials/verification/templates/id")
@@ -490,7 +520,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/verifiable-credentials/verification/templates/id")
@@ -509,7 +538,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/verifiable-credentials/verification/templates/id")
@@ -528,7 +556,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/verifiable-credentials/verification/templates/id")
@@ -547,7 +574,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
 
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .delete("/verifiable-credentials/verification/templates/id")
@@ -576,7 +602,6 @@ describe("TemplatesClient", () => {
             created_at: "2024-01-15T09:30:00Z",
             updated_at: "2024-01-15T09:30:00Z",
         };
-
         server
             .mockEndpoint()
             .patch("/verifiable-credentials/verification/templates/id")
@@ -587,7 +612,21 @@ describe("TemplatesClient", () => {
             .build();
 
         const response = await client.verifiableCredentials.verification.templates.update("id");
-        expect(response).toEqual(rawResponseBody);
+        expect(response).toEqual({
+            id: "id",
+            name: "name",
+            type: "type",
+            dialect: "dialect",
+            presentation: {
+                "org.iso.18013.5.1.mDL": {
+                    "org.iso.18013.5.1": {},
+                },
+            },
+            custom_certificate_authority: "custom_certificate_authority",
+            well_known_trusted_issuers: "well_known_trusted_issuers",
+            created_at: "2024-01-15T09:30:00Z",
+            updated_at: "2024-01-15T09:30:00Z",
+        });
     });
 
     test("update (2)", async () => {
@@ -595,7 +634,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/verifiable-credentials/verification/templates/id")
@@ -615,7 +653,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/verifiable-credentials/verification/templates/id")
@@ -635,7 +672,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/verifiable-credentials/verification/templates/id")
@@ -655,7 +691,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/verifiable-credentials/verification/templates/id")
@@ -675,7 +710,6 @@ describe("TemplatesClient", () => {
         const client = new ManagementClient({ maxRetries: 0, token: "test", environment: server.baseUrl });
         const rawRequestBody = {};
         const rawResponseBody = { key: "value" };
-
         server
             .mockEndpoint()
             .patch("/verifiable-credentials/verification/templates/id")
diff --git a/yarn.lock b/yarn.lock
index 7b7531135b..a44ec3df1f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -435,9 +435,9 @@
     resolve-from "^5.0.0"
 
 "@istanbuljs/schema@^0.1.2", "@istanbuljs/schema@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
-  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.6.tgz#8dc9afa2ac1506cb1a58f89940f1c124446c8df3"
+  integrity sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==
 
 "@jest/console@^29.7.0":
   version "29.7.0"
@@ -899,11 +899,11 @@
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/node@*":
-  version "25.5.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-25.5.2.tgz#94861e32f9ffd8de10b52bbec403465c84fff762"
-  integrity sha512-tO4ZIRKNC+MDWV4qKVZe3Ql/woTnmHDr5JD8UI5hn2pwBrHEwOEMZK7WlNb5RKB6EoJ02gwmQS9OrjuFnZYdpg==
+  version "25.6.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-25.6.0.tgz#4e09bad9b469871f2d0f68140198cbd714f4edca"
+  integrity sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==
   dependencies:
-    undici-types "~7.18.0"
+    undici-types "~7.19.0"
 
 "@types/node@^18.19.70":
   version "18.19.130"
@@ -945,99 +945,99 @@
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/eslint-plugin@^8.38.0":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.58.1.tgz#cb53038b83d165ca0ef96d67d875efbd56c50fa8"
-  integrity sha512-eSkwoemjo76bdXl2MYqtxg51HNwUSkWfODUOQ3PaTLZGh9uIWWFZIjyjaJnex7wXDu+TRx+ATsnSxdN9YWfRTQ==
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.58.2.tgz#a6882a6a328e1259cff259fdb03184245ef06191"
+  integrity sha512-aC2qc5thQahutKjP+cl8cgN9DWe3ZUqVko30CMSZHnFEHyhOYoZSzkGtAI2mcwZ38xeImDucI4dnqsHiOYuuCw==
   dependencies:
     "@eslint-community/regexpp" "^4.12.2"
-    "@typescript-eslint/scope-manager" "8.58.1"
-    "@typescript-eslint/type-utils" "8.58.1"
-    "@typescript-eslint/utils" "8.58.1"
-    "@typescript-eslint/visitor-keys" "8.58.1"
+    "@typescript-eslint/scope-manager" "8.58.2"
+    "@typescript-eslint/type-utils" "8.58.2"
+    "@typescript-eslint/utils" "8.58.2"
+    "@typescript-eslint/visitor-keys" "8.58.2"
     ignore "^7.0.5"
     natural-compare "^1.4.0"
     ts-api-utils "^2.5.0"
 
 "@typescript-eslint/parser@^8.38.0":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.58.1.tgz#0943eca522ac408bcdd649882c3d95b10ff00f62"
-  integrity sha512-gGkiNMPqerb2cJSVcruigx9eHBlLG14fSdPdqMoOcBfh+vvn4iCq2C8MzUB89PrxOXk0y3GZ1yIWb9aOzL93bw==
-  dependencies:
-    "@typescript-eslint/scope-manager" "8.58.1"
-    "@typescript-eslint/types" "8.58.1"
-    "@typescript-eslint/typescript-estree" "8.58.1"
-    "@typescript-eslint/visitor-keys" "8.58.1"
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.58.2.tgz#b267545e4bd515d896fe1f3a5b6f334fa6aa0026"
+  integrity sha512-/Zb/xaIDfxeJnvishjGdcR4jmr7S+bda8PKNhRGdljDM+elXhlvN0FyPSsMnLmJUrVG9aPO6dof80wjMawsASg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "8.58.2"
+    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/typescript-estree" "8.58.2"
+    "@typescript-eslint/visitor-keys" "8.58.2"
     debug "^4.4.3"
 
-"@typescript-eslint/project-service@8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.58.1.tgz#c78781b1ca1ec1e7bc6522efba89318c6d249feb"
-  integrity sha512-gfQ8fk6cxhtptek+/8ZIqw8YrRW5048Gug8Ts5IYcMLCw18iUgrZAEY/D7s4hkI0FxEfGakKuPK/XUMPzPxi5g==
+"@typescript-eslint/project-service@8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.58.2.tgz#8c980249100e21b87baba0ca10880fdf893e0a8e"
+  integrity sha512-Cq6UfpZZk15+r87BkIh5rDpi38W4b+Sjnb8wQCPPDDweS/LRCFjCyViEbzHk5Ck3f2QDfgmlxqSa7S7clDtlfg==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.58.1"
-    "@typescript-eslint/types" "^8.58.1"
+    "@typescript-eslint/tsconfig-utils" "^8.58.2"
+    "@typescript-eslint/types" "^8.58.2"
     debug "^4.4.3"
 
-"@typescript-eslint/scope-manager@8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.58.1.tgz#35168f561bab4e3fd10dd6b03e8b83c157479211"
-  integrity sha512-TPYUEqJK6avLcEjumWsIuTpuYODTTDAtoMdt8ZZa93uWMTX13Nb8L5leSje1NluammvU+oI3QRr5lLXPgihX3w==
+"@typescript-eslint/scope-manager@8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.58.2.tgz#aa73784d78f117940e83f71705af07ba695cd60c"
+  integrity sha512-SgmyvDPexWETQek+qzZnrG6844IaO02UVyOLhI4wpo82dpZJY9+6YZCKAMFzXb7qhx37mFK1QcPQ18tud+vo6Q==
   dependencies:
-    "@typescript-eslint/types" "8.58.1"
-    "@typescript-eslint/visitor-keys" "8.58.1"
+    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/visitor-keys" "8.58.2"
 
-"@typescript-eslint/tsconfig-utils@8.58.1", "@typescript-eslint/tsconfig-utils@^8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.1.tgz#eb16792c579300c7bfb3c74b0f5e1dfbb0a2454d"
-  integrity sha512-JAr2hOIct2Q+qk3G+8YFfqkqi7sC86uNryT+2i5HzMa2MPjw4qNFvtjnw1IiA1rP7QhNKVe21mSSLaSjwA1Olw==
+"@typescript-eslint/tsconfig-utils@8.58.2", "@typescript-eslint/tsconfig-utils@^8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.2.tgz#fa13f96432c9348bf87f6f44826def585fad7bca"
+  integrity sha512-3SR+RukipDvkkKp/d0jP0dyzuls3DbGmwDpVEc5wqk5f38KFThakqAAO0XMirWAE+kT00oTauTbzMFGPoAzB0A==
 
-"@typescript-eslint/type-utils@8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.58.1.tgz#b21085a233087bde94c92ba6f5b4dfb77ca56730"
-  integrity sha512-HUFxvTJVroT+0rXVJC7eD5zol6ID+Sn5npVPWoFuHGg9Ncq5Q4EYstqR+UOqaNRFXi5TYkpXXkLhoCHe3G0+7w==
+"@typescript-eslint/type-utils@8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.58.2.tgz#024eb1dd597f8a34cb22d8d9ab32da857bc9a817"
+  integrity sha512-Z7EloNR/B389FvabdGeTo2XMs4W9TjtPiO9DAsmT0yom0bwlPyRjkJ1uCdW1DvrrrYP50AJZ9Xc3sByZA9+dcg==
   dependencies:
-    "@typescript-eslint/types" "8.58.1"
-    "@typescript-eslint/typescript-estree" "8.58.1"
-    "@typescript-eslint/utils" "8.58.1"
+    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/typescript-estree" "8.58.2"
+    "@typescript-eslint/utils" "8.58.2"
     debug "^4.4.3"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/types@8.58.1", "@typescript-eslint/types@^8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.58.1.tgz#9dfb4723fcd2b13737d8b03d941354cf73190313"
-  integrity sha512-io/dV5Aw5ezwzfPBBWLoT+5QfVtP8O7q4Kftjn5azJ88bYyp/ZMCsyW1lpKK46EXJcaYMZ1JtYj+s/7TdzmQMw==
+"@typescript-eslint/types@8.58.2", "@typescript-eslint/types@^8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.58.2.tgz#3ab8051de0f19a46ddefb0749d0f7d82974bd57c"
+  integrity sha512-9TukXyATBQf/Jq9AMQXfvurk+G5R2MwfqQGDR2GzGz28HvY/lXNKGhkY+6IOubwcquikWk5cjlgPvD2uAA7htQ==
 
-"@typescript-eslint/typescript-estree@8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.1.tgz#8230cc9628d2cffef101e298c62807c4b9bf2fe9"
-  integrity sha512-w4w7WR7GHOjqqPnvAYbazq+Y5oS68b9CzasGtnd6jIeOIeKUzYzupGTB2T4LTPSv4d+WPeccbxuneTFHYgAAWg==
+"@typescript-eslint/typescript-estree@8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.2.tgz#b1beb1f959385b341cc76f0aebbf028e23dfdb8b"
+  integrity sha512-ELGuoofuhhoCvNbQjFFiobFcGgcDCEm0ThWdmO4Z0UzLqPXS3KFvnEZ+SHewwOYHjM09tkzOWXNTv9u6Gqtyuw==
   dependencies:
-    "@typescript-eslint/project-service" "8.58.1"
-    "@typescript-eslint/tsconfig-utils" "8.58.1"
-    "@typescript-eslint/types" "8.58.1"
-    "@typescript-eslint/visitor-keys" "8.58.1"
+    "@typescript-eslint/project-service" "8.58.2"
+    "@typescript-eslint/tsconfig-utils" "8.58.2"
+    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/visitor-keys" "8.58.2"
     debug "^4.4.3"
     minimatch "^10.2.2"
     semver "^7.7.3"
     tinyglobby "^0.2.15"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/utils@8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.58.1.tgz#099a327b04ed921e6ee3988cde9ef34bc4b5435a"
-  integrity sha512-Ln8R0tmWC7pTtLOzgJzYTXSCjJ9rDNHAqTaVONF4FEi2qwce8mD9iSOxOpLFFvWp/wBFlew0mjM1L1ihYWfBdQ==
+"@typescript-eslint/utils@8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.58.2.tgz#27165554a02d1ff57d98262fa92060498dabc8b3"
+  integrity sha512-QZfjHNEzPY8+l0+fIXMvuQ2sJlplB4zgDZvA+NmvZsZv3EQwOcc1DuIU1VJUTWZ/RKouBMhDyNaBMx4sWvrzRA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.9.1"
-    "@typescript-eslint/scope-manager" "8.58.1"
-    "@typescript-eslint/types" "8.58.1"
-    "@typescript-eslint/typescript-estree" "8.58.1"
+    "@typescript-eslint/scope-manager" "8.58.2"
+    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/typescript-estree" "8.58.2"
 
-"@typescript-eslint/visitor-keys@8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.1.tgz#7c197533177f1ba9b8249f55f7f685e32bb6f204"
-  integrity sha512-y+vH7QE8ycjoa0bWciFg7OpFcipUuem1ujhrdLtq1gByKwfbC7bPeKsiny9e0urg93DqwGcHey+bGRKCnF1nZQ==
+"@typescript-eslint/visitor-keys@8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.2.tgz#9ed699eaa9b5720b6b6b6f9c16e6c7d4cd32b276"
+  integrity sha512-f1WO2Lx8a9t8DARmcWAUPJbu0G20bJlj8L4z72K00TMeJAoyLr/tHhI/pzYBLrR4dXWkcxO1cWYZEOX8DKHTqA==
   dependencies:
-    "@typescript-eslint/types" "8.58.1"
+    "@typescript-eslint/types" "8.58.2"
     eslint-visitor-keys "^5.0.0"
 
 "@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1":
@@ -1396,14 +1396,14 @@ balanced-match@^4.0.2:
   integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==
 
 baseline-browser-mapping@^2.10.12:
-  version "2.10.16"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.16.tgz#ef80cf218a53f165689a6e32ffffdca1f35d979c"
-  integrity sha512-Lyf3aK28zpsD1yQMiiHD4RvVb6UdMoo8xzG2XzFIfR9luPzOpcBlAsT/qfB1XWS1bxWT+UtE4WmQgsp297FYOA==
+  version "2.10.18"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.18.tgz#565745085ba7743af7d4072707ad132db3a5a42f"
+  integrity sha512-VSnGQAOLtP5mib/DPyg2/t+Tlv65NTBz83BJBJvmLVHHuKJVaDOBvJJykiT5TR++em5nfAySPccDZDa4oSrn8A==
 
 brace-expansion@^1.1.7:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.13.tgz#d37875c01dc9eff988dd49d112a57cb67b54efe6"
-  integrity sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.14.tgz#d9de602370d91347cd9ddad1224d4fd701eb348b"
+  integrity sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -1476,9 +1476,9 @@ camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001782:
-  version "1.0.30001787"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001787.tgz#fd25c5e42e2d35df5c75eddda00d15d9c0c68f81"
-  integrity sha512-mNcrMN9KeI68u7muanUpEejSLghOKlVhRqS/Za2IeyGllJ9I9otGpR9g3nsw7n4W378TE/LyIteA0+/FOZm4Kg==
+  version "1.0.30001788"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001788.tgz#31e97d1bfec332b3f2d7eea7781460c97629b3bf"
+  integrity sha512-6q8HFp+lOQtcf7wBK+uEenxymVWkGKkjFpCvw5W25cmMwEDU45p1xQFBQv8JDlMMry7eNxyBaR+qxgmTUZkIRQ==
 
 chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.2"
@@ -1703,9 +1703,9 @@ dunder-proto@^1.0.1:
     gopd "^1.2.0"
 
 electron-to-chromium@^1.5.328:
-  version "1.5.334"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.334.tgz#1e3fdd8d014852104eb8e632e760fb364db7dd0e"
-  integrity sha512-mgjZAz7Jyx1SRCwEpy9wefDS7GvNPazLthHg8eQMJ76wBdGQQDW33TCrUTvQ4wzpmOrv2zrFoD3oNufMdyMpog==
+  version "1.5.336"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.336.tgz#d7c25c0827b8c5e2885b2c91ac6cdcf3e5a1386e"
+  integrity sha512-AbH9q9J455r/nLmdNZes0G0ZKcRX73FicwowalLs6ijwOmCJSRRrLX63lcAlzy9ux3dWK1w1+1nsBJEWN11hcQ==
 
 emittery@^0.13.1:
   version "0.13.1"
@@ -3094,7 +3094,7 @@ mimic-function@^5.0.0:
   resolved "https://registry.yarnpkg.com/mimic-function/-/mimic-function-5.0.1.tgz#acbe2b3349f99b9deaca7fb70e48b83e94e67076"
   integrity sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==
 
-minimatch@^10.2.2, minimatch@^10.2.4:
+minimatch@^10.2.2, minimatch@^10.2.5:
   version "10.2.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.5.tgz#bd48687a0be38ed2961399105600f832095861d1"
   integrity sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==
@@ -3363,10 +3363,10 @@ prettier-linter-helpers@^1.0.1:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.8.1.tgz#edf48977cf991558f4fcbd8a3ba6015ba2a3a173"
-  integrity sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==
+prettier@3.7.4:
+  version "3.7.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.7.4.tgz#d2f8335d4b1cec47e1c8098645411b0c9dff9c0f"
+  integrity sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==
 
 pretty-format@^29.0.0, pretty-format@^29.7.0:
   version "29.7.0"
@@ -3470,10 +3470,11 @@ resolve.exports@^2.0.0:
   integrity sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==
 
 resolve@^1.20.0:
-  version "1.22.11"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262"
-  integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==
+  version "1.22.12"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.12.tgz#f5b2a680897c69c238a13cd16b15671f8b73549f"
+  integrity sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==
   dependencies:
+    es-errors "^1.3.0"
     is-core-module "^2.16.1"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
@@ -3845,7 +3846,7 @@ ts-jest@^29.3.4:
     type-fest "^4.41.0"
     yargs-parser "^21.1.1"
 
-ts-loader@^9.5.4:
+ts-loader@^9.5.1:
   version "9.5.7"
   resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.7.tgz#582663e853646e18506cd5cc79feb354952731c0"
   integrity sha512-/ZNrKgA3K3PtpMYOC71EeMWIloGw3IYEa5/t1cyz2r5/PyUwTXGzYJvcD3kfUvmhlfpz1rhV8B2O6IVTQ0avsg==
@@ -3884,20 +3885,20 @@ typedoc-plugin-missing-exports@^4.0.0:
   integrity sha512-tgrlnwzXbqMP2/3BaZk0atddPsD7UnpCoeQ0cUCtk624gODT1bLYOLBEJLXQyVmbnP8HZCMhHpRiR+rxSdZqhg==
 
 typedoc@^0.28.7:
-  version "0.28.18"
-  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.28.18.tgz#f7578fd9aa3ace83db8cce9bf1e8d41b88ec0b94"
-  integrity sha512-NTWTUOFRQ9+SGKKTuWKUioUkjxNwtS3JDRPVKZAXGHZy2wCA8bdv2iJiyeePn0xkmK+TCCqZFT0X7+2+FLjngA==
+  version "0.28.19"
+  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.28.19.tgz#0940c6b98eafae27cba71e57855d593f88a80649"
+  integrity sha512-wKh+lhdmMFivMlc6vRRcMGXeGEHGU2g8a2CkPTJjJlwRf1iXbimWIPcFolCqe4E0d/FRtGszpIrsp3WLpDB8Pw==
   dependencies:
     "@gerrit0/mini-shiki" "^3.23.0"
     lunr "^2.3.9"
     markdown-it "^14.1.1"
-    minimatch "^10.2.4"
-    yaml "^2.8.2"
+    minimatch "^10.2.5"
+    yaml "^2.8.3"
 
-typescript@~5.9.3:
-  version "5.9.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
-  integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
+typescript@~5.7.2:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.3.tgz#919b44a7dbb8583a9b856d162be24a54bf80073e"
+  integrity sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==
 
 uc.micro@^2.0.0, uc.micro@^2.1.0:
   version "2.1.0"
@@ -3919,15 +3920,15 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-undici-types@~7.18.0:
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.18.2.tgz#29357a89e7b7ca4aef3bf0fd3fd0cd73884229e9"
-  integrity sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==
+undici-types@~7.19.0:
+  version "7.19.2"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.19.2.tgz#1b67fc26d0f157a0cba3a58a5b5c1e2276b8ba2a"
+  integrity sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==
 
 undici@^7.12.0:
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-7.24.7.tgz#af9535341bbe80625ca403a02418477a5c6a8760"
-  integrity sha512-H/nlJ/h0ggGC+uRL3ovD+G0i4bqhvsDOpbDv7At5eFLlj2b41L8QliGbnl2H7SnDiYhENphh1tQFJZf+MyfLsQ==
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-7.25.0.tgz#7d72fc429a0421769ca2966fd07cac875c85b781"
+  integrity sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==
 
 universalify@^0.2.0:
   version "0.2.0"
@@ -4008,10 +4009,10 @@ webpack-sources@^3.3.4:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.3.4.tgz#a338b95eb484ecc75fbb196cbe8a2890618b4891"
   integrity sha512-7tP1PdV4vF+lYPnkMR0jMY5/la2ub5Fc/8VQrrU+lXkiM6C4TjVfGw7iKfyhnTQOsD+6Q/iKw0eFciziRgD58Q==
 
-webpack@^5.105.4:
-  version "5.106.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.106.0.tgz#ee374da5573eef1e47b2650d6be8e40fb928d697"
-  integrity sha512-Pkx5joZ9RrdgO5LBkyX1L2ZAJeK/Taz3vqZ9CbcP0wS5LEMx5QkKsEwLl29QJfihZ+DKRBFldzy1O30pJ1MDpA==
+webpack@^5.97.1:
+  version "5.106.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.106.1.tgz#0a3eeb43a50e4f67fbecd206e1e6fc2c89fc2b6f"
+  integrity sha512-EW8af29ak8Oaf4T8k8YsajjrDBDYgnKZ5er6ljWFJsXABfTNowQfvHLftwcepVgdz+IoLSdEAbBiM9DFXoll9w==
   dependencies:
     "@types/eslint-scope" "^3.7.7"
     "@types/estree" "^1.0.8"
@@ -4141,7 +4142,7 @@ yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yaml@^2.8.2:
+yaml@^2.8.2, yaml@^2.8.3:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.3.tgz#a0d6bd2efb3dd03c59370223701834e60409bd7d"
   integrity sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==