diff --git a/sdk/appconfiguration/app-configuration/test/helpers.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/helpers.spec.ts
similarity index 99%
rename from sdk/appconfiguration/app-configuration/test/helpers.spec.ts
rename to sdk/appconfiguration/app-configuration/test/internal/helpers.spec.ts
index f3660d731014..c5a283b17982 100644
--- a/sdk/appconfiguration/app-configuration/test/helpers.spec.ts
+++ b/sdk/appconfiguration/app-configuration/test/internal/helpers.spec.ts
@@ -10,9 +10,9 @@ import {
   transformKeyValue,
   transformKeyValueResponseWithStatusCode,
   transformKeyValueResponse
-} from "../src/internal/helpers";
+} from "../../src/internal/helpers";
 import * as assert from "assert";
-import { ConfigurationSetting, HttpResponseField, HttpResponseFields } from "../src";
+import { ConfigurationSetting, HttpResponseField, HttpResponseFields } from "../../src";
 import { HttpHeaders } from "@azure/core-http";
 
 describe("helper methods", () => {
diff --git a/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts
index 6d161ccbc37d..3b8abfe05cd9 100644
--- a/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts
+++ b/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts
@@ -5,12 +5,17 @@ import { parseSyncToken, SyncTokens } from "../../src/internal/synctokenpolicy";
 import * as assert from "assert";
 import { AppConfigurationClient } from "../../src";
 import nock from "nock";
-import { getUserAgentPrefix, packageVersion } from "../../src/appConfigurationClient";
+import {
+  getUserAgentPrefix,
+  InternalAppConfigurationClientOptions,
+  packageVersion
+} from "../../src/appConfigurationClient";
 import {
   createAppConfigurationClientForTests,
   assertThrowsRestError,
   startRecorder
-} from "../testHelpers";
+} from "../public/utils/testHelpers";
+
 import * as chai from "chai";
 import { Recorder } from "@azure/test-utils-recorder";
 
@@ -146,7 +151,7 @@ describe("http request related tests", function() {
       syncTokens = new SyncTokens();
 
       client =
-        createAppConfigurationClientForTests({
+        createAppConfigurationClientForTests<InternalAppConfigurationClientOptions>({
           syncTokens: syncTokens
         }) || this.skip();
 
diff --git a/sdk/appconfiguration/app-configuration/test/package.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts
similarity index 84%
rename from sdk/appconfiguration/app-configuration/test/package.spec.ts
rename to sdk/appconfiguration/app-configuration/test/internal/package.spec.ts
index bdcfba4b28fb..b7c823cc0fbc 100644
--- a/sdk/appconfiguration/app-configuration/test/package.spec.ts
+++ b/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts
@@ -2,7 +2,7 @@ import { join } from "path";
 import * as assert from "assert";
 import { isNode } from "@azure/core-http";
 
-import { packageVersion } from "../src/appConfigurationClient";
+import { packageVersion } from "../../src/appConfigurationClient";
 
 describe("packagejson related tests", () => {
   // if this test is failing you need to update the contant `packageVersion` referenced above
@@ -18,7 +18,7 @@ describe("packagejson related tests", () => {
 
     try {
       // For integration tests
-      const packageJsonFilePath = join(__dirname, "../../package.json");
+      const packageJsonFilePath = join(__dirname, "../../../package.json");
       packageJsonContents = require(packageJsonFilePath);
     } catch (e) {
       // For unit tests
diff --git a/sdk/appconfiguration/app-configuration/test/policies/throttlingRetryPolicyTests.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/throttlingRetryPolicyTests.spec.ts
similarity index 98%
rename from sdk/appconfiguration/app-configuration/test/policies/throttlingRetryPolicyTests.spec.ts
rename to sdk/appconfiguration/app-configuration/test/internal/throttlingRetryPolicyTests.spec.ts
index 661d3e2527df..163ab5567669 100644
--- a/sdk/appconfiguration/app-configuration/test/policies/throttlingRetryPolicyTests.spec.ts
+++ b/sdk/appconfiguration/app-configuration/test/internal/throttlingRetryPolicyTests.spec.ts
@@ -12,7 +12,7 @@ import {
   RestError
 } from "@azure/core-http";
 import { ThrottlingRetryPolicy, getDelayInMs } from "../../src/policies/throttlingRetryPolicy";
-import { assertThrowsRestError } from "../testHelpers";
+import { assertThrowsRestError } from "../public/utils/testHelpers";
 
 describe("ThrottlingRetryPolicy", () => {
   class PassThroughPolicy {
diff --git a/sdk/appconfiguration/app-configuration/test/tracingHelpers.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/tracingHelpers.spec.ts
similarity index 96%
rename from sdk/appconfiguration/app-configuration/test/tracingHelpers.spec.ts
rename to sdk/appconfiguration/app-configuration/test/internal/tracingHelpers.spec.ts
index eae3cc37387c..6e2c66ed70e3 100644
--- a/sdk/appconfiguration/app-configuration/test/tracingHelpers.spec.ts
+++ b/sdk/appconfiguration/app-configuration/test/internal/tracingHelpers.spec.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { Spanner } from "../src/internal/tracingHelpers";
+import { Spanner } from "../../src/internal/tracingHelpers";
 import { RestError } from "@azure/core-http";
 import { getTracer } from "@azure/core-tracing";
 import { SpanKind, CanonicalCode } from "@opentelemetry/api";
diff --git a/sdk/appconfiguration/app-configuration/test/auth.spec.ts b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts
similarity index 88%
rename from sdk/appconfiguration/app-configuration/test/auth.spec.ts
rename to sdk/appconfiguration/app-configuration/test/public/auth.spec.ts
index 774a1cb4be88..900525f082a0 100644
--- a/sdk/appconfiguration/app-configuration/test/auth.spec.ts
+++ b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts
@@ -1,8 +1,12 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { AppConfigurationClient } from "../src";
-import { startRecorder, getTokenAuthenticationCredential, CredsAndEndpoint } from "./testHelpers";
+import { AppConfigurationClient } from "../../src";
+import {
+  startRecorder,
+  getTokenAuthenticationCredential,
+  CredsAndEndpoint
+} from "./utils/testHelpers";
 import * as assert from "assert";
 import { Recorder, isPlaybackMode } from "@azure/test-utils-recorder";
 
diff --git a/sdk/appconfiguration/app-configuration/test/etags.spec.ts b/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts
similarity index 98%
rename from sdk/appconfiguration/app-configuration/test/etags.spec.ts
rename to sdk/appconfiguration/app-configuration/test/public/etags.spec.ts
index b5f392d760e8..6bf51a263f36 100644
--- a/sdk/appconfiguration/app-configuration/test/etags.spec.ts
+++ b/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { AppConfigurationClient } from "../src";
+import { AppConfigurationClient } from "../../src";
 import {
   startRecorder,
   createAppConfigurationClientForTests,
   deleteKeyCompletely,
   assertThrowsRestError
-} from "./testHelpers";
+} from "./utils/testHelpers";
 import * as assert from "assert";
 import { Recorder } from "@azure/test-utils-recorder";
 
diff --git a/sdk/appconfiguration/app-configuration/test/index.readonlytests.spec.ts b/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts
similarity index 96%
rename from sdk/appconfiguration/app-configuration/test/index.readonlytests.spec.ts
rename to sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts
index b1ba3e010de7..26004a576d79 100644
--- a/sdk/appconfiguration/app-configuration/test/index.readonlytests.spec.ts
+++ b/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts
@@ -4,8 +4,8 @@ import {
   deleteKeyCompletely,
   assertThrowsAbortError,
   startRecorder
-} from "./testHelpers";
-import { AppConfigurationClient } from "../src";
+} from "./utils/testHelpers";
+import { AppConfigurationClient } from "../../src";
 import * as assert from "assert";
 import { Recorder } from "@azure/test-utils-recorder";
 
diff --git a/sdk/appconfiguration/app-configuration/test/index.spec.ts b/sdk/appconfiguration/app-configuration/test/public/index.spec.ts
similarity index 99%
rename from sdk/appconfiguration/app-configuration/test/index.spec.ts
rename to sdk/appconfiguration/app-configuration/test/public/index.spec.ts
index 6f33a6b07d76..c9ec1bba5497 100644
--- a/sdk/appconfiguration/app-configuration/test/index.spec.ts
+++ b/sdk/appconfiguration/app-configuration/test/public/index.spec.ts
@@ -10,8 +10,8 @@ import {
   assertThrowsRestError,
   assertThrowsAbortError,
   startRecorder
-} from "./testHelpers";
-import { AppConfigurationClient, ConfigurationSetting } from "../src";
+} from "./utils/testHelpers";
+import { AppConfigurationClient, ConfigurationSetting } from "../../src";
 import { delay } from "@azure/core-http";
 import { Recorder } from "@azure/test-utils-recorder";
 
diff --git a/sdk/appconfiguration/app-configuration/test/throwOrNotThrow.spec.ts b/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts
similarity index 98%
rename from sdk/appconfiguration/app-configuration/test/throwOrNotThrow.spec.ts
rename to sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts
index 8cbd12ca2523..0d565815e663 100644
--- a/sdk/appconfiguration/app-configuration/test/throwOrNotThrow.spec.ts
+++ b/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts
@@ -1,10 +1,10 @@
-import { AppConfigurationClient, ConfigurationSetting } from "../src";
+import { AppConfigurationClient, ConfigurationSetting } from "../../src";
 import {
   createAppConfigurationClientForTests,
   deleteKeyCompletely,
   assertThrowsRestError,
   startRecorder
-} from "./testHelpers";
+} from "./utils/testHelpers";
 import * as assert from "assert";
 import { Recorder } from "@azure/test-utils-recorder";
 
diff --git a/sdk/appconfiguration/app-configuration/test/testHelpers.ts b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts
similarity index 91%
rename from sdk/appconfiguration/app-configuration/test/testHelpers.ts
rename to sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts
index d7b91f40ba1d..d31e5bf070ce 100644
--- a/sdk/appconfiguration/app-configuration/test/testHelpers.ts
+++ b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts
@@ -1,18 +1,21 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { AppConfigurationClient } from "../src";
+import { AppConfigurationClient, AppConfigurationClientOptions } from "../../../src";
 import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { ConfigurationSetting, ListConfigurationSettingPage, ListRevisionsPage } from "../src";
+import {
+  ConfigurationSetting,
+  ListConfigurationSettingPage,
+  ListRevisionsPage
+} from "../../../src";
 import { env, isPlaybackMode, RecorderEnvironmentSetup, record } from "@azure/test-utils-recorder";
 import * as assert from "assert";
 
 // allow loading from a .env file as an alternative to defining the variable
 // in the environment
 import * as dotenv from "dotenv";
-import { RestError } from "@azure/core-http";
+
 import { DefaultAzureCredential, TokenCredential } from "@azure/identity";
-import { InternalAppConfigurationClientOptions } from "../src/appConfigurationClient";
 dotenv.config();
 
 let connectionStringNotPresentWarning = false;
@@ -70,9 +73,9 @@ export function getTokenAuthenticationCredential(): CredsAndEndpoint | undefined
   };
 }
 
-export function createAppConfigurationClientForTests(
-  options?: InternalAppConfigurationClientOptions
-): AppConfigurationClient | undefined {
+export function createAppConfigurationClientForTests<
+  Options extends AppConfigurationClientOptions = AppConfigurationClientOptions
+>(options?: Options): AppConfigurationClient | undefined {
   const connectionString = env["APPCONFIG_CONNECTION_STRING"];
 
   if (connectionString == null) {
@@ -158,7 +161,7 @@ export async function assertThrowsRestError(
     await testFunction();
     assert.fail(`${message}: No error thrown`);
   } catch (err) {
-    if (err instanceof RestError) {
+    if (err.name === "RestError") {
       assert.equal(expectedStatusCode, err.statusCode, message);
       return err;
     }
diff --git a/sdk/appconfiguration/app-configuration/tests.yml b/sdk/appconfiguration/app-configuration/tests.yml
index 2f1e6d7fe2af..f47704e9ce07 100644
--- a/sdk/appconfiguration/app-configuration/tests.yml
+++ b/sdk/appconfiguration/app-configuration/tests.yml
@@ -7,6 +7,7 @@ extends:
     ResourceServiceDirectory: appconfiguration
     TestBrowser: true
     TestSamples: false
+    TestMinMax: true
     EnvVars:
       AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
       AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)