diff --git a/tests/LSP17ContractExtension/LSP17ExtendableTokens.behaviour.ts b/tests/LSP17ContractExtension/LSP17ExtendableTokens.behaviour.ts
index 1fe2a037f..d5f2511bc 100644
--- a/tests/LSP17ContractExtension/LSP17ExtendableTokens.behaviour.ts
+++ b/tests/LSP17ContractExtension/LSP17ExtendableTokens.behaviour.ts
@@ -155,7 +155,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
           it('should revert with NoExtensionForFunctionSignature error', async () => {
             await expect(
               context.accounts[0].sendTransaction({
-                to: context.contract.address,
+                to: await context.contract.getAddress(),
                 data: notExistingFunctionSignature,
               }),
             )
@@ -172,7 +172,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
             const amountSent = 200;
             await expect(
               context.accounts[0].sendTransaction({
-                to: context.contract.address,
+                to: await context.contract.getAddress(),
                 data: notExistingFunctionSignature,
                 value: amountSent,
               }),
@@ -202,7 +202,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
                 // different sender
                 await expect(
                   context.accounts[1].sendTransaction({
-                    to: context.contract.address,
+                    to: await context.contract.getAddress(),
                     data: checkMsgVariableFunctionSignature,
                     value: value,
                   }),
@@ -225,7 +225,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
 
                 await expect(
                   sender.sendTransaction({
-                    to: context.contract.address,
+                    to: await context.contract.getAddress(),
                     data: checkMsgVariableFunctionSignature,
                     value: 100, // different value
                   }),
@@ -263,7 +263,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
 
                 await expect(
                   sender.sendTransaction({
-                    to: context.contract.address,
+                    to: await context.contract.getAddress(),
                     data: checkMsgVariableFunctionSignature,
                     value: 100, // different value
                   }),
@@ -282,7 +282,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
                 // different sender
                 await expect(
                   context.accounts[1].sendTransaction({
-                    to: context.contract.address,
+                    to: await context.contract.getAddress(),
                     data: checkMsgVariableFunctionSignature,
                     value: value,
                   }),
@@ -297,7 +297,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
                   abiCoder.encode(['address', 'uint256'], [sender.address, value]).substring(2);
 
                 await sender.sendTransaction({
-                  to: context.contract.address,
+                  to: await context.contract.getAddress(),
                   data: checkMsgVariableFunctionSignature,
                   value: value,
                 });
@@ -329,7 +329,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
 
             await expect(
               context.accounts[0].sendTransaction({
-                to: context.contract.address,
+                to: await context.contract.getAddress(),
                 data: revertStringFunctionSignature,
                 value: 0,
               }),
@@ -358,13 +358,13 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
 
             await expect(
               sender.sendTransaction({
-                to: context.contract.address,
+                to: await context.contract.getAddress(),
                 data: revertCustomFunctionSelector,
                 value: 0,
               }),
             )
               .to.be.revertedWithCustomError(revertCustomExtension, 'RevertWithAddresses')
-              .withArgs(sender.address, context.contract.address);
+              .withArgs(sender.address, await context.contract.getAddress());
           });
         });
 
@@ -384,7 +384,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
           it('should pass and emit the event on the extension', async () => {
             await expect(
               context.accounts[0].sendTransaction({
-                to: context.contract.address,
+                to: await context.contract.getAddress(),
                 data: emitEventFunctionSelector,
                 value: 0,
               }),
@@ -406,7 +406,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
           it('should pass and return the name correctly', async () => {
             const returnValue = await provider.call({
               from: context.accounts[0].address,
-              to: context.contract.address,
+              to: await context.contract.getAddress(),
               data: nameFunctionSelector,
             });
 
@@ -428,7 +428,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
           it('should pass and return the age correctly', async () => {
             const returnValue = await provider.call({
               from: context.accounts[0].address,
-              to: context.contract.address,
+              to: await context.contract.getAddress(),
               data: ageFunctionSelector,
             });
 
@@ -459,7 +459,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
               abiCoder.encode(['uint256'], [amountTransferred]).substring(2);
 
             await context.accounts[0].sendTransaction({
-              to: context.contract.address,
+              to: await context.contract.getAddress(),
               data: transferFunctionSignature,
             });
 
@@ -486,7 +486,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
             expect(balanceBefore).to.equal(0);
 
             await context.accounts[0].sendTransaction({
-              to: context.contract.address,
+              to: await context.contract.getAddress(),
               value: 100,
               data: buyFunctionSelector,
             });
@@ -530,7 +530,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
 
                 await expect(
                   context.accounts[0].sendTransaction({
-                    to: context.contract.address,
+                    to: await context.contract.getAddress(),
                     data: reenterAccountFunctionSignature,
                   }),
                 ).to.not.emit(emitEventExtension, 'EventEmittedInExtension');
@@ -558,7 +558,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
 
                 await expect(
                   context.accounts[0].sendTransaction({
-                    to: context.contract.address,
+                    to: await context.contract.getAddress(),
                     data: reenterAccountFunctionSignature,
                     value: 0,
                   }),
@@ -601,7 +601,7 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
         it('should revert', async () => {
           await expect(
             context.accounts[0].sendTransaction({
-              to: context.contract.address,
+              to: await context.contract.getAddress(),
               data: '0x01',
             }),
           ).to.be.revertedWithCustomError(context.contract, 'InvalidFunctionSelector');
diff --git a/tests/LSP17Extensions/helpers/Create2Factory.ts b/tests/LSP17Extensions/helpers/Create2Factory.ts
index f3efeff45..651cf4657 100644
--- a/tests/LSP17Extensions/helpers/Create2Factory.ts
+++ b/tests/LSP17Extensions/helpers/Create2Factory.ts
@@ -1,5 +1,5 @@
 // from: https://github.com/Arachnid/deterministic-deployment-proxy
-import { BigNumberish, JsonRpcProvider, Signer, toBeHex } from 'ethers';
+import { BigNumberish, JsonRpcProvider, Signer, ethers, toBeHex } from 'ethers';
 import { getBytes, concat, zeroPadValue, keccak256 } from 'ethers';
 import { Provider } from '@ethersproject/providers';
 import { TransactionRequest } from '@ethersproject/abstract-provider';
@@ -51,24 +51,25 @@ export class Create2Factory {
       data: this.getDeployTransactionCallData(initCode, salt),
     };
     if (gasLimit === 'estimate') {
-      gasLimit = await this.signer.estimateGas(deployTx);
+      gasLimit = await (await this.signer).estimateGas(deployTx);
     }
 
     if (gasLimit === undefined) {
-      gasLimit =
+      gasLimit = ethers.toBigInt(
         getBytes(initCode)
           .map((x) => (x === 0 ? 4 : 16))
           .reduce((sum, x) => sum + x) +
-        (200 * initCode.length) / 2 + // actual is usually somewhat smaller (only deposited code, not entire constructor)
-        6 * Math.ceil(initCode.length / 64) + // hash price. very minor compared to deposit costs
-        32000 +
-        21000;
+          (200 * initCode.length) / 2 + // actual is usually somewhat smaller (only deposited code, not entire constructor)
+          6 * Math.ceil(initCode.length / 64) + // hash price. very minor compared to deposit costs
+          32000 +
+          21000,
+      );
 
       // deployer requires some extra gas
-      gasLimit = Math.floor((gasLimit * 64) / 63);
+      gasLimit = ethers.toBigInt(Math.floor((ethers.toNumber(gasLimit) * 64) / 63));
     }
 
-    const ret = await this.signer.sendTransaction({ ...deployTx, gasLimit });
+    const ret = await (await this.signer).sendTransaction({ ...deployTx, gasLimit });
     await ret.wait();
     if ((await this.provider.getCode(addr).then((code) => code.length)) === 2) {
       throw new Error('failed to deploy');
@@ -102,7 +103,9 @@ export class Create2Factory {
     if (await this._isFactoryDeployed()) {
       return;
     }
-    await (signer ?? this.signer).sendTransaction({
+    await (
+      await (signer ?? this.signer)
+    ).sendTransaction({
       to: Create2Factory.factoryDeployer,
       value: BigInt(Create2Factory.factoryDeploymentFee),
     });
diff --git a/tests/LSP17Extensions/helpers/UserOp.ts b/tests/LSP17Extensions/helpers/UserOp.ts
index 3ef0dd21a..28eb97ca2 100644
--- a/tests/LSP17Extensions/helpers/UserOp.ts
+++ b/tests/LSP17Extensions/helpers/UserOp.ts
@@ -1,4 +1,4 @@
-import { getBytes, dataSlice, keccak256 } from 'ethers';
+import { getBytes, dataSlice, keccak256, BytesLike } from 'ethers';
 import { Wallet } from 'ethers';
 import { AddressZero, callDataCost } from './utils';
 import { ecsign, toRpcSig, keccak256 as keccak256_buffer } from 'ethereumjs-util';
@@ -7,6 +7,7 @@ import { EntryPoint } from '@account-abstraction/contracts';
 import { ethers } from 'ethers';
 import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers';
 import * as typ from './solidityTypes';
+import { ethers as hreEther } from 'hardhat';
 
 export interface UserOperation {
   sender: typ.address;
@@ -41,14 +42,14 @@ export function packUserOp(op: UserOperation, forSignature = true): string {
       [
         op.sender,
         op.nonce,
-        keccak256(op.initCode),
-        keccak256(op.callData),
+        keccak256(op.initCode as BytesLike),
+        keccak256(op.callData as BytesLike),
         op.callGasLimit,
         op.verificationGasLimit,
         op.preVerificationGas,
         op.maxFeePerGas,
         op.maxPriorityFeePerGas,
-        keccak256(op.paymasterAndData),
+        keccak256(op.paymasterAndData as BytesLike),
       ],
     );
   } else {
@@ -163,10 +164,10 @@ export async function fillUserOp(
   entryPoint?: EntryPoint,
 ): Promise<UserOperation> {
   const op1 = { ...op };
-  const provider = entryPoint?.provider;
+  const provider = hreEther.provider;
   if (op.initCode != null) {
-    const initAddr = dataSlice(op1.initCode, 0, 20);
-    const initCallData = dataSlice(op1.initCode, 20);
+    const initAddr = dataSlice(op1.initCode as BytesLike, 0, 20);
+    const initCallData = dataSlice(op1.initCode as BytesLike, 20);
     if (op1.nonce == null) op1.nonce = 0;
     if (op1.sender == null) {
       if (initAddr.toLowerCase() === Create2Factory.contractAddress.toLowerCase()) {
@@ -176,7 +177,7 @@ export async function fillUserOp(
       } else {
         if (provider == null) throw new Error('no entrypoint/provider');
         op1.sender = await entryPoint.callStatic
-          .getSenderAddress(op1.initCode)
+          .getSenderAddress(op1.initCode as BytesLike)
           .catch((e) => e.errorArgs.sender);
       }
     }
@@ -208,7 +209,7 @@ export async function fillUserOp(
     const gasEtimated = await provider.estimateGas({
       from: entryPoint?.target,
       to: op1.sender,
-      data: op1.callData,
+      data: ethers.hexlify(op1.callData as BytesLike),
     });
 
     op1.callGasLimit = gasEtimated;
@@ -216,9 +217,9 @@ export async function fillUserOp(
   if (op1.maxFeePerGas == null) {
     if (provider == null) throw new Error('must have entryPoint to autofill maxFeePerGas');
     const block = await provider.getBlock('latest');
-    op1.maxFeePerGas = block.baseFeePerGas.add(
-      op1.maxPriorityFeePerGas ?? DefaultsForUserOp.maxPriorityFeePerGas,
-    );
+    op1.maxFeePerGas =
+      block.baseFeePerGas +
+      BigInt(op1.maxPriorityFeePerGas ?? DefaultsForUserOp.maxPriorityFeePerGas);
   }
 
   if (op1.maxPriorityFeePerGas == null) {
@@ -237,11 +238,13 @@ export async function fillAndSign(
   signer: SignerWithAddress,
   entryPoint?: EntryPoint,
 ): Promise<UserOperation> {
-  const provider = entryPoint?.provider;
+  const provider = hreEther.provider;
   const op2 = await fillUserOp(op, signer, entryPoint);
 
   const chainId = await provider.getNetwork().then((net) => net.chainId);
-  const message = getBytes(getUserOpHash(op2, entryPoint.target as string, chainId));
+  const message = getBytes(
+    getUserOpHash(op2, entryPoint.target as string, ethers.toNumber(chainId)),
+  );
 
   return {
     ...op2,
diff --git a/tests/LSP17Extensions/helpers/utils.ts b/tests/LSP17Extensions/helpers/utils.ts
index 5af941741..cedceee39 100644
--- a/tests/LSP17Extensions/helpers/utils.ts
+++ b/tests/LSP17Extensions/helpers/utils.ts
@@ -12,11 +12,11 @@ export function callDataCost(data: string): number {
 }
 
 export async function deployEntryPoint(provider = ethers.provider): Promise<EntryPoint> {
-  const create2factory = new Create2Factory(provider);
+  const create2factory = new Create2Factory(provider as any);
   const addr = await create2factory.deploy(
     EntryPoint__factory.bytecode,
     0,
-    process.env.COVERAGE != null ? 20e6 : 8e6,
+    process.env.COVERAGE != null ? BigInt(20e6) : BigInt(8e6),
   );
   return EntryPoint__factory.connect(addr, await provider.getSigner());
 }
diff --git a/tests/LSP6KeyManager/LSP6KeyManager.behaviour.ts b/tests/LSP6KeyManager/LSP6KeyManager.behaviour.ts
index ae1b2f3d8..c3fdac0a5 100644
--- a/tests/LSP6KeyManager/LSP6KeyManager.behaviour.ts
+++ b/tests/LSP6KeyManager/LSP6KeyManager.behaviour.ts
@@ -154,7 +154,7 @@ export const shouldInitializeLikeLSP6 = (buildContext: () => Promise<LSP6TestCon
     });
 
     it('should be linked to the right ERC725 account contract', async () => {
-      const account = await context.keyManager.target();
+      const account = await context.keyManager['target()'].staticCall();
       expect(account).to.equal(await context.universalProfile.getAddress());
     });
   });
diff --git a/tests/LSP6KeyManager/LSP6KeyManagerInit.test.ts b/tests/LSP6KeyManager/LSP6KeyManagerInit.test.ts
index 04168dd5b..4ff2a9285 100644
--- a/tests/LSP6KeyManager/LSP6KeyManagerInit.test.ts
+++ b/tests/LSP6KeyManager/LSP6KeyManagerInit.test.ts
@@ -38,7 +38,7 @@ describe('LSP6KeyManager with proxy', () => {
       const accounts = await ethers.getSigners();
       const keyManagerBaseContract = await new LSP6KeyManagerInit__factory(accounts[0]).deploy();
 
-      const linkedTarget = await keyManagerBaseContract.target();
+      const linkedTarget = await keyManagerBaseContract['target()'].staticCall();
       expect(linkedTarget).to.equal(ethers.ZeroAddress);
     });
 
diff --git a/tests/LSP6KeyManager/Relay/MultiChannelNonce.test.ts b/tests/LSP6KeyManager/Relay/MultiChannelNonce.test.ts
index 98dc65c3e..6513383a7 100644
--- a/tests/LSP6KeyManager/Relay/MultiChannelNonce.test.ts
+++ b/tests/LSP6KeyManager/Relay/MultiChannelNonce.test.ts
@@ -53,7 +53,7 @@ export const shouldBehaveLikeMultiChannelNonce = (buildContext: () => Promise<LS
 
   describe('when calling `getNonce(...)` with a channel ID greater than 2 ** 128', () => {
     it('should revert', async () => {
-      const channelId = ethers.toBigInt(2 ** 129);
+      const channelId = ethers.toBigInt('0xffffffffffffffffffffffffffffffffff');
 
       await expect(context.keyManager.getNonce(signer.address, channelId)).to.be.revertedWithPanic;
     });
diff --git a/tests/LSP6KeyManager/SetData/PermissionSetData.test.ts b/tests/LSP6KeyManager/SetData/PermissionSetData.test.ts
index 3cd723028..5cf19926e 100644
--- a/tests/LSP6KeyManager/SetData/PermissionSetData.test.ts
+++ b/tests/LSP6KeyManager/SetData/PermissionSetData.test.ts
@@ -771,7 +771,7 @@ export const shouldBehaveLikePermissionSetData = (buildContext: () => Promise<LS
       const aliceUniversalProfilePayload =
         aliceContext.universalProfile.interface.encodeFunctionData('execute', [
           OPERATION_TYPES.CALL,
-          bobContext.keyManager.getAddress(),
+          await bobContext.keyManager.getAddress(),
           0,
           bobKeyManagerPayload,
         ]);
@@ -805,7 +805,7 @@ export const shouldBehaveLikePermissionSetData = (buildContext: () => Promise<LS
       const aliceUniversalProfilePayload =
         aliceContext.universalProfile.interface.encodeFunctionData('execute', [
           OPERATION_TYPES.CALL,
-          bobContext.keyManager.getAddress(),
+          await bobContext.keyManager.getAddress(),
           0,
           bobKeyManagerPayload,
         ]);
diff --git a/tests/LSP8IdentifiableDigitalAsset/LSP8Mintable.behaviour.ts b/tests/LSP8IdentifiableDigitalAsset/LSP8Mintable.behaviour.ts
index 5414e522e..b1477a821 100644
--- a/tests/LSP8IdentifiableDigitalAsset/LSP8Mintable.behaviour.ts
+++ b/tests/LSP8IdentifiableDigitalAsset/LSP8Mintable.behaviour.ts
@@ -103,7 +103,7 @@ export const shouldBehaveLikeLSP8Mintable = (
 
       await context.lsp8Mintable
         .connect(context.accounts.owner)
-        .transferOwnership(universalProfile.address);
+        .transferOwnership(await universalProfile.getAddress());
 
       const URDTokenReentrant = await new UniversalReceiverDelegateTokenReentrant__factory(
         context.accounts.profileOwner,
@@ -136,14 +136,14 @@ export const shouldBehaveLikeLSP8Mintable = (
       const secondRandomTokenId = ethers.randomBytes(32);
 
       const reentrantMintPayload = context.lsp8Mintable.interface.encodeFunctionData('mint', [
-        universalProfile.address,
+        universalProfile.target,
         secondRandomTokenId,
         false,
         '0x',
       ]);
 
       const mintPayload = context.lsp8Mintable.interface.encodeFunctionData('mint', [
-        universalProfile.address,
+        universalProfile.target,
         randomTokenId,
         false,
         reentrantMintPayload,
@@ -158,9 +158,9 @@ export const shouldBehaveLikeLSP8Mintable = (
 
       await lsp6KeyManager.connect(context.accounts.profileOwner).execute(executePayload);
 
-      const balanceOfUP = await context.lsp8Mintable.balanceOf(universalProfile.address);
+      const balanceOfUP = await context.lsp8Mintable.balanceOf(universalProfile.target);
 
-      const tokenIdsOfUP = await context.lsp8Mintable.tokenIdsOf(universalProfile.address);
+      const tokenIdsOfUP = await context.lsp8Mintable.tokenIdsOf(universalProfile.target);
 
       expect(balanceOfUP).to.equal(2);
       expect(tokenIdsOfUP[0]).to.equal(ethers.hexlify(randomTokenId));
diff --git a/tests/Reentrancy/LSP6/LSP6Reentrancy.test.ts b/tests/Reentrancy/LSP6/LSP6Reentrancy.test.ts
index 4c4ba4663..2aafc0ec2 100644
--- a/tests/Reentrancy/LSP6/LSP6Reentrancy.test.ts
+++ b/tests/Reentrancy/LSP6/LSP6Reentrancy.test.ts
@@ -227,9 +227,9 @@ export const shouldBehaveLikeLSP6ReentrancyScenarios = (
             [
               ERC725YDataKeys.LSP1.LSP1UniversalReceiverDelegate,
               ERC725YDataKeys.LSP6['AddressPermissions:Permissions'] +
-                (await URDDummy.getAddress()),
+                (await URDDummy.getAddress()).substring(2),
               ERC725YDataKeys.LSP6['AddressPermissions:AllowedCalls'] +
-                (await URDDummy.getAddress()),
+                (await URDDummy.getAddress()).substring(2),
             ],
             [
               await URDDummy.getAddress(),