diff --git a/helpers/contracts-deployments.ts b/helpers/contracts-deployments.ts
index ef60441e..700f1a43 100644
--- a/helpers/contracts-deployments.ts
+++ b/helpers/contracts-deployments.ts
@@ -666,8 +666,6 @@ export const deployATokenImplementations = async (
     }, new Set<eContractid>()),
   ];
 
-  console.log(aTokenImplementations);
-
   for (let x = 0; x < aTokenImplementations.length; x++) {
     const aTokenAddress = getOptionalParamAddressPerNetwork(
       poolConfig[aTokenImplementations[x].toString()],
diff --git a/helpers/types.ts b/helpers/types.ts
index c4912437..5f9cdebf 100644
--- a/helpers/types.ts
+++ b/helpers/types.ts
@@ -38,15 +38,14 @@ export enum EthereumNetworkNames {
   mumbai = 'mumbai',
   xdai = 'xdai',
   avalanche = 'avalanche',
-  fuji = 'fuji'
-
+  fuji = 'fuji',
 }
 
 export enum AavePools {
   proto = 'proto',
   matic = 'matic',
   amm = 'amm',
-  avalanche = 'avalanche'
+  avalanche = 'avalanche',
 }
 
 export enum eContractid {
@@ -367,7 +366,7 @@ export enum TokenContractId {
   WMATIC = 'WMATIC',
   STAKE = 'STAKE',
   xSUSHI = 'xSUSHI',
-  AVAX = 'AVAX'
+  AVAX = 'AVAX',
 }
 
 export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams {
diff --git a/markets/avalanche/commons.ts b/markets/avalanche/commons.ts
index e01b338a..eeed73ce 100644
--- a/markets/avalanche/commons.ts
+++ b/markets/avalanche/commons.ts
@@ -117,7 +117,7 @@ export const CommonsConfig: ICommonConfiguration = {
   },
   FallbackOracle: {
     [eAvalancheNetwork.avalanche]: ZERO_ADDRESS,
-    [eAvalancheNetwork.fuji]: ZERO_ADDRESS // TODO: Deploy?
+    [eAvalancheNetwork.fuji]: ZERO_ADDRESS 
   },
   ChainlinkAggregator: {
     [eAvalancheNetwork.avalanche]: {
@@ -150,8 +150,8 @@ export const CommonsConfig: ICommonConfiguration = {
     [eAvalancheNetwork.fuji]: ''
   },
   WETH: {
-    [eAvalancheNetwork.avalanche]: '0xf20d962a6c8f70c731bd838a3a388D7d48fA6e15', // TODO: ETH Address
-    [eAvalancheNetwork.fuji]: '0x3b8b3fc85ccA720809Af2dA4B58cF4ce84bcbdd0' // TODO: Mock ETH
+    [eAvalancheNetwork.avalanche]: '0xf20d962a6c8f70c731bd838a3a388D7d48fA6e15', // WETH Address
+    [eAvalancheNetwork.fuji]: '0x3b8b3fc85ccA720809Af2dA4B58cF4ce84bcbdd0' // MintableERC20 WETH
   },
   WrappedNativeToken: {
     [eAvalancheNetwork.avalanche]: '0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7', // Official WAVAX 
diff --git a/markets/avalanche/index.ts b/markets/avalanche/index.ts
index 4c27bfca..ec2105c9 100644
--- a/markets/avalanche/index.ts
+++ b/markets/avalanche/index.ts
@@ -39,7 +39,7 @@ export const AvalancheConfig: IAvalancheConfiguration = {
       WBTC: '0x408D4cD0ADb7ceBd1F1A1C33A0Ba2098E1295bAB',
       // AVAX: '' // TODO: Use WAVAX?
     },
-    [eAvalancheNetwork.fuji]: { // TODO: Deploy Mock tokens
+    [eAvalancheNetwork.fuji]: { // MintableERC20 tokens
       WETH: '0x3b8b3fc85ccA720809Af2dA4B58cF4ce84bcbdd0',
       // DAI: '0x51BC2DfB9D12d9dB50C855A5330fBA0faF761D15',
       // USDC: '0x7804D7f48f6E5749AF5c8Fa87b20702C34a7f5c2',
diff --git a/test-suites/test-aave/__setup.spec.ts b/test-suites/test-aave/__setup.spec.ts
index 463435ea..afaf711b 100644
--- a/test-suites/test-aave/__setup.spec.ts
+++ b/test-suites/test-aave/__setup.spec.ts
@@ -13,7 +13,6 @@ import {
   deployLendingPoolConfigurator,
   deployLendingPool,
   deployPriceOracle,
-  deployAaveOracleV2,
   deployLendingPoolCollateralManager,
   deployMockFlashLoanReceiver,
   deployWalletBalancerProvider,
@@ -29,6 +28,7 @@ import {
   deployFlashLiquidationAdapter,
   authorizeWETHGateway,
   deployATokenImplementations,
+  deployAaveOracle,
 } from '../../helpers/contracts-deployments';
 import { Signer } from 'ethers';
 import { TokenContractId, eContractid, tEthereumAddress, AavePools } from '../../helpers/types';
@@ -221,7 +221,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
     config.OracleQuoteCurrency
   );
 
-  await deployAaveOracleV2([
+  await deployAaveOracle([
     tokens,
     aggregators,
     fallbackOracle.address,
diff --git a/test-suites/test-amm/__setup.spec.ts b/test-suites/test-amm/__setup.spec.ts
index ef398214..448ea7fd 100644
--- a/test-suites/test-amm/__setup.spec.ts
+++ b/test-suites/test-amm/__setup.spec.ts
@@ -13,7 +13,6 @@ import {
   deployLendingPoolConfigurator,
   deployLendingPool,
   deployPriceOracle,
-  deployAaveOracleV2,
   deployLendingPoolCollateralManager,
   deployMockFlashLoanReceiver,
   deployWalletBalancerProvider,
@@ -29,6 +28,7 @@ import {
   deployFlashLiquidationAdapter,
   authorizeWETHGateway,
   deployATokenImplementations,
+  deployAaveOracle,
 } from '../../helpers/contracts-deployments';
 import { Signer } from 'ethers';
 import { TokenContractId, eContractid, tEthereumAddress, AavePools } from '../../helpers/types';
@@ -226,7 +226,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
     config.OracleQuoteCurrency
   );
 
-  await deployAaveOracleV2([
+  await deployAaveOracle([
     tokens,
     aggregators,
     fallbackOracle.address,