diff --git a/scripts/constant/abis.ts b/scripts/constant/abis.ts
index b63e82e8..43097ba5 100644
--- a/scripts/constant/abis.ts
+++ b/scripts/constant/abis.ts
@@ -1,4 +1,4 @@
-export default {
+export const abis: Record<string, any> = {
   core: {
     connectorsV2: require("./abi/core/connectorsV2.json"),
     instaIndex: require("./abi/core/instaIndex.json"),
diff --git a/scripts/tests/arbitrum/addresses.ts b/scripts/tests/arbitrum/addresses.ts
index 3687449b..d2da378f 100644
--- a/scripts/tests/arbitrum/addresses.ts
+++ b/scripts/tests/arbitrum/addresses.ts
@@ -1,4 +1,4 @@
-export default {
+export const addresses: Record<string, any> = {
   connectors: {
     // basic: "0x6214f9c4F9700fc7a50B5f9aEEB819d647406Ac7",
     // auth: "0xD6daA927ad756a4022858dddcc4E26137b30DB4D",
diff --git a/scripts/tests/avalanche/addresses.ts b/scripts/tests/avalanche/addresses.ts
index 3687449b..d2da378f 100644
--- a/scripts/tests/avalanche/addresses.ts
+++ b/scripts/tests/avalanche/addresses.ts
@@ -1,4 +1,4 @@
-export default {
+export const addresses: Record<string, any> = {
   connectors: {
     // basic: "0x6214f9c4F9700fc7a50B5f9aEEB819d647406Ac7",
     // auth: "0xD6daA927ad756a4022858dddcc4E26137b30DB4D",
diff --git a/scripts/tests/buildDSAv2.ts b/scripts/tests/buildDSAv2.ts
index 1729b8e0..163db741 100644
--- a/scripts/tests/buildDSAv2.ts
+++ b/scripts/tests/buildDSAv2.ts
@@ -1,14 +1,16 @@
 import { ethers } from "hardhat";
 
 import { addresses as addressesPolygon } from "./polygon/addresses";
+import { addresses as addressesArbitrum } from "./arbitrum/addresses";
+import { addresses as addressesAvalanche } from "./avalanche/addresses";
 import { addresses } from "./mainnet/addresses";
-import abis from "../constant/abis";
+import { abis } from "../constant/abis";
 import { abi } from "../../deployements/mainnet/Implementation_m1.sol/InstaImplementationM1.json";
 
 function getAddress(network: string | undefined) {
   if (network === "polygon") return addressesPolygon.core.instaIndex;
-  else if (network === "arbitrum") return addressesPolygon.core.instaIndex;
-  else if (network === "avalanche") return addressesPolygon.core.instaIndex;
+  else if (network === "arbitrum") return addressesArbitrum.core.instaIndex;
+  else if (network === "avalanche") return addressesAvalanche.core.instaIndex;
   else return addresses.core.instaIndex;
 }
 
diff --git a/scripts/tests/deployAndEnableConnector.ts b/scripts/tests/deployAndEnableConnector.ts
index 324b56ec..8e1f5d4b 100644
--- a/scripts/tests/deployAndEnableConnector.ts
+++ b/scripts/tests/deployAndEnableConnector.ts
@@ -1,6 +1,6 @@
 import { addresses as addressesPolygon } from "./polygon/addresses";
 import { addresses } from "./mainnet/addresses";
-import abis from "../constant/abis";
+import { abis } from "../constant/abis";
 
 import hre from "hardhat";
 import type { Signer, Contract } from "ethers";
diff --git a/scripts/tests/encodeSpells.ts b/scripts/tests/encodeSpells.ts
index 81ddcb03..62a7a8bb 100644
--- a/scripts/tests/encodeSpells.ts
+++ b/scripts/tests/encodeSpells.ts
@@ -1,5 +1,5 @@
 import { web3 } from "hardhat";
-import abis from "../constant/abis";
+import { abis } from "../constant/abis";
 
 export function encodeSpells(spells: any[]) {
   const targets = spells.map((a) => a.connector);
diff --git a/scripts/tests/getMasterSigner.ts b/scripts/tests/getMasterSigner.ts
index e0f0e0b1..c09fec74 100644
--- a/scripts/tests/getMasterSigner.ts
+++ b/scripts/tests/getMasterSigner.ts
@@ -1,12 +1,14 @@
 import { ethers, network } from "hardhat";
 import { addresses } from "./mainnet/addresses";
 import { addresses as addressesPolygon } from "./polygon/addresses";
-import abis from "../constant/abis";
+import { addresses as addressesArbitrum } from "./arbitrum/addresses";
+import { addresses as addressesAvalanche } from "./avalanche/addresses";
+import { abis } from "../constant/abis";
 
 function getAddress(network: string | undefined) {
   if (network === "polygon") return addressesPolygon.core.instaIndex;
-  // else if (network === "arbitrum") return addressesPolygon.core.instaIndex;
-  // else if (network === "avalanche") return addressesPolygon.core.instaIndex;
+  else if (network === "arbitrum") return addressesArbitrum.core.instaIndex;
+  else if (network === "avalanche") return addressesAvalanche.core.instaIndex;
   else return addresses.core.instaIndex;
 }
 
@@ -18,15 +20,16 @@ export async function getMasterSigner() {
     wallet3
   );
 
-  const masterAddress = await instaIndex.master(); // TODO: make it constant?
+  const masterAddress = await instaIndex.master();
   await network.provider.request({
     method: "hardhat_impersonateAccount",
     params: [masterAddress],
   });
-  await wallet3.sendTransaction({
-    to: masterAddress,
-    value: ethers.utils.parseEther("10"),
-  });
+
+  await network.provider.send("hardhat_setBalance", [
+    masterAddress,
+    "0x8ac7230489e80000", // 1e19 wei
+  ]);
 
   return await ethers.getSigner(masterAddress);
 }
diff --git a/scripts/tests/mainnet/addresses.ts b/scripts/tests/mainnet/addresses.ts
index ec5b38f4..f3e74d20 100644
--- a/scripts/tests/mainnet/addresses.ts
+++ b/scripts/tests/mainnet/addresses.ts
@@ -1,10 +1,10 @@
-export default {
-  "connectors": {
+export const addresses: Record<string, any> = {
+  connectors: {
     "basic": "0xe5398f279175962E56fE4c5E0b62dc7208EF36c6",
     "auth": "0xd1aff9f2acf800c876c409100d6f39aea93fc3d9",
     "INSTAPOOL-A": "0x5806af7ab22e2916fa582ff05731bf7c682387b2",
   },
-  "core": {
+  core: {
     "connectorsV2": "0x97b0B3A8bDeFE8cB9563a3c610019Ad10DB8aD11",
     "instaIndex": "0x2971AdFa57b20E5a416aE5a708A8655A9c74f723",
   },
diff --git a/scripts/tests/polygon/addresses.ts b/scripts/tests/polygon/addresses.ts
index fb0de779..7c13c34c 100644
--- a/scripts/tests/polygon/addresses.ts
+++ b/scripts/tests/polygon/addresses.ts
@@ -1,4 +1,4 @@
-export default {
+export const addresses: Record<string, any> = {
   connectors: {
     basic: "0x1cAF5EC802ca602E98139AD96A8f2B7BC524264E",
     auth: "0xf6474aD0dA75A0dE15D2c915e601D9f754B9e6fe",
diff --git a/test/arbitrum/uniswap-sell-beta/uniswap-sell-beta.ts b/test/arbitrum/uniswap-sell-beta/uniswap-sell-beta.ts
index dc3ad518..c4cf12ac 100644
--- a/test/arbitrum/uniswap-sell-beta/uniswap-sell-beta.ts
+++ b/test/arbitrum/uniswap-sell-beta/uniswap-sell-beta.ts
@@ -10,7 +10,7 @@ const WETH_ADDR = "0x82af49447d8a07e3bd95bd0d56f35241523fbab1";
 describe("Uniswap-sell-beta", function () {
   let UniswapSellBeta, uniswapSellBeta: Contract;
 
-  async function setBalance(address: any) {
+  async function setBalance(address: string) {
     await hre.network.provider.send("hardhat_setBalance", [
       address,
       ethers.utils.parseEther("10.0").toHexString(),
diff --git a/test/mainnet/aave/v1.test.ts b/test/mainnet/aave/v1.test.ts
index 14ba5a14..a65c3a24 100644
--- a/test/mainnet/aave/v1.test.ts
+++ b/test/mainnet/aave/v1.test.ts
@@ -1,7 +1,7 @@
 import hre from "hardhat";
 import { expect } from "chai";
-import abis from "../../../scripts/constant/abis";
-import addresses from "../../../scripts/tests/mainnet/addresses";
+import { abis } from "../../../scripts/constant/abis";
+import { addresses } from "../../../scripts/tests/mainnet/addresses";
 import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector";
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner";
 import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2";
@@ -17,8 +17,8 @@ import type { Signer, Contract } from "ethers";
 describe("Aave V1", function () {
   const connectorName = "AAVEV1-TEST-A";
 
-  let wallet0: any, wallet1: any;
-  let dsaWallet0: any;
+  let wallet0: Signer, wallet1: Signer;
+  let dsaWallet0: Contract;
   let instaConnectorsV2: Contract;
   let connector: any;
   let masterSigner: Signer;
@@ -63,7 +63,7 @@ describe("Aave V1", function () {
 
   describe("DSA wallet setup", function () {
     it("Should build DSA v2", async function () {
-      dsaWallet0 = await buildDSAv2(wallet0.address);
+      dsaWallet0 = await buildDSAv2(wallet0.getAddress());
       expect(!!dsaWallet0.address).to.be.true;
     });
 
@@ -91,7 +91,7 @@ describe("Aave V1", function () {
 
       const tx = await dsaWallet0
         .connect(wallet0)
-        .cast(...encodeSpells(spells), wallet1.address);
+        .cast(...encodeSpells(spells), wallet1.getAddress());
 
       await tx.wait();
 
@@ -122,7 +122,7 @@ describe("Aave V1", function () {
 
       const tx = await dsaWallet0
         .connect(wallet0)
-        .cast(...encodeSpells(spells), wallet1.address);
+        .cast(...encodeSpells(spells), wallet1.getAddress());
       await tx.wait();
       expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.lte(
         ethers.utils.parseEther("9")
@@ -140,7 +140,7 @@ describe("Aave V1", function () {
 
       const tx = await dsaWallet0
         .connect(wallet0)
-        .cast(...encodeSpells(spells), wallet1.address);
+        .cast(...encodeSpells(spells), wallet1.getAddress());
       await tx.wait();
       expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.lte(
         ethers.utils.parseEther("0")
@@ -158,7 +158,7 @@ describe("Aave V1", function () {
 
       const tx = await dsaWallet0
         .connect(wallet0)
-        .cast(...encodeSpells(spells), wallet1.address);
+        .cast(...encodeSpells(spells), wallet1.getAddress());
       await tx.wait();
       expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte(
         ethers.utils.parseEther("10")
diff --git a/test/mainnet/aave/v2.test.ts b/test/mainnet/aave/v2.test.ts
index b04c3568..6752e6a6 100644
--- a/test/mainnet/aave/v2.test.ts
+++ b/test/mainnet/aave/v2.test.ts
@@ -1,7 +1,7 @@
 import { expect } from "chai";
 import hre from "hardhat";
-import abis from "../../../scripts/constant/abis";
-import addresses from "../../../scripts/tests/mainnet/addresses";
+import { abis } from "../../../scripts/constant/abis";
+import { addresses } from "../../../scripts/tests/mainnet/addresses";
 import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector";
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner";
 import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2";
@@ -18,7 +18,7 @@ describe("Aave V2", function () {
   const connectorName = "AAVEV2-TEST-A";
   let connector: any;
 
-  let wallet0: any, wallet1:any;
+  let wallet0: Signer, wallet1:Signer;
   let dsaWallet0: any;
   let instaConnectorsV2: Contract;
   let masterSigner: Signer;
@@ -58,7 +58,7 @@ describe("Aave V2", function () {
 
   describe("DSA wallet setup", function () {
     it("Should build DSA v2", async function () {
-      dsaWallet0 = await buildDSAv2(wallet0.address);
+      dsaWallet0 = await buildDSAv2(wallet0.getAddress());
       expect(!!dsaWallet0.address).to.be.true;
     });
 
@@ -86,7 +86,7 @@ describe("Aave V2", function () {
 
       const tx = await dsaWallet0
         .connect(wallet0)
-        .cast(...encodeSpells(spells), wallet1.address);
+        .cast(...encodeSpells(spells), wallet1.getAddress());
 
       await tx.wait();
 
@@ -113,7 +113,7 @@ describe("Aave V2", function () {
 
       const tx = await dsaWallet0
         .connect(wallet0)
-        .cast(...encodeSpells(spells), wallet1.address);
+        .cast(...encodeSpells(spells), wallet1.getAddress());
       await tx.wait();
       expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.lte(
         ethers.utils.parseEther("9")
@@ -139,7 +139,7 @@ describe("Aave V2", function () {
 
       let tx = await dsaWallet0
         .connect(wallet0)
-        .cast(...encodeSpells(spells), wallet1.address);
+        .cast(...encodeSpells(spells), wallet1.getAddress());
       await tx.wait();
       expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.lte(
         ethers.utils.parseEther("9")
@@ -155,7 +155,7 @@ describe("Aave V2", function () {
 
       tx = await dsaWallet0
         .connect(wallet0)
-        .cast(...encodeSpells(spells), wallet1.address);
+        .cast(...encodeSpells(spells), wallet1.getAddress());
       await tx.wait();
       expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.lte(
         ethers.utils.parseEther("9")
@@ -173,7 +173,7 @@ describe("Aave V2", function () {
 
       const tx = await dsaWallet0
         .connect(wallet0)
-        .cast(...encodeSpells(spells), wallet1.address);
+        .cast(...encodeSpells(spells), wallet1.getAddress());
       await tx.wait();
       expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.lte(
         ethers.utils.parseEther("0")
@@ -191,7 +191,7 @@ describe("Aave V2", function () {
 
       const tx = await dsaWallet0
         .connect(wallet0)
-        .cast(...encodeSpells(spells), wallet1.address);
+        .cast(...encodeSpells(spells), wallet1.getAddress());
       await tx.wait();
       expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte(
         ethers.utils.parseEther("10")
@@ -216,7 +216,7 @@ describe("Aave V2", function () {
 
       const tx = await dsaWallet0
         .connect(wallet0)
-        .cast(...encodeSpells(spells), wallet1.address);
+        .cast(...encodeSpells(spells), wallet1.getAddress());
       await tx.wait();
       expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte(
         ethers.utils.parseEther("10")
diff --git a/test/mainnet/b.protocol/b.compound.test.ts b/test/mainnet/b.protocol/b.compound.test.ts
index 8214f41d..3402321a 100644
--- a/test/mainnet/b.protocol/b.compound.test.ts
+++ b/test/mainnet/b.protocol/b.compound.test.ts
@@ -7,8 +7,8 @@ import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnable
 import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
 import { encodeSpells } from "../../../scripts/tests/encodeSpells"
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
-import addresses from "../../../scripts/tests/mainnet/addresses";
-import abis from "../../../scripts/constant/abis";
+import { addresses } from "../../../scripts/tests/mainnet/addresses";
+import { abis } from "../../../scripts/constant/abis";
 import { constants } from "../../../scripts/constant/constant";
 import { ConnectV2BCompound__factory } from "../../../typechain";
 import type { Signer, Contract } from "ethers";
diff --git a/test/mainnet/b.protocol/b.liquity.test.ts b/test/mainnet/b.protocol/b.liquity.test.ts
index ce0e1a48..88e5f7c6 100644
--- a/test/mainnet/b.protocol/b.liquity.test.ts
+++ b/test/mainnet/b.protocol/b.liquity.test.ts
@@ -7,10 +7,10 @@ import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnable
 import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
 import { encodeSpells } from "../../../scripts/tests/encodeSpells"
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
-import abis from "../../../scripts/constant/abis";
+import { abis } from "../../../scripts/constant/abis";
 import { ConnectV2BLiquity__factory } from "../../../typechain";
 import type { Signer, Contract } from "ethers";
-import addresses from "../../../scripts/tests/mainnet/addresses";
+import { addresses } from "../../../scripts/tests/mainnet/addresses";
 
 const LUSD_WHALE = "0x66017D22b0f8556afDd19FC67041899Eb65a21bb" // stability pool
 const BAMM_ADDRESS = "0x0d3AbAA7E088C2c82f54B2f47613DA438ea8C598"
@@ -19,15 +19,15 @@ describe("B.Liquity", function () {
   const connectorName = "B.LIQUITY-TEST-A"
 
   let dsaWallet0: any;
-  let dsaWallet1: any
+  let dsaWallet1: any;
   let masterSigner: Signer;
   let instaConnectorsV2: Contract;
-  let connector: any;
-  let manager: any;
-  let vat: any;
-  let lusd: any;
-  let bammToken: any;
-  let stabilityPool: any;
+  let connector: Contract;
+  let manager: Contract;
+  let vat: Contract;
+  let lusd: Contract;
+  let bammToken: Contract;
+  let stabilityPool: Contract;
 
   const wallets = provider.getWallets()
   const [wallet0, wallet1, wallet2, wallet3] = wallets
diff --git a/test/mainnet/b.protocol/b.maker.test.ts b/test/mainnet/b.protocol/b.maker.test.ts
index e919283a..53bcd8bd 100644
--- a/test/mainnet/b.protocol/b.maker.test.ts
+++ b/test/mainnet/b.protocol/b.maker.test.ts
@@ -7,8 +7,8 @@ import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnable
 import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
 import { encodeSpells } from "../../../scripts/tests/encodeSpells"
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
-import addresses from "../../../scripts/tests/mainnet/addresses";
-import abis from "../../../scripts/constant/abis";
+import { addresses } from "../../../scripts/tests/mainnet/addresses";
+import { abis } from "../../../scripts/constant/abis";
 import { tokens } from "../../../scripts/tests/mainnet/tokens";
 import { ConnectV2BMakerDAO__factory } from "../../../typechain";
 import type { Signer, Contract } from "ethers";
diff --git a/test/mainnet/basic-ERC1155/ERC1155-transfer.ts b/test/mainnet/basic-ERC1155/ERC1155-transfer.ts
index f8a138bc..ceffc1cd 100644
--- a/test/mainnet/basic-ERC1155/ERC1155-transfer.ts
+++ b/test/mainnet/basic-ERC1155/ERC1155-transfer.ts
@@ -8,8 +8,8 @@ import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnable
 import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
 import { encodeSpells } from "../../../scripts/tests/encodeSpells"
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
-import addresses from "../../../scripts/tests/mainnet/addresses"
-import abis from "../../../scripts/constant/abis"
+import { addresses } from "../../../scripts/tests/mainnet/addresses"
+import { abis } from "../../../scripts/constant/abis"
 import type { Signer, Contract } from "ethers";
 
 import { ConnectV2BasicERC1155__factory, IERC1155__factory } from "../../../typechain";
@@ -26,8 +26,8 @@ describe("BASIC-ERC1155", function () {
     let dsaWallet0: any;
     let masterSigner: Signer;
     let instaConnectorsV2: Contract;
-    let connector: any;
-    let nftContract: any;
+    let connector: Contract;
+    let nftContract: Contract;
     let tokenOwner: any;
     let instaImplementationsMapping: any;
     let InstaAccountV2DefaultImpl: any;
diff --git a/test/mainnet/basic-ERC721/ERC721-transfer.ts b/test/mainnet/basic-ERC721/ERC721-transfer.ts
index 908d9f21..1ed72c0c 100644
--- a/test/mainnet/basic-ERC721/ERC721-transfer.ts
+++ b/test/mainnet/basic-ERC721/ERC721-transfer.ts
@@ -8,8 +8,8 @@ import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnable
 import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
 import { encodeSpells } from "../../../scripts/tests/encodeSpells"
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
-import addresses from "../../../scripts/tests/mainnet/addresses"
-import abis from "../../../scripts/constant/abis"
+import { addresses } from "../../../scripts/tests/mainnet/addresses"
+import { abis } from "../../../scripts/constant/abis"
 import type { Signer, Contract } from "ethers";
 
 import { ConnectV2BasicERC721__factory, IERC721__factory } from "../../../typechain";
diff --git a/test/mainnet/compound/compound.test.ts b/test/mainnet/compound/compound.test.ts
index 383ee12d..89c582ff 100644
--- a/test/mainnet/compound/compound.test.ts
+++ b/test/mainnet/compound/compound.test.ts
@@ -9,8 +9,8 @@ import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnable
 import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
 import { encodeSpells } from "../../../scripts/tests/encodeSpells";
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
-import addresses from "../../../scripts/tests/mainnet/addresses";
-import abis from "../../../scripts/constant/abis";
+import { addresses } from "../../../scripts/tests/mainnet/addresses";
+import { abis } from "../../../scripts/constant/abis";
 import { constants } from "../../../scripts/constant/constant";
 import { ConnectV2Compound__factory } from "../../../typechain";
 
diff --git a/test/mainnet/instapool/instapool.test.ts b/test/mainnet/instapool/instapool.test.ts
index 99fe80de..59f8d13d 100644
--- a/test/mainnet/instapool/instapool.test.ts
+++ b/test/mainnet/instapool/instapool.test.ts
@@ -9,8 +9,8 @@ import { encodeSpells } from "../../../scripts/tests/encodeSpells"
 import encodeFlashcastData from "../../../scripts/tests/encodeFlashcastData"
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 
-import addresses from "../../../scripts/tests/mainnet/addresses";
-import abis from "../../../scripts/constant/abis";
+import { addresses } from "../../../scripts/tests/mainnet/addresses";
+import { abis } from "../../../scripts/constant/abis";
 import type { Signer, Contract } from "ethers";
 import { ConnectV2Compound__factory } from "../../../typechain";
 
diff --git a/test/mainnet/liquity/liquity.helpers.ts b/test/mainnet/liquity/liquity.helpers.ts
index 14c1abaf..97814e71 100644
--- a/test/mainnet/liquity/liquity.helpers.ts
+++ b/test/mainnet/liquity/liquity.helpers.ts
@@ -8,9 +8,9 @@ import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
 import { encodeSpells } from "../../../scripts/tests/encodeSpells"
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 
-// Instadapp instadappAddresses/ABIs
-import instadappAddresses from "../../../scripts/tests/mainnet/addresses";
-import abis from "../../../scripts/constant/abis";
+// Instadapp addresses/ABIs
+import { addresses } from "../../../scripts/tests/mainnet/addresses";
+import { abis } from "../../../scripts/constant/abis";
 
 // Instadapp Liquity Connector artifacts
 import { ConnectV2Liquity__factory, ConnectV2Basic__factory } from "../../../typechain";
@@ -138,7 +138,7 @@ const deployAndConnect = async (contracts: any, isDebug = false) => {
   const masterSigner = await getMasterSigner();
   const instaConnectorsV2 = await ethers.getContractAt(
     abis.core.connectorsV2,
-    instadappAddresses.core.connectorsV2
+    addresses.core.connectorsV2
   );
   const connector = await deployAndEnableConnector({
     connectorName: LIQUITY_CONNECTOR,
diff --git a/test/mainnet/pooltogether/pooltogether.test.ts b/test/mainnet/pooltogether/pooltogether.test.ts
index 1bca8b79..e300ec25 100644
--- a/test/mainnet/pooltogether/pooltogether.test.ts
+++ b/test/mainnet/pooltogether/pooltogether.test.ts
@@ -8,8 +8,8 @@ import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2";
 import { encodeSpells } from "../../../scripts/tests/encodeSpells";
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner";
 
-import addresses from "../../../scripts/tests/mainnet/addresses";
-import abis from "../../../scripts/constant/abis";
+import { addresses } from "../../../scripts/tests/mainnet/addresses";
+import { abis } from "../../../scripts/constant/abis";
 import { constants } from "../../../scripts/constant/constant";
 import { tokens } from "../../../scripts/tests/mainnet/tokens";
 import type { Signer, Contract } from "ethers";
diff --git a/test/mainnet/uniswap/uniswap.test.ts b/test/mainnet/uniswap/uniswap.test.ts
index 93a87dec..4049d5de 100644
--- a/test/mainnet/uniswap/uniswap.test.ts
+++ b/test/mainnet/uniswap/uniswap.test.ts
@@ -8,8 +8,8 @@ import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2";
 import { encodeSpells } from "../../../scripts/tests/encodeSpells";
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner";
 import { addLiquidity } from "../../../scripts/tests/addLiquidity";
-import addresses from "../../../scripts/tests/mainnet/addresses";
-import abis from "../../../scripts/constant/abis";
+import { addresses } from "../../../scripts/tests/mainnet/addresses";
+import { abis } from "../../../scripts/constant/abis";
 import type { Signer, Contract } from "ethers";
 
 import { abi } from "@uniswap/v3-periphery/artifacts/contracts/NonfungiblePositionManager.sol/NonfungiblePositionManager.json";
diff --git a/test/mainnet/uniswapStake/uniswapStake.test.ts b/test/mainnet/uniswapStake/uniswapStake.test.ts
index 67889420..e2d15288 100644
--- a/test/mainnet/uniswapStake/uniswapStake.test.ts
+++ b/test/mainnet/uniswapStake/uniswapStake.test.ts
@@ -9,8 +9,8 @@ import { encodeSpells } from "../../../scripts/tests/encodeSpells";
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner";
 import { addLiquidity } from "../../../scripts/tests/addLiquidity";
 
-import addresses from "../../../scripts/tests/mainnet/addresses";
-import abis from "../../../scripts/constant/abis";
+import { addresses } from "../../../scripts/tests/mainnet/addresses";
+import { abis } from "../../../scripts/constant/abis";
 import { abi } from "@uniswap/v3-periphery/artifacts/contracts/NonfungiblePositionManager.sol/NonfungiblePositionManager.json"
 import type { Signer, Contract } from "ethers";
 
diff --git a/test/mainnet/yearn/yearn.test.ts b/test/mainnet/yearn/yearn.test.ts
index a7a27464..5c7bedc9 100644
--- a/test/mainnet/yearn/yearn.test.ts
+++ b/test/mainnet/yearn/yearn.test.ts
@@ -8,8 +8,8 @@ import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2";
 import { encodeSpells } from "../../../scripts/tests/encodeSpells";
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner";
 
-import addresses from "../../../scripts/tests/mainnet/addresses";
-import abis from "../../../scripts/constant/abis";
+import { addresses } from "../../../scripts/tests/mainnet/addresses";
+import { abis } from "../../../scripts/constant/abis";
 import { tokens } from "../../../scripts/tests/mainnet/tokens";
 import { Signer, Contract, BigNumber } from "ethers";
 
diff --git a/test/polygon/pooltogether/pooltogether.test.ts b/test/polygon/pooltogether/pooltogether.test.ts
index 04b9f821..4d77dbf7 100644
--- a/test/polygon/pooltogether/pooltogether.test.ts
+++ b/test/polygon/pooltogether/pooltogether.test.ts
@@ -10,8 +10,8 @@ import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2";
 import { encodeSpells } from "../../../scripts/tests/encodeSpells";
 import { getMasterSigner } from "../../../scripts/tests/getMasterSigner";
 
-import addresses from "../../../scripts/tests/polygon/addresses";
-import abis from "../../../scripts/constant/abis";
+import { addresses } from "../../../scripts/tests/polygon/addresses";
+import { abis } from "../../../scripts/constant/abis";
 import { tokens } from "../../../scripts/tests/polygon/tokens";
 import type { Signer, Contract } from "ethers";