diff --git a/contracts/lendingpool/LendingPool.sol b/contracts/lendingpool/LendingPool.sol
index 69a92b6f..aa3a758b 100644
--- a/contracts/lendingpool/LendingPool.sol
+++ b/contracts/lendingpool/LendingPool.sol
@@ -25,6 +25,7 @@ import {LendingPoolLiquidationManager} from './LendingPoolLiquidationManager.sol
 import {IPriceOracleGetter} from '../interfaces/IPriceOracleGetter.sol';
 import {SafeERC20} from '@openzeppelin/contracts/token/ERC20/SafeERC20.sol';
 import {ILendingPool} from '../interfaces/ILendingPool.sol';
+import {LendingPoolStorage} from './LendingPoolStorage.sol';
 
 /**
  * @title LendingPool contract
@@ -32,12 +33,9 @@ import {ILendingPool} from '../interfaces/ILendingPool.sol';
  * @author Aave
  **/
 
-contract LendingPool is VersionedInitializable, ILendingPool {
+contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage {
   using SafeMath for uint256;
   using WadRayMath for uint256;
-  using ReserveLogic for ReserveLogic.ReserveData;
-  using ReserveConfiguration for ReserveConfiguration.Map;
-  using UserConfiguration for UserConfiguration.Map;
   using SafeERC20 for IERC20;
 
   //main configuration parameters
@@ -45,18 +43,6 @@ contract LendingPool is VersionedInitializable, ILendingPool {
   uint256 public constant MAX_STABLE_RATE_BORROW_SIZE_PERCENT = 25;
   uint256 public constant FLASHLOAN_PREMIUM_TOTAL = 9;
 
-  ILendingPoolAddressesProvider internal _addressesProvider;
-
-  mapping(address => ReserveLogic.ReserveData) internal _reserves;
-  mapping(address => UserConfiguration.Map) internal _usersConfig;
-  // debt token address => user who gives allowance => user who receives allowance => amount
-  mapping(address => mapping(address => mapping(address => uint256))) internal _borrowAllowance;
-
-  address[] internal _reservesList;
-
-  bool internal _flashLiquidationLocked;
-  bool internal _paused;
-
   /**
    * @dev only lending pools configurator can use functions affected by this modifier
    **/
@@ -78,8 +64,6 @@ contract LendingPool is VersionedInitializable, ILendingPool {
     require(!_paused, Errors.IS_PAUSED);
   }
 
-  uint256 public constant UINT_MAX_VALUE = uint256(-1);
-
   uint256 public constant LENDINGPOOL_REVISION = 0x2;
 
   function getRevision() internal override pure returns (uint256) {
@@ -147,7 +131,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
     uint256 amountToWithdraw = amount;
 
     //if amount is equal to uint(-1), the user wants to redeem everything
-    if (amount == UINT_MAX_VALUE) {
+    if (amount == type(uint256).max) {
       amountToWithdraw = userBalance;
     }
 
@@ -283,7 +267,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
       ? stableDebt
       : variableDebt;
 
-    if (amount != UINT_MAX_VALUE && amount < paybackAmount) {
+    if (amount != type(uint256).max && amount < paybackAmount) {
       paybackAmount = amount;
     }
 
@@ -1003,20 +987,6 @@ contract LendingPool is VersionedInitializable, ILendingPool {
       );
   }
 
-  /**
-   * @dev returns the list of the initialized reserves
-   **/
-  function getReservesList() external view returns (address[] memory) {
-    return _reservesList;
-  }
-
-  /**
-   * @dev returns the addresses provider
-   **/
-  function getAddressesProvider() external view returns (ILendingPoolAddressesProvider) {
-    return _addressesProvider;
-  }
-
   /**
    * @dev Set the _pause state
    * @param val the boolean value to set the current pause state of LendingPool
@@ -1035,7 +1005,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
   /**
    * @dev Returns if the LendingPool is paused
    */
-  function paused() external view override returns(bool) {
+  function paused() external override view returns (bool) {
     return _paused;
   }
 }
diff --git a/contracts/lendingpool/LendingPoolLiquidationManager.sol b/contracts/lendingpool/LendingPoolLiquidationManager.sol
index 6adc18d9..6e488428 100644
--- a/contracts/lendingpool/LendingPoolLiquidationManager.sol
+++ b/contracts/lendingpool/LendingPoolLiquidationManager.sol
@@ -6,14 +6,12 @@ import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import {
   VersionedInitializable
 } from '../libraries/openzeppelin-upgradeability/VersionedInitializable.sol';
-import {LendingPoolAddressesProvider} from '../configuration/LendingPoolAddressesProvider.sol';
 import {IAToken} from '../tokenization/interfaces/IAToken.sol';
 import {IStableDebtToken} from '../tokenization/interfaces/IStableDebtToken.sol';
 import {IVariableDebtToken} from '../tokenization/interfaces/IVariableDebtToken.sol';
 import {IPriceOracleGetter} from '../interfaces/IPriceOracleGetter.sol';
 import {GenericLogic} from '../libraries/logic/GenericLogic.sol';
 import {ReserveLogic} from '../libraries/logic/ReserveLogic.sol';
-import {ReserveConfiguration} from '../libraries/configuration/ReserveConfiguration.sol';
 import {UserConfiguration} from '../libraries/configuration/UserConfiguration.sol';
 import {Helpers} from '../libraries/helpers/Helpers.sol';
 import {WadRayMath} from '../libraries/math/WadRayMath.sol';
@@ -22,6 +20,7 @@ import {SafeERC20} from '@openzeppelin/contracts/token/ERC20/SafeERC20.sol';
 import {ISwapAdapter} from '../interfaces/ISwapAdapter.sol';
 import {Errors} from '../libraries/helpers/Errors.sol';
 import {ValidationLogic} from '../libraries/logic/ValidationLogic.sol';
+import {LendingPoolStorage} from './LendingPoolStorage.sol';
 
 /**
  * @title LendingPoolLiquidationManager contract
@@ -29,29 +28,15 @@ import {ValidationLogic} from '../libraries/logic/ValidationLogic.sol';
  * @notice Implements the liquidation function.
  * @dev LendingPoolLiquidationManager inherits Pausable from OpenZeppelin to have the same storage layout as LendingPool
  **/
-contract LendingPoolLiquidationManager is VersionedInitializable {
+contract LendingPoolLiquidationManager is VersionedInitializable, LendingPoolStorage {
   using SafeERC20 for IERC20;
   using SafeMath for uint256;
   using WadRayMath for uint256;
   using PercentageMath for uint256;
-  using ReserveLogic for ReserveLogic.ReserveData;
-  using ReserveConfiguration for ReserveConfiguration.Map;
-  using UserConfiguration for UserConfiguration.Map;
 
   // IMPORTANT The storage layout of the LendingPool is reproduced here because this contract
   // is gonna be used through DELEGATECALL
 
-  LendingPoolAddressesProvider internal addressesProvider;
-
-  mapping(address => ReserveLogic.ReserveData) internal reserves;
-  mapping(address => UserConfiguration.Map) internal usersConfig;
-  mapping(address => mapping(address => mapping(address => uint256))) internal _borrowAllowance;
-
-  address[] internal reservesList;
-
-  bool internal _flashLiquidationLocked;
-  bool public _paused;
-
   uint256 internal constant LIQUIDATION_CLOSE_FACTOR_PERCENT = 5000;
 
   /**
@@ -156,18 +141,18 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
     uint256 purchaseAmount,
     bool receiveAToken
   ) external returns (uint256, string memory) {
-    ReserveLogic.ReserveData storage collateralReserve = reserves[collateral];
-    ReserveLogic.ReserveData storage principalReserve = reserves[principal];
-    UserConfiguration.Map storage userConfig = usersConfig[user];
+    ReserveLogic.ReserveData storage collateralReserve = _reserves[collateral];
+    ReserveLogic.ReserveData storage principalReserve = _reserves[principal];
+    UserConfiguration.Map storage userConfig = _usersConfig[user];
 
     LiquidationCallLocalVars memory vars;
 
     (, , , , vars.healthFactor) = GenericLogic.calculateUserAccountData(
       user,
-      reserves,
-      usersConfig[user],
-      reservesList,
-      addressesProvider.getPriceOracle()
+      _reserves,
+      _usersConfig[user],
+      _reservesList,
+      _addressesProvider.getPriceOracle()
     );
 
     //if the user hasn't borrowed the specific currency defined by asset, it cannot be liquidated
@@ -323,18 +308,18 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
     address receiver,
     bytes calldata params
   ) external returns (uint256, string memory) {
-    ReserveLogic.ReserveData storage collateralReserve = reserves[collateral];
-    ReserveLogic.ReserveData storage debtReserve = reserves[principal];
-    UserConfiguration.Map storage userConfig = usersConfig[user];
+    ReserveLogic.ReserveData storage collateralReserve = _reserves[collateral];
+    ReserveLogic.ReserveData storage debtReserve = _reserves[principal];
+    UserConfiguration.Map storage userConfig = _usersConfig[user];
 
     LiquidationCallLocalVars memory vars;
 
     (, , , , vars.healthFactor) = GenericLogic.calculateUserAccountData(
       user,
-      reserves,
-      usersConfig[user],
-      reservesList,
-      addressesProvider.getPriceOracle()
+      _reserves,
+      _usersConfig[user],
+      _reservesList,
+      _addressesProvider.getPriceOracle()
     );
 
     (vars.userStableDebt, vars.userVariableDebt) = Helpers.getUserCurrentDebt(user, debtReserve);
@@ -391,7 +376,7 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
     );
 
     if (vars.userCollateralBalance == vars.maxCollateralToLiquidate) {
-      usersConfig[user].setUsingAsCollateral(collateralReserve.id, false);
+      _usersConfig[user].setUsingAsCollateral(collateralReserve.id, false);
     }
 
     vars.principalAToken = debtReserve.aTokenAddress;
@@ -463,8 +448,8 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
     uint256 amountToSwap,
     bytes calldata params
   ) external returns (uint256, string memory) {
-    ReserveLogic.ReserveData storage fromReserve = reserves[fromAsset];
-    ReserveLogic.ReserveData storage toReserve = reserves[toAsset];
+    ReserveLogic.ReserveData storage fromReserve = _reserves[fromAsset];
+    ReserveLogic.ReserveData storage toReserve = _reserves[toAsset];
 
     // Usage of a memory struct of vars to avoid "Stack too deep" errors due to local variables
     SwapLiquidityLocalVars memory vars;
@@ -487,7 +472,7 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
     toReserve.updateCumulativeIndexesAndTimestamp();
 
     if (vars.fromReserveAToken.balanceOf(msg.sender) == amountToSwap) {
-      usersConfig[msg.sender].setUsingAsCollateral(fromReserve.id, false);
+      _usersConfig[msg.sender].setUsingAsCollateral(fromReserve.id, false);
     }
 
     fromReserve.updateInterestRates(fromAsset, address(vars.fromReserveAToken), 0, amountToSwap);
@@ -525,10 +510,10 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
 
     (, , , , vars.healthFactor) = GenericLogic.calculateUserAccountData(
       msg.sender,
-      reserves,
-      usersConfig[msg.sender],
-      reservesList,
-      addressesProvider.getPriceOracle()
+      _reserves,
+      _usersConfig[msg.sender],
+      _reservesList,
+      _addressesProvider.getPriceOracle()
     );
 
     if (vars.healthFactor < GenericLogic.HEALTH_FACTOR_LIQUIDATION_THRESHOLD) {
@@ -562,7 +547,7 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
   ) internal view returns (uint256, uint256) {
     uint256 collateralAmount = 0;
     uint256 principalAmountNeeded = 0;
-    IPriceOracleGetter oracle = IPriceOracleGetter(addressesProvider.getPriceOracle());
+    IPriceOracleGetter oracle = IPriceOracleGetter(_addressesProvider.getPriceOracle());
 
     // Usage of a memory struct of vars to avoid "Stack too deep" errors due to local variables
     AvailableCollateralToLiquidateLocalVars memory vars;
diff --git a/contracts/lendingpool/LendingPoolStorage.sol b/contracts/lendingpool/LendingPoolStorage.sol
new file mode 100644
index 00000000..1f1e6d2e
--- /dev/null
+++ b/contracts/lendingpool/LendingPoolStorage.sol
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: agpl-3.0
+pragma solidity ^0.6.8;
+
+import {UserConfiguration} from '../libraries/configuration/UserConfiguration.sol';
+import {ReserveConfiguration} from '../libraries/configuration/ReserveConfiguration.sol';
+import {ReserveLogic} from '../libraries/logic/ReserveLogic.sol';
+import {ILendingPoolAddressesProvider} from '../interfaces/ILendingPoolAddressesProvider.sol';
+
+contract LendingPoolStorage {
+  using ReserveLogic for ReserveLogic.ReserveData;
+  using ReserveConfiguration for ReserveConfiguration.Map;
+  using UserConfiguration for UserConfiguration.Map;
+
+  ILendingPoolAddressesProvider internal _addressesProvider;
+
+  mapping(address => ReserveLogic.ReserveData) internal _reserves;
+  mapping(address => UserConfiguration.Map) internal _usersConfig;
+  // debt token address => user who gives allowance => user who receives allowance => amount
+  mapping(address => mapping(address => mapping(address => uint256))) internal _borrowAllowance;
+
+  address[] internal _reservesList;
+
+  bool internal _flashLiquidationLocked;
+  bool internal _paused;
+
+  /**
+   * @dev returns the list of the initialized reserves
+   **/
+  function getReservesList() external view returns (address[] memory) {
+    return _reservesList;
+  }
+
+  /**
+   * @dev returns the addresses provider
+   **/
+  function getAddressesProvider() external view returns (ILendingPoolAddressesProvider) {
+    return _addressesProvider;
+  }
+}
diff --git a/deployed-contracts.json b/deployed-contracts.json
index 9981b17c..60c63dd8 100644
--- a/deployed-contracts.json
+++ b/deployed-contracts.json
@@ -7,6 +7,10 @@
     "localhost": {
       "address": "0x9Dc554694756dC303a087e04bA6918C333Bc26a7",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x58F132FBB86E21545A4Bace3C19f1C05d86d7A22",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "LendingPoolAddressesProvider": {
@@ -17,6 +21,10 @@
     "localhost": {
       "address": "0xAfC307938C1c0035942c141c31524504c89Aaa8B",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xa4bcDF64Cdd5451b6ac3743B414124A6299B65FF",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "LendingPoolAddressesProviderRegistry": {
@@ -27,6 +35,10 @@
     "localhost": {
       "address": "0x73DE1e0ab6A5C221258703bc546E0CAAcCc6EC87",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x5A0773Ff307Bf7C71a832dBB5312237fD3437f9F",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "FeeProvider": {
@@ -54,6 +66,9 @@
     },
     "localhost": {
       "address": "0x65e0Cd5B8904A02f2e00BC6f58bf881998D54BDe"
+    },
+    "coverage": {
+      "address": "0x6642B57e4265BAD868C17Fc1d1F4F88DBBA04Aa8"
     }
   },
   "LendingPoolDataProvider": {
@@ -67,6 +82,9 @@
     },
     "localhost": {
       "address": "0x5d12dDe3286D94E0d85F9D3B01B7099cfA0aBCf1"
+    },
+    "coverage": {
+      "address": "0xD9273d497eDBC967F39d419461CfcF382a0A822e"
     }
   },
   "PriceOracle": {
@@ -77,6 +95,10 @@
     "localhost": {
       "address": "0xbeA90474c2F3C7c43bC7c36CaAf5272c927Af5a1",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x1750499D05Ed1674d822430FB960d5F6731fDf64",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "MockAggregator": {
@@ -87,6 +109,10 @@
     "localhost": {
       "address": "0x19E42cA990cF697D3dda0e59131215C43bB6989F",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xEC1C93A9f6a9e18E97784c76aC52053587FcDB89",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "ChainlinkProxyPriceProvider": {
@@ -97,6 +123,10 @@
     "localhost": {
       "address": "0xE30c3983E51bC9d6baE3E9437710a1459e21e81F",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x7B6C3e5486D9e6959441ab554A889099eed76290",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "LendingRateOracle": {
@@ -107,6 +137,10 @@
     "localhost": {
       "address": "0xDf69898e844197a24C658CcF9fD53dF15948dc8b",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xD83D2773a7873ae2b5f8Fb92097e20a8C64F691E",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "DefaultReserveInterestRateStrategy": {
@@ -117,6 +151,10 @@
     "localhost": {
       "address": "0xBe6d8642382C241c9B4B50c89574DbF3f4181E7D",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x626FdE749F9d499d3777320CAf29484B624ab84a",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "LendingPoolLiquidationManager": {
@@ -170,6 +208,9 @@
     },
     "localhost": {
       "address": "0xAd49512dFBaD6fc13D67d3935283c0606812E962"
+    },
+    "coverage": {
+      "address": "0x2B681757d757fbB80cc51c6094cEF5eE75bF55aA"
     }
   },
   "WalletBalanceProvider": {
@@ -180,6 +221,10 @@
     "localhost": {
       "address": "0xA29C2A7e59aa49C71aF084695337E3AA5e820758",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xDf73fC454FA018051D4a1509e63D11530A59DE10",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "DAI": {
@@ -190,6 +235,10 @@
     "localhost": {
       "address": "0xbe66dC9DFEe580ED968403e35dF7b5159f873df8",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x7c2C195CD6D34B8F845992d380aADB2730bB9C6F",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "LEND": {
@@ -200,6 +249,10 @@
     "localhost": {
       "address": "0x93AfC6Df4bB8F62F2493B19e577f8382c0BA9EBC",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x8858eeB3DfffA017D4BCE9801D340D36Cf895CCf",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "TUSD": {
@@ -210,6 +263,10 @@
     "localhost": {
       "address": "0x75Ded61646B5945BdDd0CD9a9Db7c8288DA6F810",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x0078371BDeDE8aAc7DeBfFf451B74c5EDB385Af7",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "BAT": {
@@ -220,6 +277,10 @@
     "localhost": {
       "address": "0xdE7c40e675bF1aA45c18cCbaEb9662B16b0Ddf7E",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xf4e77E5Da47AC3125140c470c71cBca77B5c638c",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "USDC": {
@@ -230,6 +291,10 @@
     "localhost": {
       "address": "0xDFbeeed692AA81E7f86E72F7ACbEA2A1C4d63544",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x3619DbE27d7c1e7E91aA738697Ae7Bc5FC3eACA5",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "USDT": {
@@ -240,6 +305,10 @@
     "localhost": {
       "address": "0x5191aA68c7dB195181Dd2441dBE23A48EA24b040",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x038B86d9d8FAFdd0a02ebd1A476432877b0107C8",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "SUSD": {
@@ -250,6 +319,10 @@
     "localhost": {
       "address": "0x8F9422aa37215c8b3D1Ea1674138107F84D68F26",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x1A1FEe7EeD918BD762173e4dc5EfDB8a78C924A8",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "ZRX": {
@@ -260,6 +333,10 @@
     "localhost": {
       "address": "0xa89E20284Bd638F31b0011D0fC754Fc9d2fa73e3",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x500D1d6A4c7D8Ae28240b47c8FCde034D827fD5e",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "MKR": {
@@ -270,6 +347,10 @@
     "localhost": {
       "address": "0xaA935993065F2dDB1d13623B1941C7AEE3A60F23",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xc4905364b78a742ccce7B890A89514061E47068D",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "WBTC": {
@@ -280,6 +361,10 @@
     "localhost": {
       "address": "0x35A2624888e207e4B3434E9a9E250bF6Ee68FeA3",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xD6C850aeBFDC46D7F4c207e445cC0d6B0919BDBe",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "LINK": {
@@ -290,6 +375,10 @@
     "localhost": {
       "address": "0x1f569c307949a908A4b8Ff7453a88Ca0b8D8df13",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x8B5B7a6055E54a36fF574bbE40cf2eA68d5554b3",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "KNC": {
@@ -300,6 +389,10 @@
     "localhost": {
       "address": "0x4301cb254CCc126B9eb9cbBE030C6FDA2FA16D4a",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xEcc0a6dbC0bb4D51E4F84A315a9e5B0438cAD4f0",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "MANA": {
@@ -310,6 +403,10 @@
     "localhost": {
       "address": "0x0766c9592a8686CAB0081b4f35449462c6e82F11",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x20Ce94F404343aD2752A2D01b43fa407db9E0D00",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "REP": {
@@ -320,6 +417,10 @@
     "localhost": {
       "address": "0xaF6D34adD35E1A565be4539E4d1069c48A49C953",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x1d80315fac6aBd3EfeEbE97dEc44461ba7556160",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "SNX": {
@@ -330,6 +431,10 @@
     "localhost": {
       "address": "0x48bb3E35D2D6994374db457a6Bf61de2d9cC8E49",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x2D8553F9ddA85A9B3259F6Bf26911364B85556F5",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "BUSD": {
@@ -340,6 +445,10 @@
     "localhost": {
       "address": "0x1E59BA56B1F61c3Ee946D8c7e2994B4A9b0cA45C",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x52d3b94181f8654db2530b0fEe1B19173f519C52",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "USD": {
@@ -350,6 +459,10 @@
     "localhost": {
       "address": "0x53813198c75959DDB604462831d8989C29152164",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xd15468525c35BDBC1eD8F2e09A00F8a173437f2f",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "UNI_DAI_ETH": {
@@ -360,6 +473,10 @@
     "localhost": {
       "address": "0x0eD6115873ce6B807a03FE0df1f940387779b729",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x7e35Eaf7e8FBd7887ad538D4A38Df5BbD073814a",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "UNI_USDC_ETH": {
@@ -370,6 +487,10 @@
     "localhost": {
       "address": "0xFFfDa24e7E3d5F89a24278f53d6f0F81B3bE0d6B",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x5bcb88A0d20426e451332eE6C4324b0e663c50E0",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "UNI_SETH_ETH": {
@@ -380,6 +501,10 @@
     "localhost": {
       "address": "0x5889354f21A1C8D8D2f82669d778f6Dab778B519",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x3521eF8AaB0323004A6dD8b03CE890F4Ea3A13f5",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "UNI_LINK_ETH": {
@@ -390,6 +515,10 @@
     "localhost": {
       "address": "0x09F7bF33B3F8922268B34103af3a8AF83148C9B1",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x53369fd4680FfE3DfF39Fc6DDa9CfbfD43daeA2E",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "UNI_MKR_ETH": {
@@ -400,6 +529,10 @@
     "localhost": {
       "address": "0x8f3966F7d53Fd5f12b701C8835e1e32541613869",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xB00cC45B4a7d3e1FEE684cFc4417998A1c183e6d",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "UNI_LEND_ETH": {
@@ -410,6 +543,10 @@
     "localhost": {
       "address": "0x9Dc554694756dC303a087e04bA6918C333Bc26a7",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x58F132FBB86E21545A4Bace3C19f1C05d86d7A22",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "AaveProtocolTestHelpers": {
@@ -418,6 +555,9 @@
     },
     "localhost": {
       "address": "0x9305d862ee95a899b83906Cd9CB666aC269E5f66"
+    },
+    "coverage": {
+      "address": "0x2cfcA5785261fbC88EFFDd46fCFc04c22525F9e4"
     }
   },
   "StableDebtToken": {
@@ -428,6 +568,10 @@
     "localhost": {
       "address": "0x02BB514187B830d6A2111197cd7D8cb60650B970",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xB660Fdd109a95718cB9d20E3A89EE6cE342aDcB6",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "VariableDebtToken": {
@@ -438,6 +582,10 @@
     "localhost": {
       "address": "0x6774Ce86Abf5EBB22E9F45b5f55daCbB4170aD7f",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x830bceA96E56DBC1F8578f75fBaC0AF16B32A07d",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "AToken": {
@@ -448,6 +596,10 @@
     "buidlerevm": {
       "address": "0xA0AB1cB92A4AF81f84dCd258155B5c25D247b54E",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xA0AB1cB92A4AF81f84dCd258155B5c25D247b54E",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "MockAToken": {
@@ -458,6 +610,10 @@
     "localhost": {
       "address": "0xFBdF1E93D0D88145e3CcA63bf8d513F83FB0903b",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x392E5355a0e88Bd394F717227c752670fb3a8020",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "WETH": {
@@ -468,6 +624,10 @@
     "localhost": {
       "address": "0xEcb928A3c079a1696Aa5244779eEc3dE1717fACd",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xf784709d2317D872237C4bC22f867d1BAe2913AB",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "MockStableDebtToken": {
@@ -478,6 +638,10 @@
     "localhost": {
       "address": "0xE45fF4A0A8D0E9734C73874c034E03594E15ba28",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x3b050AFb4ac4ACE646b31fF3639C1CD43aC31460",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "MockVariableDebtToken": {
@@ -488,11 +652,18 @@
     "localhost": {
       "address": "0x5cCC6Abc4c9F7262B9485797a848Ec6CC28A11dF",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xEBAB67ee3ef604D5c250A53b4b8fcbBC6ec3007C",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "MockSwapAdapter": {
     "buidlerevm": {
       "address": "0xBEF0d4b9c089a5883741fC14cbA352055f35DDA2"
+    },
+    "coverage": {
+      "address": "0xBEF0d4b9c089a5883741fC14cbA352055f35DDA2"
     }
   }
-}
+}
\ No newline at end of file