diff --git a/contracts/interfaces/ILendingPool.sol b/contracts/interfaces/ILendingPool.sol
index acd2b9a4..55010304 100644
--- a/contracts/interfaces/ILendingPool.sol
+++ b/contracts/interfaces/ILendingPool.sol
@@ -15,7 +15,8 @@ interface ILendingPool {
    **/
   event Deposit(
     address indexed reserve,
-    address indexed user,
+    address user,
+    address indexed onBehalfOf,
     uint256 amount,
     uint16 indexed referral
   );
@@ -147,6 +148,7 @@ interface ILendingPool {
   function deposit(
     address reserve,
     uint256 amount,
+    address onBehalfOf,
     uint16 referralCode
   ) external;
 
diff --git a/contracts/lendingpool/LendingPool.sol b/contracts/lendingpool/LendingPool.sol
index c494110b..6c3eef51 100644
--- a/contracts/lendingpool/LendingPool.sol
+++ b/contracts/lendingpool/LendingPool.sol
@@ -93,6 +93,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
   function deposit(
     address asset,
     uint256 amount,
+    address onBehalfOf,
     uint16 referralCode
   ) external override {
     ReserveLogic.ReserveData storage reserve = _reserves[asset];
@@ -104,18 +105,17 @@ contract LendingPool is VersionedInitializable, ILendingPool {
     reserve.updateCumulativeIndexesAndTimestamp();
     reserve.updateInterestRates(asset, aToken, amount, 0);
 
-    bool isFirstDeposit = IAToken(aToken).balanceOf(msg.sender) == 0;
+    bool isFirstDeposit = IAToken(aToken).balanceOf(onBehalfOf) == 0;
     if (isFirstDeposit) {
-      _usersConfig[msg.sender].setUsingAsCollateral(reserve.index, true);
+      _usersConfig[onBehalfOf].setUsingAsCollateral(reserve.id, true);
     }
 
-    //minting AToken to user 1:1 with the specific exchange rate
-    IAToken(aToken).mint(msg.sender, amount);
+    IAToken(aToken).mint(onBehalfOf, amount, reserve.liquidityIndex);
 
     //transfer to the aToken contract
     IERC20(asset).safeTransferFrom(msg.sender, aToken, amount);
 
-    emit Deposit(asset, msg.sender, amount, referralCode);
+    emit Deposit(asset, msg.sender, onBehalfOf, amount, referralCode);
   }
 
   /**
@@ -153,10 +153,10 @@ contract LendingPool is VersionedInitializable, ILendingPool {
     reserve.updateInterestRates(asset, aToken, 0, amountToWithdraw);
 
     if (amountToWithdraw == userBalance) {
-      _usersConfig[msg.sender].setUsingAsCollateral(reserve.index, false);
+      _usersConfig[msg.sender].setUsingAsCollateral(reserve.id, false);
     }
 
-    IAToken(aToken).burn(msg.sender, msg.sender, amountToWithdraw);
+    IAToken(aToken).burn(msg.sender, msg.sender, amountToWithdraw, reserve.liquidityIndex);
 
     emit Withdraw(asset, msg.sender, amount);
   }
@@ -292,7 +292,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
     reserve.updateInterestRates(asset, aToken, paybackAmount, 0);
 
     if (stableDebt.add(variableDebt).sub(paybackAmount) == 0) {
-      _usersConfig[onBehalfOf].setBorrowing(reserve.index, false);
+      _usersConfig[onBehalfOf].setBorrowing(reserve.id, false);
     }
 
     IERC20(asset).safeTransferFrom(user, aToken, paybackAmount);
@@ -405,7 +405,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
       _addressesProvider.getPriceOracle()
     );
 
-    _usersConfig[msg.sender].setUsingAsCollateral(reserve.index, useAsCollateral);
+    _usersConfig[msg.sender].setUsingAsCollateral(reserve.id, useAsCollateral);
 
     if (useAsCollateral) {
       emit ReserveUsedAsCollateralEnabled(asset, msg.sender);
@@ -661,8 +661,8 @@ contract LendingPool is VersionedInitializable, ILendingPool {
       reserve.currentVariableBorrowRate,
       reserve.currentStableBorrowRate,
       IStableDebtToken(reserve.stableDebtTokenAddress).getAverageStableRate(),
-      reserve.lastLiquidityIndex,
-      reserve.lastVariableBorrowIndex,
+      reserve.liquidityIndex,
+      reserve.variableBorrowIndex,
       reserve.lastUpdateTimestamp
     );
   }
@@ -728,7 +728,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
     stableRateLastUpdated = IStableDebtToken(reserve.stableDebtTokenAddress).getUserLastUpdated(
       user
     );
-    usageAsCollateralEnabled = _usersConfig[user].isUsingAsCollateral(reserve.index);
+    usageAsCollateralEnabled = _usersConfig[user].isUsingAsCollateral(reserve.id);
     variableBorrowIndex = IVariableDebtToken(reserve.variableDebtTokenAddress).getUserIndex(user);
   }
 
@@ -833,7 +833,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
       oracle
     );
 
-    uint256 reserveIndex = reserve.index;
+    uint256 reserveIndex = reserve.id;
     if (!userConfig.isBorrowing(reserveIndex)) {
       userConfig.setBorrowing(reserveIndex, true);
     }
@@ -891,7 +891,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
         reserveAlreadyAdded = true;
       }
     if (!reserveAlreadyAdded) {
-      _reserves[asset].index = uint8(_reservesList.length);
+      _reserves[asset].id = uint8(_reservesList.length);
       _reservesList.push(asset);
     }
   }
diff --git a/contracts/lendingpool/LendingPoolLiquidationManager.sol b/contracts/lendingpool/LendingPoolLiquidationManager.sol
index ddd29256..bc204c2c 100644
--- a/contracts/lendingpool/LendingPoolLiquidationManager.sol
+++ b/contracts/lendingpool/LendingPoolLiquidationManager.sol
@@ -166,7 +166,7 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
 
     vars.isCollateralEnabled =
       collateralReserve.configuration.getLiquidationThreshold() > 0 &&
-      userConfig.isUsingAsCollateral(collateralReserve.index);
+      userConfig.isUsingAsCollateral(collateralReserve.id);
 
     //if collateral isn't enabled as collateral by user, it cannot be liquidated
     if (!vars.isCollateralEnabled) {
@@ -272,7 +272,7 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
       );
 
       //burn the equivalent amount of atoken
-      vars.collateralAtoken.burn(user, msg.sender, vars.maxCollateralToLiquidate);
+      vars.collateralAtoken.burn(user, msg.sender, vars.maxCollateralToLiquidate, collateralReserve.liquidityIndex);
     }
 
     //transfers the principal currency to the aToken
@@ -342,7 +342,7 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
     if (msg.sender != user) {
       vars.isCollateralEnabled =
         collateralReserve.configuration.getLiquidationThreshold() > 0 &&
-        userConfig.isUsingAsCollateral(collateralReserve.index);
+        userConfig.isUsingAsCollateral(collateralReserve.id);
 
       //if collateral isn't enabled as collateral by user, it cannot be liquidated
       if (!vars.isCollateralEnabled) {
@@ -389,11 +389,13 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
     if (vars.principalAmountNeeded < vars.actualAmountToLiquidate) {
       vars.actualAmountToLiquidate = vars.principalAmountNeeded;
     }
+    //updating collateral reserve indexes
+    collateralReserve.updateCumulativeIndexesAndTimestamp();
 
-    vars.collateralAtoken.burn(user, receiver, vars.maxCollateralToLiquidate);
+    vars.collateralAtoken.burn(user, receiver, vars.maxCollateralToLiquidate, collateralReserve.liquidityIndex);
 
     if (vars.userCollateralBalance == vars.maxCollateralToLiquidate) {
-      usersConfig[user].setUsingAsCollateral(collateralReserve.index, false);
+      usersConfig[user].setUsingAsCollateral(collateralReserve.id, false);
     }
 
     address principalAToken = debtReserve.aTokenAddress;
@@ -426,7 +428,6 @@ contract LendingPoolLiquidationManager is VersionedInitializable {
     }
 
     //updating collateral reserve
-    collateralReserve.updateCumulativeIndexesAndTimestamp();
     collateralReserve.updateInterestRates(
       collateral,
       address(vars.collateralAtoken),
diff --git a/contracts/libraries/helpers/Errors.sol b/contracts/libraries/helpers/Errors.sol
index ab97e2b5..3ee9d945 100644
--- a/contracts/libraries/helpers/Errors.sol
+++ b/contracts/libraries/helpers/Errors.sol
@@ -44,13 +44,11 @@ library Errors {
 
   // require error messages - aToken
   string public constant CALLER_MUST_BE_LENDING_POOL = '28'; // 'The caller of this function must be a lending pool'
-  string public constant INTEREST_REDIRECTION_NOT_ALLOWED = '29'; // 'Caller is not allowed to redirect the interest of the user'
   string public constant CANNOT_GIVE_ALLOWANCE_TO_HIMSELF = '30'; // 'User cannot give allowance to himself'
   string public constant TRANSFER_AMOUNT_NOT_GT_0 = '31'; // 'Transferred amount needs to be greater than zero'
-  string public constant INTEREST_ALREADY_REDIRECTED = '32'; // 'Interest is already redirected to the user'
-  string public constant NO_VALID_BALANCE_FOR_REDIRECTION = '33'; // 'Interest stream can only be redirected if there is a valid balance'
-
-  // require error messages - ReserveLogic
+  string public constant INVALID_ATOKEN_BALANCE = '52'; // balance on burning is invalid
+  
+   // require error messages - ReserveLogic
   string public constant RESERVE_ALREADY_INITIALIZED = '34'; // 'Reserve has already been initialized'
   string public constant LIQUIDITY_INDEX_OVERFLOW = '47'; //  Liquidity index overflows uint128
   string public constant VARIABLE_BORROW_INDEX_OVERFLOW = '48'; //  Variable borrow index overflows uint128
diff --git a/contracts/libraries/logic/GenericLogic.sol b/contracts/libraries/logic/GenericLogic.sol
index efe053a0..541c5075 100644
--- a/contracts/libraries/logic/GenericLogic.sol
+++ b/contracts/libraries/logic/GenericLogic.sol
@@ -64,7 +64,7 @@ library GenericLogic {
   ) external view returns (bool) {
     if (
       !userConfig.isBorrowingAny() ||
-      !userConfig.isUsingAsCollateral(reservesData[asset].index)
+      !userConfig.isUsingAsCollateral(reservesData[asset].id)
     ) {
       return true;
     }
diff --git a/contracts/libraries/logic/ReserveLogic.sol b/contracts/libraries/logic/ReserveLogic.sol
index 12e46b67..bccc5113 100644
--- a/contracts/libraries/logic/ReserveLogic.sol
+++ b/contracts/libraries/logic/ReserveLogic.sol
@@ -51,23 +51,27 @@ library ReserveLogic {
   struct ReserveData {
     //stores the reserve configuration
     ReserveConfiguration.Map configuration;
-    address aTokenAddress;
-    address stableDebtTokenAddress;
-    address variableDebtTokenAddress;
-    address interestRateStrategyAddress;
     //the liquidity index. Expressed in ray
-    uint128 lastLiquidityIndex;
+    uint128 liquidityIndex;
+    //variable borrow index. Expressed in ray
+    uint128 variableBorrowIndex;
     //the current supply rate. Expressed in ray
     uint128 currentLiquidityRate;
     //the current variable borrow rate. Expressed in ray
     uint128 currentVariableBorrowRate;
     //the current stable borrow rate. Expressed in ray
     uint128 currentStableBorrowRate;
-    //variable borrow index. Expressed in ray
-    uint128 lastVariableBorrowIndex;
     uint40 lastUpdateTimestamp;
-    //the index of the reserve in the list of the active reserves
-    uint8 index;
+   
+    //tokens addresses
+    address aTokenAddress;
+    address stableDebtTokenAddress;
+    address variableDebtTokenAddress;
+    
+    address interestRateStrategyAddress;
+
+    //the id of the reserve. Represents the position in the list of the active reserves
+    uint8 id;
   }
 
   /**
@@ -83,12 +87,12 @@ library ReserveLogic {
     //solium-disable-next-line
     if (timestamp == uint40(block.timestamp)) {
       //if the index was updated in the same block, no need to perform any calculation
-      return reserve.lastLiquidityIndex;
+      return reserve.liquidityIndex;
     }
 
     uint256 cumulated = MathUtils
       .calculateLinearInterest(reserve.currentLiquidityRate, timestamp)
-      .rayMul(reserve.lastLiquidityIndex);
+      .rayMul(reserve.liquidityIndex);
 
     return cumulated;
   }
@@ -106,12 +110,12 @@ library ReserveLogic {
     //solium-disable-next-line
     if (timestamp == uint40(block.timestamp)) {
       //if the index was updated in the same block, no need to perform any calculation
-      return reserve.lastVariableBorrowIndex;
+      return reserve.variableBorrowIndex;
     }
 
     uint256 cumulated = MathUtils
       .calculateCompoundedInterest(reserve.currentVariableBorrowRate, timestamp)
-      .rayMul(reserve.lastVariableBorrowIndex);
+      .rayMul(reserve.variableBorrowIndex);
 
     return cumulated;
   }
@@ -153,10 +157,10 @@ library ReserveLogic {
         currentLiquidityRate,
         lastUpdateTimestamp
       );
-      uint256 index = cumulatedLiquidityInterest.rayMul(reserve.lastLiquidityIndex);
+      uint256 index = cumulatedLiquidityInterest.rayMul(reserve.liquidityIndex);
       require(index < (1 << 128), Errors.LIQUIDITY_INDEX_OVERFLOW);
 
-      reserve.lastLiquidityIndex = uint128(index);
+      reserve.liquidityIndex = uint128(index);
 
       //as the liquidity rate might come only from stable rate loans, we need to ensure
       //that there is actual variable debt before accumulating
@@ -165,9 +169,9 @@ library ReserveLogic {
           reserve.currentVariableBorrowRate,
           lastUpdateTimestamp
         );
-        index = cumulatedVariableBorrowInterest.rayMul(reserve.lastVariableBorrowIndex);
+        index = cumulatedVariableBorrowInterest.rayMul(reserve.variableBorrowIndex);
         require(index < (1 << 128), Errors.VARIABLE_BORROW_INDEX_OVERFLOW);
-        reserve.lastVariableBorrowIndex = uint128(index);
+        reserve.variableBorrowIndex = uint128(index);
       }
     }
 
@@ -191,10 +195,10 @@ library ReserveLogic {
 
     uint256 result = amountToLiquidityRatio.add(WadRayMath.ray());
 
-    result = result.rayMul(reserve.lastLiquidityIndex);
+    result = result.rayMul(reserve.liquidityIndex);
     require(result < (1 << 128), Errors.LIQUIDITY_INDEX_OVERFLOW);
 
-    reserve.lastLiquidityIndex = uint128(result);
+    reserve.liquidityIndex = uint128(result);
   }
 
   /**
@@ -211,13 +215,13 @@ library ReserveLogic {
     address interestRateStrategyAddress
   ) external {
     require(reserve.aTokenAddress == address(0), Errors.RESERVE_ALREADY_INITIALIZED);
-    if (reserve.lastLiquidityIndex == 0) {
+    if (reserve.liquidityIndex == 0) {
       //if the reserve has not been initialized yet
-      reserve.lastLiquidityIndex = uint128(WadRayMath.ray());
+      reserve.liquidityIndex = uint128(WadRayMath.ray());
     }
 
-    if (reserve.lastVariableBorrowIndex == 0) {
-      reserve.lastVariableBorrowIndex = uint128(WadRayMath.ray());
+    if (reserve.variableBorrowIndex == 0) {
+      reserve.variableBorrowIndex = uint128(WadRayMath.ray());
     }
 
     reserve.aTokenAddress = aTokenAddress;
@@ -281,8 +285,8 @@ library ReserveLogic {
       vars.newStableRate,
       vars.currentAvgStableRate,
       vars.newVariableRate,
-      reserve.lastLiquidityIndex,
-      reserve.lastVariableBorrowIndex
+      reserve.liquidityIndex,
+      reserve.variableBorrowIndex
     );
   }
 }
diff --git a/contracts/libraries/logic/ValidationLogic.sol b/contracts/libraries/logic/ValidationLogic.sol
index 2bd29503..b88c065b 100644
--- a/contracts/libraries/logic/ValidationLogic.sol
+++ b/contracts/libraries/logic/ValidationLogic.sol
@@ -190,7 +190,7 @@ library ValidationLogic {
       require(vars.stableRateBorrowingEnabled, Errors.STABLE_BORROWING_NOT_ENABLED);
 
       require(
-        !userConfig.isUsingAsCollateral(reserve.index) ||
+        !userConfig.isUsingAsCollateral(reserve.id) ||
           reserve.configuration.getLtv() == 0 ||
           amount > IERC20(reserve.aTokenAddress).balanceOf(userAddress),
         Errors.CALLATERAL_SAME_AS_BORROWING_CURRENCY
@@ -274,7 +274,7 @@ library ValidationLogic {
       require(stableRateEnabled, Errors.STABLE_BORROWING_NOT_ENABLED);
 
       require(
-        !userConfig.isUsingAsCollateral(reserve.index) ||
+        !userConfig.isUsingAsCollateral(reserve.id) ||
           reserve.configuration.getLtv() == 0 ||
           stableBorrowBalance.add(variableBorrowBalance) >
           IERC20(reserve.aTokenAddress).balanceOf(msg.sender),
diff --git a/contracts/tokenization/AToken.sol b/contracts/tokenization/AToken.sol
index 53870c24..d4558836 100644
--- a/contracts/tokenization/AToken.sol
+++ b/contracts/tokenization/AToken.sol
@@ -23,25 +23,12 @@ contract AToken is VersionedInitializable, ERC20, IAToken {
   using SafeERC20 for ERC20;
 
   uint256 public constant UINT_MAX_VALUE = uint256(-1);
-
   address public immutable UNDERLYING_ASSET_ADDRESS;
-
-  mapping(address => uint256) private _userIndexes;
-  mapping(address => address) private _interestRedirectionAddresses;
-  mapping(address => uint256) private _redirectedBalances;
-  mapping(address => address) private _interestRedirectionAllowances;
-
-  LendingPool private immutable _pool;
-
   uint256 public constant ATOKEN_REVISION = 0x1;
+  LendingPool public immutable POOL;
 
   modifier onlyLendingPool {
-    require(msg.sender == address(_pool), Errors.CALLER_MUST_BE_LENDING_POOL);
-    _;
-  }
-
-  modifier whenTransferAllowed(address from, uint256 amount) {
-    require(isTransferAllowed(from, amount), Errors.TRANSFER_NOT_ALLOWED);
+    require(msg.sender == address(POOL), Errors.CALLER_MUST_BE_LENDING_POOL);
     _;
   }
 
@@ -51,7 +38,7 @@ contract AToken is VersionedInitializable, ERC20, IAToken {
     string memory tokenName,
     string memory tokenSymbol
   ) public ERC20(tokenName, tokenSymbol, 18) {
-    _pool = pool;
+    POOL = pool;
     UNDERLYING_ASSET_ADDRESS = underlyingAssetAddress;
   }
 
@@ -69,56 +56,6 @@ contract AToken is VersionedInitializable, ERC20, IAToken {
     _setDecimals(underlyingAssetDecimals);
   }
 
-  /**
-   * @notice ERC20 implementation internal function backing transfer() and transferFrom()
-   * @dev validates the transfer before allowing it. NOTE: This is not standard ERC20 behavior
-   **/
-  function _transfer(
-    address from,
-    address to,
-    uint256 amount
-  ) internal override whenTransferAllowed(from, amount) {
-    _executeTransfer(from, to, amount);
-  }
-
-  /**
-   * @dev redirects the interest generated to a target address.
-   * when the interest is redirected, the user balance is added to
-   * the recepient redirected balance.
-   * @param to the address to which the interest will be redirected
-   **/
-  function redirectInterestStream(address to) external override {
-    _redirectInterestStream(msg.sender, to);
-  }
-
-  /**
-   * @dev redirects the interest generated by from to a target address.
-   * when the interest is redirected, the user balance is added to
-   * the recepient redirected balance. The caller needs to have allowance on
-   * the interest redirection to be able to execute the function.
-   * @param from the address of the user whom interest is being redirected
-   * @param to the address to which the interest will be redirected
-   **/
-  function redirectInterestStreamOf(address from, address to) external override {
-    require(
-      msg.sender == _interestRedirectionAllowances[from],
-      Errors.INTEREST_REDIRECTION_NOT_ALLOWED
-    );
-    _redirectInterestStream(from, to);
-  }
-
-  /**
-   * @dev gives allowance to an address to execute the interest redirection
-   * on behalf of the caller.
-   * @param to the address to which the interest will be redirected. Pass address(0) to reset
-   * the allowance.
-   **/
-  function allowInterestRedirectionTo(address to) external override {
-    require(to != msg.sender, Errors.CANNOT_GIVE_ALLOWANCE_TO_HIMSELF);
-    _interestRedirectionAllowances[msg.sender] = to;
-    emit InterestRedirectionAllowanceChanged(msg.sender, to);
-  }
-
   /**
    * @dev burns the aTokens and sends the equivalent amount of underlying to the target.
    * only lending pools can call this function
@@ -126,37 +63,24 @@ contract AToken is VersionedInitializable, ERC20, IAToken {
    **/
   function burn(
     address user,
-    address underlyingTarget,
-    uint256 amount
+    address receiverOfUnderlying,
+    uint256 amount,
+    uint256 index
   ) external override onlyLendingPool {
-    //cumulates the balance of the user
-    (, uint256 currentBalance, uint256 balanceIncrease) = _calculateBalanceIncrease(user);
 
-    //if the user is redirecting his interest towards someone else,
-    //we update the redirected balance of the redirection address by adding the accrued interest,
-    //and removing the amount to redeem
-    _updateRedirectedBalanceOfRedirectionAddress(user, balanceIncrease, amount);
+    uint256 currentBalance = balanceOf(user);
 
-    if (balanceIncrease > amount) {
-      _mint(user, balanceIncrease.sub(amount));
-    } else {
-      _burn(user, amount.sub(balanceIncrease));
-    }
+    require(amount <= currentBalance, Errors.INVALID_ATOKEN_BALANCE);
 
-    uint256 userIndex = 0;
+    uint256 scaledAmount = amount.rayDiv(index);
 
-    //reset the user data if the remaining balance is 0
-    if (currentBalance.sub(amount) == 0) {
-      _resetDataOnZeroBalance(user);
-    } else {
-      //updates the user index
-      userIndex = _userIndexes[user] = _pool.getReserveNormalizedIncome(UNDERLYING_ASSET_ADDRESS);
-    }
+    _burn(user, scaledAmount);
 
     //transfers the underlying to the target
-    ERC20(UNDERLYING_ASSET_ADDRESS).safeTransfer(underlyingTarget, amount);
+    ERC20(UNDERLYING_ASSET_ADDRESS).safeTransfer(receiverOfUnderlying, amount);
 
-    emit Burn(msg.sender, underlyingTarget, amount, balanceIncrease, userIndex);
+
+    emit Burn(msg.sender, receiverOfUnderlying, amount, index);
   }
 
   /**
@@ -165,22 +89,15 @@ contract AToken is VersionedInitializable, ERC20, IAToken {
    * @param user the address receiving the minted tokens
    * @param amount the amount of tokens to mint
    */
-  function mint(address user, uint256 amount) external override onlyLendingPool {
-    //cumulates the balance of the user
-    (, , uint256 balanceIncrease) = _calculateBalanceIncrease(user);
+  function mint(address user, uint256 amount, uint256 index) external override onlyLendingPool {
 
-    //updates the user index
-    uint256 index = _userIndexes[user] = _pool.getReserveNormalizedIncome(UNDERLYING_ASSET_ADDRESS);
-
-    //if the user is redirecting his interest towards someone else,
-    //we update the redirected balance of the redirection address by adding the accrued interest
-    //and the amount deposited
-    _updateRedirectedBalanceOfRedirectionAddress(user, balanceIncrease.add(amount), 0);
 
+    uint256 scaledAmount = amount.rayDiv(index);
+ 
     //mint an equivalent amount of tokens to cover the new deposit
-    _mint(user, amount.add(balanceIncrease));
+    _mint(user,scaledAmount);
 
-    emit Mint(user, amount, balanceIncrease, index);
+    emit Mint(user, amount, index);
   }
 
   /**
@@ -197,52 +114,26 @@ contract AToken is VersionedInitializable, ERC20, IAToken {
   ) external override onlyLendingPool {
     //being a normal transfer, the Transfer() and BalanceTransfer() are emitted
     //so no need to emit a specific event here
-    _executeTransfer(from, to, value);
+    _transfer(from, to, value, false);
   }
 
   /**
    * @dev calculates the balance of the user, which is the
-   * principal balance + interest generated by the principal balance + interest generated by the redirected balance
+   * principal balance + interest generated by the principal balance 
    * @param user the user for which the balance is being calculated
    * @return the total balance of the user
    **/
   function balanceOf(address user) public override(ERC20, IERC20) view returns (uint256) {
-    //current principal balance of the user
-    uint256 currentPrincipalBalance = super.balanceOf(user);
-    //balance redirected by other users to user for interest rate accrual
-    uint256 redirectedBalance = _redirectedBalances[user];
-
-    if (currentPrincipalBalance == 0 && redirectedBalance == 0) {
-      return 0;
-    }
-    //if the user is not redirecting the interest to anybody, accrues
-    //the interest for himself
-
-    if (_interestRedirectionAddresses[user] == address(0)) {
-      //accruing for himself means that both the principal balance and
-      //the redirected balance partecipate in the interest
-      return
-        _calculateCumulatedBalance(user, currentPrincipalBalance.add(redirectedBalance)).sub(
-          redirectedBalance
-        );
-    } else {
-      //if the user redirected the interest, then only the redirected
-      //balance generates interest. In that case, the interest generated
-      //by the redirected balance is added to the current principal balance.
-      return
-        currentPrincipalBalance.add(
-          _calculateCumulatedBalance(user, redirectedBalance).sub(redirectedBalance)
-        );
-    }
+    return super.balanceOf(user).rayMul(POOL.getReserveNormalizedIncome(UNDERLYING_ASSET_ADDRESS));
   }
 
   /**
-   * @dev returns the principal balance of the user. The principal balance is the last
-   * updated stored balance, which does not consider the perpetually accruing interest.
+   * @dev returns the scaled balance of the user. The scaled balance is the sum of all the
+   * updated stored balance divided the reserve index at the moment of the update
    * @param user the address of the user
-   * @return the principal balance of the user
+   * @return the scaled balance of the user
    **/
-  function principalBalanceOf(address user) external override view returns (uint256) {
+  function scaledBalanceOf(address user) external override view returns (uint256) {
     return super.balanceOf(user);
   }
 
@@ -253,17 +144,15 @@ contract AToken is VersionedInitializable, ERC20, IAToken {
    * @return the current total supply
    **/
   function totalSupply() public override(ERC20, IERC20) view returns (uint256) {
-    uint256 currentSupplyPrincipal = super.totalSupply();
+    uint256 currentSupplyScaled = super.totalSupply();
 
-    if (currentSupplyPrincipal == 0) {
+    if (currentSupplyScaled == 0) {
       return 0;
     }
 
     return
-      currentSupplyPrincipal
-        .wadToRay()
-        .rayMul(_pool.getReserveNormalizedIncome(UNDERLYING_ASSET_ADDRESS))
-        .rayToWad();
+      currentSupplyScaled
+        .rayMul(POOL.getReserveNormalizedIncome(UNDERLYING_ASSET_ADDRESS));
   }
 
   /**
@@ -273,284 +162,16 @@ contract AToken is VersionedInitializable, ERC20, IAToken {
    * @return true if the user can transfer amount, false otherwise
    **/
   function isTransferAllowed(address user, uint256 amount) public override view returns (bool) {
-    return _pool.balanceDecreaseAllowed(UNDERLYING_ASSET_ADDRESS, user, amount);
+    return POOL.balanceDecreaseAllowed(UNDERLYING_ASSET_ADDRESS, user, amount);
   }
 
   /**
-   * @dev returns the last index of the user, used to calculate the balance of the user
-   * @param user address of the user
-   * @return the last user index
-   **/
-  function getUserIndex(address user) external override view returns (uint256) {
-    return _userIndexes[user];
-  }
-
-  /**
-   * @dev returns the address to which the interest is redirected
-   * @param user address of the user
-   * @return 0 if there is no redirection, an address otherwise
-   **/
-  function getInterestRedirectionAddress(address user) external override view returns (address) {
-    return _interestRedirectionAddresses[user];
-  }
-
-  /**
-   * @dev returns the redirected balance of the user. The redirected balance is the balance
-   * redirected by other accounts to the user, that is accrueing interest for him.
-   * @param user address of the user
-   * @return the total redirected balance
-   **/
-  function getRedirectedBalance(address user) external override view returns (uint256) {
-    return _redirectedBalances[user];
-  }
-
-  /**
-   * @dev calculates the increase in balance since the last user action
-   * @param user the address of the user
-   * @return the last user principal balance, the current balance and the balance increase
-   **/
-  function _calculateBalanceIncrease(address user)
-    internal
-    view
-    returns (
-      uint256,
-      uint256,
-      uint256
-    )
-  {
-    uint256 currentBalance = balanceOf(user);
-    uint256 balanceIncrease = 0;
-    uint256 previousBalance = 0;
-
-    if (currentBalance != 0) {
-      previousBalance = super.balanceOf(user);
-      //calculate the accrued interest since the last accumulation
-      balanceIncrease = currentBalance.sub(previousBalance);
-    }
-
-    return (previousBalance, currentBalance, balanceIncrease);
-  }
-
-  /**
-   * @dev accumulates the accrued interest of the user to the principal balance
-   * @param user the address of the user for which the interest is being accumulated
-   * @return the previous principal balance, the new principal balance, the balance increase
-   * and the new user index
-   **/
-  function _cumulateBalance(address user)
-    internal
-    returns (
-      uint256,
-      uint256,
-      uint256,
-      uint256
-    )
-  {
-    (
-      uint256 previousBalance,
-      uint256 currentBalance,
-      uint256 balanceIncrease
-    ) = _calculateBalanceIncrease(user);
-
-    _mint(user, balanceIncrease);
-
-    //updates the user index
-    uint256 index = _userIndexes[user] = _pool.getReserveNormalizedIncome(UNDERLYING_ASSET_ADDRESS);
-
-    return (previousBalance, currentBalance, balanceIncrease, index);
-  }
-
-  /**
-   * @dev updates the redirected balance of the user. If the user is not redirecting his
-   * interest, nothing is executed.
-   * @param user the address of the user for which the interest is being accumulated
-   * @param balanceToAdd the amount to add to the redirected balance
-   * @param balanceToRemove the amount to remove from the redirected balance
-   **/
-  function _updateRedirectedBalanceOfRedirectionAddress(
-    address user,
-    uint256 balanceToAdd,
-    uint256 balanceToRemove
-  ) internal {
-    address redirectionAddress = _interestRedirectionAddresses[user];
-    //if there isn't any redirection, nothing to be done
-    if (redirectionAddress == address(0)) {
-      return;
-    }
-
-    //compound balances of the redirected address
-    (, , uint256 balanceIncrease, uint256 index) = _cumulateBalance(redirectionAddress);
-
-    //updating the redirected balance
-    _redirectedBalances[redirectionAddress] = _redirectedBalances[redirectionAddress]
-      .add(balanceToAdd)
-      .sub(balanceToRemove);
-
-    //if the interest of redirectionAddress is also being redirected, we need to update
-    //the redirected balance of the redirection target by adding the balance increase
-    address targetOfRedirectionAddress = _interestRedirectionAddresses[redirectionAddress];
-
-    // if the redirection address is also redirecting the interest, we accumulate his balance
-    // and update his chain of redirection
-    if (targetOfRedirectionAddress != address(0)) {
-      _updateRedirectedBalanceOfRedirectionAddress(redirectionAddress, balanceIncrease, 0);
-    }
-
-    emit RedirectedBalanceUpdated(
-      redirectionAddress,
-      balanceIncrease,
-      index,
-      balanceToAdd,
-      balanceToRemove
-    );
-  }
-
-  /**
-   * @dev calculate the interest accrued by user on a specific balance
-   * @param user the address of the user for which the interest is being accumulated
-   * @param balance the balance on which the interest is calculated
-   * @return the interest rate accrued
-   **/
-  function _calculateCumulatedBalance(address user, uint256 balance)
-    internal
-    view
-    returns (uint256)
-  {
-    return
-      balance
-        .wadToRay()
-        .rayMul(_pool.getReserveNormalizedIncome(UNDERLYING_ASSET_ADDRESS))
-        .rayDiv(_userIndexes[user])
-        .rayToWad();
-  }
-
-  /**
-   * @dev executes the transfer of aTokens, invoked by both _transfer() and
-   *      transferOnLiquidation()
-   * @param from the address from which transfer the aTokens
-   * @param to the destination address
-   * @param value the amount to transfer
-   **/
-  function _executeTransfer(
-    address from,
-    address to,
-    uint256 value
-  ) internal {
-    require(value > 0, Errors.TRANSFER_AMOUNT_NOT_GT_0);
-
-    //cumulate the balance of the sender
-    (, uint256 fromBalance, uint256 fromBalanceIncrease, uint256 fromIndex) = _cumulateBalance(
-      from
-    );
-
-    //cumulate the balance of the receiver
-    (, , uint256 toBalanceIncrease, uint256 toIndex) = _cumulateBalance(to);
-
-    //if the sender is redirecting his interest towards someone else,
-    //adds to the redirected balance the accrued interest and removes the amount
-    //being transferred
-    _updateRedirectedBalanceOfRedirectionAddress(from, fromBalanceIncrease, value);
-
-    //if the receiver is redirecting his interest towards someone else,
-    //adds to the redirected balance the accrued interest and the amount
-    //being transferred
-    _updateRedirectedBalanceOfRedirectionAddress(to, toBalanceIncrease.add(value), 0);
-
-    //performs the transfer
-    super._transfer(from, to, value);
-
-    bool fromIndexReset = false;
-    //reset the user data if the remaining balance is 0
-    if (fromBalance.sub(value) == 0 && from != to) {
-      fromIndexReset = _resetDataOnZeroBalance(from);
-    }
-
-    emit BalanceTransfer(
-      from,
-      to,
-      value,
-      fromBalanceIncrease,
-      toBalanceIncrease,
-      fromIndexReset ? 0 : fromIndex,
-      toIndex
-    );
-  }
-
-  /**
-   * @dev executes the redirection of the interest from one address to another.
-   * immediately after redirection, the destination address will start to accrue interest.
-   * @param from the address from which transfer the aTokens
-   * @param to the destination address
-   **/
-  function _redirectInterestStream(address from, address to) internal {
-    address currentRedirectionAddress = _interestRedirectionAddresses[from];
-
-    require(to != currentRedirectionAddress, Errors.INTEREST_ALREADY_REDIRECTED);
-
-    //accumulates the accrued interest to the principal
-    (
-      uint256 previousPrincipalBalance,
-      uint256 fromBalance,
-      uint256 balanceIncrease,
-      uint256 fromIndex
-    ) = _cumulateBalance(from);
-
-    require(fromBalance > 0, Errors.NO_VALID_BALANCE_FOR_REDIRECTION);
-
-    //if the user is already redirecting the interest to someone, before changing
-    //the redirection address we substract the redirected balance of the previous
-    //recipient
-    if (currentRedirectionAddress != address(0)) {
-      _updateRedirectedBalanceOfRedirectionAddress(from, 0, previousPrincipalBalance);
-    }
-
-    //if the user is redirecting the interest back to himself,
-    //we simply set to 0 the interest redirection address
-    if (to == from) {
-      _interestRedirectionAddresses[from] = address(0);
-      emit InterestStreamRedirected(from, address(0), fromBalance, balanceIncrease, fromIndex);
-      return;
-    }
-
-    //first set the redirection address to the new recipient
-    _interestRedirectionAddresses[from] = to;
-
-    //adds the user balance to the redirected balance of the destination
-    _updateRedirectedBalanceOfRedirectionAddress(from, fromBalance, 0);
-
-    emit InterestStreamRedirected(from, to, fromBalance, balanceIncrease, fromIndex);
-  }
-
-  /**
-   * @dev function to reset the interest stream redirection and the user index, if the
-   * user has no balance left.
-   * @param user the address of the user
-   * @return true if the user index has also been reset, false otherwise. useful to emit the proper user index value
-   **/
-  function _resetDataOnZeroBalance(address user) internal returns (bool) {
-    //if the user has 0 principal balance, the interest stream redirection gets reset
-    _interestRedirectionAddresses[user] = address(0);
-
-    //emits a InterestStreamRedirected event to notify that the redirection has been reset
-    emit InterestStreamRedirected(user, address(0), 0, 0, 0);
-
-    //if the redirected balance is also 0, we clear up the user index
-    if (_redirectedBalances[user] == 0) {
-      _userIndexes[user] = 0;
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  /**
-   * @dev transfers the underlying asset to the target. Used by the lendingpool to transfer
-   * assets in borrow(), redeem() and flashLoan()
-   * @param target the target of the transfer
-   * @param amount the amount to transfer
-   * @return the amount transferred
-   **/
-
+  * @dev transfers the underlying asset to the target. Used by the lendingpool to transfer
+  * assets in borrow(), redeem() and flashLoan()
+  * @param target the target of the transfer
+  * @param amount the amount to transfer
+  * @return the amount transferred
+  **/
   function transferUnderlyingTo(address target, uint256 amount)
     external
     override
@@ -561,6 +182,34 @@ contract AToken is VersionedInitializable, ERC20, IAToken {
     return amount;
   }
 
+  function _transfer(
+    address from,
+    address to,
+    uint256 amount,
+    bool validate
+  ) internal  {
+    if(validate){
+      require(isTransferAllowed(from, amount), Errors.TRANSFER_NOT_ALLOWED);
+    }
+
+    uint256 index = POOL.getReserveNormalizedIncome(UNDERLYING_ASSET_ADDRESS);
+
+    uint256 scaledAmount = amount.rayDiv(index);
+
+    super._transfer(from, to, scaledAmount);
+
+    emit BalanceTransfer(from, to, amount, index);
+
+  }
+  
+  function _transfer(
+    address from,
+    address to,
+    uint256 amount
+    ) internal override {
+
+      _transfer(from, to, amount, true);
+  }
   /**
    * @dev aTokens should not receive ETH
    **/
diff --git a/contracts/tokenization/interfaces/IAToken.sol b/contracts/tokenization/interfaces/IAToken.sol
index 65ad0cfa..873860a9 100644
--- a/contracts/tokenization/interfaces/IAToken.sol
+++ b/contracts/tokenization/interfaces/IAToken.sol
@@ -8,115 +8,48 @@ interface IAToken is IERC20 {
    * @dev emitted after aTokens are burned
    * @param from the address performing the redeem
    * @param value the amount to be redeemed
-   * @param fromBalanceIncrease the cumulated balance since the last update of the user
-   * @param fromIndex the last index of the user
+   * @param index the last index of the reserve
    **/
   event Burn(
     address indexed from,
     address indexed target,
     uint256 value,
-    uint256 fromBalanceIncrease,
-    uint256 fromIndex
+    uint256 index
   );
 
   /**
    * @dev emitted after the mint action
    * @param from the address performing the mint
    * @param value the amount to be minted
-   * @param fromBalanceIncrease the cumulated balance since the last update of the user
-   * @param fromIndex the last index of the user
+   * @param index the last index of the reserve
    **/
-  event Mint(address indexed from, uint256 value, uint256 fromBalanceIncrease, uint256 fromIndex);
+  event Mint(address indexed from, uint256 value, uint256 index);
 
   /**
    * @dev emitted during the transfer action
    * @param from the address from which the tokens are being transferred
    * @param to the adress of the destination
    * @param value the amount to be minted
-   * @param fromBalanceIncrease the cumulated balance since the last update of the user
-   * @param toBalanceIncrease the cumulated balance since the last update of the destination
-   * @param fromIndex the last index of the user
-   * @param toIndex the last index of the liquidator
+   * @param index the last index of the reserve
    **/
   event BalanceTransfer(
     address indexed from,
     address indexed to,
     uint256 value,
-    uint256 fromBalanceIncrease,
-    uint256 toBalanceIncrease,
-    uint256 fromIndex,
-    uint256 toIndex
+    uint256 index
   );
 
-  /**
-   * @dev emitted when the accumulation of the interest
-   * by an user is redirected to another user
-   * @param from the address from which the interest is being redirected
-   * @param to the adress of the destination
-   * @param fromBalanceIncrease the cumulated balance since the last update of the user
-   * @param fromIndex the last index of the user
-   **/
-  event InterestStreamRedirected(
-    address indexed from,
-    address indexed to,
-    uint256 redirectedBalance,
-    uint256 fromBalanceIncrease,
-    uint256 fromIndex
-  );
-
-  /**
-   * @dev emitted when the redirected balance of an user is being updated
-   * @param targetAddress the address of which the balance is being updated
-   * @param targetBalanceIncrease the cumulated balance since the last update of the target
-   * @param targetIndex the last index of the user
-   * @param redirectedBalanceAdded the redirected balance being added
-   * @param redirectedBalanceRemoved the redirected balance being removed
-   **/
-  event RedirectedBalanceUpdated(
-    address indexed targetAddress,
-    uint256 targetBalanceIncrease,
-    uint256 targetIndex,
-    uint256 redirectedBalanceAdded,
-    uint256 redirectedBalanceRemoved
-  );
-
-  event InterestRedirectionAllowanceChanged(address indexed from, address indexed to);
-
-  /**
-   * @dev redirects the interest generated to a target address.
-   * when the interest is redirected, the user balance is added to
-   * the recepient redirected balance.
-   * @param to the address to which the interest will be redirected
-   **/
-  function redirectInterestStream(address to) external;
-
-  /**
-   * @dev redirects the interest generated by from to a target address.
-   * when the interest is redirected, the user balance is added to
-   * the recepient redirected balance. The caller needs to have allowance on
-   * the interest redirection to be able to execute the function.
-   * @param from the address of the user whom interest is being redirected
-   * @param to the address to which the interest will be redirected
-   **/
-  function redirectInterestStreamOf(address from, address to) external;
-
-  /**
-   * @dev gives allowance to an address to execute the interest redirection
-   * on behalf of the caller.
-   * @param to the address to which the interest will be redirected. Pass address(0) to reset
-   * the allowance.
-   **/
-  function allowInterestRedirectionTo(address to) external;
-
   /**
    * @dev burns the aTokens and sends the equivalent amount of underlying to the target.
    * only lending pools can call this function
    * @param amount the amount being burned
+   * @param index the liquidity index
    **/
   function burn(
     address user,
     address underlyingTarget,
-    uint256 amount
+    uint256 amount,
+    uint256 index
   ) external;
 
   /**
@@ -124,8 +57,9 @@ interface IAToken is IERC20 {
    * only lending pools can call this function
    * @param user the address receiving the minted tokens
    * @param amount the amount of tokens to mint
+   * @param index the liquidity index
    */
-  function mint(address user, uint256 amount) external;
+  function mint(address user, uint256 amount, uint256 index) external;
 
   /**
    * @dev transfers tokens in the event of a borrow being liquidated, in case the liquidators reclaims the aToken
@@ -146,7 +80,7 @@ interface IAToken is IERC20 {
    * @param user the address of the user
    * @return the principal balance of the user
    **/
-  function principalBalanceOf(address user) external view returns (uint256);
+  function scaledBalanceOf(address user) external view returns (uint256);
 
   /**
    * @dev Used to validate transfers before actually executing them.
@@ -157,34 +91,11 @@ interface IAToken is IERC20 {
   function isTransferAllowed(address user, uint256 amount) external view returns (bool);
 
   /**
-   * @dev returns the last index of the user, used to calculate the balance of the user
+   * @dev transfer the amount of the underlying asset to the user
    * @param user address of the user
-   * @return the last user index
-   **/
-  function getUserIndex(address user) external view returns (uint256);
-
-  /**
-   * @dev returns the address to which the interest is redirected
-   * @param user address of the user
-   * @return 0 if there is no redirection, an address otherwise
-   **/
-  function getInterestRedirectionAddress(address user) external view returns (address);
-
-  /**
-   * @dev returns the redirected balance of the user. The redirected balance is the balance
-   * redirected by other accounts to the user, that is accrueing interest for him.
-   * @param user address of the user
-   * @return the total redirected balance
-   **/
-  function getRedirectedBalance(address user) external view returns (uint256);
-
-  /**
-   * @dev transfers the underlying asset to the target. Used by the lendingpool to transfer
-   * assets in borrow(), redeem() and flashLoan()
-   * @param target the target of the transfer
    * @param amount the amount to transfer
    * @return the amount transferred
    **/
 
-  function transferUnderlyingTo(address target, uint256 amount) external returns (uint256);
+  function transferUnderlyingTo(address user, uint256 amount) external returns (uint256);
 }
diff --git a/deployed-contracts.json b/deployed-contracts.json
index 5abe0277..d3f80214 100644
--- a/deployed-contracts.json
+++ b/deployed-contracts.json
@@ -5,7 +5,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xf8c6eB390cDc5C08717bC2268aa0c1169A9B5deE",
+      "address": "0x9Dc554694756dC303a087e04bA6918C333Bc26a7",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -15,7 +15,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x4a716924Dad0c0d0E558844F304548814e7089F1",
+      "address": "0xAfC307938C1c0035942c141c31524504c89Aaa8B",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -25,7 +25,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x798c5b4b62b1eA9D64955D6751B03075A003F123",
+      "address": "0x73DE1e0ab6A5C221258703bc546E0CAAcCc6EC87",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -53,7 +53,7 @@
       "address": "0x6642B57e4265BAD868C17Fc1d1F4F88DBBA04Aa8"
     },
     "localhost": {
-      "address": "0x6642B57e4265BAD868C17Fc1d1F4F88DBBA04Aa8"
+      "address": "0x65e0Cd5B8904A02f2e00BC6f58bf881998D54BDe"
     }
   },
   "LendingPoolDataProvider": {
@@ -66,7 +66,7 @@
       "address": "0xD9273d497eDBC967F39d419461CfcF382a0A822e"
     },
     "localhost": {
-      "address": "0xD9273d497eDBC967F39d419461CfcF382a0A822e"
+      "address": "0x5d12dDe3286D94E0d85F9D3B01B7099cfA0aBCf1"
     }
   },
   "PriceOracle": {
@@ -75,7 +75,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x1750499D05Ed1674d822430FB960d5F6731fDf64",
+      "address": "0xbeA90474c2F3C7c43bC7c36CaAf5272c927Af5a1",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -85,7 +85,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xEC1C93A9f6a9e18E97784c76aC52053587FcDB89",
+      "address": "0x19E42cA990cF697D3dda0e59131215C43bB6989F",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -95,7 +95,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x7B6C3e5486D9e6959441ab554A889099eed76290",
+      "address": "0xE30c3983E51bC9d6baE3E9437710a1459e21e81F",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -105,7 +105,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xD83D2773a7873ae2b5f8Fb92097e20a8C64F691E",
+      "address": "0xDf69898e844197a24C658CcF9fD53dF15948dc8b",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -115,7 +115,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x626FdE749F9d499d3777320CAf29484B624ab84a",
+      "address": "0xBe6d8642382C241c9B4B50c89574DbF3f4181E7D",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -169,7 +169,7 @@
       "address": "0x2B681757d757fbB80cc51c6094cEF5eE75bF55aA"
     },
     "localhost": {
-      "address": "0x2B681757d757fbB80cc51c6094cEF5eE75bF55aA"
+      "address": "0xAd49512dFBaD6fc13D67d3935283c0606812E962"
     }
   },
   "WalletBalanceProvider": {
@@ -178,7 +178,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xBEF0d4b9c089a5883741fC14cbA352055f35DDA2",
+      "address": "0xA29C2A7e59aa49C71aF084695337E3AA5e820758",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -188,7 +188,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x11df1AF606b85226Ab9a8B1FDa90395298e7494F",
+      "address": "0xbe66dC9DFEe580ED968403e35dF7b5159f873df8",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -198,7 +198,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x8f9A92c125FFEb83d8eC808Cd9f8cb80084c1E37",
+      "address": "0x93AfC6Df4bB8F62F2493B19e577f8382c0BA9EBC",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -208,7 +208,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xc4007844AE6bBe168cE8D692C86a7A4414FBcD26",
+      "address": "0x75Ded61646B5945BdDd0CD9a9Db7c8288DA6F810",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -218,7 +218,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xAb768C858C33DfcB6651d1174AFb750433a87Be0",
+      "address": "0xdE7c40e675bF1aA45c18cCbaEb9662B16b0Ddf7E",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -228,7 +228,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xA089557D64DAE4b4FcB65aB7C8A520AABb213e37",
+      "address": "0xDFbeeed692AA81E7f86E72F7ACbEA2A1C4d63544",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -238,7 +238,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x20FAE2042b362E3FaB2806820b9A43CC116e2846",
+      "address": "0x5191aA68c7dB195181Dd2441dBE23A48EA24b040",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -248,7 +248,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x8880F314112f15C2AfF674c3B27f9a44Ca86e4d0",
+      "address": "0x8F9422aa37215c8b3D1Ea1674138107F84D68F26",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -258,7 +258,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xDcb10C2e15110Db4B02C0a1df459768E680ce245",
+      "address": "0xa89E20284Bd638F31b0011D0fC754Fc9d2fa73e3",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -268,7 +268,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xfD408ec64Da574b1859814F810564f73ea2Ff003",
+      "address": "0xaA935993065F2dDB1d13623B1941C7AEE3A60F23",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -278,7 +278,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x0006F7c3542BEE76Dd887f54eD22405Ac4ae905a",
+      "address": "0x35A2624888e207e4B3434E9a9E250bF6Ee68FeA3",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -288,7 +288,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x6ca94a51c644eca3F9CA315bcC41CbA6940A66Eb",
+      "address": "0x1f569c307949a908A4b8Ff7453a88Ca0b8D8df13",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -298,7 +298,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x6765291Cab755B980F377445eFd0F9F945CDA6C4",
+      "address": "0x4301cb254CCc126B9eb9cbBE030C6FDA2FA16D4a",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -308,7 +308,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xa7dB4d25Fc525d19Fbda4E74AAF447B88420FbcB",
+      "address": "0x0766c9592a8686CAB0081b4f35449462c6e82F11",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -318,7 +318,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x273D60904A8DBa3Ae6B20505c59902644124fF0E",
+      "address": "0xaF6D34adD35E1A565be4539E4d1069c48A49C953",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -328,7 +328,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xfc37dE87C1Ee39cc856782BF96fEdcB6FA5c5A7f",
+      "address": "0x48bb3E35D2D6994374db457a6Bf61de2d9cC8E49",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -338,7 +338,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x049228dFFEdf91ff224e9F96247aEBA700e3590c",
+      "address": "0x1E59BA56B1F61c3Ee946D8c7e2994B4A9b0cA45C",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -348,7 +348,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xA410D1f3fEAF300842142Cd7AA1709D84944DCb7",
+      "address": "0x53813198c75959DDB604462831d8989C29152164",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -358,7 +358,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x835973768750b3ED2D5c3EF5AdcD5eDb44d12aD4",
+      "address": "0x0eD6115873ce6B807a03FE0df1f940387779b729",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -368,7 +368,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x1181FC27dbF04B5105243E60BB1936c002e9d5C8",
+      "address": "0xFFfDa24e7E3d5F89a24278f53d6f0F81B3bE0d6B",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -378,7 +378,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x6F96975e2a0e1380b6e2e406BB33Ae96e4b6DB65",
+      "address": "0x5889354f21A1C8D8D2f82669d778f6Dab778B519",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -388,7 +388,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xc032930653da193EDE295B4DcE3DD093a695c3b3",
+      "address": "0x09F7bF33B3F8922268B34103af3a8AF83148C9B1",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -398,7 +398,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xb3363f4349b1160DbA55ec4D82fDe874A4123A2a",
+      "address": "0x8f3966F7d53Fd5f12b701C8835e1e32541613869",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -408,7 +408,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xf8c6eB390cDc5C08717bC2268aa0c1169A9B5deE",
+      "address": "0x9Dc554694756dC303a087e04bA6918C333Bc26a7",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -417,7 +417,7 @@
       "address": "0x2cfcA5785261fbC88EFFDd46fCFc04c22525F9e4"
     },
     "localhost": {
-      "address": "0xDf73fC454FA018051D4a1509e63D11530A59DE10"
+      "address": "0x9305d862ee95a899b83906Cd9CB666aC269E5f66"
     }
   },
   "StableDebtToken": {
@@ -426,7 +426,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xB660Fdd109a95718cB9d20E3A89EE6cE342aDcB6",
+      "address": "0x02BB514187B830d6A2111197cd7D8cb60650B970",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -436,13 +436,13 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x830bceA96E56DBC1F8578f75fBaC0AF16B32A07d",
+      "address": "0x6774Ce86Abf5EBB22E9F45b5f55daCbB4170aD7f",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "AToken": {
     "localhost": {
-      "address": "0xA0AB1cB92A4AF81f84dCd258155B5c25D247b54E",
+      "address": "0x007C1a44e85bDa8F562F916685A9DC8BdC6542bF",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "buidlerevm": {
@@ -456,7 +456,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x1203D1b97BF6E546c00C45Cda035D3010ACe1180",
+      "address": "0xFBdF1E93D0D88145e3CcA63bf8d513F83FB0903b",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -466,7 +466,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x2cc20bE530F92865c2ed8CeD0b020a11bFe62Fe7",
+      "address": "0xEcb928A3c079a1696Aa5244779eEc3dE1717fACd",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -476,7 +476,7 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0x8733AfE8174BA7c04c6CD694bD673294079b7E10",
+      "address": "0xE45fF4A0A8D0E9734C73874c034E03594E15ba28",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -486,13 +486,16 @@
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     },
     "localhost": {
-      "address": "0xA8083d78B6ABC328b4d3B714F76F384eCC7147e1",
+      "address": "0x5cCC6Abc4c9F7262B9485797a848Ec6CC28A11dF",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "MockSwapAdapter": {
     "buidlerevm": {
       "address": "0xBEF0d4b9c089a5883741fC14cbA352055f35DDA2"
+    },
+    "localhost": {
+      "address": "0x749258D38b0473d96FEcc14cC5e7DCE12d7Bd6f6"
     }
   }
 }
\ No newline at end of file
diff --git a/helpers/types.ts b/helpers/types.ts
index 79a810c2..083d043e 100644
--- a/helpers/types.ts
+++ b/helpers/types.ts
@@ -78,11 +78,8 @@ export enum ProtocolErrors {
 
   // require error messages - aToken
   CALLER_MUST_BE_LENDING_POOL = '28', // 'The caller of this function must be a lending pool'
-  INTEREST_REDIRECTION_NOT_ALLOWED = '29', // 'Caller is not allowed to redirect the interest of the user'
   CANNOT_GIVE_ALLOWANCE_TO_HIMSELF = '30', // 'User cannot give allowance to himself'
   TRANSFER_AMOUNT_NOT_GT_0 = '31', // 'Transferred amount needs to be greater than zero'
-  INTEREST_ALREADY_REDIRECTED = '32', // 'Interest is already redirected to the user'
-  NO_VALID_BALANCE_FOR_REDIRECTION = '33', // 'Interest stream can only be redirected if there is a valid balance'
 
   // require error messages - ReserveLogic
   RESERVE_ALREADY_INITIALIZED = '34', // 'Reserve has already been initialized'
@@ -107,9 +104,6 @@ export enum ProtocolErrors {
   INVALID_FROM_BALANCE_AFTER_TRANSFER = 'Invalid from balance after transfer',
   INVALID_TO_BALANCE_AFTER_TRANSFER = 'Invalid from balance after transfer',
   INVALID_OWNER_REVERT_MSG = 'Ownable: caller is not the owner',
-  INVALID_REDIRECTED_BALANCE_BEFORE_TRANSFER = 'Invalid redirected balance before transfer',
-  INVALID_REDIRECTED_BALANCE_AFTER_TRANSFER = 'Invalid redirected balance after transfer',
-  INVALID_REDIRECTION_ADDRESS = 'Invalid redirection address',
   INVALID_HF = 'Invalid health factor',
   TRANSFER_AMOUNT_EXCEEDS_BALANCE = 'ERC20: transfer amount exceeds balance',
   SAFEERC20_LOWLEVEL_CALL = 'SafeERC20: low-level call failed',
diff --git a/test.log b/test.log
index 64ab456c..ca8c215e 100644
--- a/test.log
+++ b/test.log
@@ -15,40 +15,14 @@ Compiling...
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Compiled 69 contracts successfully
+Compiled 76 contracts successfully
 
 -> Deploying test environment...
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x6bf16e8f37d22cd7a3ffd23a96d86bc0c7c848d7d808495c5bcd3eb9c33d833b
-contract address: 0x5aFF0C1AC4662850FDd2373fad858616Ef8fD459
+tx: 0x7fa031db361a2b22addc1542eb9dca3b16ddce863e1b52294c94ec3cf9ce1a82
+contract address: 0xbe66dC9DFEe580ED968403e35dF7b5159f873df8
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -58,8 +32,8 @@ gas used: 3770435
 *** DAI ***
 
 Network: localhost
-tx: 0x6bf16e8f37d22cd7a3ffd23a96d86bc0c7c848d7d808495c5bcd3eb9c33d833b
-contract address: 0x5aFF0C1AC4662850FDd2373fad858616Ef8fD459
+tx: 0x7fa031db361a2b22addc1542eb9dca3b16ddce863e1b52294c94ec3cf9ce1a82
+contract address: 0xbe66dC9DFEe580ED968403e35dF7b5159f873df8
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -69,8 +43,8 @@ gas used: 3770435
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0xbe606130c421ef7e968e01c7547567847365d01802e29c67782621e15d1cec6a
-contract address: 0x1F1Fb19B5209E95Cd97Af747072eA6Ed362DF1d6
+tx: 0xbfedacf9ef4b74c7e64c1b5cbb30142abcb758d2f75ebfb7afcbd8f64e985b8c
+contract address: 0x93AfC6Df4bB8F62F2493B19e577f8382c0BA9EBC
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -80,8 +54,8 @@ gas used: 3770555
 *** LEND ***
 
 Network: localhost
-tx: 0xbe606130c421ef7e968e01c7547567847365d01802e29c67782621e15d1cec6a
-contract address: 0x1F1Fb19B5209E95Cd97Af747072eA6Ed362DF1d6
+tx: 0xbfedacf9ef4b74c7e64c1b5cbb30142abcb758d2f75ebfb7afcbd8f64e985b8c
+contract address: 0x93AfC6Df4bB8F62F2493B19e577f8382c0BA9EBC
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -91,8 +65,8 @@ gas used: 3770555
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x1ab2d8c11871f9529c5a16c443f442fa1b49b8d86e0187b7b7b5da9b8767aa7e
-contract address: 0x6876B8Bc59cb68A5cAB8C4F9983Ee023E0726D2E
+tx: 0x77fb425d1e7d898c3d9ef846acd4541625fa0b69caeb1c73a45e81925fa965a4
+contract address: 0x75Ded61646B5945BdDd0CD9a9Db7c8288DA6F810
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -102,8 +76,8 @@ gas used: 3770555
 *** TUSD ***
 
 Network: localhost
-tx: 0x1ab2d8c11871f9529c5a16c443f442fa1b49b8d86e0187b7b7b5da9b8767aa7e
-contract address: 0x6876B8Bc59cb68A5cAB8C4F9983Ee023E0726D2E
+tx: 0x77fb425d1e7d898c3d9ef846acd4541625fa0b69caeb1c73a45e81925fa965a4
+contract address: 0x75Ded61646B5945BdDd0CD9a9Db7c8288DA6F810
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -113,8 +87,8 @@ gas used: 3770555
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x3e4b28ecffee595b88845e50a5c00d4b64f191133704f097e4f71bbc1ce47823
-contract address: 0x58741177c588c5304a9dd02A7BAF7cB19962cA9d
+tx: 0x9279772c3bd0cc7ff7229fac6a46e2a19c46ddd507d15026d758b77f8a9d1934
+contract address: 0xdE7c40e675bF1aA45c18cCbaEb9662B16b0Ddf7E
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -124,8 +98,8 @@ gas used: 3770435
 *** BAT ***
 
 Network: localhost
-tx: 0x3e4b28ecffee595b88845e50a5c00d4b64f191133704f097e4f71bbc1ce47823
-contract address: 0x58741177c588c5304a9dd02A7BAF7cB19962cA9d
+tx: 0x9279772c3bd0cc7ff7229fac6a46e2a19c46ddd507d15026d758b77f8a9d1934
+contract address: 0xdE7c40e675bF1aA45c18cCbaEb9662B16b0Ddf7E
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -135,8 +109,8 @@ gas used: 3770435
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0xf0f7309b900517d70740c14a7d91acb3d51719b1fcd12c0048080f559ca65639
-contract address: 0xd0975173C2a54Bf501f2a9253b59Fb006f73f54A
+tx: 0x6e201e503500ae5ee3b900a7a0970085b2d03e5702c1192ca07cb228d3dde9a9
+contract address: 0xEcb928A3c079a1696Aa5244779eEc3dE1717fACd
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -146,8 +120,8 @@ gas used: 3770555
 *** WETH ***
 
 Network: localhost
-tx: 0xf0f7309b900517d70740c14a7d91acb3d51719b1fcd12c0048080f559ca65639
-contract address: 0xd0975173C2a54Bf501f2a9253b59Fb006f73f54A
+tx: 0x6e201e503500ae5ee3b900a7a0970085b2d03e5702c1192ca07cb228d3dde9a9
+contract address: 0xEcb928A3c079a1696Aa5244779eEc3dE1717fACd
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -157,8 +131,8 @@ gas used: 3770555
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x55f7e61a2ad764e01cfbcba262ae8ca3f8b254630543b378d95d69a54b43e68c
-contract address: 0x888c0eEFc330b0B25eAfe5098DfcE04902142925
+tx: 0x8a2b86528542d7500abbb9af3712b6e2d93a70dccff69ad5fbcc74973be2f0c3
+contract address: 0xDFbeeed692AA81E7f86E72F7ACbEA2A1C4d63544
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -168,8 +142,8 @@ gas used: 3770555
 *** USDC ***
 
 Network: localhost
-tx: 0x55f7e61a2ad764e01cfbcba262ae8ca3f8b254630543b378d95d69a54b43e68c
-contract address: 0x888c0eEFc330b0B25eAfe5098DfcE04902142925
+tx: 0x8a2b86528542d7500abbb9af3712b6e2d93a70dccff69ad5fbcc74973be2f0c3
+contract address: 0xDFbeeed692AA81E7f86E72F7ACbEA2A1C4d63544
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -179,8 +153,8 @@ gas used: 3770555
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0xf93964e1d4ed4b5abe87bfe4cdf585defd8dd90083ab4939face95587c8068b0
-contract address: 0x283BF0d396dB5a0d4477817fd99D4198FCf48836
+tx: 0x759e5c27217595d2b42a14cabfd3fd66bdfe03d8c1976ffed978e3ddaa37bcba
+contract address: 0x5191aA68c7dB195181Dd2441dBE23A48EA24b040
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -190,8 +164,8 @@ gas used: 3770555
 *** USDT ***
 
 Network: localhost
-tx: 0xf93964e1d4ed4b5abe87bfe4cdf585defd8dd90083ab4939face95587c8068b0
-contract address: 0x283BF0d396dB5a0d4477817fd99D4198FCf48836
+tx: 0x759e5c27217595d2b42a14cabfd3fd66bdfe03d8c1976ffed978e3ddaa37bcba
+contract address: 0x5191aA68c7dB195181Dd2441dBE23A48EA24b040
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -201,8 +175,8 @@ gas used: 3770555
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x6b4df97a941422795c224275d09a971ebf2b6fbaa955cea1feec36bdd32c1d28
-contract address: 0xcb17C9195d26e2d9c35Fd2202FfAd723Eb6b9B13
+tx: 0x5ea082d2b1c31d832663b08ac1d7ad4190415a8ea5b4994b406a793a2e3b9f06
+contract address: 0x8F9422aa37215c8b3D1Ea1674138107F84D68F26
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -212,8 +186,8 @@ gas used: 3770555
 *** SUSD ***
 
 Network: localhost
-tx: 0x6b4df97a941422795c224275d09a971ebf2b6fbaa955cea1feec36bdd32c1d28
-contract address: 0xcb17C9195d26e2d9c35Fd2202FfAd723Eb6b9B13
+tx: 0x5ea082d2b1c31d832663b08ac1d7ad4190415a8ea5b4994b406a793a2e3b9f06
+contract address: 0x8F9422aa37215c8b3D1Ea1674138107F84D68F26
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -223,8 +197,8 @@ gas used: 3770555
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x273120f46fb454daa82c5808d397d5392df36fbd0b02f0df70029e85139b4532
-contract address: 0x61f131d9Eea8EB1F606035569471D4e7fed03eC4
+tx: 0xd44e0f48e38f7c216be9a16449efedfb231d7430a1c0fc3f8bcffdf7948ccfcf
+contract address: 0xa89E20284Bd638F31b0011D0fC754Fc9d2fa73e3
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -234,8 +208,8 @@ gas used: 3770435
 *** ZRX ***
 
 Network: localhost
-tx: 0x273120f46fb454daa82c5808d397d5392df36fbd0b02f0df70029e85139b4532
-contract address: 0x61f131d9Eea8EB1F606035569471D4e7fed03eC4
+tx: 0xd44e0f48e38f7c216be9a16449efedfb231d7430a1c0fc3f8bcffdf7948ccfcf
+contract address: 0xa89E20284Bd638F31b0011D0fC754Fc9d2fa73e3
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -245,8 +219,8 @@ gas used: 3770435
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0xe436195933f23481a434af68482c6cbf2a30fdb05469564e4b313d229eb5637b
-contract address: 0x8720da7Bc69d35800937CD0CB2a88517Ab681a34
+tx: 0x239d5b4ae02e9b51640fc4b37e76d04e5a8d4d89583046744365d5c986a2b03e
+contract address: 0xaA935993065F2dDB1d13623B1941C7AEE3A60F23
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -256,8 +230,8 @@ gas used: 3770435
 *** MKR ***
 
 Network: localhost
-tx: 0xe436195933f23481a434af68482c6cbf2a30fdb05469564e4b313d229eb5637b
-contract address: 0x8720da7Bc69d35800937CD0CB2a88517Ab681a34
+tx: 0x239d5b4ae02e9b51640fc4b37e76d04e5a8d4d89583046744365d5c986a2b03e
+contract address: 0xaA935993065F2dDB1d13623B1941C7AEE3A60F23
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -267,8 +241,8 @@ gas used: 3770435
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0xb4ba19deeea00d5775cd9cc6837d2481933f74920a57cc2f4bbae1a110774a2d
-contract address: 0x9005f841b010be4f5e9AAaf740B7B7b0611c2E79
+tx: 0xf04a9569ae24444f812d6e27087a159b9f2d8efd6af87530cb84dee7be87eb60
+contract address: 0x35A2624888e207e4B3434E9a9E250bF6Ee68FeA3
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -278,8 +252,8 @@ gas used: 3770555
 *** WBTC ***
 
 Network: localhost
-tx: 0xb4ba19deeea00d5775cd9cc6837d2481933f74920a57cc2f4bbae1a110774a2d
-contract address: 0x9005f841b010be4f5e9AAaf740B7B7b0611c2E79
+tx: 0xf04a9569ae24444f812d6e27087a159b9f2d8efd6af87530cb84dee7be87eb60
+contract address: 0x35A2624888e207e4B3434E9a9E250bF6Ee68FeA3
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -289,8 +263,8 @@ gas used: 3770555
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x5436aa551e3633fa33190d418297133b50c85a4389819204d8017198d6ada8cd
-contract address: 0x60cBD760B2Fd5bd4503D33710eB7A67c4b878099
+tx: 0xd14a76002a7764f1942b286cdbd83a6c31c963a6536c11e245dd844c80bf2423
+contract address: 0x1f569c307949a908A4b8Ff7453a88Ca0b8D8df13
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -300,8 +274,8 @@ gas used: 3770555
 *** LINK ***
 
 Network: localhost
-tx: 0x5436aa551e3633fa33190d418297133b50c85a4389819204d8017198d6ada8cd
-contract address: 0x60cBD760B2Fd5bd4503D33710eB7A67c4b878099
+tx: 0xd14a76002a7764f1942b286cdbd83a6c31c963a6536c11e245dd844c80bf2423
+contract address: 0x1f569c307949a908A4b8Ff7453a88Ca0b8D8df13
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -311,8 +285,8 @@ gas used: 3770555
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0xa80c21158c999fb025ee9310aa35c93be2f3dea93dcc6dadc6aaf6b83895e8f4
-contract address: 0xF2568BDC779A28534FfDE719edeBb6FaD8750C9C
+tx: 0x3eff7433edc5c39c2f4023a61518e744c4b551fc459f9a7b6ab1ca549b779895
+contract address: 0x4301cb254CCc126B9eb9cbBE030C6FDA2FA16D4a
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -322,8 +296,8 @@ gas used: 3770435
 *** KNC ***
 
 Network: localhost
-tx: 0xa80c21158c999fb025ee9310aa35c93be2f3dea93dcc6dadc6aaf6b83895e8f4
-contract address: 0xF2568BDC779A28534FfDE719edeBb6FaD8750C9C
+tx: 0x3eff7433edc5c39c2f4023a61518e744c4b551fc459f9a7b6ab1ca549b779895
+contract address: 0x4301cb254CCc126B9eb9cbBE030C6FDA2FA16D4a
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -333,8 +307,8 @@ gas used: 3770435
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0xfd4f46dfcfc9ba0be1e5a897fab846d17291dd311228d01bd461bfa7f09d8f51
-contract address: 0x0fB27075d4F9361E175459334c0D77A81cD9C835
+tx: 0x264fbe1fd2c4bd18b3e256411d085b30f34386ae6a4566a0b2f0d0c04e6bec88
+contract address: 0x0766c9592a8686CAB0081b4f35449462c6e82F11
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -344,8 +318,8 @@ gas used: 3770555
 *** MANA ***
 
 Network: localhost
-tx: 0xfd4f46dfcfc9ba0be1e5a897fab846d17291dd311228d01bd461bfa7f09d8f51
-contract address: 0x0fB27075d4F9361E175459334c0D77A81cD9C835
+tx: 0x264fbe1fd2c4bd18b3e256411d085b30f34386ae6a4566a0b2f0d0c04e6bec88
+contract address: 0x0766c9592a8686CAB0081b4f35449462c6e82F11
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -355,8 +329,8 @@ gas used: 3770555
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x9da95006a635f1695d2fe32affca618a292f1ed0a8f061ba22e4ff852ae8662f
-contract address: 0xE8a2Cf61d731Cf9f46Dc34F64538229C41865146
+tx: 0xf7f19edbb06b36151a13ed1730693bda0470274d911b3017bb05a6e17959ba80
+contract address: 0xaF6D34adD35E1A565be4539E4d1069c48A49C953
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -366,8 +340,8 @@ gas used: 3770435
 *** REP ***
 
 Network: localhost
-tx: 0x9da95006a635f1695d2fe32affca618a292f1ed0a8f061ba22e4ff852ae8662f
-contract address: 0xE8a2Cf61d731Cf9f46Dc34F64538229C41865146
+tx: 0xf7f19edbb06b36151a13ed1730693bda0470274d911b3017bb05a6e17959ba80
+contract address: 0xaF6D34adD35E1A565be4539E4d1069c48A49C953
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -377,8 +351,8 @@ gas used: 3770435
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0xaaf6edc5239638bb07fbf807a57e867ff3f392e65d1fac2a117e8a5fe6a2eb72
-contract address: 0x0326Ab87B77A453569B5CA1686a92f9dCAfC08b6
+tx: 0x609c4f2e84f0f979bed72c3fabc665e49917afc02cccd616223eaaa597a0064c
+contract address: 0x48bb3E35D2D6994374db457a6Bf61de2d9cC8E49
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -388,8 +362,8 @@ gas used: 3770435
 *** SNX ***
 
 Network: localhost
-tx: 0xaaf6edc5239638bb07fbf807a57e867ff3f392e65d1fac2a117e8a5fe6a2eb72
-contract address: 0x0326Ab87B77A453569B5CA1686a92f9dCAfC08b6
+tx: 0x609c4f2e84f0f979bed72c3fabc665e49917afc02cccd616223eaaa597a0064c
+contract address: 0x48bb3E35D2D6994374db457a6Bf61de2d9cC8E49
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -399,8 +373,8 @@ gas used: 3770435
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x1e2758befe0a7f1df47b2738261481e6fc836a79e78ded9b322931854ddc996b
-contract address: 0x5f3dCDFEdCcAaa98AfE9FAbb5ac348D4FbCa8Be8
+tx: 0xdaa890cf86da34cfd100482d0245d86acb9521c435fb6b6606dd5af05be05b0e
+contract address: 0x1E59BA56B1F61c3Ee946D8c7e2994B4A9b0cA45C
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -410,8 +384,8 @@ gas used: 3770555
 *** BUSD ***
 
 Network: localhost
-tx: 0x1e2758befe0a7f1df47b2738261481e6fc836a79e78ded9b322931854ddc996b
-contract address: 0x5f3dCDFEdCcAaa98AfE9FAbb5ac348D4FbCa8Be8
+tx: 0xdaa890cf86da34cfd100482d0245d86acb9521c435fb6b6606dd5af05be05b0e
+contract address: 0x1E59BA56B1F61c3Ee946D8c7e2994B4A9b0cA45C
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770555
@@ -421,8 +395,8 @@ gas used: 3770555
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0xb7b058ffce5b7f0026e07b1402a322925ce8b1f763f5a58262b7f24e365f2286
-contract address: 0x5033b2C3b7Fc8C359175158Dde0a57fB86C6eCb4
+tx: 0x34072a8a7ddff91366675c0443c6ed4a56f4ea38284d959ba5cac87d9176559d
+contract address: 0x53813198c75959DDB604462831d8989C29152164
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -432,8 +406,8 @@ gas used: 3770435
 *** USD ***
 
 Network: localhost
-tx: 0xb7b058ffce5b7f0026e07b1402a322925ce8b1f763f5a58262b7f24e365f2286
-contract address: 0x5033b2C3b7Fc8C359175158Dde0a57fB86C6eCb4
+tx: 0x34072a8a7ddff91366675c0443c6ed4a56f4ea38284d959ba5cac87d9176559d
+contract address: 0x53813198c75959DDB604462831d8989C29152164
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3770435
@@ -443,8 +417,8 @@ gas used: 3770435
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x492a05773ffcf7d9adad3247fdfee76f1424aec44ec524a43134d48e95d5bccb
-contract address: 0x20F17A5F6764149Ac22E17AD2b7D68A3232974bE
+tx: 0xd9d0b27927d9ea1d6e01a0b3ab30ad5fff8b1fee863170c0e09bba3164473c86
+contract address: 0x0eD6115873ce6B807a03FE0df1f940387779b729
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3771395
@@ -454,8 +428,8 @@ gas used: 3771395
 *** UNI_DAI_ETH ***
 
 Network: localhost
-tx: 0x492a05773ffcf7d9adad3247fdfee76f1424aec44ec524a43134d48e95d5bccb
-contract address: 0x20F17A5F6764149Ac22E17AD2b7D68A3232974bE
+tx: 0xd9d0b27927d9ea1d6e01a0b3ab30ad5fff8b1fee863170c0e09bba3164473c86
+contract address: 0x0eD6115873ce6B807a03FE0df1f940387779b729
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3771395
@@ -465,8 +439,8 @@ gas used: 3771395
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x4510766410d2c7e41074be5852a80895f15f8c91c449f7a4aa2fbabebc5744e4
-contract address: 0x6A3c3947F3E89BEAB768458b50B06ceB3CFC4539
+tx: 0x7108f6a2b5d09c345cef81faed01768eebc82e88cfca411f19ff89d67f39d155
+contract address: 0xFFfDa24e7E3d5F89a24278f53d6f0F81B3bE0d6B
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3771515
@@ -476,8 +450,8 @@ gas used: 3771515
 *** UNI_USDC_ETH ***
 
 Network: localhost
-tx: 0x4510766410d2c7e41074be5852a80895f15f8c91c449f7a4aa2fbabebc5744e4
-contract address: 0x6A3c3947F3E89BEAB768458b50B06ceB3CFC4539
+tx: 0x7108f6a2b5d09c345cef81faed01768eebc82e88cfca411f19ff89d67f39d155
+contract address: 0xFFfDa24e7E3d5F89a24278f53d6f0F81B3bE0d6B
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3771515
@@ -487,8 +461,8 @@ gas used: 3771515
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x2a1a981a79ffa52d65963ec90688f9c7b454a5d41310fe0eff1b1fbe268912e1
-contract address: 0x54fa46633E6F369e4Bf26560d20AF698b84F3676
+tx: 0x711140cdc325fa89a8fc7c57d40398135dbafbb8386a9714ac9406c097d7f5e1
+contract address: 0x5889354f21A1C8D8D2f82669d778f6Dab778B519
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3771515
@@ -498,8 +472,8 @@ gas used: 3771515
 *** UNI_SETH_ETH ***
 
 Network: localhost
-tx: 0x2a1a981a79ffa52d65963ec90688f9c7b454a5d41310fe0eff1b1fbe268912e1
-contract address: 0x54fa46633E6F369e4Bf26560d20AF698b84F3676
+tx: 0x711140cdc325fa89a8fc7c57d40398135dbafbb8386a9714ac9406c097d7f5e1
+contract address: 0x5889354f21A1C8D8D2f82669d778f6Dab778B519
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3771515
@@ -509,8 +483,8 @@ gas used: 3771515
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0xe893744852096dc72c06a42b02ba958ab750d91199bf79beb292f5caac0097ed
-contract address: 0xCE05F088253a85e86491bc6267E99304B8941663
+tx: 0x96e564062931f9f5b4dfec6ff64447d1413db8b199f777e40ef49b6f4cf74e42
+contract address: 0x09F7bF33B3F8922268B34103af3a8AF83148C9B1
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3771515
@@ -520,8 +494,8 @@ gas used: 3771515
 *** UNI_LINK_ETH ***
 
 Network: localhost
-tx: 0xe893744852096dc72c06a42b02ba958ab750d91199bf79beb292f5caac0097ed
-contract address: 0xCE05F088253a85e86491bc6267E99304B8941663
+tx: 0x96e564062931f9f5b4dfec6ff64447d1413db8b199f777e40ef49b6f4cf74e42
+contract address: 0x09F7bF33B3F8922268B34103af3a8AF83148C9B1
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3771515
@@ -531,8 +505,8 @@ gas used: 3771515
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x30c481cd0ebe9ac5aee1cc8c29f3ee35deaf8615d23411e101aecd082cb91ee4
-contract address: 0xA7e7aa6Cf177b8081B0077AfF3EC748F27cBAfc8
+tx: 0x7e85b4e591d15586638a15aa1585d01b53792cffbb9e88f2858e86c401eb3563
+contract address: 0x8f3966F7d53Fd5f12b701C8835e1e32541613869
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3771395
@@ -542,8 +516,8 @@ gas used: 3771395
 *** UNI_MKR_ETH ***
 
 Network: localhost
-tx: 0x30c481cd0ebe9ac5aee1cc8c29f3ee35deaf8615d23411e101aecd082cb91ee4
-contract address: 0xA7e7aa6Cf177b8081B0077AfF3EC748F27cBAfc8
+tx: 0x7e85b4e591d15586638a15aa1585d01b53792cffbb9e88f2858e86c401eb3563
+contract address: 0x8f3966F7d53Fd5f12b701C8835e1e32541613869
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3771395
@@ -553,8 +527,8 @@ gas used: 3771395
 *** MintableERC20 ***
 
 Network: localhost
-tx: 0x58f16fea1e54c8718c3c88797eb0f38dd90a5cc2f9f29bf5eb996515a8d7a05b
-contract address: 0x7B8e91D6e994c222A57ADB9615A5d55F7BEd9f6e
+tx: 0x3a490bd7d0486d2de64b06bdfe5cbc71cf68360015175f695f765ffbdaa0db73
+contract address: 0x9Dc554694756dC303a087e04bA6918C333Bc26a7
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3771515
@@ -564,8 +538,8 @@ gas used: 3771515
 *** UNI_LEND_ETH ***
 
 Network: localhost
-tx: 0x58f16fea1e54c8718c3c88797eb0f38dd90a5cc2f9f29bf5eb996515a8d7a05b
-contract address: 0x7B8e91D6e994c222A57ADB9615A5d55F7BEd9f6e
+tx: 0x3a490bd7d0486d2de64b06bdfe5cbc71cf68360015175f695f765ffbdaa0db73
+contract address: 0x9Dc554694756dC303a087e04bA6918C333Bc26a7
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 3771515
@@ -575,8 +549,8 @@ gas used: 3771515
 *** LendingPoolAddressesProvider ***
 
 Network: localhost
-tx: 0x2872ff81f4a92ded863d7703ebdd230bd7fbd49616f28c89e221d65369bc40ca
-contract address: 0x0Be2E67Ba29F7CA3093386693e0E142B9e6a55Ef
+tx: 0xe9232d3aec0076f72b4dece0ec89cbc78a8373e4abf5561b0a5008887622851b
+contract address: 0xAfC307938C1c0035942c141c31524504c89Aaa8B
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 6959345
@@ -586,23 +560,23 @@ gas used: 6959345
 *** LendingPoolAddressesProviderRegistry ***
 
 Network: localhost
-tx: 0xae5d09fad0f606915bab54ff33207af7b27e7a0888aba80f7ac031539c58f0a9
-contract address: 0x02043fC67620cCC132b0CEA385AbBb5aa4e06766
+tx: 0x3e67f200a858db6eb7fb8e1fd5939782b89d45fd82e40900fdf16d11da8e2d1b
+contract address: 0x73DE1e0ab6A5C221258703bc546E0CAAcCc6EC87
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 2407480
+gas used: 2515695
 
 ******
 
-Deployed lending pool, address: 0xADE30dD9f7F7314AD0d388ab99774a1Fc4D89649
+Deployed lending pool, address: 0xD2720591186c6DCf1DaCE6FAF262f3eB595317C5
 Added pool to addresses provider
-Address is  0xBB44FCfd30C89073F19713a978e451A237aC2e36
-implementation set, address: 0xBB44FCfd30C89073F19713a978e451A237aC2e36
+Address is  0x5d12dDe3286D94E0d85F9D3B01B7099cfA0aBCf1
+implementation set, address: 0x5d12dDe3286D94E0d85F9D3B01B7099cfA0aBCf1
 *** LendingPoolConfigurator ***
 
 Network: localhost
-tx: 0x96bc09541986b56ee3517e51b4140896df66fb4941872625842a0fc9af783b2f
-contract address: 0xF8fd6300E8De88f1d3609AE69fc707d27A10F90F
+tx: 0xf708c6f21e3ea0ce6d809ecc76fbf2682b9bb398681aebb58942712dfc5fdc01
+contract address: 0xa7a62540B8F2a0C1e091e734E261d13fd9a2B226
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -612,8 +586,8 @@ gas used: 9499999
 *** PriceOracle ***
 
 Network: localhost
-tx: 0xa7da01f683de48503f138e371a0849a6e092d66bdad85acf9dd0e05922eaa5cc
-contract address: 0x5fAeB1862A8F53338BB9c5614EE52aee0A3eed3B
+tx: 0x76a61118b12b1416a6a75626cf23450a5e9a00e561b99c992719e549e619f000
+contract address: 0xbeA90474c2F3C7c43bC7c36CaAf5272c927Af5a1
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 767525
@@ -623,8 +597,8 @@ gas used: 767525
 *** MockAggregator ***
 
 Network: localhost
-tx: 0xc54269af5d29db2f7e556c9dd590f1578ff0a4ea68f561f2b7e6f1f9dc913bf0
-contract address: 0xfAc7c047F162481Bc9d553248414B3Fb33ABc8A7
+tx: 0x0e04f73e5593e0ae08c773127c7659a847c7c9cfbbe870b5b8169807ab7390d9
+contract address: 0xa191baa1E96FeFE2b700C536E245725F09717275
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524490
@@ -634,8 +608,8 @@ gas used: 524490
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x0d5be3282f7560fcbe747b474347a827ac49d7689dcd1682f42f9fb1b83ccf3e
-contract address: 0x3eD67aca65844EEfCB1DB837CbA4c24Cd5c898EC
+tx: 0x9240496d0be4193febdb3233ecdd21b90f3d2e93e76d814d5d541f6b16015ae8
+contract address: 0xbD51e397Aa5012aa91628f0354f9670805BfA94E
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -645,8 +619,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x237e842bae623c19768a40501729659c9f5489ec08beb48dffa81a68a07c50ed
-contract address: 0xaff371B27321a7133bdc68DDbF32B5f4Be7deD99
+tx: 0x5e8af233bf52b883a0c4e7a2dfbd962649954d8ef4ad3e6cffba9c966887a1e8
+contract address: 0xFc40e47aFD52bD460D65B06c828E54A13d288CE4
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -656,8 +630,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x79182f5981f25ab47ce93f9dfdab9eaf466cbcd0daf13a6e6dd356c0972e03f3
-contract address: 0x89fa05f367742867e18c373F1421C4D97dE7ae93
+tx: 0xaa3066730f7ebd39de215205a768145fd99e65157d871d0c640f79f2eaf440ad
+contract address: 0x5795a1e56931bB7Fb8389821f3574983502A785d
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -667,8 +641,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0xb7cddcb138b4fabd0463c3dadcba41e05d7e172803b13e8d19cb02ef987537e9
-contract address: 0xd2B8Dbc72F5568d6328a821da206fe63B1859A8C
+tx: 0x8d9500b1f7bc9e00ebf25c25b81fb93603eca6a4ac1c6a23559873944ee873ca
+contract address: 0x715Ad5d800535dB0d334F9F42e3eC393947996e3
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524490
@@ -678,8 +652,8 @@ gas used: 524490
 *** MockAggregator ***
 
 Network: localhost
-tx: 0xd65bb1ed44f8c3602782a31438902ac06080efa158bce89d4384da422842cf51
-contract address: 0x0cEAfFEfC31Dc73354ece8B04d3902Cc137EE22e
+tx: 0xe4019cc104e2ff38106e730db33f74a256d59327614b2f9c3f4dd847ec53ff0e
+contract address: 0xC452C5244F701108B4e8E8BCe693160046b30332
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524490
@@ -689,8 +663,8 @@ gas used: 524490
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x62e114f598f347cdf5c47f412f449666729a413e20cee6ce3dde38c608fb0bc2
-contract address: 0x81d626516977BDa68D2CeDc1076617EBb5FF938F
+tx: 0x5864636182a83ef038a4aa03551d9a1327ca7f6964e25b023bc32dc823000246
+contract address: 0x0B63c002cb44B2e5e580C3B3560a27F4101D95c0
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -700,8 +674,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0xb006beee6096814bc5b68f5a40f638748c2aedaa08b7f388dbae2c5377495301
-contract address: 0x6B13ac7757949212524558aA044cA5fCF4087871
+tx: 0x4c7e8f67718f9ef15d31e9527499897c6defbe50e91ccbf28d324e37f3936105
+contract address: 0x3F80d60280cc4AdF3e5891765b5545A6B36ebe57
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524490
@@ -711,8 +685,8 @@ gas used: 524490
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x86a208dfa0a8671ff64ce366290ffabf2b9567131247d15674280c99cdddc162
-contract address: 0xFa7D3C8fa1b2389Cdb052262A2DC72D1B9fE6FEA
+tx: 0xbbf4865f658e69a60041983d174c53c77d2132e6e498e64efe27434f03c3a911
+contract address: 0xCeB290A2C6614BF23B2faa0f0B8067F29C48DB0F
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -722,8 +696,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x437876c65e77cccba9ee578f80a4355e5126390978b5b3ed342a2cacda8f4068
-contract address: 0xB2c6DF118556aA07f4648a349F9D6072363DBd1E
+tx: 0xfb956a1da74bf9ac7dd6daee9929a48bb6954730310a45d7a0e005dc7ff997ff
+contract address: 0x90ee8009AA6add17A0de8Ee22666a91602fa4adf
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -733,8 +707,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x89c24e229a1f4303f17e8924e99b0358be3b17c4a507d995361ed887d410d4fd
-contract address: 0x0B4bA74ba31a162900a68D48372771c649f924Ce
+tx: 0xcc9a2257abeaeecd6fa045901912802ade13c615974e0b22db1eaaf1a3ba1cf3
+contract address: 0xc5BeCE9e44E7dE5464f102f6cD4e5b7aBC94B059
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524550
@@ -744,8 +718,8 @@ gas used: 524550
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x1b48ba09705e76624011453c51f8bf0512f399a5e70686df858eaa40bc037a6d
-contract address: 0x3AC216261740288E19D8922bAf3F8bAe5c61fef8
+tx: 0x8e1d91a3cca76bb345ad3b61df570df661418dba282d4bc5a0e3879170ef8b9d
+contract address: 0xF63EA31f84CFF5D1Eb4b8C3ca0D9489490fB98d5
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -755,8 +729,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0xe6005785981898176935cde0a55f2b097d3062191f1287844c03e1f5fe5b51db
-contract address: 0x0afE3288eAEE1bbD9b4A792f50DE1Da50AEE7C5d
+tx: 0x63dc4fbb424450404f66b100c36cb33dd3e2efc1d73da8f386e8869ad1d68151
+contract address: 0xD8f534d97D241Fc9EC4A224C90BDD5E3F3990874
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524370
@@ -766,8 +740,8 @@ gas used: 524370
 *** MockAggregator ***
 
 Network: localhost
-tx: 0xea331a41f2b17f15851b046d8b574c205e01db0c16eac1a7c279bd481352ebf0
-contract address: 0x574DC7E078a660D617E718313a13598Fe69322fB
+tx: 0x82e4360e3ed1913609f51a2e80cee06aa9df2ebb9292f5f3abacf24aff0e686d
+contract address: 0xDCAB55FBf59a253B3Fb0CD2Ba45F0c02413dF375
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524370
@@ -777,8 +751,8 @@ gas used: 524370
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x43b89e5aae8607bcf1956bee09eb8c973ada7e0c8101b09472d3a519cbf0d3bc
-contract address: 0x1E8DA3eD1679f1E1f93110CD9c20Ae0FA5054F00
+tx: 0xf1da3e37ee20e209ccdd756fa2e07a2be9d01bf7675dea41309a2a56ff96c9b5
+contract address: 0x293965D84cE150Cbf5F36332ba47e997e2763bf2
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -788,8 +762,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x6fbf38ea23a1ae2bcebee8d14319a928a3629c06ceaa5f7c00ae5a227952202a
-contract address: 0x3b26f19BAADE8177fe62B2bd590b13eD150D959D
+tx: 0x8ae4fb0d23dec3b653f720bae0a4eb0538f17a88dde2d596b7e78928a121e076
+contract address: 0x3CADfB3f580F805658B747057E2Cf4E570bA378A
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -799,8 +773,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x4fe68d69ea9b00ad6d7f98bf2a796ada69950b9783b7005e60169a58374abf89
-contract address: 0xAD4EA7747fF8C3ea98009B016280d3E5A93B71e4
+tx: 0x01a1c77c94c1c43e927bf5090b25ec4826a32801cfa55fb0b97d2d50c04e2f0e
+contract address: 0x7549d6bb05083613eF87b723595553dCc570Ca21
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -810,8 +784,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x057db108081c71ad47ca9601a868fd5e033688e3564c7200dfbc29d000338028
-contract address: 0x22f401738E43A0fa0AC319B69B3d0f35Be3544B0
+tx: 0xb240c91e88558e87d3be7b5c9c312c18eb3679144d2a0f3af8d7c1d053648cc4
+contract address: 0xd28bf46B340fD3ad0c3dBD979BbE6D1663F41D80
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -821,8 +795,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x2e09c95a1337d708ba01b59d68773170ea54de1d8a0c84ae2b84d1fb8c7f3df5
-contract address: 0x7C80a3BF57BdBBb15860378d86E15EA804f12a76
+tx: 0xfc87e10978edcdf0db0d9c5d5240e4db1d9e0567abe0a8047fe1f7ca28da2815
+contract address: 0xdd008b1A40e43ABD51C7Ba41c1F810aA77b77D22
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -832,8 +806,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x7f2d5b78293ecde7754f2cda6f2fe1a31a63ca48cdbf7345e3db24fd070ab725
-contract address: 0x1176928810a1ACbb0F09C6cE7f018f2182941A20
+tx: 0xe5991391fac8afd904b94215614914404dd1acb81cb46c9a679c0adfff1894ef
+contract address: 0x23F06e0ECec7ecDb9cf204FAA35C284B51B31C0e
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -843,8 +817,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x74bde68ace3cf3c541eb67d2fefc1ccae07f2d6c31c7ff93f7cfa343fbdd5ce2
-contract address: 0x638BA4fA09e52F0B95D0aD039eB0497fE5628257
+tx: 0xaeb4931c1d026a8d162c2c019d5d4ac6d667f78b34c714fd56ffeb01c7ebed92
+contract address: 0x9e63e23026BfA85E2BCdb6e81eF78c71071b6016
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -854,8 +828,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0xc17240fbefe134fe97cc151a63875a6d91700ea69461f9c81380d4fe2bf24d54
-contract address: 0x333f834d95EeD1C2774632DE82CdA4e01944e59C
+tx: 0x1bd7ec12d77551e8af98729fea7cfd251eb14641724b6a0216fb307af7cfa26a
+contract address: 0x4EfDBAb487985C09d3be2E7d2B8e98cc09A9757b
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -865,8 +839,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x1821bd38bbc9daf5772b28ce048b90c6f50a6611b1944b1d91cc2ab9f82acf21
-contract address: 0x13E798484a718f4C9AB3D4c433Ba3a8FeA8b06a1
+tx: 0x84dd9d9906a51b08c845eba64c05e708064c351f17ae10a127efd6ff479cdf85
+contract address: 0xAbA65A243A64622eA13382160d410F269Cd63eC1
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -876,8 +850,8 @@ gas used: 524430
 *** MockAggregator ***
 
 Network: localhost
-tx: 0x82297a3a88b2f48683703d50af6db08c426d991cc7fd0233d5d479db7d93dfb3
-contract address: 0x21AA9B6ffD04550C504a70A693D158319385Efe8
+tx: 0xa83c9fb3b2af5858ad72e5323e311bbeafde65b930ded1418006e4e660bf6f38
+contract address: 0x19E42cA990cF697D3dda0e59131215C43bB6989F
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 524430
@@ -887,8 +861,8 @@ gas used: 524430
 *** ChainlinkProxyPriceProvider ***
 
 Network: localhost
-tx: 0x00323b77830b78d113e8835c09a12dd04a6c6c278ce859b812b4dd557e541a2a
-contract address: 0x0c37447827539CA1885B9e3BE76c33590e40833a
+tx: 0x0d084d72f9d6b20a27654ff6612be6cd271b1d7f5442399e0d7872ec5a0a480d
+contract address: 0xE30c3983E51bC9d6baE3E9437710a1459e21e81F
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 6255480
@@ -898,8 +872,8 @@ gas used: 6255480
 *** LendingRateOracle ***
 
 Network: localhost
-tx: 0xde2a60a8fff36d39f615f961c20a2ee2f8dab7351a97b49330c384cb2f2dd8b8
-contract address: 0x025acC37dA555270B821260F39539937085F13D6
+tx: 0xff049fb48683766195e7de8b648f8a805bc1c76e12cfc8811dbc46b40308908e
+contract address: 0xDf69898e844197a24C658CcF9fD53dF15948dc8b
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 1720040
@@ -910,41 +884,41 @@ Initialize configuration
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0x4873e906f9a8b2426f39580b1062bccc06a6bee1c02318b2a699104914ca4913
-contract address: 0xde7a19b06E13642Fa63029BcE99A3dC64Ae50fa2
+tx: 0x7f2393d8b55ddd4f0bdf96dd1ae30cab9d26935db6bdfa9943ce54c69bfe3eaf
+contract address: 0x303CEAFd0aF91A63576FF7dEFc01E66ca2D19E3a
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3106205
+gas used: 3277425
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0xa626bb7b69f3025868a1858538aeb5bbddd53098747b7a13a25523fa5d3001dd
-contract address: 0x95FcA33A67122BD7B3c53533102A07F0185Aa153
+tx: 0xe4bacd3cf0bb45f3e03d8a99036b4a77bf70ac220ec8635d7be130c83805f2ca
+contract address: 0x168ef56fCb0382f4808497C9570434684657A9D3
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6697975
+gas used: 7425490
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0xd92c11f492d7b05081a2395327bc6f8f2bef9d059801df2eb4f2c9d3ee994932
-contract address: 0x1F16D1e96161578D78581874Bc7d39fDbCBCdf7A
+tx: 0x1bd0700a586883870734011f942a2c0ec8af12431c2e4a20ed83f7127a319330
+contract address: 0x5366cD335B002b009304Dc74a21EC97e94510177
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914360
+gas used: 6936890
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0x57130242e8dd2ff8098ba541f201b6959e5ea56c37711adc68eee133cd0c895b
-contract address: 0x2f0712dCe236E6e9f5C3d5226dA2D7De7b6D3bf5
+tx: 0x97b28bbdc29f1bf73d223aac5ce6a3298175135ae0089d0189a1a6748c3b36ff
+contract address: 0x8821b8e3000629f2c43BB99A092f6687366592F0
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -954,41 +928,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0xbbf309cf5f4e994b60af5747886901359fc18eab4ef193b1eb0604f9794bd26b
-contract address: 0x62B2aD4feA8DBe859f522e3cD6C1a958Da7ba370
+tx: 0x696fd437c7b45c15abe1e7c35d71915e74c2f8ba5ce76fdafcc03a0b72e1e6b8
+contract address: 0x3E447b144e446558c2467d95FcF17Eaee9d704Bf
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3106205
+gas used: 3277425
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0xea24d6c6b2c87fbfd19fad80989fa9d4993410be7f790342d6e9cac10f635947
-contract address: 0x352BD2c9A3a019aC10F7fc81dB119D4a325117DE
+tx: 0xfe8ce2454ff8599e9c3bd21d1b4805b854875a1f1525abbe48b5bf7a1ed19f1b
+contract address: 0x6452dDB1f891be0426b6B519E461a777aeAe2E9d
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6698095
+gas used: 7425610
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0x80d9516b278586fd97da5c6b8a2ee1edf892ce87212536f17d3b01b510e87999
-contract address: 0x5Cccb7f34cB05938c29442815Cc331AA6492B723
+tx: 0x24c25ca9ebb2588733588d07e05e6e74cd617c417296ac046c2d12fdc0b95e9d
+contract address: 0x6174769FBbC16D956a7bf70c3Ae7283341CAe3B6
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914480
+gas used: 6937010
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0x7fea0b83c9fbf3eb231c18f9aa901be215d9029c5ee9c08db8ab40365edf8070
-contract address: 0x7457b9406832EEa09864dcaAB82Ae3c134f9A975
+tx: 0x469a3347ec96fad195e41b5d62b21d2cf8ff0d603f0f2c62b0fada2ae09727a0
+contract address: 0x9e498c2dF52Efdd649140417E405B9DeedcfEbE1
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -998,41 +972,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0xf041fd1bfe41a9784868821fea4c9c981c305b11d04289a449d1b39212271179
-contract address: 0x8A8dC28F6C1874f573FCBd921f1fb24301caB913
+tx: 0x2e78bf0b216139babb6e33aea0ffbe3e165124e551e4131664f9f0717cdd4f2a
+contract address: 0x184E5376484c2728e7A2cb4E7f2c1975f4a177dA
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3106205
+gas used: 3277425
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0x6e76598450f534ef4c73f73f746112df1614332fd9d76b24e9c7b1404d855838
-contract address: 0x8bAE0F999E4A82191F7536E8a5e2De0412588d86
+tx: 0xb40b0345dc8645ccd2de39cec597afa889d61d337c83d98402848e20650f0b57
+contract address: 0x23Fa899d0b780f2f439354DcdC325ff738d1234d
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6698095
+gas used: 7425610
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0xe59fb499dbf56ed332d8576cddf9b2add407f76a48fe5d4d9a17cbd163ca9d69
-contract address: 0xa61F8cfACa566F8F4303cE283e9535934A8CDdD5
+tx: 0x68079ed8c90d74997e59e47b4e99119f374f59793c5245e4a9254373042bbff3
+contract address: 0x398A7a447E4D9007Fa1A5F82F2D07F0B369bD26f
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914480
+gas used: 6937010
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0x0c0e398fb9686848d569a5da530674c9a651d6577d6f1819aa51ddb99516ebb1
-contract address: 0xb0f645D86C1436502f45229292b117e45e1a2bC4
+tx: 0x297d99eb0ebb373ac4d6aedb1d973974aaaf398c2fb2cb9b7ad6c1a523078a5b
+contract address: 0xc9ffDd024B01AcE9B8ee692b85797593ddd25eBb
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1042,41 +1016,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0xd650ef7a81e3c6972c8c55225c9fa9302d5a47d0b6b68cd64b99e853841950d3
-contract address: 0x155a2e68CB8Db7B1cB9066E717aE93e65A2f93EF
+tx: 0x29d94602d60b38369651722227f15226632a76aeb8225b3e7c20761ed8935d4e
+contract address: 0x8A054E7463937F7bf914B2a0C6C1a9D7348f32d9
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3106205
+gas used: 3277425
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0x09305e2c65bda7a7c348370c43aece73f595ed84e1243cd56ba6282ce65f46cf
-contract address: 0x94Bc72DCbdc296991dc61555e996C447cAD60369
+tx: 0x8e926fd7735088a84c0253e4c0fc852d56f7b875bf497014f296c054c9382d50
+contract address: 0x9cbEE5c0A6178F61dcD57C3b21180C8602aBdAc1
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6698095
+gas used: 7425610
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0x407f53dfca1b9750843d02d3cac4896740e90d4beb42d346aca91f3dac78e4ab
-contract address: 0x346fdD507f157a74e63a73ACf371B5bDf562De67
+tx: 0x8713a3ce634d0280113197ed918c57ecb508ab053e8d6d562c9e54659abed5bc
+contract address: 0xdE00B3eb5e9F867eE45F9B9E5aF0d102Fe6A093f
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914480
+gas used: 6937010
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0x598be39edec2030fe558ece3cf1a71cabf8157d485e205b921a234f59fb4c0d7
-contract address: 0xCF8eF26FE68C88Fc899B1F40E48688F6C6FFf9E1
+tx: 0x25e4771fd18e0bfbd9caabbba1c1ea0439705770362752945f567aec663aacea
+contract address: 0x3Eb52adc2294219C9A8F27C6a0BCcBBBEEeB0637
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1086,41 +1060,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0x0e83ecaec3d499b1c5f1093b949e882f36de690122ab1709acc8c2d7add84ff0
-contract address: 0x58C7b3Aa19a4EEb3505564ab45c6fd16442A85ec
+tx: 0x4ee8cad51cbfc07c56566826a77c12c07213bd5799200257bfcbbb5274654f9e
+contract address: 0x1b59Cd56B9D76CF3FFE0b8671164Fbe7ACA33164
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3106205
+gas used: 3277425
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0xf5cbc7164c974331ebb6788910b4f46ff6a83514663bc724617613795ca0c527
-contract address: 0xa25fA46698beE81E33e0Dd691849945B0B417ea4
+tx: 0x48074d32ee1aa4263ffd99c906205b2cb211085ef64b6593b6c869e073feb20b
+contract address: 0xEC828976783079948F5DfAc8e61de6a895EB59D2
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6698095
+gas used: 7425610
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0xac304e7b68af6be5c860778486a24bf4611ae3f00fd8e54cea937007a2c253a8
-contract address: 0xEec014eff3DBeE5a3100fb6a9128cF7c40c3e782
+tx: 0x6082f47e348f616bf616739250d90c768d1638e599d52736942af94f093560a4
+contract address: 0xbA81aEa1F2b60dF39a96952FfbE121A0c82dc590
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914480
+gas used: 6937010
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0x09676350d460e9c94211d51ec7cbf4d882ae89fe4013f80b02a13d18a05e9261
-contract address: 0x4BD61457B65687B555fb86B8038Ffb5779970A3C
+tx: 0xd685996cbfaee73738b4435112642be71a62bd5150b7622060d29a5bc10e86a2
+contract address: 0xdB70141346347383D8e01c565E74b1a607f3Dd05
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1130,41 +1104,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0x69c34a563c2be1c81373fa8b7fa26e8c3e01e0528eb94775bb2cfb6bbe5bd1e7
-contract address: 0x294c3d68F340883C44d50daD4Ec6737327f2f993
+tx: 0x89c15e0f7e757ea6bb08a253ee7aeff7977641fc163e8063e15f714aa207f0cc
+contract address: 0x3597899d1c79b516D724b33c6b5e404dCdD45Da1
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3105725
+gas used: 3276945
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0x6adb18ddb49ddbef57ac5ad57d70211c79623e6a8a4a80aef8e1d6d14486097b
-contract address: 0x22e57AEFA0f0f5aF3f0933EBB08B2FD5E1f52389
+tx: 0x42a31cd5ec3a1a0616b2dcca2d6178f436454fc2ba7d4cd4c86daae9f0d8b724
+contract address: 0xc489495Ad73C2E75fbBA3916df7BD186F6b1696F
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6698095
+gas used: 7425610
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0x12d50599978adbc7209c401b0dea09a7fabbcd6a3b8026c472e5246707c3369d
-contract address: 0xbc80b4b4D77Df85898DCA2AbB615edC353039d2b
+tx: 0x0213cc4f1faf661fdc368dd513afbfd94743d931a3501d0df5d1ebc2629653d2
+contract address: 0xf77136FA9c9280c3bBCA29a431B770AD04BE0aE3
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914480
+gas used: 6937010
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0xb00b159ce1cecc92eae653ecd6b831d286ae76d2a2cc7a25e1d61f84813894ff
-contract address: 0x613b8Aa5BAFB5c903B8AFF84307C3D8eb6a09C9D
+tx: 0x540c880640831ce39ae7be3f870f96a68fe64d5b77b4e5fb57a03b428faf3f19
+contract address: 0x1FB3ccD743653c4f8533268fFe4a9a9DA97db500
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1174,41 +1148,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0x70fab8c45a6baa3388de96807b247dfcc8b9a64ad527577dcc0f773d75d694e8
-contract address: 0x62cdE04d91F1d8eb7144612AC2168F452dE78aF6
+tx: 0xea49a43b755144530500ffb8b8001b88558831737543deb69a451d0e5850e63d
+contract address: 0x54f9224C1A99951ABc0A7e843CE19a92dFA2E3c4
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3105725
+gas used: 3276945
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0x06b4f32ad3b290a4835d6ba735f960d9376759e76602080309206d0e3648cb39
-contract address: 0x05D70e69C53E9A097E741976096ca16A4ec44Bdd
+tx: 0xf85b360885516da2a05f4ec85a0a29861caac0a8d11ac0225d5d2e1b80d5ebb0
+contract address: 0xf62D2373BAbb096EF4f7dc508e5c153c73dD9CfE
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6697975
+gas used: 7425490
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0x606ab3e7604b177d0ad8e3055abe1f5086207e1e98fee8ce8562f5931e5e72d6
-contract address: 0x0f611985C3dd0C3B6655b4216A2CB5988C5635f9
+tx: 0x496c3e75abb9d525d1d38888324a42615a52975871565b6dcdefb70aca47d508
+contract address: 0x662b3D8C8Dc691C46334bcB2229336063e3c2487
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914360
+gas used: 6936890
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0xfefc088f98f019d82551116d4bb0bfd81f39bb1b2f22cb96039fb0a9bb04bf3a
-contract address: 0x09b6478e26dd5409b82Da0072207D89215D4A9e8
+tx: 0x37edd828c08b60bc80c517b50fc90f8218623c65e844a2db67e8748e50f9cb5e
+contract address: 0xEa02aebdf8DccbD3bf2BaA9eeBa48b0275D370b8
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1218,41 +1192,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0x226264ea0c967a200f7fb1de7c3b9fe055d31c0be103756f3f6293008ae31e5f
-contract address: 0x2c380d25C5bd5739B533C875B237116D1dCC7B87
+tx: 0x1370094924d5683d96bed3dcf4331597eada7653b9dca5f15cee62184a134de1
+contract address: 0x5a3343A0CF72dC6933362676Bb5831784CaA0014
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3105725
+gas used: 3276945
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0x186ba5c289ca953e1da6f46279b765e2f192f6ccc08aeed91df95285ac7ba9e7
-contract address: 0x77987F19bee3B45A2D0eEefa4e302965cFF46349
+tx: 0x4617c93975b1b7681079d512168203358d18890f610b7bcb51c98748732d0b78
+contract address: 0xbC15a5eEA769cfB4BA6d7574c9942f0b8C40Ae03
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6697915
+gas used: 7425490
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0x40f9e44fb082b9b5a841ba0f12dda2c564cf49cdb4d42d40e13a43b2092866cf
-contract address: 0x20dA55374c2d453e62c5d007AF1f270243F3e5c0
+tx: 0xefa498d1e69d9fe6409a50b3aa506a592b807e94dddd1f21aea2cd7de547dd8f
+contract address: 0x3c3AB51fF33032159e82E1FDEe6503dEd082F1d9
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914300
+gas used: 6936890
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0xc417417c7e3f87bddca83f611b00fdd63cc2d31d3064f8decf57ef9bdd23d6ef
-contract address: 0xFFe2200229ac904D6B7a734596b1A3A2715284C3
+tx: 0xe80eca2e4658c64f6398e96298cefbb500fc9022a0fcffe444c310fbf6492911
+contract address: 0x2d17b3E44e413F1fDa30E569895863EeD139CE6B
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1262,41 +1236,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0xe6b73ea93dd59eb0ff50c81a73898e2feeb09310ef4458d1fe5ad90e7cd6a399
-contract address: 0xA34221377434bf8A0329c2f045A1454DaBa9A487
+tx: 0x12bd37e159dabe8a4841f79d966ba2c38d83da6c82227045ab65f0a19bb157b9
+contract address: 0x09e2af829b1C36A6A8876925D1557C0FA1FF7eF5
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3105725
+gas used: 3276945
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0x1f95c0711d607f430d919f9e62d7146ebcc7707d9aa722773ce09eb3ac9ef7d1
-contract address: 0x42cd662C6E4c9C92F54614336fb420Dc71641746
+tx: 0xbda59242e7edfa65c64d898da377e5db00fba42d5f0f0bce70f9967e460aec7b
+contract address: 0x64179c836DD6D887034e14be49c912d166786534
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6698095
+gas used: 7425610
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0x5073c36b76c6e74f6877de0b0e593e3537d5960d5b13741de2ee3bcd3b5e9280
-contract address: 0xA723Aa6C578634b31f26EE1E8CEaE8a3C8c584a3
+tx: 0xdba8d42783dad76edf7623d93ca8720c94a246f2916f683577de0a94abea5eeb
+contract address: 0x912e47ab2257B0fE50516444bb6a12CffaCFA322
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914480
+gas used: 6937010
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0xad23ee7f9cb12b743227c95e4d1d7d320d41d425e3b676a09f9febf7165460b4
-contract address: 0x4ef10aC22E7B3d6115A55997Aa8Af94079534c01
+tx: 0x994d41b318faa0d04d5e6475ec1c3faccd4670022897c77e2e10c6f87ff5d514
+contract address: 0x29f65c17aD1e6D6b3C99aE80093E4Bf382fA0F69
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1306,41 +1280,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0xb3868d3013a99093144cd9a02f6b4f68563c28e161d1cc68f73c0870b3fa8d72
-contract address: 0xAbD96F7Fd7C767D894C917a2BdD0305c6c08C878
+tx: 0x0d4d2be3095a1aa2ec941bad0e6d41ce8de15cd8354d0cd56fa3d919c167d49e
+contract address: 0xD4991960dB15FFd68cc78AAAF42dcC0B7ccb6459
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3105725
+gas used: 3276945
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0x99127eb2d54deecf4a07b40c84fe33497283d829e8ade4da88784b14261ab1c3
-contract address: 0x603b3ABD6bbB5076D3BDb40a44B6b55c1123213F
+tx: 0xd32a1b9b1413871a3001c6e8ba0a9e4ef2a83c4ab09f28194e20befcd9e25090
+contract address: 0xAB45290275E6970b7B76FbaC8b39619EE05D0B69
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6698095
+gas used: 7425610
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0xb600cfdc30f7e1c09683d3f9d2acb07a730d7457ce5a32b4c0692d9b8577a999
-contract address: 0xE825E4621E95a5AE37119617bfC0165724c51762
+tx: 0x3cf245cc6e80e8b0e47af13b6a48e7784236c6f06be28a566c3f6f4b6edf4122
+contract address: 0xb1c9e66a9064208a930e446811aBE8f4c24310e0
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914480
+gas used: 6937010
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0x468104dd4404cb686309180499c794defc7b4c4c338f9b5e83fc3a9694c73784
-contract address: 0xA5D1ea50407B878e29a48BeDDd2B0D1b21e7882b
+tx: 0xe794f12c3bd49d9118d9ad2cf14efc0afaad2c4b3ae746f1aceb9c375840db48
+contract address: 0x4dab1e43593c3045D3FCb1eEaBBE839C16F12dA6
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1350,41 +1324,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0xc38ae00ba5539b7fb510fae29bd94a4f637bfd413049a41f164274d7b500f7d9
-contract address: 0x3EfBdc42E9CA14f6305528fC3c82d74d87AC58b7
+tx: 0xc2db0defdfaf772c832b78fa1adb471d831ac9f2dd44f0c9829abc6136e90ce6
+contract address: 0x62650cE1014A9880f8651f5b4ADB3314F339Dc3b
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3105725
+gas used: 3276945
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0x2ea25f2f454c7a2ffc8434511dd3173533ad8a6afe5c619e138f5e4f9d0181e3
-contract address: 0x6f237C97f45F73B766d1Dc811767B7402a0a8984
+tx: 0x8065c8f31a805076424b8f6bc16b7d8fb38e3e6ee105d73b798f73bb0f8038d2
+contract address: 0x43d8f4f99eCEE76977B75F1659ad34d6A7652c93
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6697975
+gas used: 7425490
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0x9e723a1d4e29da9d0c9f0c55603a821731e152a6845441db49e81a2bf2c63a88
-contract address: 0x4e92ed34740Ef54325D0382BeA1F433374e92593
+tx: 0x0f409992c4dcbd92e3fd2c2fca0ce635d82ce9dfa400dc7cf118be901918b331
+contract address: 0x5fc30A361D6dDf1dBa00b4D86aC2EBBe265E76fc
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914360
+gas used: 6936890
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0x51aa52294635d6ca062be337b2adab0fc705bc1a21bf5de5fecdf115249e0c7c
-contract address: 0xc59Ff5B5Ed3F1aEF6e37ec21B5BfFA21bD7fb2D9
+tx: 0x1b2509cbaa127b8d6b76a64c38c66a035ad59f69e3adddd9a5180f3297c47b9b
+contract address: 0x2f77845F39273850bf6d734e21c0D8E7bdfF50F8
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1394,41 +1368,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0x59579166a42f33f7e6a256ffd2e7f82139dbdd0a0d61183556a0d476087c753b
-contract address: 0x094D1D9DbA786f0cb1269e5Ddb3EfeB0d12d20c5
+tx: 0xc8572498fec572951914dc2e1558c8834da00750856e80964504270cc6971e16
+contract address: 0x739e654a4550FC22652eFD4d91fF3bf982bEDA4d
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3105725
+gas used: 3276945
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0xb23619f1d0c635054d2897b46583ace00a35480f4db88bea229f13bfcb543702
-contract address: 0x1FA239F639978047C14d29553a8e236b6f92942F
+tx: 0x152777a73df721c0de6d51a4118e8a492d25275e25757653c4f2267e7976ade0
+contract address: 0x708e2B13F6EB3f62686BAC1795c1e3C09e91eEaF
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6697975
+gas used: 7425490
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0x05fa3bad685f370129ecd3ad8b5b5961a89b299fd99620b6c30e6692ffd33076
-contract address: 0x20C26cCB11d5D956b5463B39b6A73D6878EB0CFB
+tx: 0x5450edbf0e2695bf4add1f68970ba7b01fc13206a27f0833f3e882eff515b802
+contract address: 0x7c888989D880597456a250098e8F57B0686A2B29
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914360
+gas used: 6936890
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0x118cff416a531fa60ca1b7b502f339e2abc9d221bf861aa247d272abb9f6b35f
-contract address: 0x145b1600D91f6d4c68dDC1A822C6A63bb2DDA2C4
+tx: 0xd1931ba728e39a704c7fc1fdc0f87af362ed4e56384e828ad679607b182cf3f3
+contract address: 0x65df659Be90a49356a33458d806d9dE3d8F03969
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1438,41 +1412,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0x543349474b101d20a5de9db05605da8b937d495e3be921ab12c81b21b5bf3447
-contract address: 0x84787bC73cB356f57fA5DFD1BA71211ff6eD8457
+tx: 0x77ba9383e9e5b2960c06e763cd6af1219b5de6c18d91f9013bd69f7f03e06343
+contract address: 0xE5464F611113932335B397Eb0dD1601a896005C6
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3105725
+gas used: 3276945
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0x66deed6e0f30d57ed46ba175b7064ca0644f61dc820c066d98930fee964f0e10
-contract address: 0x7a20fD36ef479Eb5B58C90a2a334Aa03182F9e4b
+tx: 0x81358741e66b74a3238e9781bd0fb634fee8ffce2a914d82dcba0a591d4f7430
+contract address: 0xF0cDB2EcE3A2188048b79B1f94b434c594B807fB
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6697975
+gas used: 7425490
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0x27b63cc7bd9a41b1c270557a753316b30afbda669e6a84e71417284f241fe65b
-contract address: 0x0A34d88C59a3445D9B41ce495f5c246F66a2F8a4
+tx: 0xe4552f83561f339dabcbbbeededbb56ccb1ab4d5fcf1ddfa2135982cf246985a
+contract address: 0x9D8Ae53F3D152a668C7c2d7a6cB37FdD9aF38285
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914360
+gas used: 6936890
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0x5b889a7b5e8e852226b5552ab09af3eee1d4ea037eb0119f679e213a25d999e2
-contract address: 0xcF1020f625e71043dD2F7BaF0204Ab741934D071
+tx: 0x748c940099df36aae3b2b10368e70bde62e3e3dbe45ca55e7d5033f44f779a1d
+contract address: 0x7C95b1ad025F0C9aB14192f87bF2aD53889bE4F7
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1482,41 +1456,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0xae16a68e2c57d1da61c8e1c2564001ce5b93c5382428d595f2540b14d9c589bc
-contract address: 0x9a72f6e6DCA4C3E008d9cC3EF70AcC8d44B14025
+tx: 0xf4f55e9354a916fa5b9549b681025a341502d384d2f77645cf0f4060e0d1e637
+contract address: 0x9bD0Bec44106D8Ea8fFb6296d7A84742a290E064
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3105725
+gas used: 3276945
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0x661ddc18af3b5de0f192637ff220c0783d8e6a7474ec0f653a76da030b4fc847
-contract address: 0x6889Fe0F204Bf55069146eb5D0dD21c63b9F4403
+tx: 0xc40f435954d1fc3a8ad096e084a83b05647c26b0bbe9f32fee215bbfb8d4e9e8
+contract address: 0x00f126cCA2266bFb634Ed6DB17c4C74fb8cA5177
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6698095
+gas used: 7425610
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0xda4837af1afad496ba3e2f83878dddc65c20b90173a60e469528205a1ac48420
-contract address: 0x44df6b755EC92a0821D316F817E0D3aA6eCBb3A9
+tx: 0xab44990260fe38bf2b4fc6cf1100f3aad1326eb3e9cb415e5cb65f69102e6ba2
+contract address: 0x34Ac3eB6180FdD94043664C22043F004734Dc480
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914480
+gas used: 6937010
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0xd8c0a661ae6d25efb2e69ff8258585c6c549596d0d94eda7616e450db715c9a1
-contract address: 0x80529D7f9602d41d80ef2D151604BfbB41ce599d
+tx: 0x667372a46626f30abeebcf4516685a8417975a73478090f6083b0dc58eaef381
+contract address: 0x04dE7A5bCCf369cb28AB389BfD7a6262E870B0a6
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1526,41 +1500,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0x9a0ebea0f321ffefa6113646435771763021e34c76a8d159df335ea5960038aa
-contract address: 0x7F223c7a296596a37cBd31edBACF2cc19257d5D5
+tx: 0xffecfe6215cd8137e3ba605236c39278b56592675dc35a802d53de8b5378005b
+contract address: 0xC9366C94D1760624DFa702Ee99a04E9f6271Aa70
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3105725
+gas used: 3276945
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0x8f5e6650222967603634a7bf247626e898db0666f9bfb38df5cb155ec11cef5f
-contract address: 0x3075958d06E5d4727C1E1644984ca3746Cea15a6
+tx: 0xe9c01fb60c1d3d74881c2833d199081cca4c4fa57701855d63c479c4a1006bc4
+contract address: 0xd405FD3185d05Ed8ba637C1C1ae772F9916A4F49
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6697975
+gas used: 7425430
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0x187ce6b41afd30fddb16198722a98a91809455d8c04b96b5a44791deaad3d2b5
-contract address: 0x150E5416Ef69cC06b56Dd18714B90520529FfF22
+tx: 0x13deded53ea75d1a7fae2ea5e517dcb2ec6501dd72847bfdf4d293929400ed11
+contract address: 0x54F1df7dB2E46dbeF18CF97A376b79108166fa36
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914360
+gas used: 6936830
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0x09b38eefa4892b88e60aa9e3e84f79f0dcbc480be74c3ad57797ae1c31ecf1fa
-contract address: 0x2B947EB2793FC091836F08B566C5E15897cf33ab
+tx: 0x3f8f8ec47ba5d1c5e02a248086dea3eac1a72367cc5f4a730e61afe787d444cf
+contract address: 0xF778f628abF1C0E17618077bAEA4FDA95D334136
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1570,41 +1544,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0xfe12c0823f98528ee218465c4b12b198ca72d0e7a711f8413526c8064c981de8
-contract address: 0xd14b9adeA003a6455bF3E4cd5FE8870B4136d67b
+tx: 0x1f791622f6dd6ee0e3ca7369a05f94de5ac9ad34758400c20bb62d720c52bdcc
+contract address: 0x267B07Fd1032e9A4e10dBF2600C8407ee6CA1e8c
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3106205
+gas used: 3277425
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0x48df0793a1540434762efec1d0d4bee0161931a544506d59a40a4618e5273616
-contract address: 0xf0F335E78EF8A0836A97bFfFfCcb54AA46Fc2CeB
+tx: 0xbc9d4ce2f71b60a86e0936a9eccd7990fa8ed5731d53c2e0961fd8ce42b4ec3b
+contract address: 0x61751f72Fa303F3bB256707dD3cD368c89E82f1b
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6697975
+gas used: 7425490
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0x77289b63116fe7f4e67b2a89113ce4112e2ca6dcbfd847f5ba9b6900e1912e2d
-contract address: 0x3174047010ECabC827e4F275aB5745eD9Dbd5D80
+tx: 0x7af317b3ebd94924badd8b088357a9c144aa99243bb8a48de6b23cfdbc41e1b9
+contract address: 0x2E10b24b10692fa972510051A1e296D4535043ad
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914360
+gas used: 6936890
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0xb1589a9d0fbd982851593c244e66a48f3449e285ca844564a5f92421a1973d4c
-contract address: 0xe171506BBBF645C4128e9d13e2f8FdC25f4E7b9F
+tx: 0x901aedab1094e416b81636292fd3df29b6e73aeb794526a728843bd4ff9c8ec2
+contract address: 0x99245fC7F2d63e1b09EE1b89f0861dcD09e7a4C1
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1614,41 +1588,41 @@ gas used: 9499999
 *** DefaultReserveInterestRateStrategy ***
 
 Network: localhost
-tx: 0x732a60fcc8ea281cff44085b6e8e3de728ae5c7c59792c011fde333f33ccf978
-contract address: 0x049F2C09e1d8C2ba59BE6A7Ff069B3632171a4dc
+tx: 0x3fa610059efa2c6228780079b05e9d200fe986a7a6a48911278cb52e461b9e8f
+contract address: 0xBe6d8642382C241c9B4B50c89574DbF3f4181E7D
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 3106205
+gas used: 3277425
 
 ******
 
 *** StableDebtToken ***
 
 Network: localhost
-tx: 0xd1379d80156c8a177189cd802b82b7fec78a955f8b20156950437f5210df5eff
-contract address: 0x8330f3ab4680A70C76Fa55D886155f39c6800aE4
+tx: 0xc1af9ee6909ed0d6e2a5ff0deef43dbbdd0e85dfabeb20bb60f67f27b28a758c
+contract address: 0x02BB514187B830d6A2111197cd7D8cb60650B970
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6698095
+gas used: 7425610
 
 ******
 
 *** VariableDebtToken ***
 
 Network: localhost
-tx: 0xf0727ce509c211d002e888417bad16d5b9999f27cc3d66f1fb19a441e1369357
-contract address: 0xCafc5D24cf5a0aFd027C1c3aEE54FD844b5Eb2d0
+tx: 0x6612bc1ec1d383ce25143b2cb399480c4f76996b218d1150e8407fdf46520593
+contract address: 0x6774Ce86Abf5EBB22E9F45b5f55daCbB4170aD7f
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 5914480
+gas used: 6937010
 
 ******
 
 *** AToken ***
 
 Network: localhost
-tx: 0xd91e9c046fd3a889e484828dbf074ea7545f6f479977ca7c0cc5da769b90005b
-contract address: 0x1b12f84d85e5EFdF07F992ACe35E832F630Ed4b7
+tx: 0x99665e44ce3b98d3f39d6ed1bc18bbc2705109a8b5f54b36dca59e1cf3e928a0
+contract address: 0x007C1a44e85bDa8F562F916685A9DC8BdC6542bF
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1658,37 +1632,48 @@ gas used: 9499999
 *** MockFlashLoanReceiver ***
 
 Network: localhost
-tx: 0xf404ef3d1da29a2ecd51b0358a551a8729dba946cd38fae8f801cc4252279fc3
-contract address: 0xBB36dAA26Fcfc04CAC1dAcD460AF09Df3622FF51
+tx: 0x04999d6cad119214e028099ca819a45a5f26cf5c523de92e83701bf79575f08d
+contract address: 0xAd49512dFBaD6fc13D67d3935283c0606812E962
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 2482595
+gas used: 1872305
+
+******
+
+*** MockSwapAdapter ***
+
+Network: localhost
+tx: 0xfd8e8e01a41ef55102549e5e4489b6dfe5405233a722d5913758517b3d50b53b
+contract address: 0x749258D38b0473d96FEcc14cC5e7DCE12d7Bd6f6
+deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
+gas price: 8000000000
+gas used: 1895365
 
 ******
 
 *** WalletBalanceProvider ***
 
 Network: localhost
-tx: 0x7b014ac1831e541fa07053834dd2cfd3fe02a70dc16fb181837eff35bce1566f
-contract address: 0x81EDb206d8172f85d62fc91d03B5ae6C73CeF75B
+tx: 0xf36d7aaae62638f3e44de25aa1df006a96928b6459a7a3d2b80ed79e11ce190a
+contract address: 0xA29C2A7e59aa49C71aF084695337E3AA5e820758
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 2512380
+gas used: 2512320
 
 ******
 
 *** AaveProtocolTestHelpers ***
 
 Network: localhost
-tx: 0x3c6e6d17e7e10dc3cf528cac945917abc64826ca739fda12a3674a824e7be80e
-contract address: 0xd2b69b0ba7d62f6122B3FCdc3c79C15A1E51E9e2
+tx: 0x6f1847e62f402f758eaa6dfaa62f318688f8822c5090cd57157d13da892cc489
+contract address: 0x9305d862ee95a899b83906Cd9CB666aC269E5f66
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 2818975
+gas used: 2838385
 
 ******
 
-setup: 25.421s
+setup: 22.427s
 Pool loaded
 Configurator loaded
 
@@ -1704,14 +1689,8 @@ Setup and snapshot finished
 
   AToken: Transfer
     ✓ User 0 deposits 1000 DAI, transfers to user 1
-    ✓ User 1 redirects interest to user 2, transfers 500 DAI back to user 0
-    ✓ User 0 transfers back to user 1
     ✓ User 0 deposits 1 WETH and user 1 tries to borrow, but the aTokens received as a transfer are not available as collateral (revert expected)
     ✓ User 1 sets the DAI as collateral and borrows, tries to transfer everything back to user 0 (revert expected)
-    ✓ User 0 tries to transfer 0 balance (revert expected)
-    ✓ User 1 repays the borrow, transfers aDAI back to user 0
-    ✓ User 0 redirects interest to user 2, transfers 500 aDAI to user 1. User 1 redirects to user 3. User 0 transfers another 100 aDAI
-    ✓ User 1 transfers the whole amount to himself
 
   LendingPoolConfigurator
 
@@ -1724,8 +1703,7 @@ Setup and snapshot finished
     ✓ Check the onlyLendingPoolManager on freezeReserve 
     ✓ Check the onlyLendingPoolManager on unfreezeReserve 
     ✓ Deactivates the ETH reserve for borrowing
-
-    2) Activates the ETH reserve for borrowing
+    ✓ Activates the ETH reserve for borrowing
     ✓ Check the onlyLendingPoolManager on disableBorrowingOnReserve 
     ✓ Check the onlyLendingPoolManager on enableBorrowingOnReserve 
     ✓ Deactivates the ETH reserve as collateral
@@ -1746,74 +1724,127 @@ Setup and snapshot finished
     ✓ Check the onlyLendingPoolManager on setLiquidationBonus
     ✓ Reverts when trying to disable the DAI reserve with liquidity on it
 
+  LendingPool. repayWithCollateral()
+    ✓ User 1 provides some liquidity for others to borrow
+    ✓ User 2 deposit WETH and borrows DAI at Variable
+    ✓ It is not possible to do reentrancy on repayWithCollateral()
+
+    2) User 2 tries to repay his DAI Variable loan using his WETH collateral. First half the amount, after that, the rest
+
+    3) User 3 deposits WETH and borrows USDC at Variable
+
+    4) User 3 repays completely his USDC loan by swapping his WETH collateral
+    ✓ Revert expected. User 3 tries to repay with his collateral a currency he havent borrow
+
+    5) User 3 tries to repay with his collateral all his variable debt and part of the stable
+
+    6) User 4 tries to repay a bigger amount that what can be swapped of a particular collateral, repaying only the maximum allowed by that collateral
+    ✓ User 5 deposits WETH and DAI, then borrows USDC at Variable, then disables WETH as collateral
+
+    7) User 5 tries to repay his USDC loan by swapping his WETH collateral, should not revert even with WETH collateral disabled
+
+  LendingPool. repayWithCollateral() with liquidator
+    ✓ User 1 provides some liquidity for others to borrow
+
+    8) User 5 liquidate User 3 collateral, all his variable debt and part of the stable
+    ✓ User 3 deposits WETH and borrows USDC at Variable
+
+    9) User 5 liquidates half the USDC loan of User 3 by swapping his WETH collateral
+    ✓ Revert expected. User 5 tries to liquidate an User 3 collateral a currency he havent borrow
+
+    10) User 5 liquidates all the USDC loan of User 3 by swapping his WETH collateral
+    ✓ User 2 deposit WETH and borrows DAI at Variable
+
+    11) It is not possible to do reentrancy on repayWithCollateral()
+    ✓ User 5 tries to liquidate  User 2 DAI Variable loan using his WETH collateral, with good HF
+
+    12) User 5 liquidates User 2 DAI Variable loan using his WETH collateral, half the amount
+
+    13) User 2 tries to repay remaining DAI Variable loan using his WETH collateral
+
+    14) Liquidator tries to repay 4 user a bigger amount that what can be swapped of a particular collateral, repaying only the maximum allowed by that collateral
+
+    15) User 5 deposits WETH and DAI, then borrows USDC at Variable, then disables WETH as collateral
+
+    16) Liquidator tries to liquidates User 5 USDC loan by swapping his WETH collateral, should revert due WETH collateral disabled
+
   LendingPool FlashLoan function
     ✓ Deposits ETH into the reserve
 
-    3) Takes ETH flashloan, returns the funds correctly
-Total liquidity is  2000720000285388128
+    17) Takes WETH flashloan with mode = 0, returns the funds correctly
 
-    4) Takes an ETH flashloan as big as the available liquidity
-    ✓ Takes WETH flashloan, does not return the funds (revert expected)
+    18) Takes an ETH flashloan with mode = 0 as big as the available liquidity
+    ✓ Takes WETH flashloan, does not return the funds with mode = 0. (revert expected)
+    ✓ Takes a WETH flashloan with an invalid mode. (revert expected)
+
+    19) Caller deposits 1000 DAI as collateral, Takes WETH flashloan with mode = 2, does not return the funds. A variable loan for caller is created
     ✓ tries to take a very small flashloan, which would result in 0 fees (revert expected)
 
-    5) tries to take a flashloan that is bigger than the available liquidity (revert expected)
+    20) tries to take a flashloan that is bigger than the available liquidity (revert expected)
     ✓ tries to take a flashloan using a non contract address as receiver (revert expected)
-    ✓ Deposits DAI into the reserve
+    ✓ Deposits USDC into the reserve
 
-    6) Takes out a 500 DAI flashloan, returns the funds correctly
-    ✓ Takes out a 500 DAI flashloan, does not return the funds (revert expected)
+    21) Takes out a 500 USDC flashloan, returns the funds correctly
+
+    22) Takes out a 500 USDC flashloan with mode = 0, does not return the funds. (revert expected)
+
+    23) Caller deposits 5 WETH as collateral, Takes a USDC flashloan with mode = 2, does not return the funds. A loan for caller is created
+    ✓ Caller deposits 1000 DAI as collateral, Takes a WETH flashloan with mode = 0, does not approve the transfer of the funds
+
+    24) Caller takes a WETH flashloan with mode = 1
 
   LendingPoolAddressesProvider
     ✓ Test the accessibility of the LendingPoolAddressesProvider
 
   LendingPool liquidation - liquidator receiving aToken
 
-    7) LIQUIDATION - Deposits WETH, borrows DAI/Check liquidation fails because health factor is above 1
+    25) LIQUIDATION - Deposits WETH, borrows DAI/Check liquidation fails because health factor is above 1
 
-    8) LIQUIDATION - Drop the health factor below 1
+    26) LIQUIDATION - Drop the health factor below 1
 
-    9) LIQUIDATION - Tries to liquidate a different currency than the loan principal
+    27) LIQUIDATION - Tries to liquidate a different currency than the loan principal
 
-    10) LIQUIDATION - Tries to liquidate a different collateral than the borrower collateral
+    28) LIQUIDATION - Tries to liquidate a different collateral than the borrower collateral
 
-    11) LIQUIDATION - Liquidates the borrow
+    29) LIQUIDATION - Liquidates the borrow
 
-    12) User 3 deposits 1000 USDC, user 4 1 WETH, user 4 borrows - drops HF, liquidates the borrow
+    30) User 3 deposits 1000 USDC, user 4 1 WETH, user 4 borrows - drops HF, liquidates the borrow
 
   LendingPool liquidation - liquidator receiving the underlying asset
 
-    13) LIQUIDATION - Deposits WETH, borrows DAI
+    31) LIQUIDATION - Deposits WETH, borrows DAI
 
-    14) LIQUIDATION - Drop the health factor below 1
+    32) LIQUIDATION - Drop the health factor below 1
 
-    15) LIQUIDATION - Liquidates the borrow
+    33) LIQUIDATION - Liquidates the borrow
 
-    16) User 3 deposits 1000 USDC, user 4 1 WETH, user 4 borrows - drops HF, liquidates the borrow
-
-    17) User 4 deposits 1000 LEND - drops HF, liquidates the LEND, which results on a lower amount being liquidated
+    34) User 3 deposits 1000 USDC, user 4 1 WETH, user 4 borrows - drops HF, liquidates the borrow
+    ✓ User 4 deposits 1000 LEND - drops HF, liquidates the LEND, which results on a lower amount being liquidated
 
   LendingPool: Borrow negatives (reverts)
-    ✓ User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and tries to borrow 100 DAI with rate mode NONE (revert expected)
-    ✓ User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and tries to borrow 100 DAI with an invalid rate mode (revert expected)
+
+    35) User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and tries to borrow 100 DAI with rate mode NONE (revert expected)
+
+    36) User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and tries to borrow 100 DAI with an invalid rate mode (revert expected)
 
   LendingPool: Borrow/repay (stable rate)
 
-    18) User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and borrows 100 DAI at stable rate
+    37) User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and borrows 100 DAI at stable rate
     ✓ User 1 tries to borrow the rest of the DAI liquidity (revert expected)
-
-    19) User 1 repays the half of the DAI borrow after one year
-
-    20) User 1 repays the rest of the DAI borrow after one year
+    ✓ User 1 repays the half of the DAI borrow after one year
+    ✓ User 1 repays the rest of the DAI borrow after one year
     ✓ User 0 withdraws the deposited DAI plus interest
 
-    21) User 1 deposits 1000 DAI, user 2 tries to borrow 1000 DAI at a stable rate without any collateral (revert expected)
+    38) User 1 deposits 1000 DAI, user 2 tries to borrow 1000 DAI at a stable rate without any collateral (revert expected)
 
-    22) User 0 deposits 1000 DAI, user 1,2,3,4 deposit 1 WETH each and borrow 100 DAI at stable rate. Everything is repaid, user 0 withdraws
-    ✓ User 0 deposits 1000 DAI, user 1 deposits 2 WETH and borrow 100 DAI at stable rate first, then 100 DAI at variable rate, repays everything. User 0 withdraws
+    39) User 0 deposits 1000 DAI, user 1,2,3,4 deposit 1 WETH each and borrow 100 DAI at stable rate. Everything is repaid, user 0 withdraws
+
+    40) User 0 deposits 1000 DAI, user 1 deposits 2 WETH and borrow 100 DAI at stable rate first, then 100 DAI at variable rate, repays everything. User 0 withdraws
 
   LendingPool: Borrow/repay (variable rate)
     ✓ User 2 deposits 1 DAI to account for rounding errors
-    ✓ User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and borrows 100 DAI at variable rate
+
+    41) User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and borrows 100 DAI at variable rate
     ✓ User 1 tries to borrow the rest of the DAI liquidity (revert expected)
     ✓ User 1 tries to repay 0 DAI (revert expected)
     ✓ User 1 repays a small amount of DAI, enough to cover a small part of the interest
@@ -1829,23 +1860,25 @@ Total liquidity is  2000720000285388128
     ✓ User 0 withdraws the deposited WETH plus interest
     ✓ User 1 withdraws the collateral
     ✓ User 2 deposits 1 USDC to account for rounding errors
-    ✓ User 0 deposits 1000 USDC, user 1 deposits 1 WETH as collateral and borrows 100 USDC at variable rate
 
-    23) User 1 tries to borrow the rest of the USDC liquidity (revert expected)
-    ✓ User 1 repays the USDC borrow after one year
+    42) User 0 deposits 1000 USDC, user 1 deposits 1 WETH as collateral and borrows 100 USDC at variable rate
+    ✓ User 1 tries to borrow the rest of the USDC liquidity (revert expected)
+
+    43) User 1 repays the USDC borrow after one year
     ✓ User 0 withdraws the deposited USDC plus interest
     ✓ User 1 withdraws the collateral
 
-    24) User 1 deposits 1000 DAI, user 3 tries to borrow 1000 DAI without any collateral (revert expected)
+    44) User 1 deposits 1000 DAI, user 3 tries to borrow 1000 DAI without any collateral (revert expected)
 
-    25) user 3 deposits 0.1 ETH collateral to borrow 100 DAI; 0.1 ETH is not enough to borrow 100 DAI (revert expected)
-    ✓ user 3 withdraws the 0.1 ETH
-    ✓ User 1 deposits 1000 USDC, user 3 tries to borrow 1000 USDC without any collateral (revert expected)
-
-    26) user 3 deposits 0.1 ETH collateral to borrow 100 USDC; 0.1 ETH is not enough to borrow 100 USDC (revert expected)
+    45) user 3 deposits 0.1 ETH collateral to borrow 100 DAI; 0.1 ETH is not enough to borrow 100 DAI (revert expected)
     ✓ user 3 withdraws the 0.1 ETH
 
-    27) User 0 deposits 1000 DAI, user 6 deposits 2 WETH and borrow 100 DAI at variable rate first, then 100 DAI at stable rate, repays everything. User 0 withdraws
+    46) User 1 deposits 1000 USDC, user 3 tries to borrow 1000 USDC without any collateral (revert expected)
+
+    47) user 3 deposits 0.1 ETH collateral to borrow 100 USDC; 0.1 ETH is not enough to borrow 100 USDC (revert expected)
+    ✓ user 3 withdraws the 0.1 ETH
+
+    48) User 0 deposits 1000 DAI, user 6 deposits 2 WETH and borrow 100 DAI at variable rate first, then 100 DAI at stable rate, repays everything. User 0 withdraws
 
   LendingPool: Deposit
     ✓ User 0 Deposits 1000 DAI in an empty reserve
@@ -1853,61 +1886,46 @@ Total liquidity is  2000720000285388128
     ✓ User 0 deposits 1000 USDC in an empty reserve
     ✓ User 1 deposits 1000 USDC after user 0
     ✓ User 0 deposits 1 WETH in an empty reserve
-    ✓ User 1 deposits 1 WETH after user 0
+
+    49) User 1 deposits 1 WETH after user 0
     ✓ User 1 deposits 0 ETH (revert expected)
     ✓ User 1 deposits 0 DAI
-
-  AToken: interest rate redirection negative test cases
-    ✓ User 0 deposits 1000 DAI, tries to give allowance to redirect interest to himself (revert expected)
-    ✓ User 1 tries to redirect the interest of user 0 without allowance (revert expected)
-
-    28) User 0 tries to redirect the interest to user 2 twice (revert expected)
-
-    29) User 3 with 0 balance tries to redirect the interest to user 2 (revert expected)
-
-  AToken: interest rate redirection
-
-    30) User 0 deposits 1000 DAI, redirects the interest to user 2
-    ✓ User 1 deposits 1 ETH, borrows 100 DAI, repays after one year. Users 0 deposits another 1000 DAI. Redirected balance of user 2 is updated
-
-    31) User 1 borrows another 100 DAI, repay the whole amount. Users 0 and User 2 withdraw
-
-    32) User 0 deposits 1000 DAI, redirects interest to user 2, user 1 borrows 100 DAI. After one year, user 0 redirects interest back to himself, user 1 borrows another 100 DAI and after another year repays the whole amount. Users 0 and User 2 withdraw
-
-    33) User 0 deposits 1000 DAI, redirects interest to user 2, user 1 borrows 100 DAI. After one year, user 2 redirects interest to user 3. user 1 borrows another 100 DAI, user 0 deposits another 100 DAI. User 1 repays the whole amount. Users 0, 2 first 1 DAI, then everything. User 3 withdraws
+    ✓ User 1 deposits 100 DAI on behalf of user 2, user 2 tries to borrow 0.1 WETH
 
   LendingPool: Rebalance stable rate
     ✓ User 0 tries to rebalance user 1 who has no borrows in progress (revert expected)
-    ✓ User 0 deposits 1000 DAI, user 1 deposits 1 ETH, borrows 100 DAI at a variable rate, user 0 rebalances user 1 (revert expected)
 
-    34) User 1 swaps to stable, user 0 tries to rebalance but the conditions are not met (revert expected)
+    50) User 0 deposits 1000 DAI, user 1 deposits 1 ETH, borrows 100 DAI at a variable rate, user 0 rebalances user 1 (revert expected)
 
-    35) User 2 deposits ETH and borrows the remaining DAI, causing the stable rates to rise (liquidity rate < user 1 borrow rate). User 0 tries to rebalance user 1 (revert expected)
+    51) User 1 swaps to stable, user 0 tries to rebalance but the conditions are not met (revert expected)
 
-    36) User 2 borrows more DAI, causing the liquidity rate to rise above user 1 stable borrow rate User 0 rebalances user 1
+    52) User 2 deposits ETH and borrows the remaining DAI, causing the stable rates to rise (liquidity rate < user 1 borrow rate). User 0 tries to rebalance user 1 (revert expected)
+
+    53) User 2 borrows more DAI, causing the liquidity rate to rise above user 1 stable borrow rate User 0 rebalances user 1
 
   LendingPool: Usage as collateral
-    ✓ User 0 Deposits 1000 DAI, disables DAI as collateral
 
-    37) User 1 Deposits 2 ETH, disables ETH as collateral, borrows 400 DAI (revert expected)
-    ✓ User 1 enables ETH as collateral, borrows 400 DAI
+    54) User 0 Deposits 1000 DAI, disables DAI as collateral
 
-    38) User 1 disables ETH as collateral (revert expected)
+    55) User 1 Deposits 2 ETH, disables ETH as collateral, borrows 400 DAI (revert expected)
+
+    56) User 1 enables ETH as collateral, borrows 400 DAI
+
+    57) User 1 disables ETH as collateral (revert expected)
 
   LendingPool: Swap rate mode
     ✓ User 0 tries to swap rate mode without any variable rate loan in progress (revert expected)
     ✓ User 0 tries to swap rate mode without any stable rate loan in progress (revert expected)
 
-    39) User 0 deposits 1000 DAI, user 1 deposits 2 ETH as collateral, borrows 100 DAI at variable rate and swaps to stable after one year
-
-    40) User 1 borrows another 100 DAI, and swaps back to variable after one year, repays the loan
+    58) User 0 deposits 1000 DAI, user 1 deposits 2 ETH as collateral, borrows 100 DAI at variable rate and swaps to stable after one year
+    ✓ User 1 borrows another 100 DAI, and swaps back to variable after one year, repays the loan
 
   LendingPool: Redeem negative test cases
     ✓ Users 0 Deposits 1000 DAI and tries to redeem 0 DAI (revert expected)
 
-    41) Users 0 tries to redeem 1100 DAI from the 1000 DAI deposited (revert expected)
+    59) Users 0 tries to redeem 1100 DAI from the 1000 DAI deposited (revert expected)
 
-    42) Users 1 deposits 1 WETH, borrows 100 DAI, tries to redeem the 1 WETH deposited (revert expected)
+    60) Users 1 deposits 1 WETH, borrows 100 DAI, tries to redeem the 1 WETH deposited (revert expected)
 
   LendingPool: withdraw
     ✓ User 0 Deposits 1000 DAI in an empty reserve
@@ -1919,9 +1937,9 @@ Total liquidity is  2000720000285388128
     ✓ User 0 Deposits 1 WETH in an empty reserve
     ✓ User 0 withdraws half of the deposited ETH
     ✓ User 0 withdraws remaining half of the deposited ETH
+    ✓ Users 0 and 1 Deposit 1000 DAI, both withdraw
 
-    43) Users 0 and 1 Deposit 1000 DAI, both withdraw
-    ✓ Users 0 deposits 1000 DAI, user 1 Deposit 1000 USDC and 1 WETH, borrows 100 DAI. User 1 tries to withdraw all the USDC
+    61) Users 0 deposits 1000 DAI, user 1 Deposit 1000 USDC and 1 WETH, borrows 100 DAI. User 1 tries to withdraw all the USDC
 
   Stable debt token tests
     ✓ Tries to invoke mint not being the LendingPool
@@ -1931,8 +1949,8 @@ Total liquidity is  2000720000285388128
 *** MockAToken ***
 
 Network: localhost
-tx: 0x40da52faa51b723c67d0a6ebf439ad0bc8e4e53dca57f9f7ce643b373b9f8d93
-contract address: 0x3a8e062Df7c52d69654e36d412131aa73aE8677b
+tx: 0x696dc0be963fe2924a4aa5558d3e5a3bf1fed36fe36d7d23c789a3777f35f512
+contract address: 0xFBdF1E93D0D88145e3CcA63bf8d513F83FB0903b
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
 gas used: 9499999
@@ -1942,22 +1960,22 @@ gas used: 9499999
 *** MockStableDebtToken ***
 
 Network: localhost
-tx: 0x579658bfb1a9e08727d77e16aca251ae99ed8b1b72811428c041c7267d68898d
-contract address: 0xF11Ca2128CC189FcD2315A7D652BB9B4e0a88530
+tx: 0x01436232ca0350c63f60eb508aa006612a889e9d678c026f810f6a4966382a11
+contract address: 0xE45fF4A0A8D0E9734C73874c034E03594E15ba28
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6901425
+gas used: 7628560
 
 ******
 
 *** MockVariableDebtToken ***
 
 Network: localhost
-tx: 0x740ea0d8e42634ecacd64981923f30d493723b0035e1285d4580cabff675ff4c
-contract address: 0xc0099450FDd004D080655eAacB83E2A846E18D1B
+tx: 0xefccca15b91974bbe2288e8671c0451f22dfdc62e088ccfe05a744402b4e0b2e
+contract address: 0x5cCC6Abc4c9F7262B9485797a848Ec6CC28A11dF
 deployer address: 0xc783df8a850f42e7F7e57013759C285caa701eB6
 gas price: 8000000000
-gas used: 6117750
+gas used: 7139960
 
 ******
 
@@ -1979,75 +1997,85 @@ gas used: 6117750
 ·································|·································|·············|·············|·············|···············|··············
 |  Contract                      ·  Method                         ·  Min        ·  Max        ·  Avg        ·  # calls      ·  eur (avg)  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPool                   ·  borrow                         ·     300832  ·     379413  ·     332915  ·           16  ·          -  │
+|  LendingPool                   ·  borrow                         ·     262042  ·     357423  ·     307591  ·           14  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPool                   ·  deposit                        ·     161050  ·     294208  ·     208354  ·           63  ·          -  │
+|  LendingPool                   ·  deposit                        ·     106722  ·     203343  ·     166219  ·           58  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPool                   ·  flashLoan                      ·     162224  ·     162248  ·     162236  ·            2  ·          -  │
+|  LendingPool                   ·  flashLoan                      ·     174269  ·     334932  ·     281378  ·            3  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPool                   ·  repay                          ·     115764  ·     213421  ·     169447  ·           12  ·          -  │
+|  LendingPool                   ·  liquidationCall                ·          -  ·          -  ·     402890  ·            1  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPool                   ·  setUserUseReserveAsCollateral  ·      83653  ·     194201  ·     131091  ·            5  ·          -  │
+|  LendingPool                   ·  repay                          ·     133914  ·     207869  ·     181299  ·           14  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPool                   ·  swapBorrowRateMode             ·          -  ·          -  ·     159288  ·            1  ·          -  │
+|  LendingPool                   ·  repayWithCollateral            ·     404877  ·     475002  ·     432357  ·            3  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPool                   ·  withdraw                       ·     163664  ·     320531  ·     220831  ·           32  ·          -  │
+|  LendingPool                   ·  setUserUseReserveAsCollateral  ·      93517  ·     176141  ·     148600  ·            3  ·          -  │
+·································|·································|·············|·············|·············|···············|··············
+|  LendingPool                   ·  swapBorrowRateMode             ·          -  ·          -  ·     159870  ·            1  ·          -  │
+·································|·································|·············|·············|·············|···············|··············
+|  LendingPool                   ·  withdraw                       ·     171316  ·     318009  ·     207305  ·           28  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
 |  LendingPoolAddressesProvider  ·  transferOwnership              ·          -  ·          -  ·      30839  ·            1  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  activateReserve                ·          -  ·          -  ·      46805  ·            4  ·          -  │
+|  LendingPoolConfigurator       ·  activateReserve                ·          -  ·          -  ·      46958  ·            4  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  disableBorrowingOnReserve      ·          -  ·          -  ·      50971  ·            1  ·          -  │
+|  LendingPoolConfigurator       ·  disableBorrowingOnReserve      ·          -  ·          -  ·      51124  ·            2  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  disableReserveAsCollateral     ·          -  ·          -  ·      50907  ·            2  ·          -  │
+|  LendingPoolConfigurator       ·  disableReserveAsCollateral     ·          -  ·          -  ·      51060  ·            2  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  disableReserveStableRate       ·          -  ·          -  ·      51036  ·            2  ·          -  │
+|  LendingPoolConfigurator       ·  disableReserveStableRate       ·          -  ·          -  ·      51189  ·            2  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  enableBorrowingOnReserve       ·          -  ·          -  ·      51547  ·            3  ·          -  │
+|  LendingPoolConfigurator       ·  enableBorrowingOnReserve       ·          -  ·          -  ·      51700  ·            4  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  enableReserveAsCollateral      ·          -  ·          -  ·      52396  ·            4  ·          -  │
+|  LendingPoolConfigurator       ·  enableReserveAsCollateral      ·          -  ·          -  ·      52549  ·            4  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  enableReserveStableRate        ·          -  ·          -  ·      50916  ·            4  ·          -  │
+|  LendingPoolConfigurator       ·  enableReserveStableRate        ·          -  ·          -  ·      51069  ·            4  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  freezeReserve                  ·          -  ·          -  ·      50951  ·            2  ·          -  │
+|  LendingPoolConfigurator       ·  freezeReserve                  ·          -  ·          -  ·      51104  ·            2  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  setLiquidationBonus            ·          -  ·          -  ·      51228  ·            5  ·          -  │
+|  LendingPoolConfigurator       ·  setLiquidationBonus            ·          -  ·          -  ·      51381  ·            5  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  setLiquidationThreshold        ·          -  ·          -  ·      51229  ·            3  ·          -  │
+|  LendingPoolConfigurator       ·  setLiquidationThreshold        ·          -  ·          -  ·      51382  ·            3  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  setLtv                         ·          -  ·          -  ·      51257  ·            3  ·          -  │
+|  LendingPoolConfigurator       ·  setLtv                         ·          -  ·          -  ·      51410  ·            3  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  unfreezeReserve                ·          -  ·          -  ·      51014  ·            4  ·          -  │
+|  LendingPoolConfigurator       ·  unfreezeReserve                ·          -  ·          -  ·      51167  ·            4  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  updateAToken                   ·          -  ·          -  ·     140669  ·            3  ·          -  │
+|  LendingPoolConfigurator       ·  updateAToken                   ·          -  ·          -  ·     141032  ·            3  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  updateStableDebtToken          ·          -  ·          -  ·     140932  ·            3  ·          -  │
+|  LendingPoolConfigurator       ·  updateStableDebtToken          ·          -  ·          -  ·     140990  ·            3  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  LendingPoolConfigurator       ·  updateVariableDebtToken        ·          -  ·          -  ·     140901  ·            3  ·          -  │
+|  LendingPoolConfigurator       ·  updateVariableDebtToken        ·          -  ·          -  ·     140959  ·            3  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  MintableERC20                 ·  approve                        ·      24907  ·      44119  ·      32449  ·           47  ·          -  │
+|  MintableERC20                 ·  approve                        ·      24907  ·      44119  ·      36154  ·           42  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  MintableERC20                 ·  mint                           ·      35427  ·      65475  ·      40972  ·           49  ·          -  │
+|  MintableERC20                 ·  mint                           ·      35427  ·      65487  ·      44328  ·           44  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  MintableERC20                 ·  transfer                       ·     134112  ·     207037  ·     169693  ·           13  ·          -  │
+|  MintableERC20                 ·  transfer                       ·          -  ·          -  ·      79721  ·            2  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  MockAToken                    ·  redirectInterestStream         ·     120629  ·     139841  ·     133433  ·            3  ·          -  │
+|  MockFlashLoanReceiver         ·  setAmountToApprove             ·          -  ·          -  ·      41475  ·            1  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
-|  MockFlashLoanReceiver         ·  setFailExecutionTransfer       ·          -  ·          -  ·      27239  ·            6  ·          -  │
+|  MockFlashLoanReceiver         ·  setFailExecutionTransfer       ·      13614  ·      42239  ·      29921  ·            7  ·          -  │
+·································|·································|·············|·············|·············|···············|··············
+|  MockSwapAdapter               ·  setAmountToReturn              ·      26483  ·      41519  ·      29521  ·            5  ·          -  │
+·································|·································|·············|·············|·············|···············|··············
+|  MockSwapAdapter               ·  setTryReentrancy               ·          -  ·          -  ·      27257  ·            1  ·          -  │
+·································|·································|·············|·············|·············|···············|··············
+|  PriceOracle                   ·  setAssetPrice                  ·      28539  ·      28551  ·      28548  ·            4  ·          -  │
 ·································|·································|·············|·············|·············|···············|··············
 |  Deployments                                                     ·                                         ·  % of limit   ·             │
 ···································································|·············|·············|·············|···············|··············
-|  MockVariableDebtToken                                           ·          -  ·          -  ·    1223550  ·       12.2 %  ·          -  │
+|  MockVariableDebtToken                                           ·          -  ·          -  ·    1427992  ·       14.3 %  ·          -  │
 ···································································|·············|·············|·············|···············|··············
-|  ValidationLogic                                                 ·          -  ·          -  ·    1761800  ·       17.6 %  ·          -  │
+|  ValidationLogic                                                 ·          -  ·          -  ·    1539063  ·       15.4 %  ·          -  │
 ·------------------------------------------------------------------|-------------|-------------|-------------|---------------|-------------·
 
-  114 passing (4m)
-  43 failing
+  112 passing (3m)
+  61 failing
 
   1) LendingPoolConfigurator
        Deactivates the ETH reserve:
-     Error: VM Exception while processing transaction: revert The liquidity of the reserve needs to be 0
+     Error: VM Exception while processing transaction: revert 36
       at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
       at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
       at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
@@ -2067,357 +2095,318 @@ gas used: 6117750
       at runMicrotasks (<anonymous>)
       at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  2) LendingPoolConfigurator
-       Activates the ETH reserve for borrowing:
+  2) LendingPool. repayWithCollateral()
+       User 2 tries to repay his DAI Variable loan using his WETH collateral. First half the amount, after that, the rest:
 
-      AssertionError: expected '1000000000951293759814590868' to equal '1000000000000000000000000000'
+      AssertionError: expected '999594024748679625' to equal '961247816651583750'
       + expected - actual
 
-      -1000000000951293759814590868
-      +1000000000000000000000000000
+      -999594024748679625
+      +961247816651583750
       
-      at /src/test/configurator.spec.ts:86:50
-      at step (test/configurator.spec.ts:33:23)
-      at Object.next (test/configurator.spec.ts:14:53)
-      at fulfilled (test/configurator.spec.ts:5:58)
+      at /src/test/repay-with-collateral.spec.ts:169:68
+      at step (test/repay-with-collateral.spec.ts:33:23)
+      at Object.next (test/repay-with-collateral.spec.ts:14:53)
+      at fulfilled (test/repay-with-collateral.spec.ts:5:58)
       at runMicrotasks (<anonymous>)
       at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  3) LendingPool FlashLoan function
-       Takes ETH flashloan, returns the funds correctly:
+  3) LendingPool. repayWithCollateral()
+       User 3 deposits WETH and borrows USDC at Variable:
+     Error: VM Exception while processing transaction: revert 11
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-      AssertionError: expected '2000720000285388128' to equal '1000720000000000000'
+  4) LendingPool. repayWithCollateral()
+       User 3 repays completely his USDC loan by swapping his WETH collateral:
+     Error: VM Exception while processing transaction: revert 40
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  5) LendingPool. repayWithCollateral()
+       User 3 tries to repay with his collateral all his variable debt and part of the stable:
+     Error: VM Exception while processing transaction: revert 11
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  6) LendingPool. repayWithCollateral()
+       User 4 tries to repay a bigger amount that what can be swapped of a particular collateral, repaying only the maximum allowed by that collateral:
+
+      AssertionError: expected '52004058862' to equal '-2.383204320379782404696e+21'
       + expected - actual
 
-      -2000720000285388128
+      -52004058862
+      +-2.383204320379782404696e+21
+      
+      at /src/test/repay-with-collateral.spec.ts:518:66
+      at step (test/repay-with-collateral.spec.ts:33:23)
+      at Object.next (test/repay-with-collateral.spec.ts:14:53)
+      at fulfilled (test/repay-with-collateral.spec.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  7) LendingPool. repayWithCollateral()
+       User 5 tries to repay his USDC loan by swapping his WETH collateral, should not revert even with WETH collateral disabled:
+
+      AssertionError: expected '9997370843952131411' to equal '9749035101915727008'
+      + expected - actual
+
+      -9997370843952131411
+      +9749035101915727008
+      
+      at /src/test/repay-with-collateral.spec.ts:631:68
+      at step (test/repay-with-collateral.spec.ts:33:23)
+      at Object.next (test/repay-with-collateral.spec.ts:14:53)
+      at fulfilled (test/repay-with-collateral.spec.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  8) LendingPool. repayWithCollateral() with liquidator
+       User 5 liquidate User 3 collateral, all his variable debt and part of the stable:
+     Error: VM Exception while processing transaction: revert 11
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  9) LendingPool. repayWithCollateral() with liquidator
+       User 5 liquidates half the USDC loan of User 3 by swapping his WETH collateral:
+
+      AssertionError: expected '1097065639317749425' to be less than '1000000000000000000'
+      + expected - actual
+
+      -1097065639317749425
+      +1000000000000000000
+      
+      at /src/test/flash-liquidation-with-collateral.spec.ts:223:68
+      at step (test/flash-liquidation-with-collateral.spec.ts:33:23)
+      at Object.next (test/flash-liquidation-with-collateral.spec.ts:14:53)
+      at fulfilled (test/flash-liquidation-with-collateral.spec.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  10) LendingPool. repayWithCollateral() with liquidator
+       User 5 liquidates all the USDC loan of User 3 by swapping his WETH collateral:
+
+      AssertionError: expected '59993908751455423405' to equal '59418562594024569644'
+      + expected - actual
+
+      -59993908751455423405
+      +59418562594024569644
+      
+      at /src/test/flash-liquidation-with-collateral.spec.ts:433:68
+      at step (test/flash-liquidation-with-collateral.spec.ts:33:23)
+      at Object.next (test/flash-liquidation-with-collateral.spec.ts:14:53)
+      at fulfilled (test/flash-liquidation-with-collateral.spec.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  11) LendingPool. repayWithCollateral() with liquidator
+       It is not possible to do reentrancy on repayWithCollateral():
+     AssertionError: Expected transaction to be reverted with 53, but other exception was thrown: Error: VM Exception while processing transaction: revert 38
+  
+
+  12) LendingPool. repayWithCollateral() with liquidator
+       User 5 liquidates User 2 DAI Variable loan using his WETH collateral, half the amount:
+
+      AssertionError: expected '1198981160048434745' to be less than '1000000000000000000'
+      + expected - actual
+
+      -1198981160048434745
+      +1000000000000000000
+      
+      at /src/test/flash-liquidation-with-collateral.spec.ts:556:68
+      at step (test/flash-liquidation-with-collateral.spec.ts:33:23)
+      at Object.next (test/flash-liquidation-with-collateral.spec.ts:14:53)
+      at fulfilled (test/flash-liquidation-with-collateral.spec.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  13) LendingPool. repayWithCollateral() with liquidator
+       User 2 tries to repay remaining DAI Variable loan using his WETH collateral:
+     Error: VM Exception while processing transaction: revert 53
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  14) LendingPool. repayWithCollateral() with liquidator
+       Liquidator tries to repay 4 user a bigger amount that what can be swapped of a particular collateral, repaying only the maximum allowed by that collateral:
+
+      AssertionError: expected '1270283356830566122' to be less than '1000000000000000000'
+      + expected - actual
+
+      -1270283356830566122
+      +1000000000000000000
+      
+      at /src/test/flash-liquidation-with-collateral.spec.ts:761:73
+      at step (test/flash-liquidation-with-collateral.spec.ts:33:23)
+      at Object.next (test/flash-liquidation-with-collateral.spec.ts:14:53)
+      at fulfilled (test/flash-liquidation-with-collateral.spec.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  15) LendingPool. repayWithCollateral() with liquidator
+       User 5 deposits WETH and DAI, then borrows USDC at Variable, then disables WETH as collateral:
+     Error: VM Exception while processing transaction: revert 11
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  16) LendingPool. repayWithCollateral() with liquidator
+       Liquidator tries to liquidates User 5 USDC loan by swapping his WETH collateral, should revert due WETH collateral disabled:
+     AssertionError: Expected transaction to be reverted with 39, but other exception was thrown: Error: VM Exception while processing transaction: revert 38
+  
+
+  17) LendingPool FlashLoan function
+       Takes WETH flashloan with mode = 0, returns the funds correctly:
+
+      AssertionError: expected '485188345817617606687' to equal '1000720000000000000'
+      + expected - actual
+
+      -485188345817617606687
       +1000720000000000000
       
-      at /src/test/flashloan.spec.ts:55:45
+      at /src/test/flashloan.spec.ts:66:45
       at step (test/flashloan.spec.ts:33:23)
       at Object.next (test/flashloan.spec.ts:14:53)
       at fulfilled (test/flashloan.spec.ts:5:58)
       at runMicrotasks (<anonymous>)
       at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  4) LendingPool FlashLoan function
-       Takes an ETH flashloan as big as the available liquidity:
+  18) LendingPool FlashLoan function
+       Takes an ETH flashloan with mode = 0 as big as the available liquidity:
 
-      AssertionError: expected '2001620648285388128' to equal '1001620648000000000'
+      AssertionError: expected '485189246465617606687' to equal '1001620648000000000'
       + expected - actual
 
-      -2001620648285388128
+      -485189246465617606687
       +1001620648000000000
       
-      at /src/test/flashloan.spec.ts:83:45
+      at /src/test/flashloan.spec.ts:93:45
       at step (test/flashloan.spec.ts:33:23)
       at Object.next (test/flashloan.spec.ts:14:53)
       at fulfilled (test/flashloan.spec.ts:5:58)
       at runMicrotasks (<anonymous>)
       at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  5) LendingPool FlashLoan function
+  19) LendingPool FlashLoan function
+       Caller deposits 1000 DAI as collateral, Takes WETH flashloan with mode = 2, does not return the funds. A variable loan for caller is created:
+     Error: VM Exception while processing transaction: revert 11
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  20) LendingPool FlashLoan function
        tries to take a flashloan that is bigger than the available liquidity (revert expected):
-     AssertionError: There is not enough liquidity available to borrow: Expected transaction to be reverted with There is not enough liquidity available to borrow, but other exception was thrown: Error: VM Exception while processing transaction: revert The actual balance of the protocol is inconsistent
-  
 
-  6) LendingPool FlashLoan function
-       Takes out a 500 DAI flashloan, returns the funds correctly:
-     AssertionError: Expected "3000450000000000000000" to be equal 1000450000000000000000
-      at /src/test/flashloan.spec.ts:176:34
-      at step (test/flashloan.spec.ts:33:23)
-      at Object.next (test/flashloan.spec.ts:14:53)
-      at fulfilled (test/flashloan.spec.ts:5:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  7) LendingPool liquidation - liquidator receiving aToken
-       LIQUIDATION - Deposits WETH, borrows DAI/Check liquidation fails because health factor is above 1:
-
-      AssertionError: expected '5534' to equal '8000'
-      + expected - actual
-
-      -5534
-      +8000
-      
-      at /src/test/liquidation-atoken.spec.ts:66:88
-      at step (test/liquidation-atoken.spec.ts:33:23)
-      at Object.next (test/liquidation-atoken.spec.ts:14:53)
-      at fulfilled (test/liquidation-atoken.spec.ts:5:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  8) LendingPool liquidation - liquidator receiving aToken
-       LIQUIDATION - Drop the health factor below 1:
-
-      AssertionError: expected '1125536573927102016' to be less than '1000000000000000000'
-      + expected - actual
-
-      -1125536573927102016
-      +1000000000000000000
-      
-      at /src/test/liquidation-atoken.spec.ts:90:68
-      at step (test/liquidation-atoken.spec.ts:33:23)
-      at Object.next (test/liquidation-atoken.spec.ts:14:53)
-      at fulfilled (test/liquidation-atoken.spec.ts:5:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  9) LendingPool liquidation - liquidator receiving aToken
-       LIQUIDATION - Tries to liquidate a different currency than the loan principal:
-     AssertionError: Expected transaction to be reverted with User did not borrow the specified currency, but other exception was thrown: Error: VM Exception while processing transaction: revert Health factor is not below the threshold
-  
-
-  10) LendingPool liquidation - liquidator receiving aToken
-       LIQUIDATION - Tries to liquidate a different collateral than the borrower collateral:
-     AssertionError: Expected transaction to be reverted with The collateral chosen cannot be liquidated, but other exception was thrown: Error: VM Exception while processing transaction: revert Health factor is not below the threshold
-  
-
-  11) LendingPool liquidation - liquidator receiving aToken
-       LIQUIDATION - Liquidates the borrow:
-     Error: VM Exception while processing transaction: revert Health factor is not below the threshold
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  12) LendingPool liquidation - liquidator receiving aToken
-       User 3 deposits 1000 USDC, user 4 1 WETH, user 4 borrows - drops HF, liquidates the borrow:
-     Error: VM Exception while processing transaction: revert WadRayMath: Division by 0
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  13) LendingPool liquidation - liquidator receiving the underlying asset
-       LIQUIDATION - Deposits WETH, borrows DAI:
-
-      AssertionError: expected '4513' to equal '8000'
-      + expected - actual
-
-      -4513
-      +8000
-      
-      at /src/test/liquidation-underlying.spec.ts:68:88
-      at step (test/liquidation-underlying.spec.ts:33:23)
-      at Object.next (test/liquidation-underlying.spec.ts:14:53)
-      at fulfilled (test/liquidation-underlying.spec.ts:5:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  14) LendingPool liquidation - liquidator receiving the underlying asset
-       LIQUIDATION - Drop the health factor below 1:
-
-      AssertionError: expected '1072938234852519524' to be less than '1000000000000000000'
-      + expected - actual
-
-      -1072938234852519524
-      +1000000000000000000
-      
-      at /src/test/liquidation-underlying.spec.ts:87:68
-      at step (test/liquidation-underlying.spec.ts:33:23)
-      at Object.next (test/liquidation-underlying.spec.ts:14:53)
-      at fulfilled (test/liquidation-underlying.spec.ts:5:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  15) LendingPool liquidation - liquidator receiving the underlying asset
-       LIQUIDATION - Liquidates the borrow:
-     Error: VM Exception while processing transaction: revert Health factor is not below the threshold
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  16) LendingPool liquidation - liquidator receiving the underlying asset
-       User 3 deposits 1000 USDC, user 4 1 WETH, user 4 borrows - drops HF, liquidates the borrow:
-     Error: VM Exception while processing transaction: revert Health factor is not below the threshold
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  17) LendingPool liquidation - liquidator receiving the underlying asset
-       User 4 deposits 1000 LEND - drops HF, liquidates the LEND, which results on a lower amount being liquidated:
-     Error: VM Exception while processing transaction: revert Health factor is not below the threshold
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  18) LendingPool: Borrow/repay (stable rate)
-       User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and borrows 100 DAI at stable rate:
-     Error: VM Exception while processing transaction: revert There is not enough collateral to cover a new borrow
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  19) LendingPool: Borrow/repay (stable rate)
-       User 1 repays the half of the DAI borrow after one year:
-
-      AssertionError: expected '53496990783011274544094862' to be almost equal or equal '49997187858088687830220109' for property utilizationRate
-      + expected - actual
-
-      -53496990783011274544094862
-      +49997187858088687830220109
-      
-      at expectEqual (test/helpers/actions.ts:806:26)
-      at /src/test/helpers/actions.ts:446:5
-      at step (test/helpers/actions.ts:33:23)
-      at Object.next (test/helpers/actions.ts:14:53)
-      at fulfilled (test/helpers/actions.ts:5:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  20) LendingPool: Borrow/repay (stable rate)
-       User 1 repays the rest of the DAI borrow after one year:
-     Error: VM Exception while processing transaction: revert 16
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  21) LendingPool: Borrow/repay (stable rate)
-       User 1 deposits 1000 DAI, user 2 tries to borrow 1000 DAI at a stable rate without any collateral (revert expected):
-
-      AssertionError: expected '0' to be almost equal or equal '428000013596354249047' for property principalStableDebt
-      + expected - actual
-
-      -0
-      +428000013596354249047
-      
-      at expectEqual (test/helpers/actions.ts:806:26)
-      at /src/test/helpers/actions.ts:189:5
-      at step (test/helpers/actions.ts:33:23)
-      at Object.next (test/helpers/actions.ts:14:53)
-      at fulfilled (test/helpers/actions.ts:5:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  22) LendingPool: Borrow/repay (stable rate)
-       User 0 deposits 1000 DAI, user 1,2,3,4 deposit 1 WETH each and borrow 100 DAI at stable rate. Everything is repaid, user 0 withdraws:
-     Error: VM Exception while processing transaction: revert There is not enough collateral to cover a new borrow
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  23) LendingPool: Borrow/repay (variable rate)
-       User 1 tries to borrow the rest of the USDC liquidity (revert expected):
-
-      AssertionError: There is not enough collateral to cover a new borrow: Expected transaction to be reverted
+      AssertionError: ERC20: transfer amount exceeds balance: Expected transaction to be reverted
       + expected - actual
 
       -Transaction NOT reverted.
@@ -2425,7 +2414,386 @@ gas used: 6117750
       
   
 
-  24) LendingPool: Borrow/repay (variable rate)
+  21) LendingPool FlashLoan function
+       Takes out a 500 USDC flashloan, returns the funds correctly:
+     AssertionError: Expected "40000000000001000450000" to be equal 1000450000
+      at /src/test/flashloan.spec.ts:254:34
+      at step (test/flashloan.spec.ts:33:23)
+      at Object.next (test/flashloan.spec.ts:14:53)
+      at fulfilled (test/flashloan.spec.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  22) LendingPool FlashLoan function
+       Takes out a 500 USDC flashloan with mode = 0, does not return the funds. (revert expected):
+     AssertionError: Expected transaction to be reverted with 9, but other exception was thrown: Error: VM Exception while processing transaction: revert 11
+  
+
+  23) LendingPool FlashLoan function
+       Caller deposits 5 WETH as collateral, Takes a USDC flashloan with mode = 2, does not return the funds. A loan for caller is created:
+     Error: VM Exception while processing transaction: revert 11
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  24) LendingPool FlashLoan function
+       Caller takes a WETH flashloan with mode = 1:
+     Error: VM Exception while processing transaction: revert 11
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  25) LendingPool liquidation - liquidator receiving aToken
+       LIQUIDATION - Deposits WETH, borrows DAI/Check liquidation fails because health factor is above 1:
+
+      AssertionError: expected '2180' to equal '8000'
+      + expected - actual
+
+      -2180
+      +8000
+      
+      at /src/test/liquidation-atoken.spec.ts:70:88
+      at step (test/liquidation-atoken.spec.ts:33:23)
+      at Object.next (test/liquidation-atoken.spec.ts:14:53)
+      at fulfilled (test/liquidation-atoken.spec.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  26) LendingPool liquidation - liquidator receiving aToken
+       LIQUIDATION - Drop the health factor below 1:
+
+      AssertionError: expected '1106703694383782217' to be less than '1000000000000000000'
+      + expected - actual
+
+      -1106703694383782217
+      +1000000000000000000
+      
+      at /src/test/liquidation-atoken.spec.ts:94:68
+      at step (test/liquidation-atoken.spec.ts:33:23)
+      at Object.next (test/liquidation-atoken.spec.ts:14:53)
+      at fulfilled (test/liquidation-atoken.spec.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  27) LendingPool liquidation - liquidator receiving aToken
+       LIQUIDATION - Tries to liquidate a different currency than the loan principal:
+     AssertionError: Expected transaction to be reverted with 40, but other exception was thrown: Error: VM Exception while processing transaction: revert 38
+  
+
+  28) LendingPool liquidation - liquidator receiving aToken
+       LIQUIDATION - Tries to liquidate a different collateral than the borrower collateral:
+     AssertionError: Expected transaction to be reverted with 39, but other exception was thrown: Error: VM Exception while processing transaction: revert 38
+  
+
+  29) LendingPool liquidation - liquidator receiving aToken
+       LIQUIDATION - Liquidates the borrow:
+     Error: VM Exception while processing transaction: revert 38
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  30) LendingPool liquidation - liquidator receiving aToken
+       User 3 deposits 1000 USDC, user 4 1 WETH, user 4 borrows - drops HF, liquidates the borrow:
+     Error: VM Exception while processing transaction: revert 39
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  31) LendingPool liquidation - liquidator receiving the underlying asset
+       LIQUIDATION - Deposits WETH, borrows DAI:
+
+      AssertionError: expected '2053' to equal '8000'
+      + expected - actual
+
+      -2053
+      +8000
+      
+      at /src/test/liquidation-underlying.spec.ts:75:88
+      at step (test/liquidation-underlying.spec.ts:33:23)
+      at Object.next (test/liquidation-underlying.spec.ts:14:53)
+      at fulfilled (test/liquidation-underlying.spec.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  32) LendingPool liquidation - liquidator receiving the underlying asset
+       LIQUIDATION - Drop the health factor below 1:
+
+      AssertionError: expected '1084735437615841522' to be less than '1000000000000000000'
+      + expected - actual
+
+      -1084735437615841522
+      +1000000000000000000
+      
+      at /src/test/liquidation-underlying.spec.ts:94:68
+      at step (test/liquidation-underlying.spec.ts:33:23)
+      at Object.next (test/liquidation-underlying.spec.ts:14:53)
+      at fulfilled (test/liquidation-underlying.spec.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  33) LendingPool liquidation - liquidator receiving the underlying asset
+       LIQUIDATION - Liquidates the borrow:
+     Error: VM Exception while processing transaction: revert 38
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  34) LendingPool liquidation - liquidator receiving the underlying asset
+       User 3 deposits 1000 USDC, user 4 1 WETH, user 4 borrows - drops HF, liquidates the borrow:
+     Error: VM Exception while processing transaction: revert 39
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  35) LendingPool: Borrow negatives (reverts)
+       User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and tries to borrow 100 DAI with rate mode NONE (revert expected):
+
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
+      + expected - actual
+
+      -100000000000000000
+      +0
+      
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  36) LendingPool: Borrow negatives (reverts)
+       User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and tries to borrow 100 DAI with an invalid rate mode (revert expected):
+
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
+      + expected - actual
+
+      -100000000000000000
+      +0
+      
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  37) LendingPool: Borrow/repay (stable rate)
+       User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and borrows 100 DAI at stable rate:
+
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
+      + expected - actual
+
+      -100000000000000000
+      +0
+      
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  38) LendingPool: Borrow/repay (stable rate)
+       User 1 deposits 1000 DAI, user 2 tries to borrow 1000 DAI at a stable rate without any collateral (revert expected):
+
+      AssertionError: expected '0' to be almost equal or equal '1358000328427211421354' for property principalStableDebt
+      + expected - actual
+
+      -0
+      +1358000328427211421354
+      
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  39) LendingPool: Borrow/repay (stable rate)
+       User 0 deposits 1000 DAI, user 1,2,3,4 deposit 1 WETH each and borrow 100 DAI at stable rate. Everything is repaid, user 0 withdraws:
+
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
+      + expected - actual
+
+      -100000000000000000
+      +0
+      
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  40) LendingPool: Borrow/repay (stable rate)
+       User 0 deposits 1000 DAI, user 1 deposits 2 WETH and borrow 100 DAI at stable rate first, then 100 DAI at variable rate, repays everything. User 0 withdraws:
+
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
+      + expected - actual
+
+      -100000000000000000
+      +0
+      
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  41) LendingPool: Borrow/repay (variable rate)
+       User 0 deposits 1000 DAI, user 1 deposits 1 WETH as collateral and borrows 100 DAI at variable rate:
+
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
+      + expected - actual
+
+      -100000000000000000
+      +0
+      
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  42) LendingPool: Borrow/repay (variable rate)
+       User 0 deposits 1000 USDC, user 1 deposits 1 WETH as collateral and borrows 100 USDC at variable rate:
+
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
+      + expected - actual
+
+      -100000000000000000
+      +0
+      
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  43) LendingPool: Borrow/repay (variable rate)
+       User 1 repays the USDC borrow after one year:
+     Error: VM Exception while processing transaction: revert 15
+      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
+      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
+      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
+      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
+      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
+      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
+      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
+      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
+      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  44) LendingPool: Borrow/repay (variable rate)
        User 1 deposits 1000 DAI, user 3 tries to borrow 1000 DAI without any collateral (revert expected):
 
       AssertionError: The collateral balance is 0: Expected transaction to be reverted
@@ -2436,7 +2804,7 @@ gas used: 6117750
       
   
 
-  25) LendingPool: Borrow/repay (variable rate)
+  45) LendingPool: Borrow/repay (variable rate)
        user 3 deposits 0.1 ETH collateral to borrow 100 DAI; 0.1 ETH is not enough to borrow 100 DAI (revert expected):
 
       AssertionError: There is not enough collateral to cover a new borrow: Expected transaction to be reverted
@@ -2447,7 +2815,18 @@ gas used: 6117750
       
   
 
-  26) LendingPool: Borrow/repay (variable rate)
+  46) LendingPool: Borrow/repay (variable rate)
+       User 1 deposits 1000 USDC, user 3 tries to borrow 1000 USDC without any collateral (revert expected):
+
+      AssertionError: The collateral balance is 0: Expected transaction to be reverted
+      + expected - actual
+
+      -Transaction NOT reverted.
+      +Transaction reverted.
+      
+  
+
+  47) LendingPool: Borrow/repay (variable rate)
        user 3 deposits 0.1 ETH collateral to borrow 100 USDC; 0.1 ETH is not enough to borrow 100 USDC (revert expected):
 
       AssertionError: There is not enough collateral to cover a new borrow: Expected transaction to be reverted
@@ -2458,9 +2837,9 @@ gas used: 6117750
       
   
 
-  27) LendingPool: Borrow/repay (variable rate)
+  48) LendingPool: Borrow/repay (variable rate)
        User 0 deposits 1000 DAI, user 6 deposits 2 WETH and borrow 100 DAI at variable rate first, then 100 DAI at stable rate, repays everything. User 0 withdraws:
-     Error: VM Exception while processing transaction: revert There is not enough collateral to cover a new borrow
+     Error: VM Exception while processing transaction: revert 11
       at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
       at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
       at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
@@ -2480,115 +2859,43 @@ gas used: 6117750
       at runMicrotasks (<anonymous>)
       at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  28) AToken: interest rate redirection negative test cases
-       User 0 tries to redirect the interest to user 2 twice (revert expected):
+  49) LendingPool: Deposit
+       User 1 deposits 1 WETH after user 0:
 
-      AssertionError: expected '3000000004839170420641' to be almost equal or equal '3000002810040899373373' for property redirectionAddressRedirectedBalance
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
       + expected - actual
 
-      -3000000004839170420641
-      +3000002810040899373373
+      -100000000000000000
+      +0
       
-      at expectEqual (test/helpers/actions.ts:806:26)
-      at /src/test/helpers/actions.ts:692:5
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
       at step (test/helpers/actions.ts:33:23)
       at Object.next (test/helpers/actions.ts:14:53)
       at fulfilled (test/helpers/actions.ts:5:58)
       at runMicrotasks (<anonymous>)
       at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  29) AToken: interest rate redirection negative test cases
-       User 3 with 0 balance tries to redirect the interest to user 2 (revert expected):
+  50) LendingPool: Rebalance stable rate
+       User 0 deposits 1000 DAI, user 1 deposits 1 ETH, borrows 100 DAI at a variable rate, user 0 rebalances user 1 (revert expected):
 
-      AssertionError: Interest stream can only be redirected if there is a valid balance: Expected transaction to be reverted
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
       + expected - actual
 
-      -Transaction NOT reverted.
-      +Transaction reverted.
+      -100000000000000000
+      +0
       
-  
-
-  30) AToken: interest rate redirection
-       User 0 deposits 1000 DAI, redirects the interest to user 2:
-     Error: VM Exception while processing transaction: revert Interest is already redirected to the user
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  31) AToken: interest rate redirection
-       User 1 borrows another 100 DAI, repay the whole amount. Users 0 and User 2 withdraw:
-
-      AssertionError: expected '1018781913151532188979254718' to be almost equal or equal '1018781913290226822094188339' for property currentATokenUserIndex
-      + expected - actual
-
-      -1018781913151532188979254718
-      +1018781913290226822094188339
-      
-      at expectEqual (test/helpers/actions.ts:806:26)
-      at /src/test/helpers/actions.ts:267:5
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
       at step (test/helpers/actions.ts:33:23)
       at Object.next (test/helpers/actions.ts:14:53)
       at fulfilled (test/helpers/actions.ts:5:58)
       at runMicrotasks (<anonymous>)
       at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  32) AToken: interest rate redirection
-       User 0 deposits 1000 DAI, redirects interest to user 2, user 1 borrows 100 DAI. After one year, user 0 redirects interest back to himself, user 1 borrows another 100 DAI and after another year repays the whole amount. Users 0 and User 2 withdraw:
-
-      AssertionError: expected '1020673496610825275870' to be almost equal or equal '1020673496616475023834' for property redirectionAddressRedirectedBalance
-      + expected - actual
-
-      -1020673496610825275870
-      +1020673496616475023834
-      
-      at expectEqual (test/helpers/actions.ts:806:26)
-      at /src/test/helpers/actions.ts:692:5
-      at step (test/helpers/actions.ts:33:23)
-      at Object.next (test/helpers/actions.ts:14:53)
-      at fulfilled (test/helpers/actions.ts:5:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  33) AToken: interest rate redirection
-       User 0 deposits 1000 DAI, redirects interest to user 2, user 1 borrows 100 DAI. After one year, user 2 redirects interest to user 3. user 1 borrows another 100 DAI, user 0 deposits another 100 DAI. User 1 repays the whole amount. Users 0, 2 first 1 DAI, then everything. User 3 withdraws:
-     Error: VM Exception while processing transaction: revert Interest is already redirected to the user
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
-
-  34) LendingPool: Rebalance stable rate
+  51) LendingPool: Rebalance stable rate
        User 1 swaps to stable, user 0 tries to rebalance but the conditions are not met (revert expected):
-     Error: VM Exception while processing transaction: revert 12
+     Error: VM Exception while processing transaction: revert 18
       at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
       at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
       at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
@@ -2608,62 +2915,92 @@ gas used: 6117750
       at runMicrotasks (<anonymous>)
       at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  35) LendingPool: Rebalance stable rate
+  52) LendingPool: Rebalance stable rate
        User 2 deposits ETH and borrows the remaining DAI, causing the stable rates to rise (liquidity rate < user 1 borrow rate). User 0 tries to rebalance user 1 (revert expected):
-     Error: VM Exception while processing transaction: revert There is not enough collateral to cover a new borrow
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+
+      AssertionError: expected '0' to be almost equal or equal '100000000006972721' for property principalStableDebt
+      + expected - actual
+
+      -0
+      +100000000006972721
+      
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
       at runMicrotasks (<anonymous>)
       at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  36) LendingPool: Rebalance stable rate
+  53) LendingPool: Rebalance stable rate
        User 2 borrows more DAI, causing the liquidity rate to rise above user 1 stable borrow rate User 0 rebalances user 1:
-     Error: VM Exception while processing transaction: revert There is not enough collateral to cover a new borrow
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
+
+      AssertionError: expected '0' to be almost equal or equal '100000000009270565' for property principalStableDebt
+      + expected - actual
+
+      -0
+      +100000000009270565
+      
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
       at runMicrotasks (<anonymous>)
       at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  37) LendingPool: Usage as collateral
+  54) LendingPool: Usage as collateral
+       User 0 Deposits 1000 DAI, disables DAI as collateral:
+
+      AssertionError: expected '4000000000706215436781' to be almost equal or equal '4000000000676018902879' for property currentATokenBalance
+      + expected - actual
+
+      -4000000000706215436781
+      +4000000000676018902879
+      
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:509:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  55) LendingPool: Usage as collateral
        User 1 Deposits 2 ETH, disables ETH as collateral, borrows 400 DAI (revert expected):
 
-      AssertionError: The collateral balance is 0: Expected transaction to be reverted
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
       + expected - actual
 
-      -Transaction NOT reverted.
-      +Transaction reverted.
+      -100000000000000000
+      +0
       
-  
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  38) LendingPool: Usage as collateral
+  56) LendingPool: Usage as collateral
+       User 1 enables ETH as collateral, borrows 400 DAI:
+
+      AssertionError: expected '4000000000008306119' to be almost equal or equal '4000000000007484590' for property currentATokenBalance
+      + expected - actual
+
+      -4000000000008306119
+      +4000000000007484590
+      
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:509:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
+
+  57) LendingPool: Usage as collateral
        User 1 disables ETH as collateral (revert expected):
 
       AssertionError: User deposit is already being used as collateral: Expected transaction to be reverted
@@ -2674,46 +3011,24 @@ gas used: 6117750
       
   
 
-  39) LendingPool: Swap rate mode
+  58) LendingPool: Swap rate mode
        User 0 deposits 1000 DAI, user 1 deposits 2 ETH as collateral, borrows 100 DAI at variable rate and swaps to stable after one year:
-     Error: VM Exception while processing transaction: revert 12
-      at HttpProvider.send (node_modules/@nomiclabs/buidler/src/internal/core/providers/http.ts:36:34)
-      at getMultipliedGasEstimation (node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:150:45)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:108:14
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/accounts.ts:219:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:63:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at /src/node_modules/@nomiclabs/buidler/src/internal/core/providers/gas-providers.ts:82:21
-      at Proxy.cloningSendWrapper (node_modules/@nomiclabs/buidler/src/internal/core/providers/wrapper.ts:9:12)
-      at EthersProviderWrapper.send (node_modules/@nomiclabs/buidler-ethers/src/ethers-provider-wrapper.ts:13:48)
-      at EthersProviderWrapper.JsonRpcProvider.perform (node_modules/@ethersproject/providers/src.ts/json-rpc-provider.ts:432:21)
-      at EthersProviderWrapper.<anonymous> (node_modules/@ethersproject/providers/src.ts/base-provider.ts:850:42)
-      at step (node_modules/@ethersproject/providers/lib/base-provider.js:46:23)
-      at Object.next (node_modules/@ethersproject/providers/lib/base-provider.js:27:53)
-      at fulfilled (node_modules/@ethersproject/providers/lib/base-provider.js:18:58)
-      at runMicrotasks (<anonymous>)
-      at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  40) LendingPool: Swap rate mode
-       User 1 borrows another 100 DAI, and swaps back to variable after one year, repays the loan:
-
-      AssertionError: expected '10698732002040011727701' to be almost equal or equal '10652337621419709817668' for property totalLiquidity
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
       + expected - actual
 
-      -10698732002040011727701
-      +10652337621419709817668
+      -100000000000000000
+      +0
       
-      at expectEqual (test/helpers/actions.ts:806:26)
-      at /src/test/helpers/actions.ts:571:5
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
       at step (test/helpers/actions.ts:33:23)
       at Object.next (test/helpers/actions.ts:14:53)
       at fulfilled (test/helpers/actions.ts:5:58)
       at runMicrotasks (<anonymous>)
       at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  41) LendingPool: Redeem negative test cases
+  59) LendingPool: Redeem negative test cases
        Users 0 tries to redeem 1100 DAI from the 1000 DAI deposited (revert expected):
 
       AssertionError: User cannot redeem more than the available balance: Expected transaction to be reverted
@@ -2724,28 +3039,34 @@ gas used: 6117750
       
   
 
-  42) LendingPool: Redeem negative test cases
+  60) LendingPool: Redeem negative test cases
        Users 1 deposits 1 WETH, borrows 100 DAI, tries to redeem the 1 WETH deposited (revert expected):
 
-      AssertionError: Transfer cannot be allowed.: Expected transaction to be reverted
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
       + expected - actual
 
-      -Transaction NOT reverted.
-      +Transaction reverted.
+      -100000000000000000
+      +0
       
-  
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
+      at step (test/helpers/actions.ts:33:23)
+      at Object.next (test/helpers/actions.ts:14:53)
+      at fulfilled (test/helpers/actions.ts:5:58)
+      at runMicrotasks (<anonymous>)
+      at processTicksAndRejections (internal/process/task_queues.js:97:5)
 
-  43) LendingPool: withdraw
-       Users 0 and 1 Deposit 1000 DAI, both withdraw:
+  61) LendingPool: withdraw
+       Users 0 deposits 1000 DAI, user 1 Deposit 1000 USDC and 1 WETH, borrows 100 DAI. User 1 tries to withdraw all the USDC:
 
-      AssertionError: expected '100000000000000000000' to be almost equal or equal '1156444961333104368118' for property principalStableDebt
+      AssertionError: expected '100000000000000000' to be almost equal or equal '0' for property principalStableDebt
       + expected - actual
 
-      -100000000000000000000
-      +1156444961333104368118
+      -100000000000000000
+      +0
       
-      at expectEqual (test/helpers/actions.ts:806:26)
-      at /src/test/helpers/actions.ts:189:5
+      at expectEqual (test/helpers/actions.ts:664:26)
+      at /src/test/helpers/actions.ts:194:5
       at step (test/helpers/actions.ts:33:23)
       at Object.next (test/helpers/actions.ts:14:53)
       at fulfilled (test/helpers/actions.ts:5:58)
diff --git a/test/atoken-modifiers.spec.ts b/test/atoken-modifiers.spec.ts
index 406d910a..7560970c 100644
--- a/test/atoken-modifiers.spec.ts
+++ b/test/atoken-modifiers.spec.ts
@@ -7,12 +7,12 @@ makeSuite('AToken: Modifiers', (testEnv: TestEnv) => {
 
   it('Tries to invoke mint not being the LendingPool', async () => {
     const {deployer, aDai} = testEnv;
-    await expect(aDai.mint(deployer.address, '1')).to.be.revertedWith(CALLER_MUST_BE_LENDING_POOL);
+    await expect(aDai.mint(deployer.address, '1', '1')).to.be.revertedWith(CALLER_MUST_BE_LENDING_POOL);
   });
 
   it('Tries to invoke burn not being the LendingPool', async () => {
     const {deployer, aDai} = testEnv;
-    await expect(aDai.burn(deployer.address, deployer.address, '1')).to.be.revertedWith(
+    await expect(aDai.burn(deployer.address, deployer.address, '1', '1')).to.be.revertedWith(
       CALLER_MUST_BE_LENDING_POOL
     );
   });
diff --git a/test/atoken-transfer.spec.ts b/test/atoken-transfer.spec.ts
index c986fb9b..a5c13989 100644
--- a/test/atoken-transfer.spec.ts
+++ b/test/atoken-transfer.spec.ts
@@ -14,11 +14,7 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
   const {
     INVALID_FROM_BALANCE_AFTER_TRANSFER,
     INVALID_TO_BALANCE_AFTER_TRANSFER,
-    INVALID_REDIRECTED_BALANCE_BEFORE_TRANSFER,
-    INVALID_REDIRECTED_BALANCE_AFTER_TRANSFER,
-    INVALID_REDIRECTION_ADDRESS,
     // ZERO_COLLATERAL,
-    TRANSFER_AMOUNT_NOT_GT_0,
     COLLATERAL_BALANCE_IS_0,
     TRANSFER_NOT_ALLOWED,
   } = ProtocolErrors;
@@ -33,7 +29,9 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
     //user 1 deposits 1000 DAI
     const amountDAItoDeposit = await convertToCurrencyDecimals(dai.address, '1000');
 
-    await pool.connect(users[0].signer).deposit(dai.address, amountDAItoDeposit, '0');
+    await pool
+      .connect(users[0].signer)
+      .deposit(dai.address, amountDAItoDeposit, users[0].address, '0');
 
     await aDai.connect(users[0].signer).transfer(users[1].address, amountDAItoDeposit);
 
@@ -47,59 +45,18 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
     );
   });
 
-  it('User 1 redirects interest to user 2, transfers 500 DAI back to user 0', async () => {
-    const {users, aDai, dai} = testEnv;
-    await aDai.connect(users[1].signer).redirectInterestStream(users[2].address);
-
-    const aDAIRedirected = await convertToCurrencyDecimals(dai.address, '1000');
-
-    const aDAItoTransfer = await convertToCurrencyDecimals(dai.address, '500');
-
-    const user2RedirectedBalanceBefore = await aDai.getRedirectedBalance(users[2].address);
-    expect(user2RedirectedBalanceBefore.toString()).to.be.equal(
-      aDAIRedirected,
-      INVALID_REDIRECTED_BALANCE_BEFORE_TRANSFER
-    );
-
-    await aDai.connect(users[1].signer).transfer(users[0].address, aDAItoTransfer);
-
-    const user2RedirectedBalanceAfter = await aDai.getRedirectedBalance(users[2].address);
-    const user1RedirectionAddress = await aDai.getInterestRedirectionAddress(users[1].address);
-
-    expect(user2RedirectedBalanceAfter.toString()).to.be.equal(
-      aDAItoTransfer,
-      INVALID_REDIRECTED_BALANCE_BEFORE_TRANSFER
-    );
-    expect(user1RedirectionAddress.toString()).to.be.equal(
-      users[2].address,
-      INVALID_REDIRECTION_ADDRESS
-    );
-  });
-
-  it('User 0 transfers back to user 1', async () => {
-    const {users, aDai, dai, weth} = testEnv;
-    const aDAItoTransfer = await convertToCurrencyDecimals(dai.address, '500');
-
-    await aDai.connect(users[0].signer).transfer(users[1].address, aDAItoTransfer);
-
-    const user2RedirectedBalanceAfter = await aDai.getRedirectedBalance(users[2].address);
-
-    const user1BalanceAfter = await aDai.balanceOf(users[1].address);
-
-    expect(user2RedirectedBalanceAfter.toString()).to.be.equal(
-      user1BalanceAfter.toString(),
-      INVALID_REDIRECTED_BALANCE_AFTER_TRANSFER
-    );
-  });
 
   it('User 0 deposits 1 WETH and user 1 tries to borrow, but the aTokens received as a transfer are not available as collateral (revert expected)', async () => {
     const {users, pool, weth} = testEnv;
+    const userAddress = await pool.signer.getAddress();
 
     await weth.connect(users[0].signer).mint(await convertToCurrencyDecimals(weth.address, '1'));
 
     await weth.connect(users[0].signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
 
-    await pool.connect(users[0].signer).deposit(weth.address, ethers.utils.parseEther('1.0'), '0');
+    await pool
+      .connect(users[0].signer)
+      .deposit(weth.address, ethers.utils.parseEther('1.0'), userAddress, '0');
     await expect(
       pool
         .connect(users[1].signer)
@@ -136,87 +93,4 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
     ).to.be.revertedWith(TRANSFER_NOT_ALLOWED);
   });
 
-  it('User 0 tries to transfer 0 balance (revert expected)', async () => {
-    const {users, pool, aDai, dai, weth} = testEnv;
-    await expect(
-      aDai.connect(users[0].signer).transfer(users[1].address, '0'),
-      TRANSFER_AMOUNT_NOT_GT_0
-    ).to.be.revertedWith(TRANSFER_AMOUNT_NOT_GT_0);
-  });
-
-  it('User 1 repays the borrow, transfers aDAI back to user 0', async () => {
-    const {users, pool, aDai, dai, weth} = testEnv;
-
-    await weth.connect(users[1].signer).mint(await convertToCurrencyDecimals(weth.address, '2'));
-
-    await weth.connect(users[1].signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
-
-    await pool
-      .connect(users[1].signer)
-      .repay(weth.address, MAX_UINT_AMOUNT, RateMode.Stable, users[1].address);
-
-    const aDAItoTransfer = await convertToCurrencyDecimals(aDai.address, '1000');
-
-    await aDai.connect(users[1].signer).transfer(users[0].address, aDAItoTransfer);
-
-    const user2RedirectedBalanceAfter = await aDai.getRedirectedBalance(users[2].address);
-
-    const user1RedirectionAddress = await aDai.getInterestRedirectionAddress(users[1].address);
-
-    expect(user2RedirectedBalanceAfter.toString()).to.be.equal(
-      '0',
-      INVALID_REDIRECTED_BALANCE_AFTER_TRANSFER
-    );
-
-    expect(user1RedirectionAddress.toString()).to.be.equal(
-      ZERO_ADDRESS,
-      INVALID_REDIRECTION_ADDRESS
-    );
-  });
-
-  it('User 0 redirects interest to user 2, transfers 500 aDAI to user 1. User 1 redirects to user 3. User 0 transfers another 100 aDAI', async () => {
-    const {users, pool, aDai, dai, weth} = testEnv;
-
-    let aDAItoTransfer = await convertToCurrencyDecimals(aDai.address, '500');
-
-    await aDai.connect(users[0].signer).redirectInterestStream(users[2].address);
-
-    await aDai.connect(users[0].signer).transfer(users[1].address, aDAItoTransfer);
-
-    await aDai.connect(users[1].signer).redirectInterestStream(users[3].address);
-
-    aDAItoTransfer = await convertToCurrencyDecimals(aDai.address, '100');
-
-    await aDai.connect(users[0].signer).transfer(users[1].address, aDAItoTransfer);
-
-    const user2RedirectedBalanceAfter = await aDai.getRedirectedBalance(users[2].address);
-    const user3RedirectedBalanceAfter = await aDai.getRedirectedBalance(users[3].address);
-
-    const expectedUser2Redirected = await convertToCurrencyDecimals(aDai.address, '400');
-    const expectedUser3Redirected = await convertToCurrencyDecimals(aDai.address, '600');
-
-    expect(user2RedirectedBalanceAfter.toString()).to.be.equal(
-      expectedUser2Redirected,
-      INVALID_REDIRECTED_BALANCE_AFTER_TRANSFER
-    );
-    expect(user3RedirectedBalanceAfter.toString()).to.be.equal(
-      expectedUser3Redirected,
-      INVALID_REDIRECTED_BALANCE_AFTER_TRANSFER
-    );
-  });
-
-  it('User 1 transfers the whole amount to himself', async () => {
-    const {users, pool, aDai, dai} = testEnv;
-
-    const user1BalanceBefore = await aDai.balanceOf(users[1].address);
-
-    await aDai.connect(users[1].signer).transfer(users[1].address, user1BalanceBefore);
-
-    const user1BalanceAfter = await aDai.balanceOf(users[1].address);
-
-    expect(user1BalanceAfter.toString()).to.be.equal(
-      user1BalanceBefore,
-      INVALID_REDIRECTED_BALANCE_AFTER_TRANSFER
-    );
-  });
 });
diff --git a/test/configurator.spec.ts b/test/configurator.spec.ts
index a6513e54..6a85791c 100644
--- a/test/configurator.spec.ts
+++ b/test/configurator.spec.ts
@@ -234,7 +234,7 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
 
   it('Reverts when trying to disable the DAI reserve with liquidity on it', async () => {
     const {dai, pool, configurator} = testEnv;
-
+    const userAddress = await pool.signer.getAddress();
     await dai.mint(await convertToCurrencyDecimals(dai.address, '1000'));
 
     //approve protocol to access depositor wallet
@@ -242,7 +242,7 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
     const amountDAItoDeposit = await convertToCurrencyDecimals(dai.address, '1000');
 
     //user 1 deposits 1000 DAI
-    await pool.deposit(dai.address, amountDAItoDeposit, '0');
+    await pool.deposit(dai.address, amountDAItoDeposit, userAddress, '0');
 
     await expect(
       configurator.deactivateReserve(dai.address),
diff --git a/test/flash-liquidation-with-collateral.spec.ts b/test/flash-liquidation-with-collateral.spec.ts
index 0032a8c7..0dcc7f1e 100644
--- a/test/flash-liquidation-with-collateral.spec.ts
+++ b/test/flash-liquidation-with-collateral.spec.ts
@@ -20,17 +20,17 @@ makeSuite('LendingPool. repayWithCollateral() with liquidator', (testEnv: TestEn
   const {INVALID_HF, COLLATERAL_CANNOT_BE_LIQUIDATED} = ProtocolErrors;
 
   it('User 1 provides some liquidity for others to borrow', async () => {
-    const {pool, weth, dai, usdc} = testEnv;
+    const {pool, weth, dai, usdc, deployer} = testEnv;
 
     await weth.mint(parseEther('200'));
     await weth.approve(pool.address, parseEther('200'));
-    await pool.deposit(weth.address, parseEther('200'), 0);
+    await pool.deposit(weth.address, parseEther('200'), deployer.address, 0);
     await dai.mint(parseEther('20000'));
     await dai.approve(pool.address, parseEther('20000'));
-    await pool.deposit(dai.address, parseEther('20000'), 0);
+    await pool.deposit(dai.address, parseEther('20000'), deployer.address, 0);
     await usdc.mint(parseEther('20000'));
     await usdc.approve(pool.address, parseEther('20000'));
-    await pool.deposit(usdc.address, parseEther('20000'), 0);
+    await pool.deposit(usdc.address, parseEther('20000'), deployer.address, 0);
   });
 
   it('User 5 liquidate User 3 collateral, all his variable debt and part of the stable', async () => {
@@ -43,7 +43,7 @@ makeSuite('LendingPool. repayWithCollateral() with liquidator', (testEnv: TestEn
     await weth.connect(user.signer).mint(amountToDeposit);
 
     await weth.connect(user.signer).approve(pool.address, amountToDeposit);
-    await pool.connect(user.signer).deposit(weth.address, amountToDeposit, '0');
+    await pool.connect(user.signer).deposit(weth.address, amountToDeposit, user.address, '0');
 
     const usdcPrice = await oracle.getAssetPrice(usdc.address);
 
@@ -189,7 +189,7 @@ makeSuite('LendingPool. repayWithCollateral() with liquidator', (testEnv: TestEn
 
     await weth.connect(user.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
 
-    await pool.connect(user.signer).deposit(weth.address, amountToDeposit, '0');
+    await pool.connect(user.signer).deposit(weth.address, amountToDeposit, user.address, '0');
 
     const userGlobalData = await pool.getUserAccountData(user.address);
 
@@ -450,7 +450,7 @@ makeSuite('LendingPool. repayWithCollateral() with liquidator', (testEnv: TestEn
 
     await weth.connect(user.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
 
-    await pool.connect(user.signer).deposit(weth.address, amountToDeposit, '0');
+    await pool.connect(user.signer).deposit(weth.address, amountToDeposit, user.address, '0');
 
     const userGlobalData = await pool.getUserAccountData(user.address);
 
@@ -733,8 +733,8 @@ makeSuite('LendingPool. repayWithCollateral() with liquidator', (testEnv: TestEn
     await weth.connect(user.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
     await dai.connect(user.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
 
-    await pool.connect(user.signer).deposit(weth.address, amountToDepositWeth, '0');
-    await pool.connect(user.signer).deposit(dai.address, amountToDepositDAI, '0');
+    await pool.connect(user.signer).deposit(weth.address, amountToDepositWeth, user.address, '0');
+    await pool.connect(user.signer).deposit(dai.address, amountToDepositDAI, user.address, '0');
 
     await pool.connect(user.signer).borrow(usdc.address, amountToBorrowVariable, 2, 0, user.address);
 
@@ -838,11 +838,11 @@ makeSuite('LendingPool. repayWithCollateral() with liquidator', (testEnv: TestEn
 
     await weth.connect(user.signer).mint(amountWETHToDeposit);
     await weth.connect(user.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
-    await pool.connect(user.signer).deposit(weth.address, amountWETHToDeposit, '0');
+    await pool.connect(user.signer).deposit(weth.address, amountWETHToDeposit, user.address, '0');
 
     await dai.connect(user.signer).mint(amountDAIToDeposit);
     await dai.connect(user.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
-    await pool.connect(user.signer).deposit(dai.address, amountDAIToDeposit, '0');
+    await pool.connect(user.signer).deposit(dai.address, amountDAIToDeposit, user.address, '0');
 
     await pool.connect(user.signer).borrow(usdc.address, amountToBorrow, 2, 0, user.address);
   });
diff --git a/test/flashloan.spec.ts b/test/flashloan.spec.ts
index 7b964158..952bdab4 100644
--- a/test/flashloan.spec.ts
+++ b/test/flashloan.spec.ts
@@ -30,13 +30,14 @@ makeSuite('LendingPool FlashLoan function', (testEnv: TestEnv) => {
 
   it('Deposits ETH into the reserve', async () => {
     const {pool, weth} = testEnv;
+    const userAddress = await pool.signer.getAddress();
     const amountToDeposit = ethers.utils.parseEther('1');
 
     await weth.mint(amountToDeposit);
 
     await weth.approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
 
-    await pool.deposit(weth.address, amountToDeposit, '0');
+    await pool.deposit(weth.address, amountToDeposit, userAddress, '0');
   });
 
   it('Takes WETH flashloan with mode = 0, returns the funds correctly', async () => {
@@ -143,7 +144,7 @@ makeSuite('LendingPool FlashLoan function', (testEnv: TestEnv) => {
 
     const amountToDeposit = await convertToCurrencyDecimals(dai.address, '1000');
 
-    await pool.connect(caller.signer).deposit(dai.address, amountToDeposit, '0');
+    await pool.connect(caller.signer).deposit(dai.address, amountToDeposit, caller.address, '0');
 
     await _mockFlashLoanReceiver.setFailExecutionTransfer(true);
 
@@ -210,6 +211,7 @@ makeSuite('LendingPool FlashLoan function', (testEnv: TestEnv) => {
 
   it('Deposits USDC into the reserve', async () => {
     const {usdc, pool} = testEnv;
+    const userAddress = await pool.signer.getAddress();
 
     await usdc.mint(await convertToCurrencyDecimals(usdc.address, '1000'));
 
@@ -217,7 +219,7 @@ makeSuite('LendingPool FlashLoan function', (testEnv: TestEnv) => {
 
     const amountToDeposit = await convertToCurrencyDecimals(usdc.address, '1000');
 
-    await pool.deposit(usdc.address, amountToDeposit, '0');
+    await pool.deposit(usdc.address, amountToDeposit, userAddress, '0');
   });
 
   it('Takes out a 500 USDC flashloan, returns the funds correctly', async () => {
@@ -284,7 +286,7 @@ makeSuite('LendingPool FlashLoan function', (testEnv: TestEnv) => {
 
     const amountToDeposit = await convertToCurrencyDecimals(weth.address, '5');
 
-    await pool.connect(caller.signer).deposit(weth.address, amountToDeposit, '0');
+    await pool.connect(caller.signer).deposit(weth.address, amountToDeposit, caller.address, '0');
 
     await _mockFlashLoanReceiver.setFailExecutionTransfer(true);
 
@@ -307,7 +309,6 @@ makeSuite('LendingPool FlashLoan function', (testEnv: TestEnv) => {
 
   it('Caller deposits 1000 DAI as collateral, Takes a WETH flashloan with mode = 0, does not approve the transfer of the funds', async () => {
     const {dai, pool, weth, users} = testEnv;
-
     const caller = users[3];
 
     await dai.connect(caller.signer).mint(await convertToCurrencyDecimals(dai.address, '1000'));
@@ -316,7 +317,7 @@ makeSuite('LendingPool FlashLoan function', (testEnv: TestEnv) => {
 
     const amountToDeposit = await convertToCurrencyDecimals(dai.address, '1000');
 
-    await pool.connect(caller.signer).deposit(dai.address, amountToDeposit, '0');
+    await pool.connect(caller.signer).deposit(dai.address, amountToDeposit, caller.address, '0');
 
     const flashAmount = ethers.utils.parseEther('0.8');
 
diff --git a/test/helpers/actions.ts b/test/helpers/actions.ts
index 8c63b05f..3f9fea4b 100644
--- a/test/helpers/actions.ts
+++ b/test/helpers/actions.ts
@@ -14,7 +14,6 @@ import {
   calcExpectedUserDataAfterStableRateRebalance,
   calcExpectedUserDataAfterSwapRateMode,
   calcExpectedUserDataAfterWithdraw,
-  calcExpectedUsersDataAfterRedirectInterest,
 } from './utils/calculations';
 import {getReserveAddressFromSymbol, getReserveData, getUserData} from './utils/helpers';
 
@@ -49,23 +48,25 @@ const almostEqualOrEqual = function (
       key === 'marketStableRate' ||
       key === 'symbol' ||
       key === 'aTokenAddress' ||
-      key === 'initialATokenExchangeRate' ||
       key === 'decimals'
     ) {
       // skipping consistency check on accessory data
       return;
     }
 
+    
     this.assert(actual[key] != undefined, `Property ${key} is undefined in the actual data`);
     expect(expected[key] != undefined, `Property ${key} is undefined in the expected data`);
 
+    if (expected[key] == null || actual[key] == null) {
+      console.log('Found a undefined value for Key ', key, ' value ', expected[key], actual[key]);
+    }
+
     if (actual[key] instanceof BigNumber) {
-      if (!expected[key]) {
-        console.log('Key ', key, ' value ', expected[key], actual[key]);
-      }
+
       const actualValue = (<BigNumber>actual[key]).decimalPlaces(0, BigNumber.ROUND_DOWN);
       const expectedValue = (<BigNumber>expected[key]).decimalPlaces(0, BigNumber.ROUND_DOWN);
-
+  
       this.assert(
         actualValue.eq(expectedValue) ||
           actualValue.plus(1).eq(expectedValue) ||
@@ -133,7 +134,8 @@ export const approve = async (reserveSymbol: string, user: SignerWithAddress, te
 export const deposit = async (
   reserveSymbol: string,
   amount: string,
-  user: SignerWithAddress,
+  sender: SignerWithAddress,
+  onBehalfOf: tEthereumAddress,
   sendValue: string,
   expectedResult: string,
   testEnv: TestEnv,
@@ -149,8 +151,9 @@ export const deposit = async (
 
   const {reserveData: reserveDataBefore, userData: userDataBefore} = await getContractsData(
     reserve,
-    user.address,
-    testEnv
+    onBehalfOf,
+    testEnv,
+    sender.address
   );
 
   if (sendValue) {
@@ -158,14 +161,16 @@ export const deposit = async (
   }
   if (expectedResult === 'success') {
     const txResult = await waitForTx(
-      await await pool.connect(user.signer).deposit(reserve, amountToDeposit, '0', txOptions)
+      await pool
+        .connect(sender.signer)
+        .deposit(reserve, amountToDeposit, onBehalfOf, '0', txOptions)
     );
 
     const {
       reserveData: reserveDataAfter,
       userData: userDataAfter,
       timestamp,
-    } = await getContractsData(reserve, user.address, testEnv);
+    } = await getContractsData(reserve, onBehalfOf, testEnv, sender.address);
 
     const {txCost, txTimestamp} = await getTxCostAndTimestamp(txResult);
 
@@ -198,7 +203,7 @@ export const deposit = async (
     // });
   } else if (expectedResult === 'revert') {
     await expect(
-      pool.connect(user.signer).deposit(reserve, amountToDeposit, '0', txOptions),
+      pool.connect(sender.signer).deposit(reserve, amountToDeposit, onBehalfOf, '0', txOptions),
       revertMessage
     ).to.be.reverted;
   }
@@ -683,153 +688,6 @@ export const rebalanceStableBorrowRate = async (
   }
 };
 
-export const redirectInterestStream = async (
-  reserveSymbol: string,
-  user: SignerWithAddress,
-  to: tEthereumAddress,
-  expectedResult: string,
-  testEnv: TestEnv,
-  revertMessage?: string
-) => {
-  const {
-    aTokenInstance,
-    reserve,
-    userData: fromDataBefore,
-    reserveData: reserveDataBefore,
-  } = await getDataBeforeAction(reserveSymbol, user.address, testEnv);
-
-  const {userData: toDataBefore} = await getContractsData(reserve, to, testEnv);
-
-  if (expectedResult === 'success') {
-    const txResult = await waitForTx(
-      await aTokenInstance.connect(user.signer).redirectInterestStream(to)
-    );
-
-    const {txCost, txTimestamp} = await getTxCostAndTimestamp(txResult);
-
-    const {userData: fromDataAfter} = await getContractsData(reserve, user.address, testEnv);
-
-    const {userData: toDataAfter} = await getContractsData(reserve, to, testEnv);
-
-    const [expectedFromData, expectedToData] = calcExpectedUsersDataAfterRedirectInterest(
-      reserveDataBefore,
-      fromDataBefore,
-      toDataBefore,
-      user.address,
-      to,
-      true,
-      txCost,
-      txTimestamp
-    );
-
-    expectEqual(fromDataAfter, expectedFromData);
-    expectEqual(toDataAfter, expectedToData);
-
-    // truffleAssert.eventEmitted(txResult, 'InterestStreamRedirected', (ev: any) => {
-    //   const {_from, _to} = ev;
-    //   return _from === user
-    //   && _to === (to === user ? NIL_ADDRESS : to);
-    // });
-  } else if (expectedResult === 'revert') {
-    await expect(aTokenInstance.connect(user.signer).redirectInterestStream(to), revertMessage).to
-      .be.reverted;
-  }
-};
-
-export const redirectInterestStreamOf = async (
-  reserveSymbol: string,
-  user: SignerWithAddress,
-  from: tEthereumAddress,
-  to: tEthereumAddress,
-  expectedResult: string,
-  testEnv: TestEnv,
-  revertMessage?: string
-) => {
-  const {
-    aTokenInstance,
-    reserve,
-    userData: fromDataBefore,
-    reserveData: reserveDataBefore,
-  } = await getDataBeforeAction(reserveSymbol, from, testEnv);
-
-  const {userData: toDataBefore} = await getContractsData(reserve, user.address, testEnv);
-
-  if (expectedResult === 'success') {
-    const txResult = await waitForTx(
-      await aTokenInstance.connect(user.signer).redirectInterestStreamOf(from, to)
-    );
-
-    const {txCost, txTimestamp} = await getTxCostAndTimestamp(txResult);
-
-    const {userData: fromDataAfter} = await getContractsData(reserve, from, testEnv);
-
-    const {userData: toDataAfter} = await getContractsData(reserve, to, testEnv);
-
-    const [expectedFromData, exptectedToData] = calcExpectedUsersDataAfterRedirectInterest(
-      reserveDataBefore,
-      fromDataBefore,
-      toDataBefore,
-      from,
-      to,
-      from === user.address,
-      txCost,
-      txTimestamp
-    );
-
-    expectEqual(fromDataAfter, expectedFromData);
-    expectEqual(toDataAfter, exptectedToData);
-
-    // truffleAssert.eventEmitted(
-    //   txResult,
-    //   "InterestStreamRedirected",
-    //   (ev: any) => {
-    //     const {_from, _to} = ev;
-    //     return (
-    //       _from.toLowerCase() === from.toLowerCase() &&
-    //       _to.toLowerCase() === to.toLowerCase()
-    //     );
-    //   }
-    // );
-  } else if (expectedResult === 'revert') {
-    await expect(
-      aTokenInstance.connect(user.signer).redirectInterestStreamOf(from, to),
-      revertMessage
-    ).to.be.reverted;
-  }
-};
-
-export const allowInterestRedirectionTo = async (
-  reserveSymbol: string,
-  user: SignerWithAddress,
-  to: tEthereumAddress,
-  expectedResult: string,
-  testEnv: TestEnv,
-  revertMessage?: string
-) => {
-  const {aTokenInstance} = await getDataBeforeAction(reserveSymbol, user.address, testEnv);
-
-  if (expectedResult === 'success') {
-    const txResult = await waitForTx(
-      await aTokenInstance.connect(user.signer).allowInterestRedirectionTo(to)
-    );
-
-    // truffleAssert.eventEmitted(
-    //   txResult,
-    //   "InterestRedirectionAllowanceChanged",
-    //   (ev: any) => {
-    //     const {_from, _to} = ev;
-    //     return (
-    //       _from.toLowerCase() === user.toLowerCase() &&
-    //       _to.toLowerCase() === to.toLowerCase()
-    //     );
-    //   }
-    // );
-  } else if (expectedResult === 'revert') {
-    await expect(aTokenInstance.connect(user.signer).allowInterestRedirectionTo(to), revertMessage)
-      .to.be.reverted;
-  }
-};
-
 const expectEqual = (
   actual: UserReserveData | ReserveData,
   expected: UserReserveData | ReserveData
diff --git a/test/helpers/scenario-engine.ts b/test/helpers/scenario-engine.ts
index fd886114..6a03a4d1 100644
--- a/test/helpers/scenario-engine.ts
+++ b/test/helpers/scenario-engine.ts
@@ -9,9 +9,6 @@ import {
   setUseAsCollateral,
   swapBorrowRateMode,
   rebalanceStableBorrowRate,
-  redirectInterestStream,
-  redirectInterestStreamOf,
-  allowInterestRedirectionTo,
   delegateBorrowAllowance,
 } from './actions';
 import {RateMode} from '../../helpers/types';
@@ -93,13 +90,25 @@ const executeAction = async (action: Action, users: SignerWithAddress[], testEnv
 
     case 'deposit':
       {
-        const {amount, sendValue} = action.args;
+        const {amount, sendValue, onBehalfOf: onBehalfOfIndex} = action.args;
+        const onBehalfOf = onBehalfOfIndex
+          ? users[parseInt(onBehalfOfIndex)].address
+          : user.address;
 
         if (!amount || amount === '') {
           throw `Invalid amount to deposit into the ${reserve} reserve`;
         }
 
-        await deposit(reserve, amount, user, sendValue, expected, testEnv, revertMessage);
+        await deposit(
+          reserve,
+          amount,
+          user,
+          onBehalfOf,
+          sendValue,
+          expected,
+          testEnv,
+          revertMessage
+        );
       }
       break;
 
@@ -221,71 +230,7 @@ const executeAction = async (action: Action, users: SignerWithAddress[], testEnv
         await rebalanceStableBorrowRate(reserve, user, target, expected, testEnv, revertMessage);
       }
       break;
-
-    case 'redirectInterestStream':
-      {
-        const {to: toIndex} = action.args;
-
-        if (!toIndex || toIndex === '') {
-          throw `A target must be selected when trying to redirect the interest`;
-        }
-        const toUser = users[parseInt(toIndex)];
-
-        await redirectInterestStream(
-          reserve,
-          user,
-          toUser.address,
-          expected,
-          testEnv,
-          revertMessage
-        );
-      }
-      break;
-
-    case 'redirectInterestStreamOf':
-      {
-        const {from: fromIndex, to: toIndex} = action.args;
-
-        if (!fromIndex || fromIndex === '') {
-          throw `A from address must be specified when trying to redirect the interest`;
-        }
-        if (!toIndex || toIndex === '') {
-          throw `A target must be selected when trying to redirect the interest`;
-        }
-        const toUser = users[parseInt(toIndex)];
-        const fromUser = users[parseInt(fromIndex)];
-
-        await redirectInterestStreamOf(
-          reserve,
-          user,
-          fromUser.address,
-          toUser.address,
-          expected,
-          testEnv,
-          revertMessage
-        );
-      }
-      break;
-
-    case 'allowInterestRedirectionTo':
-      {
-        const {to: toIndex} = action.args;
-
-        if (!toIndex || toIndex === '') {
-          throw `A target must be selected when trying to redirect the interest`;
-        }
-        const toUser = users[parseInt(toIndex)];
-
-        await allowInterestRedirectionTo(
-          reserve,
-          user,
-          toUser.address,
-          expected,
-          testEnv,
-          revertMessage
-        );
-      }
-      break;
+   
     default:
       throw `Invalid action requested: ${name}`;
   }
diff --git a/test/helpers/scenarios/deposit.json b/test/helpers/scenarios/deposit.json
index 34f9c9e9..2456d931 100644
--- a/test/helpers/scenarios/deposit.json
+++ b/test/helpers/scenarios/deposit.json
@@ -206,7 +206,6 @@
           "name": "deposit",
           "args": {
             "reserve": "WETH",
-
             "amount": "0",
             "user": "1"
           },
@@ -229,6 +228,40 @@
           "revertMessage": "Amount must be greater than 0"
         }
       ]
+    },
+    {
+      "description": "User 1 deposits 100 DAI on behalf of user 2, user 2 tries to borrow 0.1 WETH",
+      "actions": [
+        {
+          "name": "mint",
+          "args": {
+            "reserve": "DAI",
+            "amount": "100",
+            "user": "1"
+          },
+          "expected": "success"
+        },
+        {
+          "name": "deposit",
+          "args": {
+            "reserve": "DAI",
+            "amount": "100",
+            "user": "1",
+            "onBehalfOf": "2"
+          },
+          "expected": "success"
+        },
+        {
+          "name": "borrow",
+          "args": {
+            "reserve": "WETH",
+            "amount": "0.1",
+            "borrowRateMode": "variable",
+            "user": "2"
+          },
+          "expected": "success"
+        }
+      ]
     }
   ]
 }
diff --git a/test/helpers/scenarios/interest-redirection-negatives.json b/test/helpers/scenarios/interest-redirection-negatives.json
deleted file mode 100644
index 91b6a56f..00000000
--- a/test/helpers/scenarios/interest-redirection-negatives.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "title": "AToken: interest rate redirection negative test cases",
-  "description": "Test cases for the aToken interest rate redirection.",
-  "stories": [
-    {
-      "description": "User 0 deposits 1000 DAI, tries to give allowance to redirect interest to himself (revert expected)",
-      "actions": [
-        {
-          "name": "mint",
-          "args": {
-            "reserve": "DAI",
-            "amount": "1000",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "approve",
-          "args": {
-            "reserve": "DAI",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "deposit",
-          "args": {
-            "reserve": "DAI",
-            "amount": "1000",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "allowInterestRedirectionTo",
-          "args": {
-            "reserve": "DAI",
-            "user": "0",
-            "to": "0"
-          },
-          "expected": "revert",
-          "revertMessage": "User cannot give allowance to himself"
-        }
-      ]
-    },
-    {
-      "description": "User 1 tries to redirect the interest of user 0 without allowance (revert expected)",
-      "actions": [
-        {
-          "name": "redirectInterestStreamOf",
-          "args": {
-            "reserve": "DAI",
-            "user": "1",
-            "from": "0",
-            "to": "2"
-          },
-          "expected": "revert",
-          "revertMessage": "Caller is not allowed to redirect the interest of the user"
-        }
-      ]
-    },
-    {
-      "description": "User 0 tries to redirect the interest to user 2 twice (revert expected)",
-      "actions": [
-        {
-          "name": "redirectInterestStream",
-          "args": {
-            "reserve": "DAI",
-            "user": "0",
-            "to": "2"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "redirectInterestStream",
-          "args": {
-            "reserve": "DAI",
-            "user": "0",
-            "to": "2"
-          },
-          "expected": "revert",
-          "revertMessage": "Interest is already redirected to the user"
-        }
-      ]
-    },
-    {
-      "description": "User 3 with 0 balance tries to redirect the interest to user 2 (revert expected)",
-      "actions": [
-        {
-          "name": "redirectInterestStream",
-          "args": {
-            "reserve": "DAI",
-            "user": "3",
-            "to": "2"
-          },
-          "expected": "revert",
-          "revertMessage": "Interest stream can only be redirected if there is a valid balance"
-        }
-      ]
-    }
-  ]
-}
diff --git a/test/helpers/scenarios/interest-redirection.json b/test/helpers/scenarios/interest-redirection.json
deleted file mode 100644
index 8ed00d1f..00000000
--- a/test/helpers/scenarios/interest-redirection.json
+++ /dev/null
@@ -1,405 +0,0 @@
-{
-  "title": "AToken: interest rate redirection",
-  "description": "Test cases for the aToken interest rate redirection.",
-  "stories": [
-    {
-      "description": "User 0 deposits 1000 DAI, redirects the interest to user 2",
-      "actions": [
-        {
-          "name": "mint",
-          "args": {
-            "reserve": "DAI",
-            "amount": "1000",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "approve",
-          "args": {
-            "reserve": "DAI",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "deposit",
-          "args": {
-            "reserve": "DAI",
-            "amount": "1000",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "redirectInterestStream",
-          "args": {
-            "reserve": "DAI",
-            "user": "0",
-            "to": "2"
-          },
-          "expected": "success"
-        }
-      ]
-    },
-    {
-      "description": "User 1 deposits 1 ETH, borrows 100 DAI, repays after one year. Users 0 deposits another 1000 DAI. Redirected balance of user 2 is updated",
-      "actions": [
-        {
-          "name": "mint",
-          "args": {
-            "reserve": "WETH",
-            "amount": "2",
-            "user": "1"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "approve",
-          "args": {
-            "reserve": "WETH",
-            "user": "1"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "deposit",
-          "args": {
-            "reserve": "WETH",
-
-            "amount": "2",
-            "user": "1"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "borrow",
-          "args": {
-            "reserve": "DAI",
-            "amount": "100",
-            "borrowRateMode": "stable",
-            "user": "1",
-            "timeTravel": "365"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "mint",
-          "args": {
-            "reserve": "DAI",
-            "amount": "1000",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "deposit",
-          "args": {
-            "reserve": "DAI",
-            "amount": "1000",
-            "user": "0"
-          },
-          "expected": "success"
-        }
-      ]
-    },
-    {
-      "description": "User 1 borrows another 100 DAI, repay the whole amount. Users 0 and User 2 withdraw",
-      "actions": [
-        {
-          "name": "borrow",
-          "args": {
-            "reserve": "DAI",
-            "amount": "100",
-            "borrowRateMode": "stable",
-            "user": "1",
-            "timeTravel": "365"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "mint",
-          "args": {
-            "reserve": "DAI",
-            "amount": "100",
-            "user": "1"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "approve",
-          "args": {
-            "reserve": "DAI",
-            "user": "1"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "repay",
-          "args": {
-            "reserve": "DAI",
-            "amount": "-1",
-            "user": "1",
-            "onBehalfOf": "1",
-            "borrowRateMode": "stable"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "withdraw",
-          "args": {
-            "reserve": "DAI",
-            "amount": "-1",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "withdraw",
-          "args": {
-            "reserve": "DAI",
-            "amount": "-1",
-            "user": "2"
-          },
-          "expected": "success"
-        }
-      ]
-    },
-    {
-      "description": "User 0 deposits 1000 DAI, redirects interest to user 2, user 1 borrows 100 DAI. After one year, user 0 redirects interest back to himself, user 1 borrows another 100 DAI and after another year repays the whole amount. Users 0 and User 2 withdraw",
-      "actions": [
-        {
-          "name": "deposit",
-          "args": {
-            "reserve": "DAI",
-            "amount": "1000",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "redirectInterestStream",
-          "args": {
-            "reserve": "DAI",
-            "user": "0",
-            "to": "2"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "borrow",
-          "args": {
-            "reserve": "DAI",
-            "amount": "100",
-            "borrowRateMode": "stable",
-            "user": "1",
-            "timeTravel": "365"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "redirectInterestStream",
-          "args": {
-            "reserve": "DAI",
-            "user": "0",
-            "to": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "borrow",
-          "args": {
-            "reserve": "DAI",
-            "amount": "100",
-            "borrowRateMode": "stable",
-            "user": "1",
-            "timeTravel": "365"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "mint",
-          "args": {
-            "reserve": "DAI",
-            "amount": "100",
-            "user": "1"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "approve",
-          "args": {
-            "reserve": "DAI",
-            "user": "1"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "repay",
-          "args": {
-            "reserve": "DAI",
-            "amount": "-1",
-            "user": "1",
-            "onBehalfOf": "1",
-            "borrowRateMode": "stable"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "withdraw",
-          "args": {
-            "reserve": "DAI",
-            "amount": "-1",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "withdraw",
-          "args": {
-            "reserve": "DAI",
-            "amount": "-1",
-            "user": "2"
-          },
-          "expected": "success"
-        }
-      ]
-    },
-    {
-      "description": "User 0 deposits 1000 DAI, redirects interest to user 2, user 1 borrows 100 DAI. After one year, user 2 redirects interest to user 3. user 1 borrows another 100 DAI, user 0 deposits another 100 DAI. User 1 repays the whole amount. Users 0, 2 first 1 DAI, then everything. User 3 withdraws",
-      "actions": [
-        {
-          "name": "deposit",
-          "args": {
-            "reserve": "DAI",
-            "amount": "1000",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "redirectInterestStream",
-          "args": {
-            "reserve": "DAI",
-            "user": "0",
-            "to": "2"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "borrow",
-          "args": {
-            "reserve": "DAI",
-            "amount": "100",
-            "borrowRateMode": "stable",
-            "user": "1",
-            "timeTravel": "365"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "redirectInterestStream",
-          "args": {
-            "reserve": "DAI",
-            "user": "2",
-            "to": "3"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "borrow",
-          "args": {
-            "reserve": "DAI",
-            "amount": "100",
-            "borrowRateMode": "stable",
-            "user": "1",
-            "timeTravel": "365"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "deposit",
-          "args": {
-            "reserve": "DAI",
-            "amount": "100",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "mint",
-          "args": {
-            "reserve": "DAI",
-            "amount": "100",
-            "user": "1"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "approve",
-          "args": {
-            "reserve": "DAI",
-            "user": "1"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "repay",
-          "args": {
-            "reserve": "DAI",
-            "amount": "-1",
-            "user": "1",
-            "onBehalfOf": "1",
-            "borrowRateMode": "stable"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "withdraw",
-          "args": {
-            "reserve": "DAI",
-            "amount": "1",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "withdraw",
-          "args": {
-            "reserve": "DAI",
-            "amount": "1",
-            "user": "2"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "withdraw",
-          "args": {
-            "reserve": "DAI",
-            "amount": "-1",
-            "user": "0"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "withdraw",
-          "args": {
-            "reserve": "DAI",
-            "amount": "-1",
-            "user": "2"
-          },
-          "expected": "success"
-        },
-        {
-          "name": "withdraw",
-          "args": {
-            "reserve": "DAI",
-            "amount": "-1",
-            "user": "3"
-          },
-          "expected": "success"
-        }
-      ]
-    }
-  ]
-}
diff --git a/test/helpers/utils/calculations.ts b/test/helpers/utils/calculations.ts
index 13c8da78..23f2a374 100644
--- a/test/helpers/utils/calculations.ts
+++ b/test/helpers/utils/calculations.ts
@@ -41,7 +41,7 @@ export const calcExpectedUserDataAfterDeposit = (
     txTimestamp
   );
 
-  expectedUserData.principalATokenBalance = userDataBeforeAction.principalStableDebt;
+  expectedUserData.principalStableDebt = userDataBeforeAction.principalStableDebt;
   expectedUserData.principalVariableDebt = userDataBeforeAction.principalVariableDebt;
   expectedUserData.variableBorrowIndex = userDataBeforeAction.variableBorrowIndex;
   expectedUserData.stableBorrowRate = userDataBeforeAction.stableBorrowRate;
@@ -49,38 +49,26 @@ export const calcExpectedUserDataAfterDeposit = (
 
   expectedUserData.liquidityRate = reserveDataAfterAction.liquidityRate;
 
-  expectedUserData.currentATokenBalance = userDataBeforeAction.currentATokenBalance.plus(
-    amountDeposited
+  expectedUserData.scaledATokenBalance = calcExpectedScaledATokenBalance(
+    userDataBeforeAction,
+    reserveDataAfterAction.liquidityIndex,
+    new BigNumber(amountDeposited),
+    new BigNumber(0)
   );
-
-  if (userDataBeforeAction.currentATokenBalance.eq(0)) {
-    expectedUserData.usageAsCollateralEnabled = true;
-  } else {
-    //if the user is withdrawing everything, usageAsCollateralEnabled must be false
-    if (expectedUserData.currentATokenBalance.eq(0)) {
-      expectedUserData.usageAsCollateralEnabled = false;
-    } else {
-      expectedUserData.usageAsCollateralEnabled = userDataBeforeAction.usageAsCollateralEnabled;
-    }
-  }
-
-  expectedUserData.variableBorrowIndex = userDataBeforeAction.variableBorrowIndex;
-  expectedUserData.walletBalance = userDataBeforeAction.walletBalance.minus(amountDeposited);
-
-  expectedUserData.principalATokenBalance = expectedUserData.currentATokenBalance = calcExpectedATokenBalance(
+  expectedUserData.currentATokenBalance = calcExpectedATokenBalance(
     reserveDataBeforeAction,
     userDataBeforeAction,
     txTimestamp
   ).plus(amountDeposited);
 
-  expectedUserData.redirectedBalance = userDataBeforeAction.redirectedBalance;
-  expectedUserData.interestRedirectionAddress = userDataBeforeAction.interestRedirectionAddress;
-  expectedUserData.currentATokenUserIndex = calcExpectedATokenUserIndex(
-    reserveDataBeforeAction,
-    expectedUserData.currentATokenBalance,
-    expectedUserData.redirectedBalance,
-    txTimestamp
-  );
+  if (userDataBeforeAction.currentATokenBalance.eq(0)) {
+    expectedUserData.usageAsCollateralEnabled = true;
+  } else {
+    expectedUserData.usageAsCollateralEnabled = userDataBeforeAction.usageAsCollateralEnabled;
+  }
+
+  expectedUserData.variableBorrowIndex = userDataBeforeAction.variableBorrowIndex;
+  expectedUserData.walletBalance = userDataBeforeAction.walletBalance.minus(amountDeposited);
 
   expectedUserData.currentStableDebt = expectedUserData.principalStableDebt = calcExpectedStableDebtTokenBalance(
     userDataBeforeAction,
@@ -93,14 +81,6 @@ export const calcExpectedUserDataAfterDeposit = (
     txTimestamp
   );
 
-  expectedUserData.redirectionAddressRedirectedBalance = calcExpectedRedirectedBalance(
-    userDataBeforeAction,
-    expectedUserData,
-    userDataBeforeAction.redirectionAddressRedirectedBalance,
-    new BigNumber(amountDeposited),
-    new BigNumber(0)
-  );
-
   return expectedUserData;
 };
 
@@ -125,23 +105,29 @@ export const calcExpectedUserDataAfterWithdraw = (
     amountWithdrawn = aTokenBalance.toFixed(0);
   }
 
-  expectedUserData.principalATokenBalance = expectedUserData.currentATokenBalance = aTokenBalance.minus(
-    amountWithdrawn
+  expectedUserData.scaledATokenBalance = calcExpectedScaledATokenBalance(
+    userDataBeforeAction,
+    reserveDataAfterAction.liquidityIndex,
+    new BigNumber(0),
+    new BigNumber(amountWithdrawn)
   );
 
-  expectedUserData.currentStableDebt = expectedUserData.principalStableDebt = calcExpectedStableDebtTokenBalance(
+  expectedUserData.currentATokenBalance = aTokenBalance.minus(amountWithdrawn);
+
+  expectedUserData.principalStableDebt = userDataBeforeAction.principalStableDebt;
+  expectedUserData.principalVariableDebt = userDataBeforeAction.principalVariableDebt;
+
+  expectedUserData.currentStableDebt = calcExpectedStableDebtTokenBalance(
     userDataBeforeAction,
     txTimestamp
   );
 
-  expectedUserData.currentVariableDebt = expectedUserData.principalStableDebt = calcExpectedVariableDebtTokenBalance(
+  expectedUserData.currentVariableDebt = calcExpectedVariableDebtTokenBalance(
     reserveDataBeforeAction,
     userDataBeforeAction,
     txTimestamp
   );
 
-  expectedUserData.principalStableDebt = userDataBeforeAction.principalStableDebt;
-  expectedUserData.principalVariableDebt = userDataBeforeAction.principalVariableDebt;
   expectedUserData.variableBorrowIndex = userDataBeforeAction.variableBorrowIndex;
   expectedUserData.stableBorrowRate = userDataBeforeAction.stableBorrowRate;
   expectedUserData.stableRateLastUpdated = userDataBeforeAction.stableRateLastUpdated;
@@ -159,31 +145,8 @@ export const calcExpectedUserDataAfterWithdraw = (
     }
   }
 
-  expectedUserData.variableBorrowIndex = userDataBeforeAction.variableBorrowIndex;
   expectedUserData.walletBalance = userDataBeforeAction.walletBalance.plus(amountWithdrawn);
 
-  expectedUserData.redirectedBalance = userDataBeforeAction.redirectedBalance;
-
-  if (expectedUserData.currentATokenBalance.eq(0) && expectedUserData.redirectedBalance.eq(0)) {
-    expectedUserData.interestRedirectionAddress = ZERO_ADDRESS;
-  } else {
-    expectedUserData.interestRedirectionAddress = userDataBeforeAction.interestRedirectionAddress;
-  }
-  expectedUserData.currentATokenUserIndex = calcExpectedATokenUserIndex(
-    reserveDataBeforeAction,
-    expectedUserData.currentATokenBalance,
-    expectedUserData.redirectedBalance,
-    txTimestamp
-  );
-
-  expectedUserData.redirectionAddressRedirectedBalance = calcExpectedRedirectedBalance(
-    userDataBeforeAction,
-    expectedUserData,
-    userDataBeforeAction.redirectionAddressRedirectedBalance,
-    new BigNumber(0),
-    new BigNumber(amountWithdrawn)
-  );
-
   return expectedUserData;
 };
 
@@ -575,13 +538,8 @@ export const calcExpectedUserDataAfterBorrow = (
     userDataBeforeAction,
     currentTimestamp
   );
-  expectedUserData.principalATokenBalance = userDataBeforeAction.principalATokenBalance;
-  expectedUserData.redirectedBalance = userDataBeforeAction.redirectedBalance;
-  expectedUserData.interestRedirectionAddress = userDataBeforeAction.interestRedirectionAddress;
-  expectedUserData.redirectionAddressRedirectedBalance =
-    userDataBeforeAction.redirectionAddressRedirectedBalance;
-  expectedUserData.currentATokenUserIndex = userDataBeforeAction.currentATokenUserIndex;
-
+  expectedUserData.scaledATokenBalance = userDataBeforeAction.scaledATokenBalance;
+  
   expectedUserData.walletBalance = userDataBeforeAction.walletBalance.plus(amountBorrowed);
 
   return expectedUserData;
@@ -664,13 +622,8 @@ export const calcExpectedUserDataAfterRepay = (
     userDataBeforeAction,
     txTimestamp
   );
-  expectedUserData.principalATokenBalance = userDataBeforeAction.principalATokenBalance;
-  expectedUserData.redirectedBalance = userDataBeforeAction.redirectedBalance;
-  expectedUserData.interestRedirectionAddress = userDataBeforeAction.interestRedirectionAddress;
-  expectedUserData.redirectionAddressRedirectedBalance =
-    userDataBeforeAction.redirectionAddressRedirectedBalance;
-  expectedUserData.currentATokenUserIndex = userDataBeforeAction.currentATokenUserIndex;
-
+  expectedUserData.scaledATokenBalance = userDataBeforeAction.scaledATokenBalance;
+ 
   if (user === onBehalfOf) {
     expectedUserData.walletBalance = userDataBeforeAction.walletBalance.minus(totalRepaid);
   } else {
@@ -809,18 +762,6 @@ export const calcExpectedUserDataAfterSwapRateMode = (
     txTimestamp
   );
 
-  expectedUserData.principalATokenBalance = userDataBeforeAction.principalATokenBalance;
-  expectedUserData.redirectedBalance = userDataBeforeAction.redirectedBalance;
-  expectedUserData.interestRedirectionAddress = userDataBeforeAction.interestRedirectionAddress;
-  expectedUserData.redirectionAddressRedirectedBalance =
-    userDataBeforeAction.redirectionAddressRedirectedBalance;
-  expectedUserData.currentATokenUserIndex = calcExpectedATokenUserIndex(
-    reserveDataBeforeAction,
-    expectedUserData.currentATokenBalance,
-    expectedUserData.redirectedBalance,
-    txTimestamp
-  );
-
   if (rateMode === RateMode.Stable) {
     // swap to variable
     expectedUserData.currentStableDebt = expectedUserData.principalStableDebt = new BigNumber(0);
@@ -912,6 +853,7 @@ export const calcExpectedReserveDataAfterStableRateRebalance = (
     expectedReserveData.totalBorrowsVariable,
     expectedReserveData.averageStableBorrowRate
   );
+
   expectedReserveData.liquidityRate = rates[0];
 
   expectedReserveData.stableBorrowRate = rates[1];
@@ -953,10 +895,6 @@ export const calcExpectedUserDataAfterStableRateRebalance = (
 
   expectedUserData.principalVariableDebt = userDataBeforeAction.principalVariableDebt;
 
-  const debtAccrued = expectedUserData.currentStableDebt.minus(
-    userDataBeforeAction.principalStableDebt
-  );
-
   expectedUserData.stableBorrowRate = reserveDataBeforeAction.stableBorrowRate;
 
   expectedUserData.liquidityRate = expectedDataAfterAction.liquidityRate;
@@ -966,114 +904,19 @@ export const calcExpectedUserDataAfterStableRateRebalance = (
     userDataBeforeAction,
     txTimestamp
   );
-  expectedUserData.principalATokenBalance = userDataBeforeAction.principalATokenBalance;
-  expectedUserData.redirectedBalance = userDataBeforeAction.redirectedBalance;
-  expectedUserData.interestRedirectionAddress = userDataBeforeAction.interestRedirectionAddress;
-  expectedUserData.redirectionAddressRedirectedBalance =
-    userDataBeforeAction.redirectionAddressRedirectedBalance;
-
-  expectedUserData.currentATokenUserIndex = calcExpectedATokenUserIndex(
-    reserveDataBeforeAction,
-    expectedUserData.currentATokenBalance,
-    expectedUserData.redirectedBalance,
-    txTimestamp
-  );
 
   return expectedUserData;
 };
 
-export const calcExpectedUsersDataAfterRedirectInterest = (
-  reserveDataBeforeAction: ReserveData,
-  fromDataBeforeAction: UserReserveData,
-  toDataBeforeAction: UserReserveData,
-  fromAddress: string,
-  toAddress: string,
-  isFromExecutingTx: boolean,
-  txCost: BigNumber,
-  txTimestamp: BigNumber
-): UserReserveData[] => {
-  const expectedFromData = {...fromDataBeforeAction};
-  const expectedToData = {...toDataBeforeAction};
-
-  expectedFromData.currentStableDebt = calcExpectedStableDebtTokenBalance(
-    fromDataBeforeAction,
-    txTimestamp
-  );
-
-  expectedToData.currentVariableDebt = calcExpectedVariableDebtTokenBalance(
-    reserveDataBeforeAction,
-    toDataBeforeAction,
-    txTimestamp
-  );
-
-  expectedFromData.variableBorrowIndex = fromDataBeforeAction.variableBorrowIndex;
-  expectedToData.variableBorrowIndex = toDataBeforeAction.variableBorrowIndex;
-
-  expectedFromData.stableBorrowRate = fromDataBeforeAction.stableBorrowRate;
-  expectedToData.stableBorrowRate = toDataBeforeAction.stableBorrowRate;
-
-  expectedFromData.principalATokenBalance = expectedFromData.currentATokenBalance = calcExpectedATokenBalance(
-    reserveDataBeforeAction,
-    fromDataBeforeAction,
-    txTimestamp
-  );
-
-  expectedToData.principalATokenBalance = expectedToData.currentATokenBalance = calcExpectedATokenBalance(
-    reserveDataBeforeAction,
-    toDataBeforeAction,
-    txTimestamp
-  );
-
-  expectedToData.redirectedBalance = toDataBeforeAction.redirectedBalance.plus(
-    expectedFromData.currentATokenBalance
-  );
-
-  if (fromAddress === toAddress) {
-    expectedFromData.interestRedirectionAddress = ZERO_ADDRESS;
-    expectedFromData.redirectedBalance = new BigNumber(0);
-    expectedFromData.redirectionAddressRedirectedBalance = new BigNumber(0);
-    expectedToData.interestRedirectionAddress = ZERO_ADDRESS;
-    expectedToData.redirectedBalance = new BigNumber(0);
-    expectedToData.redirectionAddressRedirectedBalance = new BigNumber(0);
-  } else {
-    expectedFromData.interestRedirectionAddress = toAddress;
-
-    expectedFromData.redirectionAddressRedirectedBalance = calcExpectedRedirectedBalance(
-      toDataBeforeAction,
-      expectedFromData,
-      toDataBeforeAction.redirectedBalance,
-      expectedFromData.currentATokenBalance,
-      new BigNumber(0)
-    );
-  }
-
-  expectedFromData.currentATokenUserIndex = calcExpectedATokenUserIndex(
-    reserveDataBeforeAction,
-    expectedFromData.currentATokenBalance,
-    expectedFromData.redirectedBalance,
-    txTimestamp
-  );
-
-  expectedToData.currentATokenUserIndex = calcExpectedATokenUserIndex(
-    reserveDataBeforeAction,
-    expectedToData.currentATokenBalance,
-    expectedToData.redirectedBalance,
-    txTimestamp
-  );
-
-  return [expectedFromData, expectedToData];
-};
-
-const calcExpectedATokenUserIndex = (
-  reserveDataBeforeAction: ReserveData,
-  expectedUserBalanceAfterAction: BigNumber,
-  expectedUserRedirectedBalanceAterAction: BigNumber,
-  currentTimestamp: BigNumber
+const calcExpectedScaledATokenBalance = (
+  userDataBeforeAction: UserReserveData,
+  index: BigNumber,
+  amountAdded: BigNumber,
+  amountTaken: BigNumber
 ) => {
-  if (expectedUserBalanceAfterAction.eq(0) && expectedUserRedirectedBalanceAterAction.eq(0)) {
-    return new BigNumber(0);
-  }
-  return calcExpectedReserveNormalizedIncome(reserveDataBeforeAction, currentTimestamp);
+  return userDataBeforeAction.scaledATokenBalance
+    .plus(amountAdded.rayDiv(index))
+    .minus(amountTaken.rayDiv(index));
 };
 
 const calcExpectedATokenBalance = (
@@ -1081,53 +924,15 @@ const calcExpectedATokenBalance = (
   userDataBeforeAction: UserReserveData,
   currentTimestamp: BigNumber
 ) => {
-  const income = calcExpectedReserveNormalizedIncome(reserveDataBeforeAction, currentTimestamp);
+  const index = calcExpectedReserveNormalizedIncome(reserveDataBeforeAction, currentTimestamp);
 
   const {
-    interestRedirectionAddress,
-    currentATokenUserIndex: userIndexBeforeAction,
-    redirectedBalance,
-    principalATokenBalance: principalBalanceBeforeAction,
+    scaledATokenBalance: scaledBalanceBeforeAction,
   } = userDataBeforeAction;
 
-  if (userIndexBeforeAction.eq(0)) {
-    return principalBalanceBeforeAction;
-  }
-  if (interestRedirectionAddress === ZERO_ADDRESS) {
-    return principalBalanceBeforeAction
-      .plus(redirectedBalance)
-      .wadToRay()
-      .rayMul(income)
-      .rayDiv(userIndexBeforeAction)
-      .rayToWad()
-      .minus(redirectedBalance);
-  } else {
-    return principalBalanceBeforeAction.plus(
-      redirectedBalance
-        .wadToRay()
-        .rayMul(income)
-        .rayDiv(userIndexBeforeAction)
-        .rayToWad()
-        .minus(redirectedBalance)
-    );
-  }
+  return scaledBalanceBeforeAction.rayMul(index);
 };
 
-const calcExpectedRedirectedBalance = (
-  userDataBeforeAction: UserReserveData,
-  expectedUserDataAfterAction: UserReserveData,
-  redirectedBalanceBefore: BigNumber,
-  amountToAdd: BigNumber,
-  amountToSubstract: BigNumber
-): BigNumber => {
-  const balanceIncrease = userDataBeforeAction.currentATokenBalance.minus(
-    userDataBeforeAction.principalATokenBalance
-  );
-
-  return expectedUserDataAfterAction.interestRedirectionAddress !== ZERO_ADDRESS
-    ? redirectedBalanceBefore.plus(balanceIncrease).plus(amountToAdd).minus(amountToSubstract)
-    : new BigNumber('0');
-};
 const calcExpectedAverageStableBorrowRate = (
   avgStableRateBefore: BigNumber,
   totalBorrowsStableBefore: BigNumber,
diff --git a/test/helpers/utils/helpers.ts b/test/helpers/utils/helpers.ts
index 9dac685b..7d3ccee5 100644
--- a/test/helpers/utils/helpers.ts
+++ b/test/helpers/utils/helpers.ts
@@ -64,28 +64,17 @@ export const getUserData = async (
   user: tEthereumAddress,
   sender?: tEthereumAddress
 ): Promise<UserReserveData> => {
-  const [userData, aTokenData] = await Promise.all([
+  const [userData, scaledATokenBalance] = await Promise.all([
     pool.getUserReserveData(reserve, user),
     getATokenUserData(reserve, user, pool),
   ]);
 
-  const [
-    userIndex,
-    redirectedBalance,
-    principalATokenBalance,
-    redirectionAddressRedirectedBalance,
-    interestRedirectionAddress,
-  ] = aTokenData;
-
+  
   const token = await getMintableErc20(reserve);
   const walletBalance = new BigNumber((await token.balanceOf(sender || user)).toString());
 
   return {
-    principalATokenBalance: new BigNumber(principalATokenBalance),
-    interestRedirectionAddress,
-    redirectionAddressRedirectedBalance: new BigNumber(redirectionAddressRedirectedBalance),
-    redirectedBalance: new BigNumber(redirectedBalance),
-    currentATokenUserIndex: new BigNumber(userIndex),
+    scaledATokenBalance: new BigNumber(scaledATokenBalance),
     currentATokenBalance: new BigNumber(userData.currentATokenBalance.toString()),
     currentStableDebt: new BigNumber(userData.currentStableDebt.toString()),
     currentVariableDebt: new BigNumber(userData.currentVariableDebt.toString()),
@@ -115,28 +104,8 @@ const getATokenUserData = async (reserve: string, user: string, pool: LendingPoo
   const aTokenAddress: string = (await pool.getReserveTokensAddresses(reserve)).aTokenAddress;
 
   const aToken = await getAToken(aTokenAddress);
-  const [
-    userIndex,
-    interestRedirectionAddress,
-    redirectedBalance,
-    principalTokenBalance,
-  ] = await Promise.all([
-    aToken.getUserIndex(user),
-    aToken.getInterestRedirectionAddress(user),
-    aToken.getRedirectedBalance(user),
-    aToken.principalBalanceOf(user),
-  ]);
 
-  const redirectionAddressRedirectedBalance =
-    interestRedirectionAddress !== ZERO_ADDRESS
-      ? new BigNumber((await aToken.getRedirectedBalance(interestRedirectionAddress)).toString())
-      : new BigNumber('0');
+  const scaledBalance = await aToken.scaledBalanceOf(user);
+  return scaledBalance.toString();
 
-  return [
-    userIndex.toString(),
-    redirectedBalance.toString(),
-    principalTokenBalance.toString(),
-    redirectionAddressRedirectedBalance.toString(),
-    interestRedirectionAddress,
-  ];
 };
diff --git a/test/helpers/utils/interfaces/index.ts b/test/helpers/utils/interfaces/index.ts
index aa84ad3d..7042bbea 100644
--- a/test/helpers/utils/interfaces/index.ts
+++ b/test/helpers/utils/interfaces/index.ts
@@ -1,12 +1,8 @@
 import BigNumber from 'bignumber.js';
 
 export interface UserReserveData {
-  principalATokenBalance: BigNumber;
+  scaledATokenBalance: BigNumber;
   currentATokenBalance: BigNumber;
-  currentATokenUserIndex: BigNumber;
-  interestRedirectionAddress: string;
-  redirectionAddressRedirectedBalance: BigNumber;
-  redirectedBalance: BigNumber;
   currentStableDebt: BigNumber;
   currentVariableDebt: BigNumber;
   principalStableDebt: BigNumber;
diff --git a/test/liquidation-atoken.spec.ts b/test/liquidation-atoken.spec.ts
index c361f7ab..15f3d12d 100644
--- a/test/liquidation-atoken.spec.ts
+++ b/test/liquidation-atoken.spec.ts
@@ -32,7 +32,9 @@ makeSuite('LendingPool liquidation - liquidator receiving aToken', (testEnv) =>
 
     //user 1 deposits 1000 DAI
     const amountDAItoDeposit = await convertToCurrencyDecimals(dai.address, '1000');
-    await pool.connect(depositor.signer).deposit(dai.address, amountDAItoDeposit, '0');
+    await pool
+      .connect(depositor.signer)
+      .deposit(dai.address, amountDAItoDeposit, depositor.address, '0');
 
     const amountETHtoDeposit = await convertToCurrencyDecimals(weth.address, '1');
 
@@ -43,7 +45,9 @@ makeSuite('LendingPool liquidation - liquidator receiving aToken', (testEnv) =>
     await weth.connect(borrower.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
 
     //user 2 deposits 1 WETH
-    await pool.connect(borrower.signer).deposit(weth.address, amountETHtoDeposit, '0');
+    await pool
+      .connect(borrower.signer)
+      .deposit(weth.address, amountETHtoDeposit, borrower.address, '0');
 
     //user 2 borrows
     const userGlobalData = await pool.getUserAccountData(borrower.address);
@@ -225,7 +229,9 @@ makeSuite('LendingPool liquidation - liquidator receiving aToken', (testEnv) =>
     //user 3 deposits 1000 USDC
     const amountUSDCtoDeposit = await convertToCurrencyDecimals(usdc.address, '1000');
 
-    await pool.connect(depositor.signer).deposit(usdc.address, amountUSDCtoDeposit, '0');
+    await pool
+      .connect(depositor.signer)
+      .deposit(usdc.address, amountUSDCtoDeposit, depositor.address, '0');
 
     //user 4 deposits 1 ETH
     const amountETHtoDeposit = await convertToCurrencyDecimals(weth.address, '1');
@@ -236,7 +242,9 @@ makeSuite('LendingPool liquidation - liquidator receiving aToken', (testEnv) =>
     //approve protocol to access borrower wallet
     await weth.connect(borrower.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
 
-    await pool.connect(borrower.signer).deposit(weth.address, amountETHtoDeposit, '0');
+    await pool
+      .connect(borrower.signer)
+      .deposit(weth.address, amountETHtoDeposit, borrower.address, '0');
 
     //user 4 borrows
     const userGlobalData = await pool.getUserAccountData(borrower.address);
diff --git a/test/liquidation-underlying.spec.ts b/test/liquidation-underlying.spec.ts
index 9f6a0a33..e40ec406 100644
--- a/test/liquidation-underlying.spec.ts
+++ b/test/liquidation-underlying.spec.ts
@@ -37,7 +37,9 @@ makeSuite('LendingPool liquidation - liquidator receiving the underlying asset',
     //user 1 deposits 1000 DAI
     const amountDAItoDeposit = await convertToCurrencyDecimals(dai.address, '1000');
 
-    await pool.connect(depositor.signer).deposit(dai.address, amountDAItoDeposit, '0');
+    await pool
+      .connect(depositor.signer)
+      .deposit(dai.address, amountDAItoDeposit, depositor.address, '0');
     //user 2 deposits 1 ETH
     const amountETHtoDeposit = await convertToCurrencyDecimals(weth.address, '1');
 
@@ -47,7 +49,9 @@ makeSuite('LendingPool liquidation - liquidator receiving the underlying asset',
     //approve protocol to access the borrower wallet
     await weth.connect(borrower.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
 
-    await pool.connect(borrower.signer).deposit(weth.address, amountETHtoDeposit, '0');
+    await pool
+      .connect(borrower.signer)
+      .deposit(weth.address, amountETHtoDeposit, borrower.address, '0');
 
     //user 2 borrows
 
@@ -204,7 +208,9 @@ makeSuite('LendingPool liquidation - liquidator receiving the underlying asset',
     //depositor deposits 1000 USDC
     const amountUSDCtoDeposit = await convertToCurrencyDecimals(usdc.address, '1000');
 
-    await pool.connect(depositor.signer).deposit(usdc.address, amountUSDCtoDeposit, '0');
+    await pool
+      .connect(depositor.signer)
+      .deposit(usdc.address, amountUSDCtoDeposit, depositor.address, '0');
 
     //borrower deposits 1 ETH
     const amountETHtoDeposit = await convertToCurrencyDecimals(weth.address, '1');
@@ -215,7 +221,9 @@ makeSuite('LendingPool liquidation - liquidator receiving the underlying asset',
     //approve protocol to access the borrower wallet
     await weth.connect(borrower.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
 
-    await pool.connect(borrower.signer).deposit(weth.address, amountETHtoDeposit, '0');
+    await pool
+      .connect(borrower.signer)
+      .deposit(weth.address, amountETHtoDeposit, borrower.address, '0');
 
     //borrower borrows
     const userGlobalData = await pool.getUserAccountData(borrower.address);
@@ -345,7 +353,9 @@ makeSuite('LendingPool liquidation - liquidator receiving the underlying asset',
     //borrower deposits 1000 LEND
     const amountLENDtoDeposit = await convertToCurrencyDecimals(lend.address, '1000');
 
-    await pool.connect(borrower.signer).deposit(lend.address, amountLENDtoDeposit, '0');
+    await pool
+      .connect(borrower.signer)
+      .deposit(lend.address, amountLENDtoDeposit, borrower.address, '0');
     const usdcPrice = await oracle.getAssetPrice(usdc.address);
 
     //drops HF below 1
diff --git a/test/repay-with-collateral.spec.ts b/test/repay-with-collateral.spec.ts
index 91440c07..9c169f10 100644
--- a/test/repay-with-collateral.spec.ts
+++ b/test/repay-with-collateral.spec.ts
@@ -40,17 +40,17 @@ export const expectRepayWithCollateralEvent = (
 
 makeSuite('LendingPool. repayWithCollateral()', (testEnv: TestEnv) => {
   it('User 1 provides some liquidity for others to borrow', async () => {
-    const {pool, weth, dai, usdc} = testEnv;
+    const {pool, weth, dai, usdc, deployer} = testEnv;
 
     await weth.mint(parseEther('200'));
     await weth.approve(pool.address, parseEther('200'));
-    await pool.deposit(weth.address, parseEther('200'), 0);
+    await pool.deposit(weth.address, parseEther('200'), deployer.address, 0);
     await dai.mint(parseEther('20000'));
     await dai.approve(pool.address, parseEther('20000'));
-    await pool.deposit(dai.address, parseEther('20000'), 0);
+    await pool.deposit(dai.address, parseEther('20000'), deployer.address, 0);
     await usdc.mint(parseEther('20000'));
     await usdc.approve(pool.address, parseEther('20000'));
-    await pool.deposit(usdc.address, parseEther('20000'), 0);
+    await pool.deposit(usdc.address, parseEther('20000'), deployer.address, 0);
   });
 
   it('User 2 deposit WETH and borrows DAI at Variable', async () => {
@@ -63,7 +63,7 @@ makeSuite('LendingPool. repayWithCollateral()', (testEnv: TestEnv) => {
 
     await weth.connect(user.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
 
-    await pool.connect(user.signer).deposit(weth.address, amountToDeposit, '0');
+    await pool.connect(user.signer).deposit(weth.address, amountToDeposit, user.address, '0');
 
     await pool.connect(user.signer).borrow(dai.address, amountToBorrow, 2, 0, user.address);
   });
@@ -185,7 +185,7 @@ makeSuite('LendingPool. repayWithCollateral()', (testEnv: TestEnv) => {
 
     await weth.connect(user.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
 
-    await pool.connect(user.signer).deposit(weth.address, amountToDeposit, '0');
+    await pool.connect(user.signer).deposit(weth.address, amountToDeposit, user.address, '0');
 
     await pool.connect(user.signer).borrow(usdc.address, amountToBorrow, 2, 0, user.address);
   });
@@ -307,7 +307,7 @@ makeSuite('LendingPool. repayWithCollateral()', (testEnv: TestEnv) => {
 
     await weth.connect(user.signer).mint(amountToDeposit);
 
-    await pool.connect(user.signer).deposit(weth.address, amountToDeposit, '0');
+    await pool.connect(user.signer).deposit(weth.address, amountToDeposit, user.address, '0');
 
     await pool.connect(user.signer).borrow(usdc.address, amountToBorrowVariable, 2, 0, user.address);
 
@@ -447,8 +447,8 @@ makeSuite('LendingPool. repayWithCollateral()', (testEnv: TestEnv) => {
     await weth.connect(user.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
     await dai.connect(user.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
 
-    await pool.connect(user.signer).deposit(weth.address, amountToDepositWeth, '0');
-    await pool.connect(user.signer).deposit(dai.address, amountToDepositDAI, '0');
+    await pool.connect(user.signer).deposit(weth.address, amountToDepositWeth, user.address, '0');
+    await pool.connect(user.signer).deposit(dai.address, amountToDepositDAI, user.address, '0');
 
     await pool.connect(user.signer).borrow(dai.address, amountToBorrowVariable, 2, 0, user.address);
 
@@ -536,11 +536,11 @@ makeSuite('LendingPool. repayWithCollateral()', (testEnv: TestEnv) => {
 
     await weth.connect(user.signer).mint(amountWETHToDeposit);
     await weth.connect(user.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
-    await pool.connect(user.signer).deposit(weth.address, amountWETHToDeposit, '0');
+    await pool.connect(user.signer).deposit(weth.address, amountWETHToDeposit, user.address, '0');
 
     await dai.connect(user.signer).mint(amountDAIToDeposit);
     await dai.connect(user.signer).approve(pool.address, APPROVAL_AMOUNT_LENDING_POOL);
-    await pool.connect(user.signer).deposit(dai.address, amountDAIToDeposit, '0');
+    await pool.connect(user.signer).deposit(dai.address, amountDAIToDeposit, user.address, '0');
 
     await pool.connect(user.signer).borrow(usdc.address, amountToBorrow, 2, 0, user.address);
   });