diff --git a/packages/app/src/features/dialogs/convert-stables/e2e/base/UsdcToUsds.test-e2e.ts b/packages/app/src/features/dialogs/convert-stables/e2e/base/UsdcToUsds.test-e2e.ts
index e3b5f98e7..1d10c9b11 100644
--- a/packages/app/src/features/dialogs/convert-stables/e2e/base/UsdcToUsds.test-e2e.ts
+++ b/packages/app/src/features/dialogs/convert-stables/e2e/base/UsdcToUsds.test-e2e.ts
@@ -1,66 +1,69 @@
-// import { SavingsPageObject } from '@/pages/Savings.PageObject'
-// import { setupFork } from '@/test/e2e/forking/setupFork'
-// import { setup } from '@/test/e2e/setup'
-// import { test } from '@playwright/test'
-// import { base } from 'viem/chains'
-// import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
+import { SavingsPageObject } from '@/pages/Savings.PageObject'
+import { setup } from '@/test/e2e/setup'
+import { test } from '@playwright/test'
+import { base } from 'viem/chains'
+import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
+import { BASE_DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
 
-// test.describe('Convert USDC to USDS', () => {
-//   const fork = setupFork({ chainId: base.id, blockNumber: 22143788n, useTenderlyVnet: true })
-//   let savingsPage: SavingsPageObject
-//   let convertStablesDialog: ConvertStablesDialogPageObject
+test.describe('Convert USDC to USDS', () => {
+  let savingsPage: SavingsPageObject
+  let convertStablesDialog: ConvertStablesDialogPageObject
 
-//   test.beforeEach(async ({ page }) => {
-//     await setup(page, fork, {
-//       initialPage: 'savings',
-//       account: {
-//         type: 'connected-random',
-//         assetBalances: {
-//           ETH: 1,
-//           USDC: 10_000,
-//         },
-//       },
-//     })
+  test.beforeEach(async ({ page }) => {
+    const testContext =await setup(page, {
+      blockchain: {
+        blockNumber: BASE_DEFAULT_BLOCK_NUMBER,
+        chainId: base.id,
+      },
+      initialPage: 'savings',
+      account: {
+        type: 'connected-random',
+        assetBalances: {
+          ETH: 1,
+          USDC: 10_000,
+        },
+      },
+    })
 
-//     savingsPage = new SavingsPageObject(page)
-//     await savingsPage.clickConvertStablesButtonAction()
+    savingsPage = new SavingsPageObject(testContext)
+    await savingsPage.clickConvertStablesButtonAction()
 
-//     convertStablesDialog = new ConvertStablesDialogPageObject(page)
-//     await convertStablesDialog.selectAssetInAction('USDC')
-//     await convertStablesDialog.selectAssetOutAction('USDS')
-//     await convertStablesDialog.fillAmountInAction(10_000)
-//   })
+    convertStablesDialog = new ConvertStablesDialogPageObject(testContext)
+    await convertStablesDialog.selectAssetInAction('USDC')
+    await convertStablesDialog.selectAssetOutAction('USDS')
+    await convertStablesDialog.fillAmountInAction(10_000)
+  })
 
-//   test('uses psm convert action', async () => {
-//     await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
-//     await convertStablesDialog.actionsContainer.expectActions([
-//       { type: 'approve', asset: 'USDC' },
-//       { type: 'psmConvert', inToken: 'USDC', outToken: 'USDS' },
-//     ])
-//   })
+  test('uses psm convert action', async () => {
+    await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
+    await convertStablesDialog.actionsContainer.expectActions([
+      { type: 'approve', asset: 'USDC' },
+      { type: 'psmConvert', inToken: 'USDC', outToken: 'USDS' },
+    ])
+  })
 
-//   test('displays transaction overview', async () => {
-//     await convertStablesDialog.expectTransactionOverview({
-//       routeItems: [
-//         {
-//           tokenAmount: '10,000.00 USDC',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//         {
-//           tokenAmount: '10,000.00 USDS',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//       ],
-//       outcome: '10,000.00 USDS',
-//       outcomeUsd: '$10,000.00',
-//     })
-//   })
+  test('displays transaction overview', async () => {
+    await convertStablesDialog.expectTransactionOverview({
+      routeItems: [
+        {
+          tokenAmount: '10,000.00 USDC',
+          tokenUsdValue: '$10,000.00',
+        },
+        {
+          tokenAmount: '10,000.00 USDS',
+          tokenUsdValue: '$10,000.00',
+        },
+      ],
+      outcome: '10,000.00 USDS',
+      outcomeUsd: '$10,000.00',
+    })
+  })
 
-//   test('executes conversion', async () => {
-//     await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
-//     await convertStablesDialog.expectSuccessPage()
-//     await convertStablesDialog.clickBackToSavingsButton()
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '-')
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '10,000.00')
-//   })
-// })
+  test('executes conversion', async () => {
+    await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
+    await convertStablesDialog.expectSuccessPage()
+    await convertStablesDialog.clickBackToSavingsButton()
+    await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '-')
+    await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '10,000.00')
+  })
+})
diff --git a/packages/app/src/features/dialogs/convert-stables/e2e/base/UsdsToUsdc.test-e2e.ts b/packages/app/src/features/dialogs/convert-stables/e2e/base/UsdsToUsdc.test-e2e.ts
index 0591f3253..51a8c96c3 100644
--- a/packages/app/src/features/dialogs/convert-stables/e2e/base/UsdsToUsdc.test-e2e.ts
+++ b/packages/app/src/features/dialogs/convert-stables/e2e/base/UsdsToUsdc.test-e2e.ts
@@ -1,66 +1,69 @@
-// import { SavingsPageObject } from '@/pages/Savings.PageObject'
-// import { setupFork } from '@/test/e2e/forking/setupFork'
-// import { setup } from '@/test/e2e/setup'
-// import { test } from '@playwright/test'
-// import { base } from 'viem/chains'
-// import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
+import { SavingsPageObject } from '@/pages/Savings.PageObject'
+import { setup } from '@/test/e2e/setup'
+import { test } from '@playwright/test'
+import { base } from 'viem/chains'
+import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
+import { BASE_DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
 
-// test.describe('Convert USDS to USDC', () => {
-//   const fork = setupFork({ chainId: base.id, blockNumber: 22143788n, useTenderlyVnet: true })
-//   let savingsPage: SavingsPageObject
-//   let convertStablesDialog: ConvertStablesDialogPageObject
+test.describe('Convert USDS to USDC', () => {
+  let savingsPage: SavingsPageObject
+  let convertStablesDialog: ConvertStablesDialogPageObject
 
-//   test.beforeEach(async ({ page }) => {
-//     await setup(page, fork, {
-//       initialPage: 'savings',
-//       account: {
-//         type: 'connected-random',
-//         assetBalances: {
-//           ETH: 1,
-//           USDS: 10_000,
-//         },
-//       },
-//     })
+  test.beforeEach(async ({ page }) => {
+    const testContext = await setup(page, {
+      blockchain: {
+        blockNumber: BASE_DEFAULT_BLOCK_NUMBER,
+        chainId: base.id,
+      },
+      initialPage: 'savings',
+      account: {
+        type: 'connected-random',
+        assetBalances: {
+          ETH: 1,
+          USDS: 10_000,
+        },
+      },
+    })
 
-//     savingsPage = new SavingsPageObject(page)
-//     await savingsPage.clickConvertStablesButtonAction()
+    savingsPage = new SavingsPageObject(testContext)
+    await savingsPage.clickConvertStablesButtonAction()
 
-//     convertStablesDialog = new ConvertStablesDialogPageObject(page)
-//     await convertStablesDialog.selectAssetInAction('USDS')
-//     await convertStablesDialog.selectAssetOutAction('USDC')
-//     await convertStablesDialog.fillAmountInAction(10_000)
-//   })
+    convertStablesDialog = new ConvertStablesDialogPageObject(testContext)
+    await convertStablesDialog.selectAssetInAction('USDS')
+    await convertStablesDialog.selectAssetOutAction('USDC')
+    await convertStablesDialog.fillAmountInAction(10_000)
+  })
 
-//   test('uses psm convert action', async () => {
-//     await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
-//     await convertStablesDialog.actionsContainer.expectActions([
-//       { type: 'approve', asset: 'USDS' },
-//       { type: 'psmConvert', inToken: 'USDS', outToken: 'USDC' },
-//     ])
-//   })
+  test('uses psm convert action', async () => {
+    await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
+    await convertStablesDialog.actionsContainer.expectActions([
+      { type: 'approve', asset: 'USDS' },
+      { type: 'psmConvert', inToken: 'USDS', outToken: 'USDC' },
+    ])
+  })
 
-//   test('displays transaction overview', async () => {
-//     await convertStablesDialog.expectTransactionOverview({
-//       routeItems: [
-//         {
-//           tokenAmount: '10,000.00 USDS',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//         {
-//           tokenAmount: '10,000.00 USDC',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//       ],
-//       outcome: '10,000.00 USDC',
-//       outcomeUsd: '$10,000.00',
-//     })
-//   })
+  test('displays transaction overview', async () => {
+    await convertStablesDialog.expectTransactionOverview({
+      routeItems: [
+        {
+          tokenAmount: '10,000.00 USDS',
+          tokenUsdValue: '$10,000.00',
+        },
+        {
+          tokenAmount: '10,000.00 USDC',
+          tokenUsdValue: '$10,000.00',
+        },
+      ],
+      outcome: '10,000.00 USDC',
+      outcomeUsd: '$10,000.00',
+    })
+  })
 
-//   test('executes conversion', async () => {
-//     await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
-//     await convertStablesDialog.expectSuccessPage()
-//     await convertStablesDialog.clickBackToSavingsButton()
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '-')
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '10,000.00')
-//   })
-// })
+  test('executes conversion', async () => {
+    await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
+    await convertStablesDialog.expectSuccessPage()
+    await convertStablesDialog.clickBackToSavingsButton()
+    await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '-')
+    await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '10,000.00')
+  })
+})
diff --git a/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/DaiToUsdc.test-e2e.ts b/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/DaiToUsdc.test-e2e.ts
index 29f46ec5d..fd535b167 100644
--- a/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/DaiToUsdc.test-e2e.ts
+++ b/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/DaiToUsdc.test-e2e.ts
@@ -1,67 +1,69 @@
-// import { SavingsPageObject } from '@/pages/Savings.PageObject'
-// import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
-// import { setupFork } from '@/test/e2e/forking/setupFork'
-// import { setup } from '@/test/e2e/setup'
-// import { test } from '@playwright/test'
-// import { mainnet } from 'viem/chains'
-// import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
+import { SavingsPageObject } from '@/pages/Savings.PageObject'
+import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
+import { setup } from '@/test/e2e/setup'
+import { test } from '@playwright/test'
+import { mainnet } from 'viem/chains'
+import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
 
-// test.describe('Convert DAI to USDC', () => {
-//   const fork = setupFork({ blockNumber: DEFAULT_BLOCK_NUMBER, chainId: mainnet.id, useTenderlyVnet: true })
-//   let savingsPage: SavingsPageObject
-//   let convertStablesDialog: ConvertStablesDialogPageObject
+test.describe('Convert DAI to USDC', () => {
+  let savingsPage: SavingsPageObject
+  let convertStablesDialog: ConvertStablesDialogPageObject
 
-//   test.beforeEach(async ({ page }) => {
-//     await setup(page, fork, {
-//       initialPage: 'savings',
-//       account: {
-//         type: 'connected-random',
-//         assetBalances: {
-//           ETH: 1,
-//           DAI: 10_000,
-//         },
-//       },
-//     })
+  test.beforeEach(async ({ page }) => {
+    const testContext = await setup(page, {
+      blockchain: {
+        blockNumber: DEFAULT_BLOCK_NUMBER,
+        chainId: mainnet.id,
+      },
+      initialPage: 'savings',
+      account: {
+        type: 'connected-random',
+        assetBalances: {
+          ETH: 1,
+          DAI: 10_000,
+        },
+      },
+    })
 
-//     savingsPage = new SavingsPageObject(page)
-//     await savingsPage.clickConvertStablesButtonAction()
+    savingsPage = new SavingsPageObject(testContext)
+    await savingsPage.clickConvertStablesButtonAction()
 
-//     convertStablesDialog = new ConvertStablesDialogPageObject(page)
-//     await convertStablesDialog.selectAssetInAction('DAI')
-//     await convertStablesDialog.selectAssetOutAction('USDC')
-//     await convertStablesDialog.fillAmountInAction(10_000)
-//   })
+    convertStablesDialog = new ConvertStablesDialogPageObject(testContext)
+    await convertStablesDialog.selectAssetInAction('DAI')
+    await convertStablesDialog.selectAssetOutAction('USDC')
+    await convertStablesDialog.fillAmountInAction(10_000)
+  })
 
-//   test('uses psm convert action', async () => {
-//     await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
-//     await convertStablesDialog.actionsContainer.expectActions([
-//       { type: 'approve', asset: 'DAI' },
-//       { type: 'psmConvert', inToken: 'DAI', outToken: 'USDC' },
-//     ])
-//   })
+  test('uses psm convert action', async () => {
+    await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
+    await convertStablesDialog.actionsContainer.expectActions([
+      { type: 'approve', asset: 'DAI' },
+      { type: 'psmConvert', inToken: 'DAI', outToken: 'USDC' },
+    ])
+  })
 
-//   test('displays transaction overview', async () => {
-//     await convertStablesDialog.expectTransactionOverview({
-//       routeItems: [
-//         {
-//           tokenAmount: '10,000.00 DAI',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//         {
-//           tokenAmount: '10,000.00 USDC',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//       ],
-//       outcome: '10,000.00 USDC',
-//       outcomeUsd: '$10,000.00',
-//     })
-//   })
+  test('displays transaction overview', async () => {
+    await convertStablesDialog.expectTransactionOverview({
+      routeItems: [
+        {
+          tokenAmount: '10,000.00 DAI',
+          tokenUsdValue: '$10,000.00',
+        },
+        {
+          tokenAmount: '10,000.00 USDC',
+          tokenUsdValue: '$10,000.00',
+        },
+      ],
+      outcome: '10,000.00 USDC',
+      outcomeUsd: '$10,000.00',
+    })
+  })
 
-//   test('executes conversion', async () => {
-//     await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
-//     await convertStablesDialog.expectSuccessPage()
-//     await convertStablesDialog.clickBackToSavingsButton()
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('DAI', '-')
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '10,000.00')
-//   })
-// })
+  test('executes conversion', async () => {
+    await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
+    await convertStablesDialog.expectSuccessPage()
+    await convertStablesDialog.clickBackToSavingsButton()
+    await savingsPage.expectStablecoinsInWalletAssetBalance('DAI', '-')
+    await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '10,000.00')
+  })
+})
diff --git a/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/DaiToUsds.test-e2e.ts b/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/DaiToUsds.test-e2e.ts
index 4951bab59..df67ccb42 100644
--- a/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/DaiToUsds.test-e2e.ts
+++ b/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/DaiToUsds.test-e2e.ts
@@ -1,67 +1,69 @@
-// import { SavingsPageObject } from '@/pages/Savings.PageObject'
-// import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
-// import { setupFork } from '@/test/e2e/forking/setupFork'
-// import { setup } from '@/test/e2e/setup'
-// import { test } from '@playwright/test'
-// import { mainnet } from 'viem/chains'
-// import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
+import { SavingsPageObject } from '@/pages/Savings.PageObject'
+import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
+import { setup } from '@/test/e2e/setup'
+import { test } from '@playwright/test'
+import { mainnet } from 'viem/chains'
+import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
 
-// test.describe('Convert DAI to USDS', () => {
-//   const fork = setupFork({ blockNumber: DEFAULT_BLOCK_NUMBER, chainId: mainnet.id, useTenderlyVnet: true })
-//   let savingsPage: SavingsPageObject
-//   let convertStablesDialog: ConvertStablesDialogPageObject
+test.describe('Convert DAI to USDS', () => {
+  let savingsPage: SavingsPageObject
+  let convertStablesDialog: ConvertStablesDialogPageObject
 
-//   test.beforeEach(async ({ page }) => {
-//     await setup(page, fork, {
-//       initialPage: 'savings',
-//       account: {
-//         type: 'connected-random',
-//         assetBalances: {
-//           ETH: 1,
-//           DAI: 10_000,
-//         },
-//       },
-//     })
+  test.beforeEach(async ({ page }) => {
+    const testContext = await setup(page, {
+      blockchain: {
+        blockNumber: DEFAULT_BLOCK_NUMBER,
+        chainId: mainnet.id,
+      },
+      initialPage: 'savings',
+      account: {
+        type: 'connected-random',
+        assetBalances: {
+          ETH: 1,
+          DAI: 10_000,
+        },
+      },
+    })
 
-//     savingsPage = new SavingsPageObject(page)
-//     await savingsPage.clickConvertStablesButtonAction()
+    savingsPage = new SavingsPageObject(testContext)
+    await savingsPage.clickConvertStablesButtonAction()
 
-//     convertStablesDialog = new ConvertStablesDialogPageObject(page)
-//     await convertStablesDialog.selectAssetInAction('DAI')
-//     await convertStablesDialog.selectAssetOutAction('USDS')
-//     await convertStablesDialog.fillAmountInAction(10_000)
-//   })
+    convertStablesDialog = new ConvertStablesDialogPageObject(testContext)
+    await convertStablesDialog.selectAssetInAction('DAI')
+    await convertStablesDialog.selectAssetOutAction('USDS')
+    await convertStablesDialog.fillAmountInAction(10_000)
+  })
 
-//   test('uses upgrade action', async () => {
-//     await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
-//     await convertStablesDialog.actionsContainer.expectActions([
-//       { type: 'approve', asset: 'DAI' },
-//       { type: 'upgrade', fromToken: 'DAI', toToken: 'USDS' },
-//     ])
-//   })
+  test('uses upgrade action', async () => {
+    await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
+    await convertStablesDialog.actionsContainer.expectActions([
+      { type: 'approve', asset: 'DAI' },
+      { type: 'upgrade', fromToken: 'DAI', toToken: 'USDS' },
+    ])
+  })
 
-//   test('displays transaction overview', async () => {
-//     await convertStablesDialog.expectTransactionOverview({
-//       routeItems: [
-//         {
-//           tokenAmount: '10,000.00 DAI',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//         {
-//           tokenAmount: '10,000.00 USDS',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//       ],
-//       outcome: '10,000.00 USDS',
-//       outcomeUsd: '$10,000.00',
-//     })
-//   })
+  test('displays transaction overview', async () => {
+    await convertStablesDialog.expectTransactionOverview({
+      routeItems: [
+        {
+          tokenAmount: '10,000.00 DAI',
+          tokenUsdValue: '$10,000.00',
+        },
+        {
+          tokenAmount: '10,000.00 USDS',
+          tokenUsdValue: '$10,000.00',
+        },
+      ],
+      outcome: '10,000.00 USDS',
+      outcomeUsd: '$10,000.00',
+    })
+  })
 
-//   test('executes conversion', async () => {
-//     await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
-//     await convertStablesDialog.expectSuccessPage()
-//     await convertStablesDialog.clickBackToSavingsButton()
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('DAI', '-')
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '10,000.00')
-//   })
-// })
+  test('executes conversion', async () => {
+    await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
+    await convertStablesDialog.expectSuccessPage()
+    await convertStablesDialog.clickBackToSavingsButton()
+    await savingsPage.expectStablecoinsInWalletAssetBalance('DAI', '-')
+    await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '10,000.00')
+  })
+})
diff --git a/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdcToDai.test-e2e.ts b/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdcToDai.test-e2e.ts
index 8efceca4a..15f35e0eb 100644
--- a/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdcToDai.test-e2e.ts
+++ b/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdcToDai.test-e2e.ts
@@ -1,67 +1,69 @@
-// import { SavingsPageObject } from '@/pages/Savings.PageObject'
-// import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
-// import { setupFork } from '@/test/e2e/forking/setupFork'
-// import { setup } from '@/test/e2e/setup'
-// import { test } from '@playwright/test'
-// import { mainnet } from 'viem/chains'
-// import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
+import { SavingsPageObject } from '@/pages/Savings.PageObject'
+import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
+import { setup } from '@/test/e2e/setup'
+import { test } from '@playwright/test'
+import { mainnet } from 'viem/chains'
+import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
 
-// test.describe('Convert USDC to DAI', () => {
-//   const fork = setupFork({ blockNumber: DEFAULT_BLOCK_NUMBER, chainId: mainnet.id, useTenderlyVnet: true })
-//   let savingsPage: SavingsPageObject
-//   let convertStablesDialog: ConvertStablesDialogPageObject
+test.describe('Convert USDC to DAI', () => {
+  let savingsPage: SavingsPageObject
+  let convertStablesDialog: ConvertStablesDialogPageObject
 
-//   test.beforeEach(async ({ page }) => {
-//     await setup(page, fork, {
-//       initialPage: 'savings',
-//       account: {
-//         type: 'connected-random',
-//         assetBalances: {
-//           ETH: 1,
-//           USDC: 10_000,
-//         },
-//       },
-//     })
+  test.beforeEach(async ({ page }) => {
+    const testContext = await setup(page, {
+      blockchain: {
+        blockNumber: DEFAULT_BLOCK_NUMBER,
+        chainId: mainnet.id,
+      },
+      initialPage: 'savings',
+      account: {
+        type: 'connected-random',
+        assetBalances: {
+          ETH: 1,
+          USDC: 10_000,
+        },
+      },
+    })
 
-//     savingsPage = new SavingsPageObject(page)
-//     await savingsPage.clickConvertStablesButtonAction()
+    savingsPage = new SavingsPageObject(testContext)
+    await savingsPage.clickConvertStablesButtonAction()
 
-//     convertStablesDialog = new ConvertStablesDialogPageObject(page)
-//     await convertStablesDialog.selectAssetInAction('USDC')
-//     await convertStablesDialog.selectAssetOutAction('DAI')
-//     await convertStablesDialog.fillAmountInAction(10_000)
-//   })
+    convertStablesDialog = new ConvertStablesDialogPageObject(testContext)
+    await convertStablesDialog.selectAssetInAction('USDC')
+    await convertStablesDialog.selectAssetOutAction('DAI')
+    await convertStablesDialog.fillAmountInAction(10_000)
+  })
 
-//   test('uses psm convert action', async () => {
-//     await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
-//     await convertStablesDialog.actionsContainer.expectActions([
-//       { type: 'approve', asset: 'USDC' },
-//       { type: 'psmConvert', inToken: 'USDC', outToken: 'DAI' },
-//     ])
-//   })
+  test('uses psm convert action', async () => {
+    await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
+    await convertStablesDialog.actionsContainer.expectActions([
+      { type: 'approve', asset: 'USDC' },
+      { type: 'psmConvert', inToken: 'USDC', outToken: 'DAI' },
+    ])
+  })
 
-//   test('displays transaction overview', async () => {
-//     await convertStablesDialog.expectTransactionOverview({
-//       routeItems: [
-//         {
-//           tokenAmount: '10,000.00 USDC',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//         {
-//           tokenAmount: '10,000.00 DAI',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//       ],
-//       outcome: '10,000.00 DAI',
-//       outcomeUsd: '$10,000.00',
-//     })
-//   })
+  test('displays transaction overview', async () => {
+    await convertStablesDialog.expectTransactionOverview({
+      routeItems: [
+        {
+          tokenAmount: '10,000.00 USDC',
+          tokenUsdValue: '$10,000.00',
+        },
+        {
+          tokenAmount: '10,000.00 DAI',
+          tokenUsdValue: '$10,000.00',
+        },
+      ],
+      outcome: '10,000.00 DAI',
+      outcomeUsd: '$10,000.00',
+    })
+  })
 
-//   test('executes conversion', async () => {
-//     await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
-//     await convertStablesDialog.expectSuccessPage()
-//     await convertStablesDialog.clickBackToSavingsButton()
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '-')
-//     await savingsPage.expectUpgradableDaiBalance('10,000.00')
-//   })
-// })
+  test('executes conversion', async () => {
+    await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
+    await convertStablesDialog.expectSuccessPage()
+    await convertStablesDialog.clickBackToSavingsButton()
+    await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '-')
+    await savingsPage.expectUpgradableDaiBalance('10,000.00')
+  })
+})
diff --git a/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdcToUsds.test-e2e.ts b/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdcToUsds.test-e2e.ts
index 92ecc0188..7c8568311 100644
--- a/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdcToUsds.test-e2e.ts
+++ b/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdcToUsds.test-e2e.ts
@@ -1,67 +1,69 @@
-// import { SavingsPageObject } from '@/pages/Savings.PageObject'
-// import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
-// import { setupFork } from '@/test/e2e/forking/setupFork'
-// import { setup } from '@/test/e2e/setup'
-// import { test } from '@playwright/test'
-// import { mainnet } from 'viem/chains'
-// import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
+import { SavingsPageObject } from '@/pages/Savings.PageObject'
+import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
+import { setup } from '@/test/e2e/setup'
+import { test } from '@playwright/test'
+import { mainnet } from 'viem/chains'
+import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
 
-// test.describe('Convert USDC to USDS', () => {
-//   const fork = setupFork({ blockNumber: DEFAULT_BLOCK_NUMBER, chainId: mainnet.id, useTenderlyVnet: true })
-//   let savingsPage: SavingsPageObject
-//   let convertStablesDialog: ConvertStablesDialogPageObject
+test.describe('Convert USDC to USDS', () => {
+  let savingsPage: SavingsPageObject
+  let convertStablesDialog: ConvertStablesDialogPageObject
 
-//   test.beforeEach(async ({ page }) => {
-//     await setup(page, fork, {
-//       initialPage: 'savings',
-//       account: {
-//         type: 'connected-random',
-//         assetBalances: {
-//           ETH: 1,
-//           USDC: 10_000,
-//         },
-//       },
-//     })
+  test.beforeEach(async ({ page }) => {
+    const testContext = await setup(page, {
+      blockchain: {
+        blockNumber: DEFAULT_BLOCK_NUMBER,
+        chainId: mainnet.id,
+      },
+      initialPage: 'savings',
+      account: {
+        type: 'connected-random',
+        assetBalances: {
+          ETH: 1,
+          USDC: 10_000,
+        },
+      },
+    })
 
-//     savingsPage = new SavingsPageObject(page)
-//     await savingsPage.clickConvertStablesButtonAction()
+    savingsPage = new SavingsPageObject(testContext)
+    await savingsPage.clickConvertStablesButtonAction()
 
-//     convertStablesDialog = new ConvertStablesDialogPageObject(page)
-//     await convertStablesDialog.selectAssetInAction('USDC')
-//     await convertStablesDialog.selectAssetOutAction('USDS')
-//     await convertStablesDialog.fillAmountInAction(10_000)
-//   })
+    convertStablesDialog = new ConvertStablesDialogPageObject(testContext)
+    await convertStablesDialog.selectAssetInAction('USDC')
+    await convertStablesDialog.selectAssetOutAction('USDS')
+    await convertStablesDialog.fillAmountInAction(10_000)
+  })
 
-//   test('uses psm convert action', async () => {
-//     await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
-//     await convertStablesDialog.actionsContainer.expectActions([
-//       { type: 'approve', asset: 'USDC' },
-//       { type: 'psmConvert', inToken: 'USDC', outToken: 'USDS' },
-//     ])
-//   })
+  test('uses psm convert action', async () => {
+    await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
+    await convertStablesDialog.actionsContainer.expectActions([
+      { type: 'approve', asset: 'USDC' },
+      { type: 'psmConvert', inToken: 'USDC', outToken: 'USDS' },
+    ])
+  })
 
-//   test('displays transaction overview', async () => {
-//     await convertStablesDialog.expectTransactionOverview({
-//       routeItems: [
-//         {
-//           tokenAmount: '10,000.00 USDC',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//         {
-//           tokenAmount: '10,000.00 USDS',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//       ],
-//       outcome: '10,000.00 USDS',
-//       outcomeUsd: '$10,000.00',
-//     })
-//   })
+  test('displays transaction overview', async () => {
+    await convertStablesDialog.expectTransactionOverview({
+      routeItems: [
+        {
+          tokenAmount: '10,000.00 USDC',
+          tokenUsdValue: '$10,000.00',
+        },
+        {
+          tokenAmount: '10,000.00 USDS',
+          tokenUsdValue: '$10,000.00',
+        },
+      ],
+      outcome: '10,000.00 USDS',
+      outcomeUsd: '$10,000.00',
+    })
+  })
 
-//   test('executes conversion', async () => {
-//     await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
-//     await convertStablesDialog.expectSuccessPage()
-//     await convertStablesDialog.clickBackToSavingsButton()
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '-')
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '10,000.00')
-//   })
-// })
+  test('executes conversion', async () => {
+    await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
+    await convertStablesDialog.expectSuccessPage()
+    await convertStablesDialog.clickBackToSavingsButton()
+    await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '-')
+    await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '10,000.00')
+  })
+})
diff --git a/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdsToDai.test-e2e.ts b/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdsToDai.test-e2e.ts
index e9bbf16df..9c04e05f4 100644
--- a/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdsToDai.test-e2e.ts
+++ b/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdsToDai.test-e2e.ts
@@ -1,67 +1,69 @@
-// import { SavingsPageObject } from '@/pages/Savings.PageObject'
-// import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
-// import { setupFork } from '@/test/e2e/forking/setupFork'
-// import { setup } from '@/test/e2e/setup'
-// import { test } from '@playwright/test'
-// import { mainnet } from 'viem/chains'
-// import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
+import { SavingsPageObject } from '@/pages/Savings.PageObject'
+import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
+import { setup } from '@/test/e2e/setup'
+import { test } from '@playwright/test'
+import { mainnet } from 'viem/chains'
+import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
 
-// test.describe('Convert USDS to DAI', () => {
-//   const fork = setupFork({ blockNumber: DEFAULT_BLOCK_NUMBER, chainId: mainnet.id, useTenderlyVnet: true })
-//   let savingsPage: SavingsPageObject
-//   let convertStablesDialog: ConvertStablesDialogPageObject
+test.describe('Convert USDS to DAI', () => {
+  let savingsPage: SavingsPageObject
+  let convertStablesDialog: ConvertStablesDialogPageObject
 
-//   test.beforeEach(async ({ page }) => {
-//     await setup(page, fork, {
-//       initialPage: 'savings',
-//       account: {
-//         type: 'connected-random',
-//         assetBalances: {
-//           ETH: 1,
-//           USDS: 10_000,
-//         },
-//       },
-//     })
+  test.beforeEach(async ({ page }) => {
+    const testContext = await setup(page, {
+      blockchain: {
+        blockNumber: DEFAULT_BLOCK_NUMBER,
+        chainId: mainnet.id,
+      },
+      initialPage: 'savings',
+      account: {
+        type: 'connected-random',
+        assetBalances: {
+          ETH: 1,
+          USDS: 10_000,
+        },
+      },
+    })
 
-//     savingsPage = new SavingsPageObject(page)
-//     await savingsPage.clickConvertStablesButtonAction()
+    savingsPage = new SavingsPageObject(testContext)
+    await savingsPage.clickConvertStablesButtonAction()
 
-//     convertStablesDialog = new ConvertStablesDialogPageObject(page)
-//     await convertStablesDialog.selectAssetInAction('USDS')
-//     await convertStablesDialog.selectAssetOutAction('DAI')
-//     await convertStablesDialog.fillAmountInAction(10_000)
-//   })
+    convertStablesDialog = new ConvertStablesDialogPageObject(testContext)
+    await convertStablesDialog.selectAssetInAction('USDS')
+    await convertStablesDialog.selectAssetOutAction('DAI')
+    await convertStablesDialog.fillAmountInAction(10_000)
+  })
 
-//   test('uses downgrade action', async () => {
-//     await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
-//     await convertStablesDialog.actionsContainer.expectActions([
-//       { type: 'approve', asset: 'USDS' },
-//       { type: 'downgrade', fromToken: 'USDS', toToken: 'DAI' },
-//     ])
-//   })
+  test('uses downgrade action', async () => {
+    await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
+    await convertStablesDialog.actionsContainer.expectActions([
+      { type: 'approve', asset: 'USDS' },
+      { type: 'downgrade', fromToken: 'USDS', toToken: 'DAI' },
+    ])
+  })
 
-//   test('displays transaction overview', async () => {
-//     await convertStablesDialog.expectTransactionOverview({
-//       routeItems: [
-//         {
-//           tokenAmount: '10,000.00 USDS',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//         {
-//           tokenAmount: '10,000.00 DAI',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//       ],
-//       outcome: '10,000.00 DAI',
-//       outcomeUsd: '$10,000.00',
-//     })
-//   })
+  test('displays transaction overview', async () => {
+    await convertStablesDialog.expectTransactionOverview({
+      routeItems: [
+        {
+          tokenAmount: '10,000.00 USDS',
+          tokenUsdValue: '$10,000.00',
+        },
+        {
+          tokenAmount: '10,000.00 DAI',
+          tokenUsdValue: '$10,000.00',
+        },
+      ],
+      outcome: '10,000.00 DAI',
+      outcomeUsd: '$10,000.00',
+    })
+  })
 
-//   test('executes conversion', async () => {
-//     await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
-//     await convertStablesDialog.expectSuccessPage()
-//     await convertStablesDialog.clickBackToSavingsButton()
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '-')
-//     await savingsPage.expectUpgradableDaiBalance('10,000.00')
-//   })
-// })
+  test('executes conversion', async () => {
+    await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
+    await convertStablesDialog.expectSuccessPage()
+    await convertStablesDialog.clickBackToSavingsButton()
+    await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '-')
+    await savingsPage.expectUpgradableDaiBalance('10,000.00')
+  })
+})
diff --git a/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdsToUsdc.test-e2e.ts b/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdsToUsdc.test-e2e.ts
index ce075748b..1e84f5d25 100644
--- a/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdsToUsdc.test-e2e.ts
+++ b/packages/app/src/features/dialogs/convert-stables/e2e/mainnet/UsdsToUsdc.test-e2e.ts
@@ -1,67 +1,69 @@
-// import { SavingsPageObject } from '@/pages/Savings.PageObject'
-// import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
-// import { setupFork } from '@/test/e2e/forking/setupFork'
-// import { setup } from '@/test/e2e/setup'
-// import { test } from '@playwright/test'
-// import { mainnet } from 'viem/chains'
-// import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
+import { SavingsPageObject } from '@/pages/Savings.PageObject'
+import { DEFAULT_BLOCK_NUMBER } from '@/test/e2e/constants'
+import { setup } from '@/test/e2e/setup'
+import { test } from '@playwright/test'
+import { mainnet } from 'viem/chains'
+import { ConvertStablesDialogPageObject } from '../../ConvertStablesDialog.PageObject'
 
-// test.describe('Convert USDS to USDC', () => {
-//   const fork = setupFork({ blockNumber: DEFAULT_BLOCK_NUMBER, chainId: mainnet.id, useTenderlyVnet: true })
-//   let savingsPage: SavingsPageObject
-//   let convertStablesDialog: ConvertStablesDialogPageObject
+test.describe('Convert USDS to USDC', () => {
+  let savingsPage: SavingsPageObject
+  let convertStablesDialog: ConvertStablesDialogPageObject
 
-//   test.beforeEach(async ({ page }) => {
-//     await setup(page, fork, {
-//       initialPage: 'savings',
-//       account: {
-//         type: 'connected-random',
-//         assetBalances: {
-//           ETH: 1,
-//           USDS: 10_000,
-//         },
-//       },
-//     })
+  test.beforeEach(async ({ page }) => {
+    const testContext = await setup(page, {
+      blockchain: {
+        blockNumber: DEFAULT_BLOCK_NUMBER,
+        chainId: mainnet.id,
+      },
+      initialPage: 'savings',
+      account: {
+        type: 'connected-random',
+        assetBalances: {
+          ETH: 1,
+          USDS: 10_000,
+        },
+      },
+    })
 
-//     savingsPage = new SavingsPageObject(page)
-//     await savingsPage.clickConvertStablesButtonAction()
+    savingsPage = new SavingsPageObject(testContext)
+    await savingsPage.clickConvertStablesButtonAction()
 
-//     convertStablesDialog = new ConvertStablesDialogPageObject(page)
-//     await convertStablesDialog.selectAssetInAction('USDS')
-//     await convertStablesDialog.selectAssetOutAction('USDC')
-//     await convertStablesDialog.fillAmountInAction(10_000)
-//   })
+    convertStablesDialog = new ConvertStablesDialogPageObject(testContext)
+    await convertStablesDialog.selectAssetInAction('USDS')
+    await convertStablesDialog.selectAssetOutAction('USDC')
+    await convertStablesDialog.fillAmountInAction(10_000)
+  })
 
-//   test('uses psm convert action', async () => {
-//     await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
-//     await convertStablesDialog.actionsContainer.expectActions([
-//       { type: 'approve', asset: 'USDS' },
-//       { type: 'psmConvert', inToken: 'USDS', outToken: 'USDC' },
-//     ])
-//   })
+  test('uses psm convert action', async () => {
+    await convertStablesDialog.actionsContainer.expectEnabledActionAtIndex(0)
+    await convertStablesDialog.actionsContainer.expectActions([
+      { type: 'approve', asset: 'USDS' },
+      { type: 'psmConvert', inToken: 'USDS', outToken: 'USDC' },
+    ])
+  })
 
-//   test('displays transaction overview', async () => {
-//     await convertStablesDialog.expectTransactionOverview({
-//       routeItems: [
-//         {
-//           tokenAmount: '10,000.00 USDS',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//         {
-//           tokenAmount: '10,000.00 USDC',
-//           tokenUsdValue: '$10,000.00',
-//         },
-//       ],
-//       outcome: '10,000.00 USDC',
-//       outcomeUsd: '$10,000.00',
-//     })
-//   })
+  test('displays transaction overview', async () => {
+    await convertStablesDialog.expectTransactionOverview({
+      routeItems: [
+        {
+          tokenAmount: '10,000.00 USDS',
+          tokenUsdValue: '$10,000.00',
+        },
+        {
+          tokenAmount: '10,000.00 USDC',
+          tokenUsdValue: '$10,000.00',
+        },
+      ],
+      outcome: '10,000.00 USDC',
+      outcomeUsd: '$10,000.00',
+    })
+  })
 
-//   test('executes conversion', async () => {
-//     await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
-//     await convertStablesDialog.expectSuccessPage()
-//     await convertStablesDialog.clickBackToSavingsButton()
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '-')
-//     await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '10,000.00')
-//   })
-// })
+  test('executes conversion', async () => {
+    await convertStablesDialog.actionsContainer.acceptAllActionsAction(2)
+    await convertStablesDialog.expectSuccessPage()
+    await convertStablesDialog.clickBackToSavingsButton()
+    await savingsPage.expectStablecoinsInWalletAssetBalance('USDS', '-')
+    await savingsPage.expectStablecoinsInWalletAssetBalance('USDC', '10,000.00')
+  })
+})