diff --git a/integration/nevermined/AgreementStoreManager.test.ts b/integration/nevermined/AgreementStoreManager.test.ts
index a91f1fd63..62b7353db 100644
--- a/integration/nevermined/AgreementStoreManager.test.ts
+++ b/integration/nevermined/AgreementStoreManager.test.ts
@@ -26,6 +26,7 @@ describe('Agreement Store Manager', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
 
     // Accounts
     ;[account1, account2] = await nevermined.accounts.list()
diff --git a/integration/nevermined/Assets.test.ts b/integration/nevermined/Assets.test.ts
index 5110c17c2..5b0e7d509 100644
--- a/integration/nevermined/Assets.test.ts
+++ b/integration/nevermined/Assets.test.ts
@@ -33,6 +33,8 @@ let ddoBefore: DDO
 describe('Assets', () => {
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
+
     // Accounts
     ;[publisher] = await nevermined.accounts.list()
 
diff --git a/integration/nevermined/AssetsPriceQuery.test.ts b/integration/nevermined/AssetsPriceQuery.test.ts
index 011911942..475358a6c 100644
--- a/integration/nevermined/AssetsPriceQuery.test.ts
+++ b/integration/nevermined/AssetsPriceQuery.test.ts
@@ -22,6 +22,8 @@ describe('Assets Query by Price', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
+
     token = await nevermined.contracts.loadErc20(nevermined.utils.token.getAddress())
 
     price1 = parseUnits('2', await token.decimals())
diff --git a/integration/nevermined/AssetsWithMultipleServices.test.ts b/integration/nevermined/AssetsWithMultipleServices.test.ts
index 392dd393e..03aa4e804 100644
--- a/integration/nevermined/AssetsWithMultipleServices.test.ts
+++ b/integration/nevermined/AssetsWithMultipleServices.test.ts
@@ -35,6 +35,7 @@ const totalAmount2 = '350'
 describe('Assets with multiple services', () => {
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;({ token } = nevermined.keeper)
     // Accounts
     ;[publisher, consumer] = await nevermined.accounts.list()
diff --git a/integration/nevermined/Bookmarks.test.ts b/integration/nevermined/Bookmarks.test.ts
index 30b1beb76..0ee6dfff7 100644
--- a/integration/nevermined/Bookmarks.test.ts
+++ b/integration/nevermined/Bookmarks.test.ts
@@ -13,6 +13,7 @@ describe('Bookmarks', () => {
     config.marketplaceAuthToken = undefined
 
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[account1] = await nevermined.accounts.list()
 
     const clientAssertion = await nevermined.utils.jwt.generateClientAssertion(account1)
diff --git a/integration/nevermined/ConsumeAsset.test.ts b/integration/nevermined/ConsumeAsset.test.ts
index b9c7e17d5..dd64641c3 100644
--- a/integration/nevermined/ConsumeAsset.test.ts
+++ b/integration/nevermined/ConsumeAsset.test.ts
@@ -33,6 +33,7 @@ describe('Consume Asset', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
 
     // Accounts
     ;[publisher, consumer] = await nevermined.accounts.list()
diff --git a/integration/nevermined/ContractEvent.test.ts b/integration/nevermined/ContractEvent.test.ts
index a4c78aa03..2ca4e8f47 100644
--- a/integration/nevermined/ContractEvent.test.ts
+++ b/integration/nevermined/ContractEvent.test.ts
@@ -15,6 +15,7 @@ describe('ContractEvent', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance({ ...config, graphHttpUri: undefined })
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[account] = await nevermined.accounts.list()
     await nevermined.keeper.loadDispenserAndTokenInstances()
 
diff --git a/integration/nevermined/Credits.e2e.test.ts b/integration/nevermined/Credits.e2e.test.ts
index ce5b691f1..4cce36f32 100644
--- a/integration/nevermined/Credits.e2e.test.ts
+++ b/integration/nevermined/Credits.e2e.test.ts
@@ -81,6 +81,7 @@ describe('Credit Subscriptions using NFT ERC-1155 End-to-End', () => {
     TestContractHandler.setConfig(config)
 
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[, editor, subscriber, , reseller] = await nevermined.accounts.list()
 
     const clientAssertion = await nevermined.utils.jwt.generateClientAssertion(editor)
diff --git a/integration/nevermined/CreditsWithDuration.e2e.test.ts b/integration/nevermined/CreditsWithDuration.e2e.test.ts
index 121fc614d..e082e9f41 100644
--- a/integration/nevermined/CreditsWithDuration.e2e.test.ts
+++ b/integration/nevermined/CreditsWithDuration.e2e.test.ts
@@ -76,6 +76,7 @@ describe('Credit and Duration Subscriptions with Multiple services using NFT ERC
     TestContractHandler.setConfig(config)
 
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[, editor, subscriber, , reseller] = await nevermined.accounts.list()
 
     const clientAssertion = await nevermined.utils.jwt.generateClientAssertion(editor)
diff --git a/integration/nevermined/CustomToken.test.ts b/integration/nevermined/CustomToken.test.ts
index 6deefcc79..fdfc6b19b 100644
--- a/integration/nevermined/CustomToken.test.ts
+++ b/integration/nevermined/CustomToken.test.ts
@@ -11,6 +11,7 @@ describe('CustomToken', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[account] = await nevermined.accounts.list()
     erc20TokenAddress = process.env.TOKEN_ADDRESS || nevermined.utils.token.getAddress()
   })
diff --git a/integration/nevermined/DDO.test.ts b/integration/nevermined/DDO.test.ts
index d7c47910e..98a9e5da2 100644
--- a/integration/nevermined/DDO.test.ts
+++ b/integration/nevermined/DDO.test.ts
@@ -31,6 +31,7 @@ describe('DDO Tests', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[publisher] = await nevermined.accounts.list()
 
     const clientAssertion = await nevermined.utils.jwt.generateClientAssertion(publisher)
diff --git a/integration/nevermined/MetaTx.test.ts b/integration/nevermined/MetaTx.test.ts
index a2e0f61a6..11a055c0a 100644
--- a/integration/nevermined/MetaTx.test.ts
+++ b/integration/nevermined/MetaTx.test.ts
@@ -25,6 +25,8 @@ describe.skip('MetaTx test with nfts', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
+
     wallets = makeAccounts(process.env.SEED_WORDS)
 
     // Accounts
diff --git a/integration/nevermined/NFT.test.ts b/integration/nevermined/NFT.test.ts
index 60d4f24e2..a60b42068 100644
--- a/integration/nevermined/NFT.test.ts
+++ b/integration/nevermined/NFT.test.ts
@@ -18,6 +18,7 @@ describe('Nfts operations', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
 
     // Accounts
     ;[artist, collector] = await nevermined.accounts.list()
diff --git a/integration/nevermined/NFT1155.test.ts b/integration/nevermined/NFT1155.test.ts
index cb585a2dc..71468ae9e 100644
--- a/integration/nevermined/NFT1155.test.ts
+++ b/integration/nevermined/NFT1155.test.ts
@@ -46,6 +46,7 @@ describe('NFT1155 End-to-End', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[deployer, publisher, someone, minter, ,] = await nevermined.accounts.list()
     ;({ token, nftUpgradeable } = nevermined.keeper)
 
diff --git a/integration/nevermined/NFT1155Api.e2e.test.ts b/integration/nevermined/NFT1155Api.e2e.test.ts
index 753dd758f..8a73748a2 100644
--- a/integration/nevermined/NFT1155Api.e2e.test.ts
+++ b/integration/nevermined/NFT1155Api.e2e.test.ts
@@ -58,6 +58,7 @@ function makeTest(isCustom) {
 
     before(async () => {
       nevermined = await Nevermined.getInstance(config)
+      await nevermined.keeper.loadDispenserAndTokenInstances()
       ;[, artist, collector1, collector2, , gallery] = await nevermined.accounts.list()
       const clientAssertion = await nevermined.utils.jwt.generateClientAssertion(artist)
 
diff --git a/integration/nevermined/NFT721.test.ts b/integration/nevermined/NFT721.test.ts
index e4a9d6bb4..0a90104e0 100644
--- a/integration/nevermined/NFT721.test.ts
+++ b/integration/nevermined/NFT721.test.ts
@@ -25,6 +25,7 @@ describe('Nfts721 operations', async () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
 
     // Accounts
     ;[deployer, artist, collector] = await nevermined.accounts.list()
diff --git a/integration/nevermined/NFT721Api.e2e.test.ts b/integration/nevermined/NFT721Api.e2e.test.ts
index 7614b099f..248fbf4bc 100644
--- a/integration/nevermined/NFT721Api.e2e.test.ts
+++ b/integration/nevermined/NFT721Api.e2e.test.ts
@@ -45,6 +45,7 @@ describe('NFTs721 Api End-to-End', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[, artist, collector1, , gallery] = await nevermined.accounts.list()
 
     const networkName = await nevermined.keeper.getNetworkName()
diff --git a/integration/nevermined/NFT721Templates.test.ts b/integration/nevermined/NFT721Templates.test.ts
index 5ca9e2fe2..46707c4a6 100644
--- a/integration/nevermined/NFT721Templates.test.ts
+++ b/integration/nevermined/NFT721Templates.test.ts
@@ -88,6 +88,7 @@ describe('NFT721Templates E2E', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[owner, artist, collector1, collector2, gallery] = await nevermined.accounts.list()
 
     const networkName = await nevermined.keeper.getNetworkName()
diff --git a/integration/nevermined/NFTTemplates.test.ts b/integration/nevermined/NFTTemplates.test.ts
index 7a86a56c5..d814eef85 100644
--- a/integration/nevermined/NFTTemplates.test.ts
+++ b/integration/nevermined/NFTTemplates.test.ts
@@ -87,6 +87,7 @@ describe('NFTTemplates E2E', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[owner, artist, collector1, collector2, gallery] = await nevermined.accounts.list()
 
     receivers = [artist.getId(), gallery.getId()]
diff --git a/integration/nevermined/NFTTemplatesWithEther.test.ts b/integration/nevermined/NFTTemplatesWithEther.test.ts
index 77e63cfce..dd43e4ce3 100644
--- a/integration/nevermined/NFTTemplatesWithEther.test.ts
+++ b/integration/nevermined/NFTTemplatesWithEther.test.ts
@@ -75,6 +75,7 @@ describe('NFTTemplates With Ether E2E', async () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[sender, artist, collector1, collector2, gallery, , , , , governor] =
       await nevermined.accounts.list()
 
diff --git a/integration/nevermined/NFTsWithMultipleServices.test.ts b/integration/nevermined/NFTsWithMultipleServices.test.ts
index aac91f4eb..9f43820b7 100644
--- a/integration/nevermined/NFTsWithMultipleServices.test.ts
+++ b/integration/nevermined/NFTsWithMultipleServices.test.ts
@@ -38,6 +38,7 @@ const totalAmount2 = '150'
 describe('E2E Flow for NFTs with multiple services', () => {
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;({ token } = nevermined.keeper)
     // Accounts
     ;[publisher, collector1] = await nevermined.accounts.list()
diff --git a/integration/nevermined/NVMAppFlows.ts b/integration/nevermined/NVMAppFlows.ts
index 8f73acaef..cdb732b78 100644
--- a/integration/nevermined/NVMAppFlows.ts
+++ b/integration/nevermined/NVMAppFlows.ts
@@ -80,6 +80,7 @@ describe('NVM App main flows using Credit NFTs (ERC-1155)', () => {
     TestContractHandler.setConfig(config)
 
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[, publisher, subscriber, , reseller] = await nevermined.accounts.list()
 
     const clientAssertion = await nevermined.utils.jwt.generateClientAssertion(publisher)
diff --git a/integration/nevermined/Poap.test.ts b/integration/nevermined/Poap.test.ts
index 06465481f..e8c74599f 100644
--- a/integration/nevermined/Poap.test.ts
+++ b/integration/nevermined/Poap.test.ts
@@ -21,6 +21,8 @@ describe('POAPs with Assets', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
+
     gatewayAddress = await nevermined.services.node.getProviderAddress()
     ;[editor, user] = await nevermined.accounts.list()
 
diff --git a/integration/nevermined/RegisterAccessTemplate.test.ts b/integration/nevermined/RegisterAccessTemplate.test.ts
index 06d74498c..815b59636 100644
--- a/integration/nevermined/RegisterAccessTemplate.test.ts
+++ b/integration/nevermined/RegisterAccessTemplate.test.ts
@@ -39,6 +39,7 @@ describe('Register Escrow Access Template', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;({ keeper } = nevermined)
     ;({ accessTemplate } = keeper.templates)
     ;({ token } = keeper)
diff --git a/integration/nevermined/RegisterEscrowComputeExecutionTemplate.test.ts b/integration/nevermined/RegisterEscrowComputeExecutionTemplate.test.ts
index a1a4f8302..db5420089 100644
--- a/integration/nevermined/RegisterEscrowComputeExecutionTemplate.test.ts
+++ b/integration/nevermined/RegisterEscrowComputeExecutionTemplate.test.ts
@@ -45,6 +45,7 @@ describe('Register Escrow Compute Execution Template', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;({ keeper } = nevermined)
     ;({ escrowComputeExecutionTemplate } = keeper.templates)
     ;({ token } = keeper)
diff --git a/integration/nevermined/SecondaryMarket.test.ts b/integration/nevermined/SecondaryMarket.test.ts
index 70c8131d6..992544802 100644
--- a/integration/nevermined/SecondaryMarket.test.ts
+++ b/integration/nevermined/SecondaryMarket.test.ts
@@ -87,6 +87,7 @@ describe('Secondary Markets', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[owner, artist, collector1, collector2, gallery] = await nevermined.accounts.list()
 
     receivers = [artist.getId(), gallery.getId()]
diff --git a/integration/nevermined/SubscriptionDuration.test.ts b/integration/nevermined/SubscriptionDuration.test.ts
index ced2e5c3e..31871f591 100644
--- a/integration/nevermined/SubscriptionDuration.test.ts
+++ b/integration/nevermined/SubscriptionDuration.test.ts
@@ -12,6 +12,7 @@ describe('Subscription Durations', () => {
   before(async () => {
     TestContractHandler.setConfig(config)
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[publisher, subscriber] = await nevermined.accounts.list()
 
     const clientAssertion = await nevermined.utils.jwt.generateClientAssertion(publisher)
diff --git a/integration/nevermined/Subscriptions.e2e.test.ts b/integration/nevermined/Subscriptions.e2e.test.ts
index 6c2ab7cfc..cc1ec7cb7 100644
--- a/integration/nevermined/Subscriptions.e2e.test.ts
+++ b/integration/nevermined/Subscriptions.e2e.test.ts
@@ -72,6 +72,7 @@ describe('Subscriptions using NFT ERC-721 End-to-End', () => {
     TestContractHandler.setConfig(config)
 
     nevermined = await Nevermined.getInstance(config)
+    await nevermined.keeper.loadDispenserAndTokenInstances()
     ;[, editor, subscriber, , reseller] = await nevermined.accounts.list()
 
     const clientAssertion = await nevermined.utils.jwt.generateClientAssertion(editor)