diff --git a/tasks/dev/7_uniswap_market.ts b/tasks/dev/7_uniswap_market.ts
index aa73fc40..3703f9bb 100644
--- a/tasks/dev/7_uniswap_market.ts
+++ b/tasks/dev/7_uniswap_market.ts
@@ -139,6 +139,7 @@ task(
       ProtocolGlobalParams: {UsdAddress, MockUsdPriceInWei},
       LendingRateOracleRatesCommon,
     } = poolConfig as ICommonConfiguration;
+    
     console.log("Initialized mocks, global params and lending rate oracle rates");
 
     const defaultTokenList = {
diff --git a/test/__setup.spec.ts b/test/__setup.spec.ts
index 51542de9..e464b47f 100644
--- a/test/__setup.spec.ts
+++ b/test/__setup.spec.ts
@@ -97,6 +97,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
   const addressList = await Promise.all(
     (await DRE.ethers.getSigners()).map((signer) => signer.getAddress())
   );
+  console.log(addressList);
 
   await waitForTx(await addressesProvider.setEmergencyAdmin(addressList[2]));
 
@@ -159,13 +160,8 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
       REN: mockTokens.REN.address,
       UNI: mockTokens.UNI.address,
       ENJ: mockTokens.ENJ.address,
-      UNI_WETH: mockTokens.WETH.address,
-      UNI_WBTC: mockTokens.WBTC.address,
-      UNI_DAI: mockTokens.DAI.address,
-      UNI_USDC: mockTokens.USDC.address,
-      UNI_USDT: mockTokens.USDT.address,
-      UNI_WETHDAI: mockTokens.UNI_WETHDAI.address,
-      UNI_WETHWBTC: mockTokens.UNI_WETHWBTC.address,
+      WETHDAI: mockTokens.WETHDAI.address,
+      WETHWBTC: mockTokens.WETHWBTC.address,
       USD: USD_ADDRESS,
     },
     fallbackOracle