diff --git a/contracts/common/Block.sol b/contracts/common/Block.sol
index 30ae86eb9a..bc2e1ed499 100644
--- a/contracts/common/Block.sol
+++ b/contracts/common/Block.sol
@@ -40,7 +40,7 @@ contract BlockTimestamp {
 
     function addDataToMapping(uint256 _value1, uint256 _value2) public {
         uint256 currentTimestamp = block.timestamp % 1000000;
-        for (uint256 i = 0; i < 5; i++) {
+        for (uint256 i = 0; i < 20; i++) {
             Data memory newData = Data({
                 value1: _value1,
                 value2: _value2
diff --git a/integration/tests/neon_evm/test_transaction_step_from_account.py b/integration/tests/neon_evm/test_transaction_step_from_account.py
index a7a6af117a..6f3b84392e 100644
--- a/integration/tests/neon_evm/test_transaction_step_from_account.py
+++ b/integration/tests/neon_evm/test_transaction_step_from_account.py
@@ -873,18 +873,6 @@ def test_trx_steps_with_number_timestamp(
         operator_balance_pubkey = evm_loader.get_operator_balance_pubkey(operator_keypair)
         evm_loader.write_transaction_to_holder_account(signed_tx, holder, operator_keypair)
 
-        def send_transaction_steps_for_holder(accounts):
-            resp = evm_loader.send_transaction_step_from_account(
-                operator_keypair,
-                operator_balance_pubkey,
-                treasury_pool,
-                holder,
-                accounts,
-                EVM_STEPS,
-                operator_keypair,
-            )
-            return resp
-
         def get_account_override(eth_account):
             sender_address = eth_account.eth_address.hex()
             sender_account_info = neon_api_client.get_balance(sender_address)["value"][0]
@@ -904,7 +892,15 @@ def make_trace_config(block_params, overrides):
 
         # State of the sender account should be fetched before the first iteration.
         sender_overrides = get_account_override(sender_with_tokens)
-        send_transaction_steps_for_holder(initial_accounts)
+        evm_loader.send_transaction_step_from_account(
+            operator_keypair,
+            operator_balance_pubkey,
+            treasury_pool,
+            holder,
+            initial_accounts,
+            EVM_STEPS,
+            operator_keypair,
+        )
 
         # Fetch block params after the first iteration as stored in the holder.
         block_params = get_block_params()
@@ -920,11 +916,8 @@ def make_trace_config(block_params, overrides):
 
         # Fetch new account list that depends on the re-emulation.
         new_accounts = [Pubkey.from_string(item["pubkey"]) for item in emulate_result["solana_accounts"]]
+        evm_loader.execute_transaction_steps_from_account(operator_keypair,treasury_pool,holder,new_accounts)
 
-        # Run the rest of iterations with the new account list.
-        send_transaction_steps_for_holder(new_accounts)
-        send_transaction_steps_for_holder(new_accounts)
-        send_transaction_steps_for_holder(new_accounts)
 
         check_holder_account_tag(holder, FINALIZED_STORAGE_ACCOUNT_INFO_LAYOUT, TAG_FINALIZED_STATE)