diff --git a/test/collateral-swap.spec.ts b/test/collateral-swap.spec.ts
index feb78b63..867875a0 100644
--- a/test/collateral-swap.spec.ts
+++ b/test/collateral-swap.spec.ts
@@ -4,6 +4,9 @@ import {getMockSwapAdapter} from '../helpers/contracts-helpers';
 import {ProtocolErrors} from '../helpers/types';
 import {ethers} from 'ethers';
 import {APPROVAL_AMOUNT_LENDING_POOL} from '../helpers/constants';
+import {getContractsData, getTxCostAndTimestamp} from './helpers/actions';
+import {calcExpectedATokenBalance} from './helpers/utils/calculations';
+import {waitForTx} from './__setup.spec';
 
 const {expect} = require('chai');
 
@@ -54,13 +57,6 @@ makeSuite('LendingPool CollateralSwap function', (testEnv: TestEnv) => {
         '0x10'
       )
     ).to.be.revertedWith('SafeMath: subtraction overflow');
-    await weth.mint(ethers.utils.parseEther('0.1'));
-    await pool.repay(
-      weth.address,
-      ethers.utils.parseEther('0.2'),
-      1,
-      await pool.signer.getAddress()
-    );
   });
 
   it('User tries to swap correct amount', async () => {
@@ -71,19 +67,30 @@ makeSuite('LendingPool CollateralSwap function', (testEnv: TestEnv) => {
     const amountToReturn = ethers.utils.parseEther('0.5');
     await _mockSwapAdapter.setAmountToReturn(amountToReturn);
 
+    const {
+      reserveData: wethReserveDataBefore,
+      userData: wethUserDataBefore,
+    } = await getContractsData(weth.address, userAddress, testEnv);
+
+    const {reserveData: daiReserveDataBefore, userData: daiUserDataBefore} = await getContractsData(
+      dai.address,
+      userAddress,
+      testEnv
+    );
+
     const reserveBalanceWETHBefore = await weth.balanceOf(aEth.address);
     const reserveBalanceDAIBefore = await dai.balanceOf(aDai.address);
 
-    const userATokenBalanceWETHBefore = await aEth.balanceOf(userAddress);
-    const userATokenBalanceDAIBefore = await aDai.balanceOf(userAddress);
-
-    await pool.collateralSwap(
-      _mockSwapAdapter.address,
-      weth.address,
-      dai.address,
-      amountToSwap,
-      '0x10'
+    const txReceipt = await waitForTx(
+      await pool.collateralSwap(
+        _mockSwapAdapter.address,
+        weth.address,
+        dai.address,
+        amountToSwap,
+        '0x10'
+      )
     );
+    const {txTimestamp} = await getTxCostAndTimestamp(txReceipt);
     const userATokenBalanceWETHAfter = await aEth.balanceOf(userAddress);
     const userATokenBalanceDAIAfter = await aDai.balanceOf(userAddress);
 
@@ -91,11 +98,15 @@ makeSuite('LendingPool CollateralSwap function', (testEnv: TestEnv) => {
     const reserveBalanceDAIAfter = await dai.balanceOf(aDai.address);
 
     expect(userATokenBalanceWETHAfter.toString()).to.be.equal(
-      userATokenBalanceWETHBefore.sub(amountToSwap).toString(),
+      calcExpectedATokenBalance(wethReserveDataBefore, wethUserDataBefore, txTimestamp)
+        .minus(amountToSwap.toString())
+        .toString(),
       'was burned incorrect amount of user funds'
     );
     expect(userATokenBalanceDAIAfter.toString()).to.be.equal(
-      userATokenBalanceDAIBefore.add(amountToReturn).toString(),
+      calcExpectedATokenBalance(daiReserveDataBefore, daiUserDataBefore, txTimestamp)
+        .plus(amountToReturn.toString())
+        .toString(),
       'was minted incorrect amount of user funds'
     );
 
@@ -116,7 +127,7 @@ makeSuite('LendingPool CollateralSwap function', (testEnv: TestEnv) => {
     const amountToReturn = ethers.utils.parseEther('0.5');
     await _mockSwapAdapter.setAmountToReturn(amountToReturn);
 
-    await pool.borrow(weth.address, ethers.utils.parseEther('0.4'), 1, 0);
+    await pool.borrow(weth.address, ethers.utils.parseEther('0.3'), 1, 0);
 
     await expect(
       pool.collateralSwap(_mockSwapAdapter.address, weth.address, dai.address, amountToSwap, '0x10')
diff --git a/test/helpers/actions.ts b/test/helpers/actions.ts
index be0daac5..b9a181e8 100644
--- a/test/helpers/actions.ts
+++ b/test/helpers/actions.ts
@@ -831,7 +831,7 @@ const getDataBeforeAction = async (
   };
 };
 
-const getTxCostAndTimestamp = async (tx: ContractReceipt) => {
+export const getTxCostAndTimestamp = async (tx: ContractReceipt) => {
   if (!tx.blockNumber || !tx.transactionHash || !tx.cumulativeGasUsed) {
     throw new Error('No tx blocknumber');
   }
@@ -845,7 +845,7 @@ const getTxCostAndTimestamp = async (tx: ContractReceipt) => {
   return {txCost, txTimestamp};
 };
 
-const getContractsData = async (reserve: string, user: string, testEnv: TestEnv) => {
+export const getContractsData = async (reserve: string, user: string, testEnv: TestEnv) => {
   const {pool} = testEnv;
   const reserveData = await getReserveData(pool, reserve);
   const userData = await getUserData(pool, reserve, user);
diff --git a/test/helpers/utils/calculations.ts b/test/helpers/utils/calculations.ts
index 4ff03b19..d16943d9 100644
--- a/test/helpers/utils/calculations.ts
+++ b/test/helpers/utils/calculations.ts
@@ -1076,7 +1076,7 @@ const calcExpectedATokenUserIndex = (
   return calcExpectedReserveNormalizedIncome(reserveDataBeforeAction, currentTimestamp);
 };
 
-const calcExpectedATokenBalance = (
+export const calcExpectedATokenBalance = (
   reserveDataBeforeAction: ReserveData,
   userDataBeforeAction: UserReserveData,
   currentTimestamp: BigNumber