diff --git a/config/aave.ts b/config/aave.ts
index 1f769d78..e7c89a7d 100644
--- a/config/aave.ts
+++ b/config/aave.ts
@@ -34,99 +34,99 @@ export const AaveConfig: IAaveConfiguration = {
   ConfigName: 'Aave',
   ProviderId: 1,
   ReservesConfig: {
-    DAI: stablecoinStrategyDAI,
-    TUSD: stablecoinStrategyTUSD,
-    USDC: stablecoinStrategyUSDC,
-    USDT: stablecoinStrategyUSDT,
-    SUSD: stablecoinStrategySUSD,
     AAVE: strategyAAVE,
     BAT: strategyBase,
-    WETH: strategyWETH,
-    LINK: strategyLINK,
-    WBTC: strategyWBTC,
-    KNC: strategyKNC,
-    REP: strategyREP,
-    MKR: strategyMKR,
-    MANA: strategyMANA,
-    ZRX: strategyBase,
-    SNX: strategySNX,
-    YFI: strategyYFI,
-    UNI: strategyUNI,
     BUSD: stablecoinStrategyBUSD,
-    REN: strategyREN,
+    DAI: stablecoinStrategyDAI,
     ENJ: strategyREN,
+    KNC: strategyKNC,
+    LINK: strategyLINK,
+    MANA: strategyMANA,
+    MKR: strategyMKR,
+    REN: strategyREN,
+    REP: strategyREP,
+    SNX: strategySNX,
+    SUSD: stablecoinStrategySUSD,
+    TUSD: stablecoinStrategyTUSD,
+    UNI: strategyUNI,
+    USDC: stablecoinStrategyUSDC,
+    USDT: stablecoinStrategyUSDT,
+    WBTC: strategyWBTC,
+    WETH: strategyWETH,
+    YFI: strategyYFI,
+    ZRX: strategyBase,
   },
   ReserveAssets: {
     [eEthereumNetwork.buidlerevm]: {},
     [eEthereumNetwork.coverage]: {},
     [EthereumNetwork.kovan]: {
-      WETH: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
-      DAI: '0xFf795577d9AC8bD7D90Ee22b6C1703490b6512FD',
-      TUSD: '0x016750AC630F711882812f24Dba6c95b9D35856d',
-      USDC: '0xe22da380ee6B445bb8273C81944ADEB6E8450422',
-      USDT: '0x13512979ADE267AB5100878E2e0f485B568328a4',
-      SUSD: '0xD868790F57B39C9B2B51b12de046975f986675f9',
       AAVE: '0xB597cd8D3217ea6477232F9217fa70837ff667Af',
       BAT: '0x2d12186Fbb9f9a8C28B3FfdD4c42920f8539D738',
-      REP: '0x260071C8D61DAf730758f8BD0d6370353956AE0E',
-      MKR: '0x61e4CAE3DA7FD189e52a4879C7B8067D7C2Cc0FA',
-      LINK: '0xAD5ce863aE3E4E9394Ab43d4ba0D80f419F61789',
-      KNC: '0x3F80c39c0b96A0945f9F0E9f55d8A8891c5671A8',
-      WBTC: '0xD1B98B6607330172f1D991521145A22BCe793277',
-      MANA: '0x738Dc6380157429e957d223e6333Dc385c85Fec7',
-      ZRX: '0xD0d76886cF8D952ca26177EB7CfDf83bad08C00C',
-      SNX: '0x7FDb81B0b8a010dd4FFc57C3fecbf145BA8Bd947',
       BUSD: '0x4c6E1EFC12FDfD568186b7BAEc0A43fFfb4bCcCf',
-      REN: '0x5eebf65A6746eed38042353Ba84c8e37eD58Ac6f',
-      YFI: '0xb7c325266ec274fEb1354021D27FA3E3379D840d',
-      UNI: '0x075A36BA8846C6B6F53644fDd3bf17E5151789DC',
+      DAI: '0xFf795577d9AC8bD7D90Ee22b6C1703490b6512FD',
       ENJ: '0xC64f90Cd7B564D3ab580eb20a102A8238E218be2',
+      KNC: '0x3F80c39c0b96A0945f9F0E9f55d8A8891c5671A8',
+      LINK: '0xAD5ce863aE3E4E9394Ab43d4ba0D80f419F61789',
+      MANA: '0x738Dc6380157429e957d223e6333Dc385c85Fec7',
+      MKR: '0x61e4CAE3DA7FD189e52a4879C7B8067D7C2Cc0FA',
+      REN: '0x5eebf65A6746eed38042353Ba84c8e37eD58Ac6f',
+      REP: '0x260071C8D61DAf730758f8BD0d6370353956AE0E',
+      SNX: '0x7FDb81B0b8a010dd4FFc57C3fecbf145BA8Bd947',
+      SUSD: '0xD868790F57B39C9B2B51b12de046975f986675f9',
+      TUSD: '0x016750AC630F711882812f24Dba6c95b9D35856d',
+      UNI: '0x075A36BA8846C6B6F53644fDd3bf17E5151789DC',
+      USDC: '0xe22da380ee6B445bb8273C81944ADEB6E8450422',
+      USDT: '0x13512979ADE267AB5100878E2e0f485B568328a4',
+      WBTC: '0xD1B98B6607330172f1D991521145A22BCe793277',
+      WETH: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
+      YFI: '0xb7c325266ec274fEb1354021D27FA3E3379D840d',
+      ZRX: '0xD0d76886cF8D952ca26177EB7CfDf83bad08C00C',
     },
     [EthereumNetwork.ropsten]: {
-      WETH: '0xc778417e063141139fce010982780140aa0cd5ab',
-      DAI: '0xf80A32A835F79D7787E8a8ee5721D0fEaFd78108',
-      TUSD: '0xa2EA00Df6d8594DBc76b79beFe22db9043b8896F',
-      USDC: '0x851dEf71f0e6A903375C1e536Bd9ff1684BAD802',
-      USDT: '0xB404c51BBC10dcBE948077F18a4B8E553D160084',
-      SUSD: '0xc374eB17f665914c714Ac4cdC8AF3a3474228cc5',
       AAVE: '',
       BAT: '0x85B24b3517E3aC7bf72a14516160541A60cFF19d',
-      REP: '0xBeb13523503d35F9b3708ca577CdCCAdbFB236bD',
-      MKR: '0x2eA9df3bABe04451c9C3B06a2c844587c59d9C37',
-      LINK: '0x1a906E71FF9e28d8E01460639EB8CF0a6f0e2486',
-      KNC: '0xCe4aA1dE3091033Ba74FA2Ad951f6adc5E5cF361',
-      WBTC: '0xa0E54Ab6AA5f0bf1D62EC3526436F3c05b3348A0',
-      MANA: '0x78b1F763857C8645E46eAdD9540882905ff32Db7',
-      ZRX: '0x02d7055704EfF050323A2E5ee4ba05DB2A588959',
-      SNX: '0xF80Aa7e2Fda4DA065C55B8061767F729dA1476c7',
       BUSD: '0xFA6adcFf6A90c11f31Bc9bb59eC0a6efB38381C6',
-      REN: ZERO_ADDRESS,
-      YFI: ZERO_ADDRESS,
-      UNI: ZERO_ADDRESS,
+      DAI: '0xf80A32A835F79D7787E8a8ee5721D0fEaFd78108',
       ENJ: ZERO_ADDRESS,
+      KNC: '0xCe4aA1dE3091033Ba74FA2Ad951f6adc5E5cF361',
+      LINK: '0x1a906E71FF9e28d8E01460639EB8CF0a6f0e2486',
+      MANA: '0x78b1F763857C8645E46eAdD9540882905ff32Db7',
+      MKR: '0x2eA9df3bABe04451c9C3B06a2c844587c59d9C37',
+      REN: ZERO_ADDRESS,
+      REP: '0xBeb13523503d35F9b3708ca577CdCCAdbFB236bD',
+      SNX: '0xF80Aa7e2Fda4DA065C55B8061767F729dA1476c7',
+      SUSD: '0xc374eB17f665914c714Ac4cdC8AF3a3474228cc5',
+      TUSD: '0xa2EA00Df6d8594DBc76b79beFe22db9043b8896F',
+      UNI: ZERO_ADDRESS,
+      USDC: '0x851dEf71f0e6A903375C1e536Bd9ff1684BAD802',
+      USDT: '0xB404c51BBC10dcBE948077F18a4B8E553D160084',
+      WBTC: '0xa0E54Ab6AA5f0bf1D62EC3526436F3c05b3348A0',
+      WETH: '0xc778417e063141139fce010982780140aa0cd5ab',
+      YFI: ZERO_ADDRESS,
+      ZRX: '0x02d7055704EfF050323A2E5ee4ba05DB2A588959',
     },
     [EthereumNetwork.main]: {
-      WETH: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-      DAI: '0x6b175474e89094c44da98b954eedeac495271d0f',
-      TUSD: '0x0000000000085d4780B73119b644AE5ecd22b376',
-      USDC: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-      USDT: '0xdac17f958d2ee523a2206206994597c13d831ec7',
-      SUSD: '0x57ab1ec28d129707052df4df418d58a2d46d5f51',
       AAVE: '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9',
       BAT: '0x0d8775f648430679a709e98d2b0cb6250d2887ef',
-      REP: '0x1985365e9f78359a9B6AD760e32412f4a445E862',
-      MKR: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
-      LINK: '0x514910771af9ca656af840dff83e8264ecf986ca',
-      KNC: '0xdd974d5c2e2928dea5f71b9825b8b646686bd200',
-      WBTC: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
-      MANA: '0x0f5d2fb29fb7d3cfee444a200298f468908cc942',
-      ZRX: '0xe41d2489571d322189246dafa5ebde1f4699f498',
-      SNX: '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F',
       BUSD: '0x4Fabb145d64652a948d72533023f6E7A623C7C53',
-      REN: '0x408e41876cCCDC0F92210600ef50372656052a38',
-      YFI: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
-      UNI: '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984',
+      DAI: '0x6b175474e89094c44da98b954eedeac495271d0f',
       ENJ: '0xF629cBd94d3791C9250152BD8dfBDF380E2a3B9c',
+      KNC: '0xdd974d5c2e2928dea5f71b9825b8b646686bd200',
+      LINK: '0x514910771af9ca656af840dff83e8264ecf986ca',
+      MANA: '0x0f5d2fb29fb7d3cfee444a200298f468908cc942',
+      MKR: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
+      REN: '0x408e41876cCCDC0F92210600ef50372656052a38',
+      REP: '0x1985365e9f78359a9B6AD760e32412f4a445E862',
+      SNX: '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F',
+      SUSD: '0x57ab1ec28d129707052df4df418d58a2d46d5f51',
+      TUSD: '0x0000000000085d4780B73119b644AE5ecd22b376',
+      UNI: '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984',
+      USDC: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+      USDT: '0xdac17f958d2ee523a2206206994597c13d831ec7',
+      WBTC: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
+      WETH: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+      YFI: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
+      ZRX: '0xe41d2489571d322189246dafa5ebde1f4699f498',
     },
   },
 };
diff --git a/config/commons.ts b/config/commons.ts
index 00588921..3db7e26c 100644
--- a/config/commons.ts
+++ b/config/commons.ts
@@ -4,28 +4,28 @@ import {oneEther, oneRay, RAY, ZERO_ADDRESS} from '../helpers/constants';
 import {ICommonConfiguration, EthereumNetwork, eEthereumNetwork} from '../helpers/types';
 
 const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
-  DAI: oneEther.multipliedBy('0.00369068412860').toFixed(),
-  TUSD: oneEther.multipliedBy('0.00364714136416').toFixed(),
-  USDC: oneEther.multipliedBy('0.00367714136416').toFixed(),
   AAVE: oneEther.multipliedBy('0.003620948469').toFixed(),
   BAT: oneEther.multipliedBy('0.00137893825230').toFixed(),
-  USDT: oneEther.multipliedBy('0.00369068412860').toFixed(),
-  SUSD: oneEther.multipliedBy('0.00364714136416').toFixed(),
-  MKR: oneEther.multipliedBy('2.508581').toFixed(),
-  REP: oneEther.multipliedBy('0.048235').toFixed(),
-  ZRX: oneEther.multipliedBy('0.001151').toFixed(),
-  WBTC: oneEther.multipliedBy('47.332685').toFixed(),
-  LINK: oneEther.multipliedBy('0.009955').toFixed(),
-  KNC: oneEther.multipliedBy('0.001072').toFixed(),
-  MANA: oneEther.multipliedBy('0.000158').toFixed(),
-  SNX: oneEther.multipliedBy('0.00442616').toFixed(),
   BUSD: oneEther.multipliedBy('0.00736484').toFixed(),
-  WETH: oneEther.toFixed(),
-  USD: '5848466240000000',
-  YFI: oneEther.multipliedBy('22.407436').toFixed(),
-  REN: oneEther.multipliedBy('0.00065133').toFixed(),
-  UNI: oneEther.multipliedBy('0.00536479').toFixed(),
+  DAI: oneEther.multipliedBy('0.00369068412860').toFixed(),
   ENJ: oneEther.multipliedBy('0.00029560').toFixed(),
+  KNC: oneEther.multipliedBy('0.001072').toFixed(),
+  LINK: oneEther.multipliedBy('0.009955').toFixed(),
+  MANA: oneEther.multipliedBy('0.000158').toFixed(),
+  MKR: oneEther.multipliedBy('2.508581').toFixed(),
+  REN: oneEther.multipliedBy('0.00065133').toFixed(),
+  REP: oneEther.multipliedBy('0.048235').toFixed(),
+  SNX: oneEther.multipliedBy('0.00442616').toFixed(),
+  SUSD: oneEther.multipliedBy('0.00364714136416').toFixed(),
+  TUSD: oneEther.multipliedBy('0.00364714136416').toFixed(),
+  UNI: oneEther.multipliedBy('0.00536479').toFixed(),
+  USDC: oneEther.multipliedBy('0.00367714136416').toFixed(),
+  USDT: oneEther.multipliedBy('0.00369068412860').toFixed(),
+  WETH: oneEther.toFixed(),
+  WBTC: oneEther.multipliedBy('47.332685').toFixed(),
+  YFI: oneEther.multipliedBy('22.407436').toFixed(),
+  ZRX: oneEther.multipliedBy('0.001151').toFixed(),
+  USD: '5848466240000000',
   UNI_DAI_ETH: oneEther.multipliedBy('2.1').toFixed(),
   UNI_USDC_ETH: oneEther.multipliedBy('2.1').toFixed(),
   UNI_SETH_ETH: oneEther.multipliedBy('2.1').toFixed(),
@@ -187,27 +187,27 @@ export const CommonsConfig: ICommonConfiguration = {
     [eEthereumNetwork.coverage]: {},
     [eEthereumNetwork.buidlerevm]: {},
     [EthereumNetwork.kovan]: {
-      DAI: '0x6F47077D3B6645Cb6fb7A29D280277EC1e5fFD90',
-      TUSD: '0x02424c54D78D48179Fd12ebFfB11c16f9CA984Ad',
-      USDC: '0x672c1C0d1130912D83664011E7960a42E8cA05D5',
-      USDT: '0xCC833A6522721B3252e7578c5BCAF65738B75Fc3',
-      SUSD: '0xa353F8b083F7575cfec443b5ad585D42f652E9F7',
       AAVE: '0xd04647B7CB523bb9f26730E9B6dE1174db7591Ad',
-      BAT: '0x2c8d01771CCDca47c103194C5860dbEA2fE61626',
-      REP: '0x09F4A94F44c29d4967C761bBdB89f5bD3E2c09E6',
-      MKR: '0x14D7714eC44F44ECD0098B39e642b246fB2c38D0',
-      LINK: '0xf1e71Afd1459C05A2F898502C4025be755aa844A',
-      KNC: '0x0893AaF58f62279909F9F6FF2E5642f53342e77F',
-      WBTC: '0x33E5085E92f5b53E9A193E28ad2f76bF210550BB',
-      MANA: '0x3c30c5c415B2410326297F0f65f5Cbb32f3aefCc',
-      ZRX: '0x2636cfdDB457a6C7A7D60A439F1E5a5a0C3d9c65',
-      SNX: '0x775E76cca1B5bc903c9a8C6f77416A35E5744664',
-      BUSD: '0x63294A05C9a81b1A40CAD3f2ff30617111630393',
-      USD: '0xD21912D8762078598283B14cbA40Cb4bFCb87581',
-      YFI: '0xe45f3ed2218E7e411bf8DFdE66069e57F46b26eF',
-      REN: '0xF1939BECE7708382b5fb5e559f630CB8B39a10ee',
-      UNI: '0x17756515f112429471F86f98D5052aCB6C47f6ee',
+      BAT: '0x0e4fcEC26c9f85c3D714370c98f43C4E02Fc35Ae',
+      BUSD: '0xbF7A18ea5DE0501f7559144e702b29c55b055CcB',
+      DAI: '0x22B58f1EbEDfCA50feF632bD73368b2FdA96D541',
       ENJ: '0xfaDbe2ee798889F02d1d39eDaD98Eff4c7fe95D4',
+      KNC: '0xb8E8130d244CFd13a75D6B9Aee029B1C33c808A7',
+      LINK: '0x3Af8C569ab77af5230596Acf0E8c2F9351d24C38',
+      MANA: '0x1b93D8E109cfeDcBb3Cc74eD761DE286d5771511',
+      MKR: '0x0B156192e04bAD92B6C1C13cf8739d14D78D5701',
+      REN: '0xF1939BECE7708382b5fb5e559f630CB8B39a10ee',
+      REP: '0x3A7e6117F2979EFf81855de32819FBba48a63e9e',
+      SNX: '0xF9A76ae7a1075Fe7d646b06fF05Bd48b9FA5582e',
+      SUSD: '0xb343e7a1aF578FA35632435243D814e7497622f7',
+      TUSD: '0x7aeCF1c19661d12E962b69eBC8f6b2E63a55C660',
+      UNI: '0x17756515f112429471F86f98D5052aCB6C47f6ee',
+      USDC: '0x64EaC61A2DFda2c3Fa04eED49AA33D021AeC8838',
+      USDT: '0x0bF499444525a23E7Bb61997539725cA2e928138',
+      WBTC: '0xF7904a295A029a3aBDFFB6F12755974a958C7C25',
+      YFI: '0xC5d1B1DEb2992738C0273408ac43e1e906086B6C',
+      ZRX: '0xBc3f28Ccc21E9b5856E81E6372aFf57307E2E883',
+      USD: '0x9326BFA02ADD2366b30bacB125260Af641031331',
       UNI_DAI_ETH: '0x0338C40020Bf886c11406115fD1ba205Ef1D9Ff9',
       UNI_USDC_ETH: '0x7f5E5D34591e9a70D187BBA94260C30B92aC0961',
       UNI_SETH_ETH: '0xc5F1eA001c1570783b3af418fa775237Eb129EDC',