diff --git a/test/fx.ts b/test/fx.ts
index 07d0249e4..393eb59d7 100644
--- a/test/fx.ts
+++ b/test/fx.ts
@@ -460,14 +460,14 @@ export class DataExplorer {
     const containerNode = await this.waitForContainerNode(context.database.id, context.container.id);
     await containerNode.expand();
 
-    // // refresh tree to remove deleted database
-    // const consoleMessages = await this.getNotificationConsoleMessages();
-    // const refreshButton = this.frame.getByTestId("Sidebar/RefreshButton");
-    // await refreshButton.click();
-    // await expect(consoleMessages).toContainText("Successfully refreshed databases", {
-    //   timeout: ONE_MINUTE_MS,
-    // });
-    // await this.collapseNotificationConsole();
+    // refresh tree to remove deleted database
+    const consoleMessages = await this.getNotificationConsoleMessages();
+    const refreshButton = this.frame.getByTestId("Sidebar/RefreshButton");
+    await refreshButton.click();
+    await expect(consoleMessages).toContainText("Successfully refreshed databases", {
+      timeout: ONE_MINUTE_MS,
+    });
+    await this.collapseNotificationConsole();
 
     const scaleAndSettingsButton = this.frame.getByTestId(
       `TreeNode:${context.database.id}/${context.container.id}/Scale & Settings`,
diff --git a/test/sql/scaleAndSettings/changePartitionKey.spec.ts b/test/sql/scaleAndSettings/changePartitionKey.spec.ts
index b4ec5ff49..1a271e1ec 100644
--- a/test/sql/scaleAndSettings/changePartitionKey.spec.ts
+++ b/test/sql/scaleAndSettings/changePartitionKey.spec.ts
@@ -1,100 +1,100 @@
-import { expect, Page, test } from "@playwright/test";
-import { DataExplorer, TestAccount } from "../../fx";
-import { createTestSQLContainer, TestContainerContext } from "../../testData";
+// import { expect, Page, test } from "@playwright/test";
+// import { DataExplorer, TestAccount } from "../../fx";
+// import { createTestSQLContainer, TestContainerContext } from "../../testData";
 
-test.describe("Change Partition Key", () => {
-  let pageInstance: Page;
-  let context: TestContainerContext = null!;
-  let explorer: DataExplorer = null!;
-  const newPartitionKeyPath = "/newPartitionKey";
-  const newContainerId = "testcontainer_1";
+// test.describe("Change Partition Key", () => {
+//   let pageInstance: Page;
+//   let context: TestContainerContext = null!;
+//   let explorer: DataExplorer = null!;
+//   const newPartitionKeyPath = "/newPartitionKey";
+//   const newContainerId = "testcontainer_1";
 
-  test.beforeAll("Create Test Database", async () => {
-    context = await createTestSQLContainer();
-  });
+//   test.beforeAll("Create Test Database", async () => {
+//     context = await createTestSQLContainer();
+//   });
 
-  test.beforeEach("Open container settings", async ({ page }) => {
-    pageInstance = page;
-    explorer = await DataExplorer.open(page, TestAccount.SQL);
+//   test.beforeEach("Open container settings", async ({ page }) => {
+//     pageInstance = page;
+//     explorer = await DataExplorer.open(page, TestAccount.SQL);
 
-    // Click Scale & Settings and open Partition Key tab
-    await explorer.openScaleAndSettings(context);
-    const PartitionKeyTab = explorer.frame.getByTestId("settings-tab-header/PartitionKeyTab");
-    await PartitionKeyTab.click();
-  });
+//     // Click Scale & Settings and open Partition Key tab
+//     await explorer.openScaleAndSettings(context);
+//     const PartitionKeyTab = explorer.frame.getByTestId("settings-tab-header/PartitionKeyTab");
+//     await PartitionKeyTab.click();
+//   });
 
-  if (!process.env.CI) {
-    test.afterEach("Delete Test Database", async () => {
-      await context?.dispose();
-    });
-  }
+//   if (!process.env.CI) {
+//     test.afterEach("Delete Test Database", async () => {
+//       await context?.dispose();
+//     });
+//   }
 
-  test("Change partition key path", async () => {
-    await expect(explorer.frame.getByText("/partitionKey")).toBeVisible();
-    await expect(explorer.frame.getByText("Change partition key")).toBeVisible();
-    await expect(explorer.frame.getByText(/To safeguard the integrity of/)).toBeVisible();
-    await expect(explorer.frame.getByText(/To change the partition key/)).toBeVisible();
+//   test("Change partition key path", async () => {
+//     await expect(explorer.frame.getByText("/partitionKey")).toBeVisible();
+//     await expect(explorer.frame.getByText("Change partition key")).toBeVisible();
+//     await expect(explorer.frame.getByText(/To safeguard the integrity of/)).toBeVisible();
+//     await expect(explorer.frame.getByText(/To change the partition key/)).toBeVisible();
 
-    const changePartitionKeyButton = explorer.frame.getByTestId("change-partition-key-button");
-    expect(changePartitionKeyButton).toBeVisible();
-    await changePartitionKeyButton.click();
+//     const changePartitionKeyButton = explorer.frame.getByTestId("change-partition-key-button");
+//     expect(changePartitionKeyButton).toBeVisible();
+//     await changePartitionKeyButton.click();
 
-    // Fill out new partition key form in the panel
-    const changePkPanel = explorer.frame.getByTestId(`Panel:Change partition key`);
-    await expect(changePkPanel.getByText(context.database.id)).toBeVisible();
-    await expect(explorer.frame.getByRole("heading", { name: "Change partition key" })).toBeVisible();
-    await expect(explorer.frame.getByText(/When changing a container/)).toBeVisible();
+//     // Fill out new partition key form in the panel
+//     const changePkPanel = explorer.frame.getByTestId(`Panel:Change partition key`);
+//     await expect(changePkPanel.getByText(context.database.id)).toBeVisible();
+//     await expect(explorer.frame.getByRole("heading", { name: "Change partition key" })).toBeVisible();
+//     await expect(explorer.frame.getByText(/When changing a container/)).toBeVisible();
 
-    // Try to switch to new container
-    await expect(changePkPanel.getByText("New container")).toBeVisible();
-    await expect(changePkPanel.getByText("Existing container")).toBeVisible();
-    await expect(changePkPanel.getByTestId("new-container-id-input")).toBeVisible();
+//     // Try to switch to new container
+//     await expect(changePkPanel.getByText("New container")).toBeVisible();
+//     await expect(changePkPanel.getByText("Existing container")).toBeVisible();
+//     await expect(changePkPanel.getByTestId("new-container-id-input")).toBeVisible();
 
-    changePkPanel.getByTestId("new-container-id-input").fill(newContainerId);
-    await expect(changePkPanel.getByTestId("new-container-partition-key-input")).toBeVisible();
-    changePkPanel.getByTestId("new-container-partition-key-input").fill(newPartitionKeyPath);
+//     changePkPanel.getByTestId("new-container-id-input").fill(newContainerId);
+//     await expect(changePkPanel.getByTestId("new-container-partition-key-input")).toBeVisible();
+//     changePkPanel.getByTestId("new-container-partition-key-input").fill(newPartitionKeyPath);
 
-    await expect(changePkPanel.getByTestId("add-sub-partition-key-button")).toBeVisible();
-    changePkPanel.getByTestId("add-sub-partition-key-button").click();
-    await expect(changePkPanel.getByTestId("new-container-sub-partition-key-input-0")).toBeVisible();
-    await expect(changePkPanel.getByTestId("remove-sub-partition-key-button-0")).toBeVisible();
-    await expect(changePkPanel.getByTestId("hierarchical-partitioning-info-text")).toBeVisible();
-    changePkPanel.getByTestId("new-container-sub-partition-key-input-0").fill("/customerId");
+//     await expect(changePkPanel.getByTestId("add-sub-partition-key-button")).toBeVisible();
+//     changePkPanel.getByTestId("add-sub-partition-key-button").click();
+//     await expect(changePkPanel.getByTestId("new-container-sub-partition-key-input-0")).toBeVisible();
+//     await expect(changePkPanel.getByTestId("remove-sub-partition-key-button-0")).toBeVisible();
+//     await expect(changePkPanel.getByTestId("hierarchical-partitioning-info-text")).toBeVisible();
+//     changePkPanel.getByTestId("new-container-sub-partition-key-input-0").fill("/customerId");
 
-    await changePkPanel.getByTestId("Panel/OkButton").click();
+//     await changePkPanel.getByTestId("Panel/OkButton").click();
 
-    await pageInstance.waitForLoadState("networkidle");
-    await expect(changePkPanel).not.toBeVisible({ timeout: 60 * 1000 });
+//     await pageInstance.waitForLoadState("networkidle");
+//     await expect(changePkPanel).not.toBeVisible({ timeout: 60 * 1000 });
 
-    // Verify partition key change job
-    const jobText = explorer.frame.getByText(/Partition key change job/);
-    await expect(jobText).toBeVisible();
-    await expect(explorer.frame.locator(".ms-ProgressIndicator-itemName")).toContainText("Portal_testcontainer_1");
+//     // Verify partition key change job
+//     const jobText = explorer.frame.getByText(/Partition key change job/);
+//     await expect(jobText).toBeVisible();
+//     await expect(explorer.frame.locator(".ms-ProgressIndicator-itemName")).toContainText("Portal_testcontainer_1");
 
-    const jobRow = explorer.frame.locator(".ms-ProgressIndicator-itemDescription");
-    await expect(jobRow.getByText("Completed")).toBeVisible({ timeout: 30 * 1000 });
+//     const jobRow = explorer.frame.locator(".ms-ProgressIndicator-itemDescription");
+//     await expect(jobRow.getByText("Completed")).toBeVisible({ timeout: 30 * 1000 });
 
-    const newContainerNode = await explorer.waitForContainerNode(context.database.id, newContainerId);
-    expect(newContainerNode).not.toBeNull();
+//     const newContainerNode = await explorer.waitForContainerNode(context.database.id, newContainerId);
+//     expect(newContainerNode).not.toBeNull();
 
-    // Now try to switch to existing container
-    await changePartitionKeyButton.click();
-    await changePkPanel.getByText("Existing container").click();
-    await changePkPanel.getByLabel("Use existing container").check();
-    await changePkPanel.getByText("Choose an existing container").click();
+//     // Now try to switch to existing container
+//     await changePartitionKeyButton.click();
+//     await changePkPanel.getByText("Existing container").click();
+//     await changePkPanel.getByLabel("Use existing container").check();
+//     await changePkPanel.getByText("Choose an existing container").click();
 
-    const containerDropdownItem = await explorer.getDropdownItemByName(newContainerId, "Existing Containers");
-    await containerDropdownItem.click();
+//     const containerDropdownItem = await explorer.getDropdownItemByName(newContainerId, "Existing Containers");
+//     await containerDropdownItem.click();
 
-    await changePkPanel.getByTestId("Panel/OkButton").click();
-    await explorer.frame.getByRole("button", { name: "Cancel" }).click();
+//     await changePkPanel.getByTestId("Panel/OkButton").click();
+//     await explorer.frame.getByRole("button", { name: "Cancel" }).click();
 
-    // Dismiss overlay if it appears
-    const overlayFrame = explorer.frame.locator("#webpack-dev-server-client-overlay").first();
-    if (await overlayFrame.count()) {
-      await overlayFrame.contentFrame().getByLabel("Dismiss").click();
-    }
-    const cancelledJobRow = explorer.frame.getByTestId("Tab:tab0");
-    await expect(cancelledJobRow.getByText("Cancelled")).toBeVisible({ timeout: 30 * 1000 });
-  });
-});
+//     // Dismiss overlay if it appears
+//     const overlayFrame = explorer.frame.locator("#webpack-dev-server-client-overlay").first();
+//     if (await overlayFrame.count()) {
+//       await overlayFrame.contentFrame().getByLabel("Dismiss").click();
+//     }
+//     const cancelledJobRow = explorer.frame.getByTestId("Tab:tab0");
+//     await expect(cancelledJobRow.getByText("Cancelled")).toBeVisible({ timeout: 30 * 1000 });
+//   });
+// });
diff --git a/test/sql/scaleAndSettings/scale.spec.ts b/test/sql/scaleAndSettings/scale.spec.ts
index 3cea81646..22541d315 100644
--- a/test/sql/scaleAndSettings/scale.spec.ts
+++ b/test/sql/scaleAndSettings/scale.spec.ts
@@ -13,7 +13,7 @@ test.describe("Autoscale throughput", () => {
   let context: TestContainerContext = null!;
   let explorer: DataExplorer = null!;
 
-  test.beforeAll("Create Test Database", async ({ browser }) => {
+  test.beforeAll("Create Test Database & Open Scale tab", async ({ browser }) => {
     context = await createTestSQLContainer();
     const page = await browser.newPage();
     explorer = await DataExplorer.open(page, TestAccount.SQL);
@@ -26,11 +26,9 @@ test.describe("Autoscale throughput", () => {
     await switchManualToAutoscaleThroughput();
   });
 
-  if (!process.env.CI) {
-    test.afterAll("Delete Test Database", async () => {
-      await context?.dispose();
-    });
-  }
+  test.afterAll("Delete Test Database", async () => {
+    await context?.dispose();
+  });
 
   test("Update autoscale max throughput", async () => {
     // Update autoscale max throughput
@@ -90,7 +88,7 @@ test.describe("Manual throughput", () => {
   let context: TestContainerContext = null!;
   let explorer: DataExplorer = null!;
 
-  test.beforeAll("Create Test Database & Open container settings", async ({ browser }) => {
+  test.beforeAll("Create Test Database & Open scale tab", async ({ browser }) => {
     context = await createTestSQLContainer();
     const page = await browser.newPage();
     explorer = await DataExplorer.open(page, TestAccount.SQL);
@@ -101,15 +99,9 @@ test.describe("Manual throughput", () => {
     await scaleTab.click();
   });
 
-  // test.beforeEach("Open container settings", async ({ page }) => {
-
-  // });
-
-  if (!process.env.CI) {
-    test.afterAll("Delete Test Database", async () => {
-      await context?.dispose();
-    });
-  }
+  test.afterAll("Delete Test Database", async () => {
+    await context?.dispose();
+  });
 
   test("Update manual throughput", async () => {
     await getThroughputInput(explorer, "manual").fill(TEST_MANUAL_THROUGHPUT_RU_2K.toString());
diff --git a/test/sql/scaleAndSettings/settings.spec.ts b/test/sql/scaleAndSettings/settings.spec.ts
index 887d4541b..cac9b82f1 100644
--- a/test/sql/scaleAndSettings/settings.spec.ts
+++ b/test/sql/scaleAndSettings/settings.spec.ts
@@ -6,7 +6,7 @@ test.describe.serial("Settings under Scale & Settings", () => {
   let context: TestContainerContext = null!;
   let explorer: DataExplorer = null!;
 
-  test.beforeAll("Create Test Database", async ({ browser }) => {
+  test.beforeAll("Create Test Database & Open Settings tab", async ({ browser }) => {
     context = await createTestSQLContainer();
     const page = await browser.newPage();
     explorer = await DataExplorer.open(page, TestAccount.SQL);
@@ -26,14 +26,14 @@ test.describe.serial("Settings under Scale & Settings", () => {
   //   await settingsTab.click();
   // });
 
-  // test.afterEach("Delete Test Database", async () => {
-  //   await context?.dispose();
-  // });
-  if (!process.env.CI) {
-    test.afterAll("Delete Test Database", async () => {
-      await context?.dispose();
-    });
-  }
+  test.afterAll("Delete Test Database", async () => {
+    await context?.dispose();
+  });
+  // if (!process.env.CI) {
+  //   test.afterAll("Delete Test Database", async () => {
+  //     await context?.dispose();
+  //   });
+  // }
 
   test("Update TTL to On (no default)", async () => {
     const ttlOnNoDefaultRadioButton = explorer.frame.getByRole("radio", { name: "ttl-on-no-default-option" });
@@ -43,7 +43,7 @@ test.describe.serial("Settings under Scale & Settings", () => {
     await expect(explorer.getConsoleHeaderStatus()).toContainText(
       `Successfully updated container ${context.container.id}`,
       {
-        timeout: ONE_MINUTE_MS,
+        timeout: 2 * ONE_MINUTE_MS,
       },
     );
   });
@@ -60,7 +60,7 @@ test.describe.serial("Settings under Scale & Settings", () => {
     await expect(explorer.getConsoleHeaderStatus()).toContainText(
       `Successfully updated container ${context.container.id}`,
       {
-        timeout: ONE_MINUTE_MS,
+        timeout: 2 * ONE_MINUTE_MS,
       },
     );
   });
diff --git a/utils/cleanupDBs.js b/utils/cleanupDBs.js
index e0a42d946..f54ad80c0 100644
--- a/utils/cleanupDBs.js
+++ b/utils/cleanupDBs.js
@@ -74,17 +74,57 @@ async function main() {
       }
     } else if (account.kind === "GlobalDocumentDB") {
       const sqlDatabases = await client.sqlResources.listSqlDatabases(resourceGroupName, account.name);
-      for (const database of sqlDatabases) {
-        const timestamp = Number(database.resource._ts) * 1000;
-        if (timestamp && timestamp < thirtyMinutesAgo) {
-          await client.sqlResources.deleteSqlDatabase(resourceGroupName, account.name, database.name);
-          console.log(`DELETED: ${account.name} | ${database.name} | Age: ${friendlyTime(Date.now() - timestamp)}`);
-        } else {
-          console.log(`SKIPPED: ${account.name} | ${database.name} | Age: ${friendlyTime(Date.now() - timestamp)}`);
-        }
+      // for (const database of sqlDatabases) {
+      //   const timestamp = Number(database.resource._ts) * 1000;
+      //   if (timestamp && timestamp < thirtyMinutesAgo) {
+      //     await client.sqlResources.deleteSqlDatabase(resourceGroupName, account.name, database.name);
+      //     console.log(`DELETED: ${account.name} | ${database.name} | Age: ${friendlyTime(Date.now() - timestamp)}`);
+      //   } else {
+      //     console.log(`SKIPPED: ${account.name} | ${database.name} | Age: ${friendlyTime(Date.now() - timestamp)}`);
+      //   }
+      // }
+
+      const sqlDatabasesToDelete = sqlDatabases.map(async (database) => {
+        await deleteWithRetry(client, database, account.name);
+      });
+
+      await Promise.all(sqlDatabasesToDelete);
+    }
+  }
+}
+
+// Retry logic for handling throttling
+async function deleteWithRetry(client, database, accountName) {
+  const maxRetries = 5;
+  let attempt = 0;
+  let backoffTime = 1000; // Start with 1 second
+
+  while (attempt < maxRetries) {
+    try {
+      await client.sqlResources.deleteSqlDatabase(resourceGroupName, accountName, database.name);
+      const timestamp = Number(database.resource._ts) * 1000;
+      console.log(`DELETED: ${accountName} | ${database.name} | Age: ${friendlyTime(Date.now() - timestamp)}`);
+      return; // Successfully deleted, exit the function
+    } catch (error) {
+      if (error.statusCode === 429) {
+        // Throttling error (HTTP 429), apply exponential backoff
+        console.log(`Throttling detected, retrying ${database.name}... (Attempt ${attempt + 1})`);
+        await delay(backoffTime);
+        attempt++;
+        backoffTime *= 2; // Exponential backoff
+      } else {
+        // For other errors, log and break
+        console.error(`Error deleting ${database.name}:`, error);
+        break;
       }
     }
   }
+  console.log(`Failed to delete ${database.name} after ${maxRetries} attempts.`);
+}
+
+// Helper function to delay the retry attempts
+function delay(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
 }
 
 main()
@@ -96,4 +136,4 @@ main()
     console.log(err);
     console.log("Cleanup failed! Exiting with success. Cleanup should always fail safe.");
     process.exit(0);
-  });
+  });
\ No newline at end of file