diff --git a/constants.ts b/constants.ts
index d68d0981b..85b4b69f4 100644
--- a/constants.ts
+++ b/constants.ts
@@ -69,7 +69,7 @@ export const INTERFACE_IDS = {
   LSP17Extendable: INTERFACE_ID_LSP17Extendable,
   LSP17Extension: INTERFACE_ID_LSP17Extension,
   LSP20CallVerification: INTERFACE_ID_LSP20CallVerification,
-  LSP20CalVerifier: INTERFACE_ID_LSP20CallVerifier,
+  LSP20CallVerifier: INTERFACE_ID_LSP20CallVerifier,
   LSP11BasicSocialRecovery: '0x049a28f1',
   LSP25ExecuteRelayCall: INTERFACE_ID_LSP25,
 };
diff --git a/contracts/Imports.sol b/contracts/Imports.sol
index cc63c6749..1a5f4a3c8 100644
--- a/contracts/Imports.sol
+++ b/contracts/Imports.sol
@@ -38,3 +38,6 @@ import {
 import {
     IPostDeploymentModule
 } from "@lukso/lsp23-contracts/contracts/IPostDeploymentModule.sol";
+import {
+    Extension4337
+} from "@lukso/lsp17-contracts/contracts/Extension4337.sol";
diff --git a/tests/Benchmark.test.ts b/tests/Benchmark.test.ts
index a9764a5e3..66561425a 100644
--- a/tests/Benchmark.test.ts
+++ b/tests/Benchmark.test.ts
@@ -3,28 +3,21 @@ import { ethers } from 'hardhat';
 import { expect } from 'chai';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 
-import { LSP7Mintable, LSP7Mintable__factory } from '@lukso/lsp7-contracts/types';
 import {
+  LSP7Mintable,
+  LSP7Mintable__factory,
   LSP1UniversalReceiverDelegateUP,
   LSP1UniversalReceiverDelegateUP__factory,
-} from '../types';
-import {
   UniversalProfile,
   UniversalProfile__factory,
-} from '@lukso/universalprofile-contracts/types';
-import { LSP6KeyManager__factory } from '@lukso/lsp6-contracts/types';
-
-import { LSP8Mintable, LSP8Mintable__factory } from '@lukso/lsp8-contracts/types';
+  LSP6KeyManager__factory,
+} from '../types';
 
-import {
-  ERC725YDataKeys,
-  INTERFACE_IDS,
-  OPERATION_TYPES,
-  PERMISSIONS,
-  CALLTYPE,
-  LSP8_TOKEN_ID_FORMAT,
-  LSP4_TOKEN_TYPES,
-} from '../constants';
+import { ERC725YDataKeys, INTERFACE_IDS } from '../constants';
+import { OPERATION_TYPES } from '@lukso/lsp0-contracts';
+import { LSP4_TOKEN_TYPES } from '@lukso/lsp4-contracts';
+import { PERMISSIONS, CALLTYPE } from '@lukso/lsp6-contracts';
+import { LSP8_TOKEN_ID_FORMAT } from '@lukso/lsp8-contracts';
 import { LSP6TestContext } from './utils/context';
 import { setupKeyManager, setupProfileWithKeyManagerWithURD } from './utils/fixtures';
 import {
diff --git a/tests/LSP17Extensions/Extension4337/4337.test.ts b/tests/LSP17Extensions/Extension4337/4337.test.ts
index 34442a580..67037fadf 100644
--- a/tests/LSP17Extensions/Extension4337/4337.test.ts
+++ b/tests/LSP17Extensions/Extension4337/4337.test.ts
@@ -10,8 +10,8 @@ import {
   LSP6KeyManager__factory,
   UniversalProfile,
   UniversalProfile__factory,
+  Extension4337__factory,
 } from '../../../types';
-import { Extension4337__factory } from '@lukso/lsp17-contracts/types';
 import { deployEntryPoint, getBalance, isDeployed } from '../helpers/utils';
 import { ERC725YDataKeys } from '../../../constants';
 import { OPERATION_TYPES } from '@lukso/lsp0-contracts';
diff --git a/tests/LSP20CallVerification/LSP6/Interactions/AllowedStandards.test.ts b/tests/LSP20CallVerification/LSP6/Interactions/AllowedStandards.test.ts
index 52c64d1d5..37c163cea 100644
--- a/tests/LSP20CallVerification/LSP6/Interactions/AllowedStandards.test.ts
+++ b/tests/LSP20CallVerification/LSP6/Interactions/AllowedStandards.test.ts
@@ -2,17 +2,16 @@ import { expect } from 'chai';
 import { ethers } from 'hardhat';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 
-import { LSP7Mintable, LSP7Mintable__factory } from '@lukso/lsp7-contracts/types';
 import {
   SignatureValidator,
   SignatureValidator__factory,
   TargetContract,
   TargetContract__factory,
-} from '../../../../types';
-import {
+  LSP7Mintable,
+  LSP7Mintable__factory,
   UniversalProfile,
   UniversalProfile__factory,
-} from '@lukso/universalprofile-contracts/types';
+} from '../../../../types';
 
 // constants
 import { ERC725YDataKeys, INTERFACE_IDS } from '../../../../constants';
diff --git a/tests/LSP20CallVerification/LSP6/Interactions/PermissionTransferValue.test.ts b/tests/LSP20CallVerification/LSP6/Interactions/PermissionTransferValue.test.ts
index 616a88def..c1cda248b 100644
--- a/tests/LSP20CallVerification/LSP6/Interactions/PermissionTransferValue.test.ts
+++ b/tests/LSP20CallVerification/LSP6/Interactions/PermissionTransferValue.test.ts
@@ -14,11 +14,9 @@ import {
   GraffitiEventExtension,
   LSP7Mintable,
   LSP7Mintable__factory,
-} from '../../../../types';
-import {
   UniversalProfile__factory,
   UniversalProfile,
-} from '@lukso/universalprofile-contracts/types';
+} from '../../../../types';
 
 // constants
 import { ERC725YDataKeys } from '../../../../constants';
diff --git a/tests/LSP6KeyManager/Interactions/AllowedFunctions.test.ts b/tests/LSP6KeyManager/Interactions/AllowedFunctions.test.ts
index d85950516..59c25632a 100644
--- a/tests/LSP6KeyManager/Interactions/AllowedFunctions.test.ts
+++ b/tests/LSP6KeyManager/Interactions/AllowedFunctions.test.ts
@@ -3,9 +3,14 @@ import { ethers } from 'hardhat';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import { EIP191Signer } from '@lukso/eip191-signer.js';
 
-import { LSP7Mintable, LSP7Mintable__factory } from '@lukso/lsp7-contracts/types';
-import { LSP8Mintable, LSP8Mintable__factory } from '@lukso/lsp8-contracts/types';
-import { TargetContract, TargetContract__factory } from '../../../types';
+import {
+  LSP7Mintable,
+  LSP7Mintable__factory,
+  LSP8Mintable,
+  LSP8Mintable__factory,
+  TargetContract,
+  TargetContract__factory,
+} from '../../../types';
 
 // constants
 import { ERC725YDataKeys, INTERFACE_IDS } from '../../../constants';
diff --git a/tests/LSP6KeyManager/Interactions/AllowedStandards.test.ts b/tests/LSP6KeyManager/Interactions/AllowedStandards.test.ts
index 2bf67638d..d7c84e9af 100644
--- a/tests/LSP6KeyManager/Interactions/AllowedStandards.test.ts
+++ b/tests/LSP6KeyManager/Interactions/AllowedStandards.test.ts
@@ -2,17 +2,16 @@ import { expect } from 'chai';
 import { ethers } from 'hardhat';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 
-import { LSP7Mintable, LSP7Mintable__factory } from '@lukso/lsp7-contracts/types';
 import {
+  LSP7Mintable,
+  LSP7Mintable__factory,
   SignatureValidator,
   SignatureValidator__factory,
   TargetContract,
   TargetContract__factory,
-} from '../../../types';
-import {
   UniversalProfile__factory,
   UniversalProfile,
-} from '@lukso/universalprofile-contracts/types';
+} from '../../../types';
 
 // constants
 import { ERC725YDataKeys, INTERFACE_IDS } from '../../../constants';
diff --git a/tests/LSP6KeyManager/Interactions/BatchExecute.test.ts b/tests/LSP6KeyManager/Interactions/BatchExecute.test.ts
index dc5180450..1819a296d 100644
--- a/tests/LSP6KeyManager/Interactions/BatchExecute.test.ts
+++ b/tests/LSP6KeyManager/Interactions/BatchExecute.test.ts
@@ -12,11 +12,7 @@ import { ALL_PERMISSIONS } from '@lukso/lsp6-contracts';
 import { LSP6TestContext } from '../../utils/context';
 import { setupKeyManager } from '../../utils/fixtures';
 import { abiCoder, provider } from '../../utils/helpers';
-import {
-  LSP7Mintable,
-  LSP7MintableInit__factory,
-  LSP7Mintable__factory,
-} from '@lukso/lsp7-contracts/types';
+import { LSP7Mintable, LSP7MintableInit__factory, LSP7Mintable__factory } from '../../../types';
 
 export const shouldBehaveLikeBatchExecute = (
   buildContext: (initialFunding?: BigNumber) => Promise<LSP6TestContext>,
diff --git a/tests/LSP6KeyManager/Interactions/PermissionDeploy.test.ts b/tests/LSP6KeyManager/Interactions/PermissionDeploy.test.ts
index 013562752..0ef07b3ae 100644
--- a/tests/LSP6KeyManager/Interactions/PermissionDeploy.test.ts
+++ b/tests/LSP6KeyManager/Interactions/PermissionDeploy.test.ts
@@ -4,8 +4,7 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import { calculateCreate2 } from 'eth-create2-calculator';
 import { EIP191Signer } from '@lukso/eip191-signer.js';
 
-import { TargetContract__factory } from '../../../types';
-import { UniversalProfile__factory } from '@lukso/universalprofile-contracts/types';
+import { TargetContract__factory, UniversalProfile__factory } from '../../../types';
 
 // constants
 import { ERC725YDataKeys } from '../../../constants';
diff --git a/tests/LSP6KeyManager/Interactions/PermissionTransferValue.test.ts b/tests/LSP6KeyManager/Interactions/PermissionTransferValue.test.ts
index c9e60ab1c..dc6b862f7 100644
--- a/tests/LSP6KeyManager/Interactions/PermissionTransferValue.test.ts
+++ b/tests/LSP6KeyManager/Interactions/PermissionTransferValue.test.ts
@@ -5,7 +5,6 @@ import { EIP191Signer } from '@lukso/eip191-signer.js';
 import { BigNumber } from 'ethers';
 import { FakeContract, smock } from '@defi-wonderland/smock';
 
-import { LSP7Mintable, LSP7Mintable__factory } from '@lukso/lsp7-contracts/types';
 import {
   Executor,
   Executor__factory,
@@ -14,11 +13,11 @@ import {
   TargetPayableContract__factory,
   GraffitiEventExtension__factory,
   GraffitiEventExtension,
-} from '../../../types';
-import {
   UniversalProfile__factory,
   UniversalProfile,
-} from '@lukso/universalprofile-contracts/types';
+  LSP7Mintable,
+  LSP7Mintable__factory,
+} from '../../../types';
 
 // constants
 import { ERC725YDataKeys } from '../../../constants';
diff --git a/tests/LSP7DigitalAsset/proxy/LSP7MintableInit.test.ts b/tests/LSP7DigitalAsset/proxy/LSP7MintableInit.test.ts
index 7e5d39662..72d653c25 100644
--- a/tests/LSP7DigitalAsset/proxy/LSP7MintableInit.test.ts
+++ b/tests/LSP7DigitalAsset/proxy/LSP7MintableInit.test.ts
@@ -1,6 +1,6 @@
 import { ethers } from 'hardhat';
 import { expect } from 'chai';
-import { LSP7MintableInit, LSP7MintableInit__factory } from '@lukso/lsp7-contracts/types';
+import { LSP7MintableInit, LSP7MintableInit__factory } from '../../../types';
 
 import { shouldInitializeLikeLSP7 } from '../LSP7DigitalAsset.behaviour';
 import {
@@ -11,7 +11,8 @@ import {
 } from '../LSP7Mintable.behaviour';
 
 import { deployProxy } from '../../utils/fixtures';
-import { ERC725YDataKeys, LSP4_TOKEN_TYPES } from '../../../constants';
+import { ERC725YDataKeys } from '../../../constants';
+import { LSP4_TOKEN_TYPES } from '@lukso/lsp4-contracts';
 
 describe('LSP7MintableInit with proxy', () => {
   const buildTestContext = async () => {
diff --git a/tests/Reentrancy/LSP20/ERC725XBatchExecuteToERC725XExecute.test.ts b/tests/Reentrancy/LSP20/ERC725XBatchExecuteToERC725XExecute.test.ts
index 083952875..a36300e18 100644
--- a/tests/Reentrancy/LSP20/ERC725XBatchExecuteToERC725XExecute.test.ts
+++ b/tests/Reentrancy/LSP20/ERC725XBatchExecuteToERC725XExecute.test.ts
@@ -1,11 +1,12 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-//types
+// types
 import { BigNumber, BytesLike } from 'ethers';
 
 // constants
-import { ALL_PERMISSIONS, ERC725YDataKeys } from '../../../constants';
+import { ERC725YDataKeys } from '../../../constants';
+import { ALL_PERMISSIONS } from '@lukso/lsp6-contracts';
 
 // setup
 import { LSP6TestContext } from '../../utils/context';
diff --git a/tests/Reentrancy/LSP20/ERC725XExecuteToERC725XBatchExecute.test.ts b/tests/Reentrancy/LSP20/ERC725XExecuteToERC725XBatchExecute.test.ts
index 58f07617c..b5fab46bf 100644
--- a/tests/Reentrancy/LSP20/ERC725XExecuteToERC725XBatchExecute.test.ts
+++ b/tests/Reentrancy/LSP20/ERC725XExecuteToERC725XBatchExecute.test.ts
@@ -1,11 +1,12 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-//types
+// types
 import { BigNumber, BytesLike } from 'ethers';
 
 // constants
-import { ALL_PERMISSIONS, ERC725YDataKeys } from '../../../constants';
+import { ERC725YDataKeys } from '../../../constants';
+import { ALL_PERMISSIONS } from '@lukso/lsp6-contracts';
 
 // setup
 import { LSP6TestContext } from '../../utils/context';
diff --git a/tests/Reentrancy/LSP20/ERC725XExecuteToERC725XExecute.test.ts b/tests/Reentrancy/LSP20/ERC725XExecuteToERC725XExecute.test.ts
index c9d399619..267487fb5 100644
--- a/tests/Reentrancy/LSP20/ERC725XExecuteToERC725XExecute.test.ts
+++ b/tests/Reentrancy/LSP20/ERC725XExecuteToERC725XExecute.test.ts
@@ -1,11 +1,12 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-//types
+// types
 import { BigNumber, BytesLike } from 'ethers';
 
 // constants
-import { ALL_PERMISSIONS, ERC725YDataKeys } from '../../../constants';
+import { ERC725YDataKeys } from '../../../constants';
+import { ALL_PERMISSIONS } from '@lukso/lsp6-contracts';
 
 // setup
 import { LSP6TestContext } from '../../utils/context';
diff --git a/tests/Reentrancy/LSP20/ERC725XExecuteToLSP6BatchExecuteRelayCall.test.ts b/tests/Reentrancy/LSP20/ERC725XExecuteToLSP6BatchExecuteRelayCall.test.ts
index b784381d3..82394a0a3 100644
--- a/tests/Reentrancy/LSP20/ERC725XExecuteToLSP6BatchExecuteRelayCall.test.ts
+++ b/tests/Reentrancy/LSP20/ERC725XExecuteToLSP6BatchExecuteRelayCall.test.ts
@@ -1,12 +1,13 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-//types
+// types
 import { BigNumber, BytesLike } from 'ethers';
 import { SingleReentrancyRelayer__factory } from '../../../types';
 
 // constants
-import { ERC725YDataKeys, OPERATION_TYPES } from '../../../constants';
+import { ERC725YDataKeys } from '../../../constants';
+import { OPERATION_TYPES } from '@lukso/lsp0-contracts';
 
 // setup
 import { LSP6TestContext } from '../../utils/context';
diff --git a/tests/Reentrancy/LSP20/ERC725XExecuteToLSP6ExecuteRelayCall.test.ts b/tests/Reentrancy/LSP20/ERC725XExecuteToLSP6ExecuteRelayCall.test.ts
index 4b3b0627c..7c07c3a69 100644
--- a/tests/Reentrancy/LSP20/ERC725XExecuteToLSP6ExecuteRelayCall.test.ts
+++ b/tests/Reentrancy/LSP20/ERC725XExecuteToLSP6ExecuteRelayCall.test.ts
@@ -1,12 +1,13 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-//types
+// types
 import { BigNumber, BytesLike } from 'ethers';
 import { SingleReentrancyRelayer__factory } from '../../../types';
 
 // constants
-import { ERC725YDataKeys, OPERATION_TYPES } from '../../../constants';
+import { ERC725YDataKeys } from '../../../constants';
+import { OPERATION_TYPES } from '@lukso/lsp0-contracts';
 
 // setup
 import { LSP6TestContext } from '../../utils/context';
diff --git a/tests/Reentrancy/LSP6/LSP6Reentrancy.test.ts b/tests/Reentrancy/LSP6/LSP6Reentrancy.test.ts
index 6b66a6080..bd931cae6 100644
--- a/tests/Reentrancy/LSP6/LSP6Reentrancy.test.ts
+++ b/tests/Reentrancy/LSP6/LSP6Reentrancy.test.ts
@@ -15,15 +15,10 @@ import { testSingleExecuteRelayCallToSingleExecuteRelayCall } from './SingleExec
 import { testSingleExecuteToBatchExecute } from './SingleExecuteToBatchExecute.test';
 import { testSingleExecuteToBatchExecuteRelayCall } from './SingleExecuteToBatchExecuteRelayCall.test';
 
-import {
-  ALL_PERMISSIONS,
-  CALLTYPE,
-  ERC725YDataKeys,
-  LSP1_TYPE_IDS,
-  LSP25_VERSION,
-  OPERATION_TYPES,
-  PERMISSIONS,
-} from '../../../constants';
+import { ERC725YDataKeys, LSP1_TYPE_IDS } from '../../../constants';
+import { OPERATION_TYPES } from '@lukso/lsp0-contracts';
+import { ALL_PERMISSIONS, CALLTYPE, PERMISSIONS } from '@lukso/lsp6-contracts';
+import { LSP25_VERSION } from '@lukso/lsp25-contracts';
 
 import {
   combineAllowedCalls,
diff --git a/tests/Reentrancy/LSP6/SingleExecuteRelayCallToSingleExecute.test.ts b/tests/Reentrancy/LSP6/SingleExecuteRelayCallToSingleExecute.test.ts
index 848bcd970..09c5a936f 100644
--- a/tests/Reentrancy/LSP6/SingleExecuteRelayCallToSingleExecute.test.ts
+++ b/tests/Reentrancy/LSP6/SingleExecuteRelayCallToSingleExecute.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-//types
+// types
 import { BigNumber } from 'ethers';
 
 // constants
diff --git a/tests/Reentrancy/LSP6/SingleExecuteRelayCallToSingleExecuteRelayCall.test.ts b/tests/Reentrancy/LSP6/SingleExecuteRelayCallToSingleExecuteRelayCall.test.ts
index 35d4b41ed..87edf591f 100644
--- a/tests/Reentrancy/LSP6/SingleExecuteRelayCallToSingleExecuteRelayCall.test.ts
+++ b/tests/Reentrancy/LSP6/SingleExecuteRelayCallToSingleExecuteRelayCall.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-//types
+// types
 import { BigNumber, BytesLike } from 'ethers';
 import { SingleReentrancyRelayer__factory, UniversalProfile__factory } from '../../../types';
 
diff --git a/tests/Reentrancy/LSP6/SingleExecuteToBatchExecute.test.ts b/tests/Reentrancy/LSP6/SingleExecuteToBatchExecute.test.ts
index b3c5a6d18..79d7a04be 100644
--- a/tests/Reentrancy/LSP6/SingleExecuteToBatchExecute.test.ts
+++ b/tests/Reentrancy/LSP6/SingleExecuteToBatchExecute.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-//types
+// types
 import { BigNumber, BytesLike } from 'ethers';
 
 // constants
diff --git a/tests/Reentrancy/LSP6/SingleExecuteToBatchExecuteRelayCall.test.ts b/tests/Reentrancy/LSP6/SingleExecuteToBatchExecuteRelayCall.test.ts
index 6224e6cc4..966708f2b 100644
--- a/tests/Reentrancy/LSP6/SingleExecuteToBatchExecuteRelayCall.test.ts
+++ b/tests/Reentrancy/LSP6/SingleExecuteToBatchExecuteRelayCall.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-//types
+// types
 import { BigNumber, BytesLike } from 'ethers';
 import { SingleReentrancyRelayer__factory, UniversalProfile__factory } from '../../../types';
 
diff --git a/tests/Reentrancy/LSP6/SingleExecuteToSingleExecute.test.ts b/tests/Reentrancy/LSP6/SingleExecuteToSingleExecute.test.ts
index 43266d498..b9f40728b 100644
--- a/tests/Reentrancy/LSP6/SingleExecuteToSingleExecute.test.ts
+++ b/tests/Reentrancy/LSP6/SingleExecuteToSingleExecute.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-//types
+// types
 import { BigNumber, BytesLike } from 'ethers';
 
 // constants
diff --git a/tests/Reentrancy/LSP6/SingleExecuteToSingleExecuteRelayCall.test.ts b/tests/Reentrancy/LSP6/SingleExecuteToSingleExecuteRelayCall.test.ts
index 88101ffcb..2b8489944 100644
--- a/tests/Reentrancy/LSP6/SingleExecuteToSingleExecuteRelayCall.test.ts
+++ b/tests/Reentrancy/LSP6/SingleExecuteToSingleExecuteRelayCall.test.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-//types
+// types
 import { BigNumber, BytesLike } from 'ethers';
 import { SingleReentrancyRelayer__factory, UniversalProfile__factory } from '../../../types';
 
diff --git a/tests/Reentrancy/LSP6/reentrancyHelpers.ts b/tests/Reentrancy/LSP6/reentrancyHelpers.ts
index b32efb594..ddb1fd6aa 100644
--- a/tests/Reentrancy/LSP6/reentrancyHelpers.ts
+++ b/tests/Reentrancy/LSP6/reentrancyHelpers.ts
@@ -1,6 +1,6 @@
 import { ethers } from 'hardhat';
 
-//types
+// types
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import { BigNumber, BytesLike, Wallet } from 'ethers';
 import {
@@ -16,7 +16,8 @@ import {
 } from '../../../types';
 
 // constants
-import { ERC725YDataKeys, ALL_PERMISSIONS, PERMISSIONS, CALLTYPE } from '../../../constants';
+import { ERC725YDataKeys } from '../../../constants';
+import { ALL_PERMISSIONS, PERMISSIONS, CALLTYPE } from '@lukso/lsp6-contracts';
 
 // setup
 import { LSP6TestContext } from '../../utils/context';
diff --git a/tests/Reentrancy/Reentrancy.test.ts b/tests/Reentrancy/Reentrancy.test.ts
index ff1fc4a3e..9ab0f7cb0 100644
--- a/tests/Reentrancy/Reentrancy.test.ts
+++ b/tests/Reentrancy/Reentrancy.test.ts
@@ -1,8 +1,7 @@
 import { BigNumber } from 'ethers';
 import { ethers } from 'hardhat';
 
-import { UniversalProfile__factory } from '@lukso/universalprofile-contracts/types';
-import { LSP6KeyManager__factory } from '@lukso/lsp6-contracts/types';
+import { UniversalProfile__factory, LSP6KeyManager__factory } from '../../types';
 
 import { LSP6TestContext } from '../utils/context';
 
diff --git a/tests/Reentrancy/ReentrancyInit.test.ts b/tests/Reentrancy/ReentrancyInit.test.ts
index c951542cf..2a3c0a33e 100644
--- a/tests/Reentrancy/ReentrancyInit.test.ts
+++ b/tests/Reentrancy/ReentrancyInit.test.ts
@@ -1,8 +1,7 @@
 import { BigNumber } from 'ethers';
 import { ethers } from 'hardhat';
 
-import { UniversalProfileInit__factory } from '@lukso/universalprofile-contracts/types';
-import { LSP6KeyManagerInit__factory } from '@lukso/lsp6-contracts/types';
+import { UniversalProfileInit__factory, LSP6KeyManagerInit__factory } from '../../types';
 
 import { deployProxy } from '../utils/fixtures';
 import { LSP6TestContext } from '../utils/context';