diff --git a/src/index.ts b/src/index.ts
index 61a2980..0bb63a7 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -2,7 +2,12 @@
 // Licensed under the MIT license.
 
 export { AzureAppConfiguration } from "./appConfiguration.js";
+export { AzureAppConfigurationOptions } from "./appConfigurationOptions.js";
 export { Disposable } from "./common/disposable.js";
 export { load, loadFromAzureFrontDoor } from "./load.js";
-export { KeyFilter, LabelFilter } from "./types.js";
+export { FeatureFlagOptions } from "./featureManagement/featureFlagOptions.js";
+export { KeyVaultOptions } from "./keyvault/keyVaultOptions.js";
+export { RefreshOptions, FeatureFlagRefreshOptions } from "./refresh/refreshOptions.js";
+export { StartupOptions } from "./startupOptions.js";
+export { KeyFilter, LabelFilter, SettingSelector } from "./types.js";
 export { VERSION } from "./version.js";
diff --git a/test/utils/testHelper.ts b/test/utils/testHelper.ts
index 5fd1863..ea4e034 100644
--- a/test/utils/testHelper.ts
+++ b/test/utils/testHelper.ts
@@ -12,10 +12,6 @@ import { ConfigurationClientWrapper } from "../../src/configurationClientWrapper
 
 const sleepInMs = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
 
-const TEST_CLIENT_ID = "00000000-0000-0000-0000-000000000000";
-const TEST_TENANT_ID = "00000000-0000-0000-0000-000000000000";
-const TEST_CLIENT_SECRET = "0000000000000000000000000000000000000000";
-
 // Async, browser-safe SHA-256 using native crypto.subtle when available; falls back to tiny FNV-1a for Node without subtle.
 async function _sha256(input: string): Promise<string> {
     let crypto;
@@ -290,8 +286,11 @@ const createMockedConnectionString = (endpoint = createMockedEndpoint(), secret
     return `Endpoint=${endpoint};Id=${id};Secret=${secret}`;
 };
 
-const createMockedTokenCredential = (tenantId = TEST_TENANT_ID, clientId = TEST_CLIENT_ID, clientSecret = TEST_CLIENT_SECRET) => {
-    return new ClientSecretCredential(tenantId, clientId, clientSecret);
+const createMockedTokenCredential = () => {
+    const effectiveTenantId = uuid.v4();
+    const effectiveClientId = uuid.v4();
+    const effectiveClientSecret = uuid.v4();
+    return new ClientSecretCredential(effectiveTenantId, effectiveClientId, effectiveClientSecret);
 };
 
 const createMockedKeyVaultReference = (key: string, vaultUri: string): ConfigurationSetting => ({