diff --git a/sdk/keyvault/keyvault-admin/test/public/accessControlClient.aborts.spec.ts b/sdk/keyvault/keyvault-admin/test/public/accessControlClient.aborts.spec.ts
index 02f7da0961c9..cbccb04b3d72 100644
--- a/sdk/keyvault/keyvault-admin/test/public/accessControlClient.aborts.spec.ts
+++ b/sdk/keyvault/keyvault-admin/test/public/accessControlClient.aborts.spec.ts
@@ -5,8 +5,8 @@ import { env, Recorder } from "@azure-tools/test-recorder";
 import { AbortController } from "@azure/abort-controller";
 
 import { KeyVaultAccessControlClient } from "../../src";
-import { assertThrowsAbortError, getServiceVersion } from "../utils/common";
-import { authenticate } from "../utils/authentication";
+import { assertThrowsAbortError, getServiceVersion } from "./utils/common";
+import { authenticate } from "./utils/authentication";
 
 describe("Aborting KeyVaultAccessControlClient's requests", () => {
   let client: KeyVaultAccessControlClient;
diff --git a/sdk/keyvault/keyvault-admin/test/public/accessControlClient.spec.ts b/sdk/keyvault/keyvault-admin/test/public/accessControlClient.spec.ts
index c2a5bf42c374..4fc415f409de 100644
--- a/sdk/keyvault/keyvault-admin/test/public/accessControlClient.spec.ts
+++ b/sdk/keyvault/keyvault-admin/test/public/accessControlClient.spec.ts
@@ -13,9 +13,9 @@ import {
   KeyVaultRoleDefinition,
   KnownKeyVaultDataAction,
 } from "../../src";
-import { authenticate } from "../utils/authentication";
-import { supportsTracing } from "../utils/supportsTracing";
-import { getServiceVersion } from "../utils/common";
+import { authenticate } from "./utils/authentication";
+import { supportsTracing } from "./utils/supportsTracing";
+import { getServiceVersion } from "./utils/common";
 
 describe("KeyVaultAccessControlClient", () => {
   let client: KeyVaultAccessControlClient;
diff --git a/sdk/keyvault/keyvault-admin/test/public/backupClient.abort.spec.ts b/sdk/keyvault/keyvault-admin/test/public/backupClient.abort.spec.ts
index 583bc4e542d5..d79bb5eaa7b3 100644
--- a/sdk/keyvault/keyvault-admin/test/public/backupClient.abort.spec.ts
+++ b/sdk/keyvault/keyvault-admin/test/public/backupClient.abort.spec.ts
@@ -5,9 +5,9 @@ import { Recorder } from "@azure-tools/test-recorder";
 import { AbortController } from "@azure/abort-controller";
 
 import { KeyVaultBackupClient } from "../../src";
-import { authenticate } from "../utils/authentication";
-import { testPollerProperties } from "../utils/recorder";
-import { assertThrowsAbortError, getSasToken, getServiceVersion } from "../utils/common";
+import { authenticate } from "./utils/authentication";
+import { testPollerProperties } from "./utils/recorder";
+import { assertThrowsAbortError, getSasToken, getServiceVersion } from "./utils/common";
 
 describe("Aborting KeyVaultBackupClient's requests", () => {
   let client: KeyVaultBackupClient;
diff --git a/sdk/keyvault/keyvault-admin/test/public/backupClient.spec.ts b/sdk/keyvault/keyvault-admin/test/public/backupClient.spec.ts
index 24c1847add91..fa65e4cafdd8 100644
--- a/sdk/keyvault/keyvault-admin/test/public/backupClient.spec.ts
+++ b/sdk/keyvault/keyvault-admin/test/public/backupClient.spec.ts
@@ -7,9 +7,9 @@ chai.use(chaiAsPromised);
 import { isPlaybackMode, Recorder } from "@azure-tools/test-recorder";
 
 import { KeyVaultBackupClient } from "../../src";
-import { authenticate } from "../utils/authentication";
-import { testPollerProperties } from "../utils/recorder";
-import { getSasToken, getServiceVersion } from "../utils/common";
+import { authenticate } from "./utils/authentication";
+import { testPollerProperties } from "./utils/recorder";
+import { getSasToken, getServiceVersion } from "./utils/common";
 import { delay } from "@azure/core-util";
 import { assert } from "chai";
 import { KeyClient } from "@azure/keyvault-keys";
diff --git a/sdk/keyvault/keyvault-admin/test/utils/authentication.ts b/sdk/keyvault/keyvault-admin/test/public/utils/authentication.ts
similarity index 99%
rename from sdk/keyvault/keyvault-admin/test/utils/authentication.ts
rename to sdk/keyvault/keyvault-admin/test/public/utils/authentication.ts
index bfd0efe65b5d..7c10cff67008 100644
--- a/sdk/keyvault/keyvault-admin/test/utils/authentication.ts
+++ b/sdk/keyvault/keyvault-admin/test/public/utils/authentication.ts
@@ -7,7 +7,7 @@ import { KeyClient } from "@azure/keyvault-keys";
 import { v4 as uuidv4 } from "uuid";
 import { Context } from "mocha";
 
-import { KeyVaultAccessControlClient, KeyVaultBackupClient } from "../../src";
+import { KeyVaultAccessControlClient, KeyVaultBackupClient } from "../../../src";
 import { uniqueString } from "./recorder";
 import { getEnvironmentVariable, getServiceVersion } from "./common";
 
diff --git a/sdk/keyvault/keyvault-admin/test/utils/common.ts b/sdk/keyvault/keyvault-admin/test/public/utils/common.ts
similarity index 99%
rename from sdk/keyvault/keyvault-admin/test/utils/common.ts
rename to sdk/keyvault/keyvault-admin/test/public/utils/common.ts
index f161f423289c..90658eea6d13 100644
--- a/sdk/keyvault/keyvault-admin/test/utils/common.ts
+++ b/sdk/keyvault/keyvault-admin/test/public/utils/common.ts
@@ -4,7 +4,7 @@
 import { assert } from "chai";
 import { env } from "@azure-tools/test-recorder";
 import { SupportedVersions, supports, TestFunctionWrapper } from "@azure/test-utils";
-import { LATEST_API_VERSION, SUPPORTED_API_VERSIONS } from "../../src/constants";
+import { LATEST_API_VERSION, SUPPORTED_API_VERSIONS } from "../../../src/constants";
 
 export async function assertThrowsAbortError(cb: () => Promise<any>): Promise<void> {
   let passed = false;
diff --git a/sdk/keyvault/keyvault-admin/test/utils/recorder.ts b/sdk/keyvault/keyvault-admin/test/public/utils/recorder.ts
similarity index 100%
rename from sdk/keyvault/keyvault-admin/test/utils/recorder.ts
rename to sdk/keyvault/keyvault-admin/test/public/utils/recorder.ts
diff --git a/sdk/keyvault/keyvault-admin/test/utils/supportsTracing.ts b/sdk/keyvault/keyvault-admin/test/public/utils/supportsTracing.ts
similarity index 100%
rename from sdk/keyvault/keyvault-admin/test/utils/supportsTracing.ts
rename to sdk/keyvault/keyvault-admin/test/public/utils/supportsTracing.ts
diff --git a/sdk/keyvault/keyvault-certificates/test/internal/challengeBasedAuthenticationPolicy.spec.ts b/sdk/keyvault/keyvault-certificates/test/internal/challengeBasedAuthenticationPolicy.spec.ts
index b0ac27d1d7f9..a148292c6fad 100644
--- a/sdk/keyvault/keyvault-certificates/test/internal/challengeBasedAuthenticationPolicy.spec.ts
+++ b/sdk/keyvault/keyvault-certificates/test/internal/challengeBasedAuthenticationPolicy.spec.ts
@@ -5,7 +5,7 @@ import { assert } from "chai";
 import { Context } from "mocha";
 import { createSandbox } from "sinon";
 import { env, Recorder } from "@azure-tools/test-recorder";
-import { getServiceVersion } from "../utils/utils.common";
+import { getServiceVersion } from "../public/utils/common";
 
 import {
   AuthenticationChallengeCache,
@@ -14,9 +14,9 @@ import {
   challengeBasedAuthenticationPolicy,
 } from "../../../keyvault-common/src";
 import { CertificateClient } from "../../src";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { testPollerProperties } from "../public/utils/recorderUtils";
+import { authenticate } from "../public/utils/testAuthentication";
+import TestClient from "../public/utils/testClient";
 import { WebResource } from "@azure/core-http";
 import { ClientSecretCredential } from "@azure/identity";
 
diff --git a/sdk/keyvault/keyvault-certificates/test/public/CRUD.spec.ts b/sdk/keyvault/keyvault-certificates/test/public/CRUD.spec.ts
index 956cd173a7ae..01e7ef54f2c9 100644
--- a/sdk/keyvault/keyvault-certificates/test/public/CRUD.spec.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/CRUD.spec.ts
@@ -15,11 +15,11 @@ import { ClientSecretCredential } from "@azure/identity";
 import { isNode } from "@azure/core-http";
 
 import { CertificateClient } from "../../src";
-import { assertThrowsAbortError } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - create, read, update and delete", () => {
   const prefix = `CRUD${env.CERTIFICATE_NAME || "CertificateName"}`;
diff --git a/sdk/keyvault/keyvault-certificates/test/public/list.spec.ts b/sdk/keyvault/keyvault-certificates/test/public/list.spec.ts
index 596715e3bd7c..30e586485102 100644
--- a/sdk/keyvault/keyvault-certificates/test/public/list.spec.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/list.spec.ts
@@ -8,11 +8,11 @@ import { env, isPlaybackMode, Recorder, isRecordMode } from "@azure-tools/test-r
 import { isNode } from "@azure/core-http";
 
 import { CertificateClient } from "../../src";
-import { assertThrowsAbortError } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 const { expect } = chai;
 
diff --git a/sdk/keyvault/keyvault-certificates/test/public/lro.create.spec.ts b/sdk/keyvault/keyvault-certificates/test/public/lro.create.spec.ts
index 126516651735..743f59b53573 100644
--- a/sdk/keyvault/keyvault-certificates/test/public/lro.create.spec.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/lro.create.spec.ts
@@ -7,10 +7,10 @@ import { PollerStoppedError } from "@azure/core-lro";
 import { env, Recorder } from "@azure-tools/test-recorder";
 
 import { CertificateClient, KeyVaultCertificate, DefaultCertificatePolicy } from "../../src";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - LRO - create", () => {
   const certificatePrefix = `lroCreate${env.CERTIFICATE_NAME || "CertificateName"}`;
diff --git a/sdk/keyvault/keyvault-certificates/test/public/lro.delete.spec.ts b/sdk/keyvault/keyvault-certificates/test/public/lro.delete.spec.ts
index f35d6eea84e7..73a8ebddaf51 100644
--- a/sdk/keyvault/keyvault-certificates/test/public/lro.delete.spec.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/lro.delete.spec.ts
@@ -7,10 +7,10 @@ import { PollerStoppedError } from "@azure/core-lro";
 import { env, Recorder } from "@azure-tools/test-recorder";
 
 import { CertificateClient, DeletedCertificate, DefaultCertificatePolicy } from "../../src";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - lro - delete", () => {
   const certificatePrefix = `lroDelete${env.CERTIFICATE_NAME || "CertificateName"}`;
diff --git a/sdk/keyvault/keyvault-certificates/test/public/lro.operation.spec.ts b/sdk/keyvault/keyvault-certificates/test/public/lro.operation.spec.ts
index c3c2b5500562..7726c5e439d5 100644
--- a/sdk/keyvault/keyvault-certificates/test/public/lro.operation.spec.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/lro.operation.spec.ts
@@ -11,10 +11,10 @@ import {
   DefaultCertificatePolicy,
   KeyVaultCertificateWithPolicy,
 } from "../../src";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - LRO - certificate operation", () => {
   const certificatePrefix = `lroOperation${env.CERTIFICATE_NAME || "CertificateName"}`;
diff --git a/sdk/keyvault/keyvault-certificates/test/public/lro.recover.spec.ts b/sdk/keyvault/keyvault-certificates/test/public/lro.recover.spec.ts
index d27b7ea1a363..fc367a8d639d 100644
--- a/sdk/keyvault/keyvault-certificates/test/public/lro.recover.spec.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/lro.recover.spec.ts
@@ -7,11 +7,11 @@ import { env, Recorder } from "@azure-tools/test-recorder";
 import { PollerStoppedError } from "@azure/core-lro";
 
 import { CertificateClient, DeletedCertificate, DefaultCertificatePolicy } from "../../src";
-import { assertThrowsAbortError } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - LRO - recoverDelete", () => {
   const certificatePrefix = `lroRecover${env.CERTIFICATE_NAME || "CertificateName"}`;
diff --git a/sdk/keyvault/keyvault-certificates/test/public/mergeAndImport.spec.ts b/sdk/keyvault/keyvault-certificates/test/public/mergeAndImport.spec.ts
index 560e2a01dd47..7849c764193b 100644
--- a/sdk/keyvault/keyvault-certificates/test/public/mergeAndImport.spec.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/mergeAndImport.spec.ts
@@ -11,10 +11,10 @@ import { ClientSecretCredential } from "@azure/identity";
 
 import { CertificateClient } from "../../src";
 import { base64ToUint8Array, stringToUint8Array } from "../../src/utils";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - merge and import certificates", () => {
   const prefix = `merge${env.CERTIFICATE_NAME || "CertificateName"}`;
diff --git a/sdk/keyvault/keyvault-certificates/test/public/recoverBackupRestore.spec.ts b/sdk/keyvault/keyvault-certificates/test/public/recoverBackupRestore.spec.ts
index 2525afb82049..4beff60e4ea4 100644
--- a/sdk/keyvault/keyvault-certificates/test/public/recoverBackupRestore.spec.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/recoverBackupRestore.spec.ts
@@ -7,11 +7,11 @@ import { env, isPlaybackMode, Recorder, isRecordMode } from "@azure-tools/test-r
 import { isNode } from "@azure/core-http";
 
 import { CertificateClient } from "../../src";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { assertThrowsAbortError } from "../utils/utils.common";
-import { authenticate } from "../utils/testAuthentication";
-import { getServiceVersion } from "../utils/utils.common";
-import TestClient from "../utils/testClient";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { assertThrowsAbortError } from "./utils/common";
+import { authenticate } from "./utils/testAuthentication";
+import { getServiceVersion } from "./utils/common";
+import TestClient from "./utils/testClient";
 
 describe("Certificates client - restore certificates and recover backups", () => {
   const prefix = `backupRestore${env.CERTIFICATE_NAME || "CertificateName"}`;
diff --git a/sdk/keyvault/keyvault-certificates/test/utils/utils.common.ts b/sdk/keyvault/keyvault-certificates/test/public/utils/common.ts
similarity index 93%
rename from sdk/keyvault/keyvault-certificates/test/utils/utils.common.ts
rename to sdk/keyvault/keyvault-certificates/test/public/utils/common.ts
index 75fcb5e7c317..8fa93e181ab6 100644
--- a/sdk/keyvault/keyvault-certificates/test/utils/utils.common.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/utils/common.ts
@@ -4,7 +4,7 @@
 import { env } from "@azure-tools/test-recorder";
 import { assert } from "chai";
 import { SupportedVersions, supports, TestFunctionWrapper } from "@azure/test-utils";
-import { LATEST_API_VERSION, CertificateClientOptions } from "../../src/certificatesModels";
+import { CertificateClientOptions } from "../../../src";
 
 export function getKeyvaultName(): string {
   const keyVaultEnvVarName = "KEYVAULT_NAME";
@@ -43,7 +43,7 @@ export const serviceVersions = ["7.0", "7.1", "7.2", "7.3-preview"] as const;
  * @returns - The service version to test
  */
 export function getServiceVersion(): NonNullable<CertificateClientOptions["serviceVersion"]> {
-  return env.SERVICE_VERSION || LATEST_API_VERSION;
+  return env.SERVICE_VERSION || serviceVersions[serviceVersions.length - 1];
 }
 
 /**
diff --git a/sdk/keyvault/keyvault-certificates/test/utils/lro/restore/operation.ts b/sdk/keyvault/keyvault-certificates/test/public/utils/lro/restore/operation.ts
similarity index 98%
rename from sdk/keyvault/keyvault-certificates/test/utils/lro/restore/operation.ts
rename to sdk/keyvault/keyvault-certificates/test/public/utils/lro/restore/operation.ts
index d44c176ce4a8..f0d8c37d7624 100644
--- a/sdk/keyvault/keyvault-certificates/test/utils/lro/restore/operation.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/utils/lro/restore/operation.ts
@@ -4,7 +4,7 @@
 import { AbortSignalLike } from "@azure/abort-controller";
 import { PollOperationState, PollOperation } from "@azure/core-lro";
 import { OperationOptions } from "@azure/core-http";
-import { KeyVaultCertificate, CertificatePollerOptions } from "../../../../src/certificatesModels";
+import { KeyVaultCertificate, CertificatePollerOptions } from "../../../../../src";
 
 /**
  * Options sent to the beginRestoreCertificateBackup method.
diff --git a/sdk/keyvault/keyvault-certificates/test/utils/lro/restore/poller.ts b/sdk/keyvault/keyvault-certificates/test/public/utils/lro/restore/poller.ts
similarity index 95%
rename from sdk/keyvault/keyvault-certificates/test/utils/lro/restore/poller.ts
rename to sdk/keyvault/keyvault-certificates/test/public/utils/lro/restore/poller.ts
index 0b26ddeb2b97..8d3e41eba5cf 100644
--- a/sdk/keyvault/keyvault-certificates/test/utils/lro/restore/poller.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/utils/lro/restore/poller.ts
@@ -8,7 +8,7 @@ import {
   makeRestoreCertificateBackupPollOperation,
   TestCertificateClientInterface,
 } from "./operation";
-import { KeyVaultCertificate } from "../../../../src/certificatesModels";
+import { KeyVaultCertificate } from "../../../../../src";
 
 export interface RestoreCertificateBackupPollerOptions {
   client: TestCertificateClientInterface;
diff --git a/sdk/keyvault/keyvault-certificates/test/utils/recorderUtils.ts b/sdk/keyvault/keyvault-certificates/test/public/utils/recorderUtils.ts
similarity index 100%
rename from sdk/keyvault/keyvault-certificates/test/utils/recorderUtils.ts
rename to sdk/keyvault/keyvault-certificates/test/public/utils/recorderUtils.ts
diff --git a/sdk/keyvault/keyvault-certificates/test/utils/testAuthentication.ts b/sdk/keyvault/keyvault-certificates/test/public/utils/testAuthentication.ts
similarity index 95%
rename from sdk/keyvault/keyvault-certificates/test/utils/testAuthentication.ts
rename to sdk/keyvault/keyvault-certificates/test/public/utils/testAuthentication.ts
index 100630c5b468..807e0fbc2d9a 100644
--- a/sdk/keyvault/keyvault-certificates/test/utils/testAuthentication.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/utils/testAuthentication.ts
@@ -2,10 +2,10 @@
 // Licensed under the MIT license.
 
 import { ClientSecretCredential } from "@azure/identity";
-import { CertificateClient } from "../../src";
+import { CertificateClient } from "../../../src";
 import { uniqueString } from "./recorderUtils";
 import { env, record, RecorderEnvironmentSetup } from "@azure-tools/test-recorder";
-import { getServiceVersion } from "./utils.common";
+import { getServiceVersion } from "./common";
 import TestClient from "./testClient";
 import { Context } from "mocha";
 
diff --git a/sdk/keyvault/keyvault-certificates/test/utils/testClient.ts b/sdk/keyvault/keyvault-certificates/test/public/utils/testClient.ts
similarity index 95%
rename from sdk/keyvault/keyvault-certificates/test/utils/testClient.ts
rename to sdk/keyvault/keyvault-certificates/test/public/utils/testClient.ts
index 11138f8b5786..a64065bf6a49 100644
--- a/sdk/keyvault/keyvault-certificates/test/utils/testClient.ts
+++ b/sdk/keyvault/keyvault-certificates/test/public/utils/testClient.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { CertificateClient, KeyVaultCertificate } from "../../src";
+import { CertificateClient, KeyVaultCertificate } from "../../../src";
 import { PollerLike, PollOperationState } from "@azure/core-lro";
 import { RestoreCertificateBackupPoller } from "./lro/restore/poller";
 import { BeginRestoreCertificateBackupOptions } from "./lro/restore/operation";
diff --git a/sdk/keyvault/keyvault-keys/test/internal/aesCryptography.spec.ts b/sdk/keyvault/keyvault-keys/test/internal/aesCryptography.spec.ts
index 5a18e9560448..e1e442d5555f 100644
--- a/sdk/keyvault/keyvault-keys/test/internal/aesCryptography.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/internal/aesCryptography.spec.ts
@@ -10,15 +10,15 @@ import {
   KeyClient,
   KeyVaultKey,
 } from "../../src";
-import { getKey, stringToUint8Array, uint8ArrayToString } from "../utils/crypto";
+import { getKey, stringToUint8Array, uint8ArrayToString } from "../public/utils/crypto";
 import { isNode } from "@azure/core-http";
 import { AesCryptographyProvider } from "../../src/cryptography/aesCryptographyProvider";
-import TestClient from "../utils/testClient";
-import { authenticate } from "../utils/testAuthentication";
+import TestClient from "../public/utils/testClient";
+import { authenticate } from "../public/utils/testAuthentication";
 import { env, Recorder } from "@azure-tools/test-recorder";
 import { RemoteCryptographyProvider } from "../../src/cryptography/remoteCryptographyProvider";
 import { ClientSecretCredential } from "@azure/identity";
-import { getServiceVersion } from "../utils/utils.common";
+import { getServiceVersion } from "../public/utils/common";
 
 describe("AesCryptographyProvider browser tests", function () {
   it("uses the browser replacement when running in the browser", async function (this: Context) {
diff --git a/sdk/keyvault/keyvault-keys/test/internal/challengeBasedAuthenticationPolicy.spec.ts b/sdk/keyvault/keyvault-keys/test/internal/challengeBasedAuthenticationPolicy.spec.ts
index b798282d28cd..dc0ae3fc14be 100644
--- a/sdk/keyvault/keyvault-keys/test/internal/challengeBasedAuthenticationPolicy.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/internal/challengeBasedAuthenticationPolicy.spec.ts
@@ -13,9 +13,9 @@ import {
   challengeBasedAuthenticationPolicy,
 } from "../../../keyvault-common/src";
 import { KeyClient } from "../../src";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
-import { getServiceVersion } from "../utils/utils.common";
+import { authenticate } from "../public/utils/testAuthentication";
+import TestClient from "../public/utils/testClient";
+import { getServiceVersion } from "../public/utils/common";
 import { HttpHeaders, isNode, WebResource } from "@azure/core-http";
 import { ClientSecretCredential } from "@azure/identity";
 import sinon from "sinon";
diff --git a/sdk/keyvault/keyvault-keys/test/internal/crypto.spec.ts b/sdk/keyvault/keyvault-keys/test/internal/crypto.spec.ts
index d65445a466a0..1b158ed291db 100644
--- a/sdk/keyvault/keyvault-keys/test/internal/crypto.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/internal/crypto.spec.ts
@@ -18,7 +18,7 @@ import {
 } from "../../src";
 import { RsaCryptographyProvider } from "../../src/cryptography/rsaCryptographyProvider";
 import { JsonWebKey } from "../../src";
-import { stringToUint8Array } from "../utils/crypto";
+import { stringToUint8Array } from "../public/utils/crypto";
 import { CryptographyProvider } from "../../src/cryptography/models";
 import { RemoteCryptographyProvider } from "../../src/cryptography/remoteCryptographyProvider";
 
diff --git a/sdk/keyvault/keyvault-keys/test/public/recoverBackupRestore.spec.ts b/sdk/keyvault/keyvault-keys/test/internal/recoverBackupRestore.spec.ts
similarity index 92%
rename from sdk/keyvault/keyvault-keys/test/public/recoverBackupRestore.spec.ts
rename to sdk/keyvault/keyvault-keys/test/internal/recoverBackupRestore.spec.ts
index 5684bdc21f5f..541650d24d9b 100644
--- a/sdk/keyvault/keyvault-keys/test/public/recoverBackupRestore.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/internal/recoverBackupRestore.spec.ts
@@ -5,11 +5,12 @@ import { assert } from "chai";
 import { Context } from "mocha";
 import { isNode } from "@azure/core-http";
 import { KeyClient } from "../../src";
-import { assertThrowsAbortError, getServiceVersion } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
+import { assertThrowsAbortError, getServiceVersion } from "../public/utils/common";
+import { testPollerProperties } from "../public/utils/recorderUtils";
 import { env, Recorder, isRecordMode, isPlaybackMode } from "@azure-tools/test-recorder";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { authenticate } from "../public/utils/testAuthentication";
+import TestClient from "../public/utils/testClient";
+import { RestoreKeyBackupPoller } from "../public/utils/lro/restore/poller";
 
 describe("Keys client - restore keys and recover backups", () => {
   const keyPrefix = `backupRestore${env.KEY_NAME || "KeyName"}`;
@@ -118,10 +119,12 @@ describe("Keys client - restore keys and recover backups", () => {
       // This test implementation of a restore poller only applies for backups that have been recently deleted.
       // Backups might not be ready to be restored in an unknown amount of time.
       // If this is useful to you, please open an issue at: https://github.com/Azure/azure-sdk-for-js/issues
-      const restorePoller = await testClient.beginRestoreKeyBackup(
-        backup as Uint8Array,
-        testPollerProperties
-      );
+      const restorePoller = new RestoreKeyBackupPoller({
+        backup: backup!,
+        client,
+        intervalInMs: testPollerProperties.intervalInMs,
+      });
+
       const restoredKey = await restorePoller.pollUntilDone();
 
       assert.equal(restoredKey.name, keyName);
diff --git a/sdk/keyvault/keyvault-keys/test/internal/serviceVersionParameter.spec.ts b/sdk/keyvault/keyvault-keys/test/internal/serviceVersionParameter.spec.ts
index ef7e31ce6e5c..0fd383572c7d 100644
--- a/sdk/keyvault/keyvault-keys/test/internal/serviceVersionParameter.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/internal/serviceVersionParameter.spec.ts
@@ -9,7 +9,7 @@ import { HttpClient, HttpOperationResponse, WebResourceLike, HttpHeaders } from
 import { ClientSecretCredential } from "@azure/identity";
 import { env } from "@azure-tools/test-recorder";
 import { versionsToTest } from "@azure/test-utils";
-import { serviceVersions } from "../utils/utils.common";
+import { serviceVersions } from "../public/utils/common";
 
 describe("The Keys client should set the serviceVersion", () => {
   const keyVaultUrl = `https://keyVaultName.vault.azure.net`;
diff --git a/sdk/keyvault/keyvault-keys/test/internal/transformations.spec.ts b/sdk/keyvault/keyvault-keys/test/internal/transformations.spec.ts
index 76f9a57f5267..3c3d2b2679fe 100644
--- a/sdk/keyvault/keyvault-keys/test/internal/transformations.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/internal/transformations.spec.ts
@@ -21,7 +21,7 @@ import {
   getKeyPropertiesFromKeyItem,
   keyRotationTransformations,
 } from "../../src/transformations";
-import { stringToUint8Array } from "../utils/crypto";
+import { stringToUint8Array } from "../public/utils/crypto";
 
 describe("Transformations", () => {
   const releasePolicy = {
diff --git a/sdk/keyvault/keyvault-keys/test/public/crypto.hsm.spec.ts b/sdk/keyvault/keyvault-keys/test/public/crypto.hsm.spec.ts
index a7981055387a..42ea8975af56 100644
--- a/sdk/keyvault/keyvault-keys/test/public/crypto.hsm.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/crypto.hsm.spec.ts
@@ -7,10 +7,10 @@ import { Recorder } from "@azure-tools/test-recorder";
 import { ClientSecretCredential } from "@azure/identity";
 
 import { CryptographyClient, KeyVaultKey, KeyClient } from "../../src";
-import { authenticate } from "../utils/testAuthentication";
-import { stringToUint8Array, uint8ArrayToString } from "../utils/crypto";
-import TestClient from "../utils/testClient";
-import { getServiceVersion, onVersions } from "../utils/utils.common";
+import { authenticate } from "./utils/testAuthentication";
+import { stringToUint8Array, uint8ArrayToString } from "./utils/crypto";
+import TestClient from "./utils/testClient";
+import { getServiceVersion, onVersions } from "./utils/common";
 import { isNode } from "@azure/core-http";
 
 onVersions({ minVer: "7.2" }).describe(
diff --git a/sdk/keyvault/keyvault-keys/test/public/crypto.spec.ts b/sdk/keyvault/keyvault-keys/test/public/crypto.spec.ts
index a40ada928b4a..fdea045cc6cd 100644
--- a/sdk/keyvault/keyvault-keys/test/public/crypto.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/crypto.spec.ts
@@ -9,11 +9,11 @@ import { Recorder, env, isLiveMode } from "@azure-tools/test-recorder";
 import { ClientSecretCredential } from "@azure/identity";
 
 import { CryptographyClient, KeyVaultKey, KeyClient } from "../../src";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
-import { stringToUint8Array, uint8ArrayToString } from "../utils/crypto";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
+import { stringToUint8Array, uint8ArrayToString } from "./utils/crypto";
 import { RsaCryptographyProvider } from "../../src/cryptography/rsaCryptographyProvider";
-import { getServiceVersion } from "../utils/utils.common";
+import { getServiceVersion } from "./utils/common";
 import { isNode } from "@azure/core-http";
 
 describe("CryptographyClient (all decrypts happen remotely)", () => {
diff --git a/sdk/keyvault/keyvault-keys/test/public/import.spec.ts b/sdk/keyvault/keyvault-keys/test/public/import.spec.ts
index 58434ef71e11..7f5654c08796 100644
--- a/sdk/keyvault/keyvault-keys/test/public/import.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/import.spec.ts
@@ -6,10 +6,10 @@ import { Context } from "mocha";
 import { env, Recorder } from "@azure-tools/test-recorder";
 
 import { KeyClient } from "../../src";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
-import { getServiceVersion } from "../utils/utils.common";
-import { createRsaKey } from "../utils/crypto";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
+import { getServiceVersion } from "./utils/common";
+import { createRsaKey } from "./utils/crypto";
 
 describe("Keys client - import keys", () => {
   const prefix = `import${env.CERTIFICATE_NAME || "KeyName"}`;
diff --git a/sdk/keyvault/keyvault-keys/test/public/keyClient.hsm.spec.ts b/sdk/keyvault/keyvault-keys/test/public/keyClient.hsm.spec.ts
index e17a1938df27..38e7d75dea7d 100644
--- a/sdk/keyvault/keyvault-keys/test/public/keyClient.hsm.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/keyClient.hsm.spec.ts
@@ -5,12 +5,12 @@ import { assert } from "chai";
 import { Context } from "mocha";
 import { env, Recorder } from "@azure-tools/test-recorder";
 import { KeyClient } from "../../src";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
 import { CreateOctKeyOptions, KnownKeyExportEncryptionAlgorithm } from "../../src/keysModels";
-import { getServiceVersion, onVersions } from "../utils/utils.common";
+import { getServiceVersion, onVersions } from "./utils/common";
 import { supportsTracing } from "../../../keyvault-common/test/utils/supportsTracing";
-import { createRsaKey, stringToUint8Array, uint8ArrayToString } from "../utils/crypto";
+import { createRsaKey, stringToUint8Array, uint8ArrayToString } from "./utils/crypto";
 import { DefaultHttpClient, WebResource } from "@azure/core-http";
 
 onVersions({ minVer: "7.2" }).describe(
diff --git a/sdk/keyvault/keyvault-keys/test/public/keyClient.spec.ts b/sdk/keyvault/keyvault-keys/test/public/keyClient.spec.ts
index 3efe3cd1aad3..bafba11d3adc 100644
--- a/sdk/keyvault/keyvault-keys/test/public/keyClient.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/keyClient.spec.ts
@@ -7,7 +7,6 @@ import chaiAsPromised from "chai-as-promised";
 chai.use(chaiExclude);
 chai.use(chaiAsPromised);
 import { Context } from "mocha";
-import { RestError } from "@azure/core-http";
 import { AbortController } from "@azure/abort-controller";
 import { env, isPlaybackMode, isRecordMode, Recorder } from "@azure-tools/test-recorder";
 
@@ -22,13 +21,13 @@ import {
   getServiceVersion,
   isPublicCloud,
   onVersions,
-} from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+} from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
 import { supportsTracing } from "../../../keyvault-common/test/utils/supportsTracing";
 import { DefaultHttpClient, WebResource } from "@azure/core-http";
-import { stringToUint8Array, uint8ArrayToString } from "../utils/crypto";
+import { stringToUint8Array, uint8ArrayToString } from "./utils/crypto";
 
 describe("Keys client - create, read, update and delete operations", () => {
   const keyPrefix = `CRUD${env.KEY_NAME || "KeyName"}`;
@@ -287,7 +286,7 @@ describe("Keys client - create, read, update and delete operations", () => {
       await client.getKey(keyName);
       throw Error("Expecting an error but not catching one.");
     } catch (e) {
-      if (e instanceof RestError) {
+      if (e.name === "RestError") {
         assert.equal(e.code, "KeyNotFound");
         assert.equal(e.statusCode, 404);
       } else {
@@ -318,7 +317,7 @@ describe("Keys client - create, read, update and delete operations", () => {
       await client.getKey(keyName);
       throw Error("Expecting an error but not catching one.");
     } catch (e) {
-      if (e instanceof RestError) {
+      if (e.name === "RestError") {
         assert.equal(e.code, "KeyNotFound");
         assert.equal(e.statusCode, 404);
       } else {
diff --git a/sdk/keyvault/keyvault-keys/test/public/list.spec.ts b/sdk/keyvault/keyvault-keys/test/public/list.spec.ts
index 399e5dc51515..3747bbddaddb 100644
--- a/sdk/keyvault/keyvault-keys/test/public/list.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/list.spec.ts
@@ -6,10 +6,10 @@ import { Context } from "mocha";
 import { env, Recorder, isRecordMode } from "@azure-tools/test-recorder";
 
 import { KeyClient } from "../../src";
-import { assertThrowsAbortError, getServiceVersion } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError, getServiceVersion } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
 
 describe("Keys client - list keys in various ways", () => {
   const keyPrefix = `list${env.KEY_NAME || "KeyName"}`;
diff --git a/sdk/keyvault/keyvault-keys/test/public/localCryptography.spec.ts b/sdk/keyvault/keyvault-keys/test/public/localCryptography.spec.ts
index 4fb598906ef3..8d3f48f2077c 100644
--- a/sdk/keyvault/keyvault-keys/test/public/localCryptography.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/localCryptography.spec.ts
@@ -8,12 +8,12 @@ import chaiAsPromised from "chai-as-promised";
 chai.use(chaiAsPromised);
 import { isNode } from "@azure/core-http";
 import { createHash } from "crypto";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
 import { Recorder, env } from "@azure-tools/test-recorder";
 import { ClientSecretCredential } from "@azure/identity";
 import { RsaCryptographyProvider } from "../../src/cryptography/rsaCryptographyProvider";
-import { getServiceVersion } from "../utils/utils.common";
+import { getServiceVersion } from "./utils/common";
 const { assert } = chai;
 
 describe("Local cryptography public tests", () => {
diff --git a/sdk/keyvault/keyvault-keys/test/public/lro.delete.spec.ts b/sdk/keyvault/keyvault-keys/test/public/lro.delete.spec.ts
index 15685f92597c..6c6f56d33cf2 100644
--- a/sdk/keyvault/keyvault-keys/test/public/lro.delete.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/lro.delete.spec.ts
@@ -4,13 +4,12 @@
 import { assert } from "chai";
 import { Context } from "mocha";
 import { env, Recorder } from "@azure-tools/test-recorder";
-import { PollerStoppedError } from "@azure/core-lro";
 
 import { KeyClient, DeletedKey } from "../../src";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
-import { getServiceVersion } from "../utils/utils.common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
+import { getServiceVersion } from "./utils/common";
 
 describe("Keys client - Long Running Operations - delete", () => {
   const keyPrefix = `lroDelete${env.CERTIFICATE_NAME || "KeyName"}`;
@@ -59,7 +58,7 @@ describe("Keys client - Long Running Operations - delete", () => {
     assert.ok(poller.getOperationState().isStarted);
 
     poller.pollUntilDone().catch((e) => {
-      assert.ok(e instanceof PollerStoppedError);
+      assert.ok(e.name === "PollerStoppedError");
       assert.equal(e.name, "PollerStoppedError");
       assert.equal(e.message, "This poller is already stopped");
     });
diff --git a/sdk/keyvault/keyvault-keys/test/public/lro.recoverDelete.spec.ts b/sdk/keyvault/keyvault-keys/test/public/lro.recoverDelete.spec.ts
index b308451ab55d..01a0289c035f 100644
--- a/sdk/keyvault/keyvault-keys/test/public/lro.recoverDelete.spec.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/lro.recoverDelete.spec.ts
@@ -4,13 +4,12 @@
 import { assert } from "chai";
 import { Context } from "mocha";
 import { env, Recorder } from "@azure-tools/test-recorder";
-import { PollerStoppedError } from "@azure/core-lro";
 
 import { KeyClient, DeletedKey } from "../../src";
-import { assertThrowsAbortError, getServiceVersion } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError, getServiceVersion } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
 
 describe("Keys client - Long Running Operations - recoverDelete", () => {
   const keyPrefix = `lroRecoverDelete${env.CERTIFICATE_NAME || "KeyName"}`;
@@ -66,7 +65,7 @@ describe("Keys client - Long Running Operations - recoverDelete", () => {
     assert.ok(poller.getOperationState().isStarted);
 
     poller.pollUntilDone().catch((e) => {
-      assert.ok(e instanceof PollerStoppedError);
+      assert.ok(e.name === "PollerStoppedError");
       assert.equal(e.name, "PollerStoppedError");
       assert.equal(e.message, "This poller is already stopped");
     });
diff --git a/sdk/keyvault/keyvault-keys/test/utils/base64url.browser.ts b/sdk/keyvault/keyvault-keys/test/public/utils/base64url.browser.ts
similarity index 100%
rename from sdk/keyvault/keyvault-keys/test/utils/base64url.browser.ts
rename to sdk/keyvault/keyvault-keys/test/public/utils/base64url.browser.ts
diff --git a/sdk/keyvault/keyvault-keys/test/utils/base64url.ts b/sdk/keyvault/keyvault-keys/test/public/utils/base64url.ts
similarity index 100%
rename from sdk/keyvault/keyvault-keys/test/utils/base64url.ts
rename to sdk/keyvault/keyvault-keys/test/public/utils/base64url.ts
diff --git a/sdk/keyvault/keyvault-keys/test/utils/utils.common.ts b/sdk/keyvault/keyvault-keys/test/public/utils/common.ts
similarity index 95%
rename from sdk/keyvault/keyvault-keys/test/utils/utils.common.ts
rename to sdk/keyvault/keyvault-keys/test/public/utils/common.ts
index 0c181f7774ef..2befaa2af9b7 100644
--- a/sdk/keyvault/keyvault-keys/test/utils/utils.common.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/utils/common.ts
@@ -4,7 +4,6 @@
 import { SupportedVersions, supports, TestFunctionWrapper } from "@azure/test-utils";
 import { env } from "@azure-tools/test-recorder";
 import { assert } from "chai";
-import { LATEST_API_VERSION } from "../../src/keysModels";
 
 export function getKeyvaultName(): string {
   const keyVaultEnvVarName = "KEYVAULT_NAME";
@@ -32,20 +31,20 @@ export async function assertThrowsAbortError(cb: () => Promise<any>): Promise<vo
   }
 }
 
+/**
+ * The known API versions that we support.
+ */
+export const serviceVersions = ["7.0", "7.1", "7.2", "7.3-preview"] as const;
+
 /**
  * Fetches the service version to test against. This version could be configured as part of CI
  * and then passed through the environment in order to support testing prior service versions.
  * @returns - The service version to test
  */
 export function getServiceVersion(): string {
-  return env.SERVICE_VERSION || LATEST_API_VERSION;
+  return env.SERVICE_VERSION || serviceVersions[serviceVersions.length - 1];
 }
 
-/**
- * The known API versions that we support.
- */
-export const serviceVersions = ["7.0", "7.1", "7.2", "7.3-preview"] as const;
-
 /**
  * A convenience wrapper allowing us to limit service versions without using the `versionsToTest` wrapper.
  *
diff --git a/sdk/keyvault/keyvault-keys/test/utils/crypto.ts b/sdk/keyvault/keyvault-keys/test/public/utils/crypto.ts
similarity index 98%
rename from sdk/keyvault/keyvault-keys/test/utils/crypto.ts
rename to sdk/keyvault/keyvault-keys/test/public/utils/crypto.ts
index 1ea3368ce8c3..35241d170f8a 100644
--- a/sdk/keyvault/keyvault-keys/test/utils/crypto.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/utils/crypto.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import { isNode } from "@azure/core-http";
-import { JsonWebKey } from "../../src/keysModels";
+import { JsonWebKey } from "../../../src";
 
 export function stringToUint8Array(str: string): Uint8Array {
   if (isNode) {
diff --git a/sdk/keyvault/keyvault-keys/test/utils/lro/restore/operation.ts b/sdk/keyvault/keyvault-keys/test/public/utils/lro/restore/operation.ts
similarity index 97%
rename from sdk/keyvault/keyvault-keys/test/utils/lro/restore/operation.ts
rename to sdk/keyvault/keyvault-keys/test/public/utils/lro/restore/operation.ts
index 56855649e43f..3a361b3cf6ca 100644
--- a/sdk/keyvault/keyvault-keys/test/utils/lro/restore/operation.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/utils/lro/restore/operation.ts
@@ -4,7 +4,7 @@
 import { AbortSignalLike } from "@azure/abort-controller";
 import { PollOperationState, PollOperation } from "@azure/core-lro";
 import { RequestOptionsBase } from "@azure/core-http";
-import { KeyVaultKey, KeyPollerOptions } from "../../../../src/keysModels";
+import { KeyVaultKey, KeyPollerOptions } from "../../../../../src";
 
 /**
  * Options sent to the beginRestoreKeyBackup method.
diff --git a/sdk/keyvault/keyvault-keys/test/utils/lro/restore/poller.ts b/sdk/keyvault/keyvault-keys/test/public/utils/lro/restore/poller.ts
similarity index 96%
rename from sdk/keyvault/keyvault-keys/test/utils/lro/restore/poller.ts
rename to sdk/keyvault/keyvault-keys/test/public/utils/lro/restore/poller.ts
index a5723d267f07..2dfa7c3e71a7 100644
--- a/sdk/keyvault/keyvault-keys/test/utils/lro/restore/poller.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/utils/lro/restore/poller.ts
@@ -8,7 +8,7 @@ import {
   makeRestoreKeyBackupPollOperation,
   TestKeyClientInterface,
 } from "./operation";
-import { KeyVaultKey } from "../../../../src/keysModels";
+import { KeyVaultKey } from "../../../../../src";
 
 export interface RestoreKeyBackupPollerOptions {
   client: TestKeyClientInterface;
diff --git a/sdk/keyvault/keyvault-keys/test/utils/recorderUtils.ts b/sdk/keyvault/keyvault-keys/test/public/utils/recorderUtils.ts
similarity index 100%
rename from sdk/keyvault/keyvault-keys/test/utils/recorderUtils.ts
rename to sdk/keyvault/keyvault-keys/test/public/utils/recorderUtils.ts
diff --git a/sdk/keyvault/keyvault-keys/test/utils/testAuthentication.ts b/sdk/keyvault/keyvault-keys/test/public/utils/testAuthentication.ts
similarity index 98%
rename from sdk/keyvault/keyvault-keys/test/utils/testAuthentication.ts
rename to sdk/keyvault/keyvault-keys/test/public/utils/testAuthentication.ts
index 60bfd0a9b617..cfe619523dc9 100644
--- a/sdk/keyvault/keyvault-keys/test/utils/testAuthentication.ts
+++ b/sdk/keyvault/keyvault-keys/test/public/utils/testAuthentication.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import { ClientSecretCredential } from "@azure/identity";
-import { KeyClient } from "../../src";
+import { KeyClient } from "../../../src";
 import { env, record, RecorderEnvironmentSetup } from "@azure-tools/test-recorder";
 import { uniqueString } from "./recorderUtils";
 import TestClient from "./testClient";
diff --git a/sdk/keyvault/keyvault-keys/test/public/utils/testClient.ts b/sdk/keyvault/keyvault-keys/test/public/utils/testClient.ts
new file mode 100644
index 000000000000..32210e091b15
--- /dev/null
+++ b/sdk/keyvault/keyvault-keys/test/public/utils/testClient.ts
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { testPollerProperties } from "./recorderUtils";
+import { KeyClient } from "../../../src";
+
+export interface TestClientInterface {
+  client: KeyClient;
+  formatName: (name: string) => string;
+  purgeKey: (keyName: string) => Promise<void>;
+  flushKey: (keyName: string) => Promise<void>;
+}
+export default class TestClient implements TestClientInterface {
+  public readonly client: KeyClient;
+  constructor(client: KeyClient) {
+    this.client = client;
+  }
+  public formatName(name: string): string {
+    return name.replace(/[^0-9a-zA-Z-]/g, "");
+  }
+  public async purgeKey(keyName: string): Promise<void> {
+    await this.client.purgeDeletedKey(keyName);
+  }
+  public async flushKey(keyName: string): Promise<void> {
+    const that = this;
+    const poller = await that.client.beginDeleteKey(keyName, testPollerProperties);
+    await poller.pollUntilDone();
+    await this.purgeKey(keyName);
+  }
+}
diff --git a/sdk/keyvault/keyvault-keys/test/utils/testClient.ts b/sdk/keyvault/keyvault-keys/test/utils/testClient.ts
deleted file mode 100644
index 18b40d38e41e..000000000000
--- a/sdk/keyvault/keyvault-keys/test/utils/testClient.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import { testPollerProperties } from "./recorderUtils";
-import { KeyClient, KeyVaultKey } from "../../src";
-import { PollerLike, PollOperationState } from "@azure/core-lro";
-import { operationOptionsToRequestOptionsBase } from "@azure/core-http";
-import { RestoreKeyBackupPoller } from "./lro/restore/poller";
-import { BeginRestoreKeyBackupOptions } from "./lro/restore/operation";
-
-export default class TestClient {
-  public readonly client: KeyClient;
-  constructor(client: KeyClient) {
-    this.client = client;
-  }
-  public formatName(name: string): string {
-    return name.replace(/[^0-9a-zA-Z-]/g, "");
-  }
-  public async purgeKey(keyName: string): Promise<void> {
-    await this.client.purgeDeletedKey(keyName);
-  }
-  public async flushKey(keyName: string): Promise<void> {
-    const that = this;
-    const poller = await that.client.beginDeleteKey(keyName, testPollerProperties);
-    await poller.pollUntilDone();
-    await this.purgeKey(keyName);
-  }
-  public async beginRestoreKeyBackup(
-    backup: Uint8Array,
-    options: BeginRestoreKeyBackupOptions = {}
-  ): Promise<PollerLike<PollOperationState<KeyVaultKey>, KeyVaultKey>> {
-    const requestOptions = operationOptionsToRequestOptionsBase(options);
-    const poller = new RestoreKeyBackupPoller({
-      backup,
-      client: this.client,
-      intervalInMs: options.intervalInMs,
-      resumeFrom: options.resumeFrom,
-      requestOptions,
-    });
-
-    // This will initialize the poller's operation (the recovery of the backup).
-    await poller.poll();
-
-    return poller;
-  }
-}
diff --git a/sdk/keyvault/keyvault-secrets/test/internal/challengeBasedAuthenticationPolicy.spec.ts b/sdk/keyvault/keyvault-secrets/test/internal/challengeBasedAuthenticationPolicy.spec.ts
index 1d3e42cdd564..78e990b25c48 100644
--- a/sdk/keyvault/keyvault-secrets/test/internal/challengeBasedAuthenticationPolicy.spec.ts
+++ b/sdk/keyvault/keyvault-secrets/test/internal/challengeBasedAuthenticationPolicy.spec.ts
@@ -13,11 +13,11 @@ import {
   challengeBasedAuthenticationPolicy,
 } from "../../../keyvault-common/src";
 import { SecretClient } from "../../src";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { authenticate } from "../public/utils/testAuthentication";
+import TestClient from "../public/utils/testClient";
 import { ClientSecretCredential } from "@azure/identity";
 import { WebResource } from "@azure/core-http";
-import { getServiceVersion } from "../utils/utils.common";
+import { getServiceVersion } from "../public/utils/common";
 
 // Following the philosophy of not testing the insides if we can test the outsides...
 // I present you with this "Get Out of Jail Free" card (in reference to Monopoly).
diff --git a/sdk/keyvault/keyvault-secrets/test/public/CRUD.spec.ts b/sdk/keyvault/keyvault-secrets/test/public/CRUD.spec.ts
index 54755de842d2..3a31a7457d43 100644
--- a/sdk/keyvault/keyvault-secrets/test/public/CRUD.spec.ts
+++ b/sdk/keyvault/keyvault-secrets/test/public/CRUD.spec.ts
@@ -8,10 +8,10 @@ import { env, Recorder } from "@azure-tools/test-recorder";
 import { AbortController } from "@azure/abort-controller";
 
 import { SecretClient } from "../../src";
-import { assertThrowsAbortError, getServiceVersion } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError, getServiceVersion } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
 
 describe("Secret client - create, read, update and delete operations", () => {
   const secretValue = "SECRET_VALUE";
diff --git a/sdk/keyvault/keyvault-secrets/test/public/list.spec.ts b/sdk/keyvault/keyvault-secrets/test/public/list.spec.ts
index 8dbeb36446ab..b67d3eefdb28 100644
--- a/sdk/keyvault/keyvault-secrets/test/public/list.spec.ts
+++ b/sdk/keyvault/keyvault-secrets/test/public/list.spec.ts
@@ -7,10 +7,10 @@ import chai from "chai";
 import { env, Recorder, isRecordMode } from "@azure-tools/test-recorder";
 
 import { SecretClient } from "../../src";
-import { assertThrowsAbortError, getServiceVersion } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError, getServiceVersion } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
 
 const { expect } = chai;
 
diff --git a/sdk/keyvault/keyvault-secrets/test/public/lro.delete.spec.ts b/sdk/keyvault/keyvault-secrets/test/public/lro.delete.spec.ts
index 8a1b35c43bff..ab9bcf8bb330 100644
--- a/sdk/keyvault/keyvault-secrets/test/public/lro.delete.spec.ts
+++ b/sdk/keyvault/keyvault-secrets/test/public/lro.delete.spec.ts
@@ -7,10 +7,10 @@ import { env, Recorder } from "@azure-tools/test-recorder";
 import { PollerStoppedError } from "@azure/core-lro";
 
 import { SecretClient, DeletedSecret } from "../../src";
-import { assertThrowsAbortError, getServiceVersion } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError, getServiceVersion } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
 
 describe("Secrets client - Long Running Operations - delete", () => {
   const secretPrefix = `lroDelete${env.CERTIFICATE_NAME || "SecretName"}`;
diff --git a/sdk/keyvault/keyvault-secrets/test/public/lro.recover.spec.ts b/sdk/keyvault/keyvault-secrets/test/public/lro.recover.spec.ts
index bcbc56d5634e..d1749dc1c2ba 100644
--- a/sdk/keyvault/keyvault-secrets/test/public/lro.recover.spec.ts
+++ b/sdk/keyvault/keyvault-secrets/test/public/lro.recover.spec.ts
@@ -7,10 +7,10 @@ import { env, Recorder } from "@azure-tools/test-recorder";
 import { PollerStoppedError } from "@azure/core-lro";
 
 import { SecretClient, SecretProperties } from "../../src";
-import { assertThrowsAbortError, getServiceVersion } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError, getServiceVersion } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
 
 describe("Secrets client - Long Running Operations - recoverDelete", () => {
   const secretPrefix = `lroRecover${env.CERTIFICATE_NAME || "SecretName"}`;
diff --git a/sdk/keyvault/keyvault-secrets/test/public/recoverBackupRestore.spec.ts b/sdk/keyvault/keyvault-secrets/test/public/recoverBackupRestore.spec.ts
index f8516e7a968b..1d9d337c3cf5 100644
--- a/sdk/keyvault/keyvault-secrets/test/public/recoverBackupRestore.spec.ts
+++ b/sdk/keyvault/keyvault-secrets/test/public/recoverBackupRestore.spec.ts
@@ -7,10 +7,10 @@ import { isNode } from "@azure/core-http";
 import { env, isPlaybackMode, Recorder, isRecordMode } from "@azure-tools/test-recorder";
 
 import { SecretClient } from "../../src";
-import { assertThrowsAbortError, getServiceVersion } from "../utils/utils.common";
-import { testPollerProperties } from "../utils/recorderUtils";
-import { authenticate } from "../utils/testAuthentication";
-import TestClient from "../utils/testClient";
+import { assertThrowsAbortError, getServiceVersion } from "./utils/common";
+import { testPollerProperties } from "./utils/recorderUtils";
+import { authenticate } from "./utils/testAuthentication";
+import TestClient from "./utils/testClient";
 
 describe("Secret client - restore secrets and recover backups", () => {
   const secretPrefix = `backupRestore${env.SECRET_NAME || "SecretName"}`;
diff --git a/sdk/keyvault/keyvault-secrets/test/utils/utils.common.ts b/sdk/keyvault/keyvault-secrets/test/public/utils/common.ts
similarity index 93%
rename from sdk/keyvault/keyvault-secrets/test/utils/utils.common.ts
rename to sdk/keyvault/keyvault-secrets/test/public/utils/common.ts
index eb4cf62775e1..c3ed0622f5f5 100644
--- a/sdk/keyvault/keyvault-secrets/test/utils/utils.common.ts
+++ b/sdk/keyvault/keyvault-secrets/test/public/utils/common.ts
@@ -4,7 +4,7 @@
 import { assert } from "chai";
 import { SupportedVersions, supports, TestFunctionWrapper } from "@azure/test-utils";
 import { env } from "@azure-tools/test-recorder";
-import { LATEST_API_VERSION, SecretClientOptions } from "../../src/secretsModels";
+import { SecretClientOptions } from "../../../src";
 
 export async function assertThrowsAbortError(cb: () => Promise<any>): Promise<void> {
   let passed = false;
@@ -32,7 +32,7 @@ export const serviceVersions = ["7.0", "7.1", "7.2", "7.3-preview"] as const;
  * @returns - The service version to test
  */
 export function getServiceVersion(): NonNullable<SecretClientOptions["serviceVersion"]> {
-  return env.SERVICE_VERSION || LATEST_API_VERSION;
+  return env.SERVICE_VERSION || serviceVersions[serviceVersions.length - 1];
 }
 
 /**
diff --git a/sdk/keyvault/keyvault-secrets/test/utils/lro/restore/operation.ts b/sdk/keyvault/keyvault-secrets/test/public/utils/lro/restore/operation.ts
similarity index 99%
rename from sdk/keyvault/keyvault-secrets/test/utils/lro/restore/operation.ts
rename to sdk/keyvault/keyvault-secrets/test/public/utils/lro/restore/operation.ts
index 7f6b9f265d76..b221458625e5 100644
--- a/sdk/keyvault/keyvault-secrets/test/utils/lro/restore/operation.ts
+++ b/sdk/keyvault/keyvault-secrets/test/public/utils/lro/restore/operation.ts
@@ -4,7 +4,7 @@
 import { AbortSignalLike } from "@azure/abort-controller";
 import { PollOperationState, PollOperation } from "@azure/core-lro";
 import { OperationOptions } from "@azure/core-http";
-import { SecretPollerOptions, SecretProperties } from "../../../../src/secretsModels";
+import { SecretPollerOptions, SecretProperties } from "../../../../../src";
 
 /**
  * Options sent to the beginRestoreSecretBackup method.
diff --git a/sdk/keyvault/keyvault-secrets/test/utils/lro/restore/poller.ts b/sdk/keyvault/keyvault-secrets/test/public/utils/lro/restore/poller.ts
similarity index 95%
rename from sdk/keyvault/keyvault-secrets/test/utils/lro/restore/poller.ts
rename to sdk/keyvault/keyvault-secrets/test/public/utils/lro/restore/poller.ts
index 9fe9304e0dbf..6b61a504ff75 100644
--- a/sdk/keyvault/keyvault-secrets/test/utils/lro/restore/poller.ts
+++ b/sdk/keyvault/keyvault-secrets/test/public/utils/lro/restore/poller.ts
@@ -8,7 +8,7 @@ import {
   makeRestoreSecretBackupPollOperation,
   TestSecretClientInterface,
 } from "./operation";
-import { SecretProperties } from "../../../../src/secretsModels";
+import { SecretProperties } from "../../../../../src";
 
 export interface RestoreSecretBackupPollerOptions {
   client: TestSecretClientInterface;
diff --git a/sdk/keyvault/keyvault-secrets/test/utils/recorderUtils.ts b/sdk/keyvault/keyvault-secrets/test/public/utils/recorderUtils.ts
similarity index 100%
rename from sdk/keyvault/keyvault-secrets/test/utils/recorderUtils.ts
rename to sdk/keyvault/keyvault-secrets/test/public/utils/recorderUtils.ts
diff --git a/sdk/keyvault/keyvault-secrets/test/utils/testAuthentication.ts b/sdk/keyvault/keyvault-secrets/test/public/utils/testAuthentication.ts
similarity index 94%
rename from sdk/keyvault/keyvault-secrets/test/utils/testAuthentication.ts
rename to sdk/keyvault/keyvault-secrets/test/public/utils/testAuthentication.ts
index 73434e96fa06..3ee500760afa 100644
--- a/sdk/keyvault/keyvault-secrets/test/utils/testAuthentication.ts
+++ b/sdk/keyvault/keyvault-secrets/test/public/utils/testAuthentication.ts
@@ -2,12 +2,12 @@
 // Licensed under the MIT license.
 
 import { ClientSecretCredential } from "@azure/identity";
-import { SecretClient } from "../../src";
+import { SecretClient } from "../../../src";
 import { env, record, RecorderEnvironmentSetup } from "@azure-tools/test-recorder";
 import { uniqueString } from "./recorderUtils";
 import TestClient from "./testClient";
 import { Context } from "mocha";
-import { getServiceVersion } from "./utils.common";
+import { getServiceVersion } from "./common";
 
 export async function authenticate(
   that: Context,
diff --git a/sdk/keyvault/keyvault-secrets/test/utils/testClient.ts b/sdk/keyvault/keyvault-secrets/test/public/utils/testClient.ts
similarity index 95%
rename from sdk/keyvault/keyvault-secrets/test/utils/testClient.ts
rename to sdk/keyvault/keyvault-secrets/test/public/utils/testClient.ts
index 2e0a072bbcec..fcc688561f98 100644
--- a/sdk/keyvault/keyvault-secrets/test/utils/testClient.ts
+++ b/sdk/keyvault/keyvault-secrets/test/public/utils/testClient.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import { testPollerProperties } from "./recorderUtils";
-import { SecretClient, SecretProperties } from "../../src";
+import { SecretClient, SecretProperties } from "../../../src";
 import { PollerLike, PollOperationState } from "@azure/core-lro";
 import { RestoreSecretBackupPoller } from "./lro/restore/poller";
 import { BeginRestoreSecretBackupOptions } from "./lro/restore/operation";