diff --git a/test/specs/mainnet/getAddresses/arbitrum.spec.js b/test/specs/mainnet/getAddresses/arbitrum.spec.js
index 6369963..0620880 100644
--- a/test/specs/mainnet/getAddresses/arbitrum.spec.js
+++ b/test/specs/mainnet/getAddresses/arbitrum.spec.js
@@ -23,7 +23,6 @@ describe('The PrimeSDK, when get the ZeroDev address and SimpleAccount address d
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.arbitrum_chainid),
-            projectKey: process.env.PROJECT_KEY,
             factoryWallet: Factory.ZERO_DEV, bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
           },
         );
@@ -81,7 +80,6 @@ describe('The PrimeSDK, when get the ZeroDev address and SimpleAccount address d
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.arbitrum_chainid),
-            projectKey: process.env.PROJECT_KEY,
             factoryWallet: Factory.SIMPLE_ACCOUNT, bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
           },
         );
@@ -139,7 +137,7 @@ describe('The PrimeSDK, when get the ZeroDev address and SimpleAccount address d
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.arbitrum_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/getAddresses/matic.spec.js b/test/specs/mainnet/getAddresses/matic.spec.js
index 27c495f..8a99a3a 100644
--- a/test/specs/mainnet/getAddresses/matic.spec.js
+++ b/test/specs/mainnet/getAddresses/matic.spec.js
@@ -23,7 +23,6 @@ describe('The PrimeSDK, when get the ZeroDev address and SimpleAccount address d
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.matic_chainid),
-            projectKey: process.env.PROJECT_KEY,
             factoryWallet: Factory.ZERO_DEV, bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
           },
         );
@@ -81,7 +80,6 @@ describe('The PrimeSDK, when get the ZeroDev address and SimpleAccount address d
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.matic_chainid),
-            projectKey: process.env.PROJECT_KEY,
             factoryWallet: Factory.SIMPLE_ACCOUNT, bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
           },
         );
@@ -139,7 +137,7 @@ describe('The PrimeSDK, when get the ZeroDev address and SimpleAccount address d
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.matic_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/getAddresses/optimism.spec.js b/test/specs/mainnet/getAddresses/optimism.spec.js
index 9fc1a0a..b53e295 100644
--- a/test/specs/mainnet/getAddresses/optimism.spec.js
+++ b/test/specs/mainnet/getAddresses/optimism.spec.js
@@ -23,7 +23,6 @@ describe('The PrimeSDK, when get the ZeroDev address and SimpleAccount address d
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.optimism_chainid),
-            projectKey: process.env.PROJECT_KEY,
             factoryWallet: Factory.ZERO_DEV, bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
           },
         );
@@ -81,7 +80,6 @@ describe('The PrimeSDK, when get the ZeroDev address and SimpleAccount address d
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.optimism_chainid),
-            projectKey: process.env.PROJECT_KEY,
             factoryWallet: Factory.SIMPLE_ACCOUNT, bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
           },
         );
@@ -139,7 +137,7 @@ describe('The PrimeSDK, when get the ZeroDev address and SimpleAccount address d
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.optimism_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/getAddresses/xdai.spec.js b/test/specs/mainnet/getAddresses/xdai.spec.js
index 54aeddf..6926313 100644
--- a/test/specs/mainnet/getAddresses/xdai.spec.js
+++ b/test/specs/mainnet/getAddresses/xdai.spec.js
@@ -23,7 +23,6 @@ describe('The PrimeSDK, when get the ZeroDev address and SimpleAccount address d
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.xdai_chainid),
-            projectKey: process.env.PROJECT_KEY,
             factoryWallet: Factory.ZERO_DEV, bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
           },
         );
@@ -81,7 +80,6 @@ describe('The PrimeSDK, when get the ZeroDev address and SimpleAccount address d
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.xdai_chainid),
-            projectKey: process.env.PROJECT_KEY,
             factoryWallet: Factory.SIMPLE_ACCOUNT, bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
           },
         );
@@ -139,7 +137,7 @@ describe('The PrimeSDK, when get the ZeroDev address and SimpleAccount address d
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.xdai_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/listAndRates/arbitrum.spec.js b/test/specs/mainnet/listAndRates/arbitrum.spec.js
index 9a6f93b..0478bdc 100644
--- a/test/specs/mainnet/listAndRates/arbitrum.spec.js
+++ b/test/specs/mainnet/listAndRates/arbitrum.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { utils } from 'ethers';
 import { assert } from 'chai';
 import addContext from 'mochawesome/addContext.js';
@@ -24,7 +24,7 @@ describe('The PrimeSDK, when get the NFT List, Token List and Exchange Rates det
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.arbitrum_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
@@ -999,7 +999,6 @@ describe('The PrimeSDK, when get the NFT List, Token List and Exchange Rates det
     if (runTest) {
       await customRetryAsync(async function () {
         let TOKEN_LIST;
-        let rates;
         let requestPayload;
 
         try {
@@ -1010,15 +1009,22 @@ describe('The PrimeSDK, when get the NFT List, Token List and Exchange Rates det
             chainId: Number(data.invalid_arbitrum_chainid),
           };
 
-          rates = await arbitrumDataService.fetchExchangeRates(requestPayload);
+          await arbitrumDataService.fetchExchangeRates(requestPayload);
 
         } catch (e) {
-          console.error(e);
-          const eString = e.toString();
-          addContext(test, eString);
-          assert.fail(
-            'The respective validate is displayed with invalid ChainID while fetching the exchange rates.',
-          );
+          let errorMessage = e.message;
+          if (errorMessage.includes('Cannot set properties of undefined')) {
+            console.log(
+              'The correct validation is displayed invalid ChainID while fetching the exchange rates.',
+            );
+          } else {
+            console.error(e);
+            const eString = e.toString();
+            addContext(test, eString);
+            assert.fail(
+              'The respective validate is not displayed invalid ChainID while fetching the exchange rates.',
+            );
+          }
         }
       }, data.retry); // Retry this async test up to 5 times
     } else {
diff --git a/test/specs/mainnet/listAndRates/matic.spec.js b/test/specs/mainnet/listAndRates/matic.spec.js
index d5cc371..aae6675 100644
--- a/test/specs/mainnet/listAndRates/matic.spec.js
+++ b/test/specs/mainnet/listAndRates/matic.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { utils } from 'ethers';
 import { assert } from 'chai';
 import addContext from 'mochawesome/addContext.js';
@@ -24,7 +24,7 @@ describe('The PrimeSDK, when get the NFT List, Token List and Exchange Rates det
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.matic_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
@@ -999,7 +999,6 @@ describe('The PrimeSDK, when get the NFT List, Token List and Exchange Rates det
     if (runTest) {
       await customRetryAsync(async function () {
         let TOKEN_LIST;
-        let rates;
         let requestPayload;
 
         try {
@@ -1010,15 +1009,22 @@ describe('The PrimeSDK, when get the NFT List, Token List and Exchange Rates det
             chainId: Number(data.invalid_matic_chainid),
           };
 
-          rates = await maticDataService.fetchExchangeRates(requestPayload);
+          await maticDataService.fetchExchangeRates(requestPayload);
 
         } catch (e) {
-          console.error(e);
-          const eString = e.toString();
-          addContext(test, eString);
-          assert.fail(
-            'The respective validate is displayed with invalid ChainID while fetching the exchange rates.',
-          );
+          let errorMessage = e.message;
+          if (errorMessage.includes('Cannot set properties of undefined')) {
+            console.log(
+              'The correct validation is displayed invalid ChainID while fetching the exchange rates.',
+            );
+          } else {
+            console.error(e);
+            const eString = e.toString();
+            addContext(test, eString);
+            assert.fail(
+              'The respective validate is not displayed invalid ChainID while fetching the exchange rates.',
+            );
+          }
         }
       }, data.retry); // Retry this async test up to 5 times
     } else {
diff --git a/test/specs/mainnet/listAndRates/optimism.spec.js b/test/specs/mainnet/listAndRates/optimism.spec.js
index c2990e6..c6231a2 100644
--- a/test/specs/mainnet/listAndRates/optimism.spec.js
+++ b/test/specs/mainnet/listAndRates/optimism.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { utils } from 'ethers';
 import { assert } from 'chai';
 import addContext from 'mochawesome/addContext.js';
@@ -24,7 +24,7 @@ describe('The PrimeSDK, when get the NFT List, Token List and Exchange Rates det
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.optimism_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
@@ -999,7 +999,6 @@ describe('The PrimeSDK, when get the NFT List, Token List and Exchange Rates det
     if (runTest) {
       await customRetryAsync(async function () {
         let TOKEN_LIST;
-        let rates;
         let requestPayload;
 
         try {
@@ -1010,15 +1009,22 @@ describe('The PrimeSDK, when get the NFT List, Token List and Exchange Rates det
             chainId: Number(data.invalid_optimism_chainid),
           };
 
-          rates = await optimismDataService.fetchExchangeRates(requestPayload);
+          await optimismDataService.fetchExchangeRates(requestPayload);
 
         } catch (e) {
-          console.error(e);
-          const eString = e.toString();
-          addContext(test, eString);
-          assert.fail(
-            'The respective validate is displayed with invalid ChainID while fetching the exchange rates.',
-          );
+          let errorMessage = e.message;
+          if (errorMessage.includes('Cannot set properties of undefined')) {
+            console.log(
+              'The correct validation is displayed invalid ChainID while fetching the exchange rates.',
+            );
+          } else {
+            console.error(e);
+            const eString = e.toString();
+            addContext(test, eString);
+            assert.fail(
+              'The respective validate is not displayed invalid ChainID while fetching the exchange rates.',
+            );
+          }
         }
       }, data.retry); // Retry this async test up to 5 times
     } else {
diff --git a/test/specs/mainnet/listAndRates/xdai.spec.js b/test/specs/mainnet/listAndRates/xdai.spec.js
index 1be0d13..0d13f7b 100644
--- a/test/specs/mainnet/listAndRates/xdai.spec.js
+++ b/test/specs/mainnet/listAndRates/xdai.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { utils } from 'ethers';
 import { assert } from 'chai';
 import addContext from 'mochawesome/addContext.js';
@@ -24,7 +24,7 @@ describe('The PrimeSDK, when get the NFT List, Token List and Exchange Rates det
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.xdai_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
@@ -999,7 +999,6 @@ describe('The PrimeSDK, when get the NFT List, Token List and Exchange Rates det
     if (runTest) {
       await customRetryAsync(async function () {
         let TOKEN_LIST;
-        let rates;
         let requestPayload;
 
         try {
@@ -1010,15 +1009,22 @@ describe('The PrimeSDK, when get the NFT List, Token List and Exchange Rates det
             chainId: Number(data.invalid_xdai_chainid),
           };
 
-          rates = await xdaiDataService.fetchExchangeRates(requestPayload);
+          await xdaiDataService.fetchExchangeRates(requestPayload);
 
         } catch (e) {
-          console.error(e);
-          const eString = e.toString();
-          addContext(test, eString);
-          assert.fail(
-            'The respective validate is displayed with invalid ChainID while fetching the exchange rates.',
-          );
+          let errorMessage = e.message;
+          if (errorMessage.includes('Cannot set properties of undefined')) {
+            console.log(
+              'The correct validation is displayed invalid ChainID while fetching the exchange rates.',
+            );
+          } else {
+            console.error(e);
+            const eString = e.toString();
+            addContext(test, eString);
+            assert.fail(
+              'The respective validate is not displayed invalid ChainID while fetching the exchange rates.',
+            );
+          }
         }
       }, data.retry); // Retry this async test up to 5 times
     } else {
diff --git a/test/specs/mainnet/paymaster/arbitrum.spec.js b/test/specs/mainnet/paymaster/arbitrum.spec.js
index e59e1f1..6b8236e 100644
--- a/test/specs/mainnet/paymaster/arbitrum.spec.js
+++ b/test/specs/mainnet/paymaster/arbitrum.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { ethers, utils } from 'ethers';
 import { assert } from 'chai';
 import { ERC20_ABI } from '@etherspot/prime-sdk/dist/sdk/helpers/abi/ERC20_ABI.js';
@@ -25,7 +25,7 @@ describe('The PrimeSDK, when transaction with arka and pimlico paymasters with a
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.arbitrum_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/paymaster/matic.spec.js b/test/specs/mainnet/paymaster/matic.spec.js
index accdf12..6775698 100644
--- a/test/specs/mainnet/paymaster/matic.spec.js
+++ b/test/specs/mainnet/paymaster/matic.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { ethers, utils } from 'ethers';
 import { assert } from 'chai';
 import { ERC20_ABI } from '@etherspot/prime-sdk/dist/sdk/helpers/abi/ERC20_ABI.js';
@@ -25,7 +25,7 @@ describe('The PrimeSDK, when transaction with arka and pimlico paymasters with m
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.matic_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/paymaster/optimism.spec.js b/test/specs/mainnet/paymaster/optimism.spec.js
index 1997ac0..c4c2aea 100644
--- a/test/specs/mainnet/paymaster/optimism.spec.js
+++ b/test/specs/mainnet/paymaster/optimism.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { ethers, utils } from 'ethers';
 import { assert } from 'chai';
 import { ERC20_ABI } from '@etherspot/prime-sdk/dist/sdk/helpers/abi/ERC20_ABI.js';
@@ -25,7 +25,7 @@ describe('The PrimeSDK, when transaction with arka and pimlico paymasters with o
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.optimism_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/paymaster/xdai.spec.js b/test/specs/mainnet/paymaster/xdai.spec.js
index 4c6cd69..abbe68c 100644
--- a/test/specs/mainnet/paymaster/xdai.spec.js
+++ b/test/specs/mainnet/paymaster/xdai.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { ethers, utils } from 'ethers';
 import { assert } from 'chai';
 import { ERC20_ABI } from '@etherspot/prime-sdk/dist/sdk/helpers/abi/ERC20_ABI.js';
@@ -26,7 +26,7 @@ describe('The PrimeSDK, when transaction with arka and pimlico paymasters with x
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.xdai_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/swap/arbitrum.spec.js b/test/specs/mainnet/swap/arbitrum.spec.js
index f723395..39e7aeb 100644
--- a/test/specs/mainnet/swap/arbitrum.spec.js
+++ b/test/specs/mainnet/swap/arbitrum.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { utils, constants, BigNumber } from 'ethers';
 import { assert } from 'chai';
 import addContext from 'mochawesome/addContext.js';
@@ -24,7 +24,7 @@ describe('The PrimeSDK, when get cross chain quotes and get advance routes LiFi
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.arbitrum_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/swap/matic.spec.js b/test/specs/mainnet/swap/matic.spec.js
index 5548b8d..f19fbf7 100644
--- a/test/specs/mainnet/swap/matic.spec.js
+++ b/test/specs/mainnet/swap/matic.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { utils, constants, BigNumber } from 'ethers';
 import { assert } from 'chai';
 import addContext from 'mochawesome/addContext.js';
@@ -24,7 +24,7 @@ describe('The PrimeSDK, when get cross chain quotes and get advance routes LiFi
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.matic_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/swap/optimism.spec.js b/test/specs/mainnet/swap/optimism.spec.js
index 885c78e..d46ff4f 100644
--- a/test/specs/mainnet/swap/optimism.spec.js
+++ b/test/specs/mainnet/swap/optimism.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { utils, constants, BigNumber } from 'ethers';
 import { assert } from 'chai';
 import addContext from 'mochawesome/addContext.js';
@@ -24,7 +24,7 @@ describe('The PrimeSDK, when get cross chain quotes and get advance routes LiFi
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.optimism_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/swap/xdai.spec.js b/test/specs/mainnet/swap/xdai.spec.js
index dc3507a..163b07c 100644
--- a/test/specs/mainnet/swap/xdai.spec.js
+++ b/test/specs/mainnet/swap/xdai.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { utils, constants, BigNumber } from 'ethers';
 import { assert } from 'chai';
 import addContext from 'mochawesome/addContext.js';
@@ -24,7 +24,7 @@ describe('The PrimeSDK, when get cross chain quotes and get advance routes LiFi
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.xdai_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/transactionHistory/arbitrum.spec.js b/test/specs/mainnet/transactionHistory/arbitrum.spec.js
index 387a99a..0d2e507 100644
--- a/test/specs/mainnet/transactionHistory/arbitrum.spec.js
+++ b/test/specs/mainnet/transactionHistory/arbitrum.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { ethers, utils } from 'ethers';
 import { assert } from 'chai';
 import addContext from 'mochawesome/addContext.js';
@@ -25,7 +25,7 @@ describe('The PrimeSDK, when get the single transaction and multiple transaction
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.arbitrum_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/transactionHistory/matic.spec.js b/test/specs/mainnet/transactionHistory/matic.spec.js
index bb15581..1cd5083 100644
--- a/test/specs/mainnet/transactionHistory/matic.spec.js
+++ b/test/specs/mainnet/transactionHistory/matic.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { ethers, utils } from 'ethers';
 import { assert } from 'chai';
 import addContext from 'mochawesome/addContext.js';
@@ -25,7 +25,7 @@ describe('The PrimeSDK, when get the single transaction and multiple transaction
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.matic_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/transactionHistory/optimism.spec.js b/test/specs/mainnet/transactionHistory/optimism.spec.js
index 0b65b91..dd2c791 100644
--- a/test/specs/mainnet/transactionHistory/optimism.spec.js
+++ b/test/specs/mainnet/transactionHistory/optimism.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { ethers, utils } from 'ethers';
 import { assert } from 'chai';
 import addContext from 'mochawesome/addContext.js';
@@ -25,7 +25,7 @@ describe('The PrimeSDK, when get the single transaction and multiple transaction
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.optimism_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/transactionHistory/xdai.spec.js b/test/specs/mainnet/transactionHistory/xdai.spec.js
index 62f0a36..ecef06e 100644
--- a/test/specs/mainnet/transactionHistory/xdai.spec.js
+++ b/test/specs/mainnet/transactionHistory/xdai.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { ethers, utils } from 'ethers';
 import { assert } from 'chai';
 import addContext from 'mochawesome/addContext.js';
@@ -25,7 +25,7 @@ describe('The PrimeSDK, when get the single transaction and multiple transaction
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.xdai_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/transferringFunds/arbitrum.spec.js b/test/specs/mainnet/transferringFunds/arbitrum.spec.js
index b5a153b..f9b85ee 100644
--- a/test/specs/mainnet/transferringFunds/arbitrum.spec.js
+++ b/test/specs/mainnet/transferringFunds/arbitrum.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { ethers, utils, providers } from 'ethers';
 import { assert } from 'chai';
 import { ERC20_ABI } from '@etherspot/prime-sdk/dist/sdk/helpers/abi/ERC20_ABI.js';
@@ -26,7 +26,7 @@ describe('The PrimeSDK, when transfer a token with arbitrum network on the MainN
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.arbitrum_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.arbitrum_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/transferringFunds/matic.spec.js b/test/specs/mainnet/transferringFunds/matic.spec.js
index 4eaec82..8f8565c 100644
--- a/test/specs/mainnet/transferringFunds/matic.spec.js
+++ b/test/specs/mainnet/transferringFunds/matic.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { ethers, utils, providers } from 'ethers';
 import { assert } from 'chai';
 import { ERC20_ABI } from '@etherspot/prime-sdk/dist/sdk/helpers/abi/ERC20_ABI.js';
@@ -26,7 +26,7 @@ describe('The PrimeSDK, when transfer a token with matic network on the MainNet'
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.matic_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.matic_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/transferringFunds/optimism.spec.js b/test/specs/mainnet/transferringFunds/optimism.spec.js
index 246a4af..46b9e96 100644
--- a/test/specs/mainnet/transferringFunds/optimism.spec.js
+++ b/test/specs/mainnet/transferringFunds/optimism.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { ethers, utils, providers } from 'ethers';
 import { assert } from 'chai';
 import { ERC20_ABI } from '@etherspot/prime-sdk/dist/sdk/helpers/abi/ERC20_ABI.js';
@@ -26,7 +26,7 @@ describe('The PrimeSDK, when transfer a token with optimism network on the MainN
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.optimism_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.optimism_chainid), process.env.BUNDLER_API_KEY)
           },
         );
 
diff --git a/test/specs/mainnet/transferringFunds/xdai.spec.js b/test/specs/mainnet/transferringFunds/xdai.spec.js
index c757677..302960a 100644
--- a/test/specs/mainnet/transferringFunds/xdai.spec.js
+++ b/test/specs/mainnet/transferringFunds/xdai.spec.js
@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv';
 dotenv.config(); // init dotenv
-import { PrimeSdk, DataUtils, graphqlEndpoints, EtherspotBundler } from '@etherspot/prime-sdk';
+import { PrimeSdk, DataUtils, EtherspotBundler } from '@etherspot/prime-sdk';
 import { ethers, utils, providers } from 'ethers';
 import { assert } from 'chai';
 import Helper from '../../../utils/helper.js';
@@ -27,7 +27,7 @@ describe('The PrimeSDK, when transfer a token with xdai network on the MainNet',
           { privateKey: process.env.PRIVATE_KEY },
           {
             chainId: Number(data.xdai_chainid),
-            projectKey: process.env.PROJECT_KEY, bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
+            bundlerProvider: new EtherspotBundler(Number(data.xdai_chainid), process.env.BUNDLER_API_KEY)
           },
         );