diff --git a/src/Nethermind/Nethermind.AuRa.Test/Contract/ContractDataStoreTests.cs b/src/Nethermind/Nethermind.AuRa.Test/Contract/ContractDataStoreTests.cs
index f88647fade18..a9669604116e 100644
--- a/src/Nethermind/Nethermind.AuRa.Test/Contract/ContractDataStoreTests.cs
+++ b/src/Nethermind/Nethermind.AuRa.Test/Contract/ContractDataStoreTests.cs
@@ -5,7 +5,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using FluentAssertions;
 using Nethermind.Abi;
 using Nethermind.Blockchain;
@@ -91,7 +90,7 @@ public void returns_data_from_getAll_on_non_consecutive_receipts_with_incrementa
     }
 
     [Test]
-    public async Task returns_data_from_receipts_on_non_consecutive_with_not_incremental_changes()
+    public void returns_data_from_receipts_on_non_consecutive_with_not_incremental_changes()
     {
         TestCase<Address> testCase = BuildTestCase<Address>();
         testCase.DataContract.IncrementalChanges.Returns(false);
@@ -109,9 +108,10 @@ public async Task returns_data_from_receipts_on_non_consecutive_with_not_increme
         testCase.ContractDataStore.GetItemsFromContractAtBlock(blockHeader);
         testCase.BlockTree.NewHeadBlock += Raise.EventWith(new BlockEventArgs(secondBlock));
 
-        await Task.Delay(10); // delay for refresh from contract as its async
-
-        testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header).Should().BeEquivalentTo(expected.Cast<object>());
+        Assert.That(
+            () => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header),
+            Is.EquivalentTo(expected.Cast<object>()).After(200, 20)
+        );
     }
 
     [Test]
@@ -127,7 +127,7 @@ public void returns_data_from_getAll_on_non_consecutive_with_not_incremental_cha
     }
 
     [Test]
-    public async Task returns_data_from_receipts_on_consecutive_with_not_incremental_changes()
+    public void returns_data_from_receipts_on_consecutive_with_not_incremental_changes()
     {
         TestCase<Address> testCase = BuildTestCase<Address>();
         testCase.DataContract.IncrementalChanges.Returns(false);
@@ -145,13 +145,14 @@ public async Task returns_data_from_receipts_on_consecutive_with_not_incremental
         testCase.ContractDataStore.GetItemsFromContractAtBlock(blockHeader);
         testCase.BlockTree.NewHeadBlock += Raise.EventWith(new BlockEventArgs(secondBlock));
 
-        await Task.Delay(10); // delay for refresh from contract as its async
-
-        testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header).Should().BeEquivalentTo(expected.Cast<object>());
+        Assert.That(
+            () => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header),
+            Is.EquivalentTo(expected.Cast<object>()).After(200, 20)
+        );
     }
 
     [Test]
-    public async Task returns_data_from_receipts_on_consecutive_with_incremental_changes()
+    public void returns_data_from_receipts_on_consecutive_with_incremental_changes()
     {
         TestCase<Address> testCase = BuildTestCase<Address>();
         BlockHeader blockHeader = Build.A.BlockHeader.WithNumber(1).WithHash(TestItem.KeccakA).TestObject;
@@ -167,16 +168,14 @@ public async Task returns_data_from_receipts_on_consecutive_with_incremental_cha
         testCase.ContractDataStore.GetItemsFromContractAtBlock(blockHeader);
         testCase.BlockTree.NewHeadBlock += Raise.EventWith(new BlockEventArgs(secondBlock));
 
-        await Task.Delay(50); // delay for refresh from contract as its async
-
         Assert.That(
             () => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header).ToList(),
-            Is.EquivalentTo(new ArrayList() { TestItem.AddressA, TestItem.AddressB }).After(1000, 100)
+            Is.EquivalentTo(new ArrayList() { TestItem.AddressA, TestItem.AddressB }).After(200, 20)
             );
     }
 
     [Test]
-    public async Task returns_unmodified_data_from_empty_receipts_on_consecutive_with_incremental_changes()
+    public void returns_unmodified_data_from_empty_receipts_on_consecutive_with_incremental_changes()
     {
         TestCase<Address> testCase = BuildTestCase<Address>();
         BlockHeader blockHeader = Build.A.BlockHeader.WithNumber(1).WithHash(TestItem.KeccakA).TestObject;
@@ -192,13 +191,14 @@ public async Task returns_unmodified_data_from_empty_receipts_on_consecutive_wit
         testCase.ContractDataStore.GetItemsFromContractAtBlock(blockHeader);
         testCase.BlockTree.NewHeadBlock += Raise.EventWith(new BlockEventArgs(secondBlock));
 
-        await Task.Delay(10); // delay for refresh from contract as its async
-
-        testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header).Should().BeEquivalentTo(TestItem.AddressA, TestItem.AddressC);
+        Assert.That(
+            () => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header),
+            Is.EquivalentTo(new[] { TestItem.AddressA, TestItem.AddressC }).After(200, 20)
+        );
     }
 
     [Test]
-    public async Task returns_data_from_receipts_on_consecutive_with_incremental_changes_with_identity()
+    public void returns_data_from_receipts_on_consecutive_with_incremental_changes_with_identity()
     {
         TestCase<TxPriorityContract.Destination> testCase = BuildTestCase(
             TxPriorityContract.DistinctDestinationMethodComparer.Instance,
@@ -227,11 +227,9 @@ public async Task returns_data_from_receipts_on_consecutive_with_incremental_cha
         testCase.ContractDataStore.GetItemsFromContractAtBlock(blockHeader);
         testCase.BlockTree.NewHeadBlock += Raise.EventWith(new BlockEventArgs(secondBlock));
 
-        await Task.Delay(10); // delay for refresh from contract as its async
-
         Assert.That(
             () => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header).Count(),
-            Is.EqualTo(3).After(1000, 100)
+            Is.EqualTo(3).After(200, 20)
         );
 
         testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header).Should().BeEquivalentTo(new[]
diff --git a/src/Nethermind/Nethermind.AuRa.Test/Contract/ContractDataStoreWithLocalDataTests.cs b/src/Nethermind/Nethermind.AuRa.Test/Contract/ContractDataStoreWithLocalDataTests.cs
index 735267cdbb63..9d1f68f70926 100644
--- a/src/Nethermind/Nethermind.AuRa.Test/Contract/ContractDataStoreWithLocalDataTests.cs
+++ b/src/Nethermind/Nethermind.AuRa.Test/Contract/ContractDataStoreWithLocalDataTests.cs
@@ -86,7 +86,7 @@ public void combines_contract_and_local_data_correctly()
 
             Assert.That(
                 () => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header),
-                Is.EquivalentTo(expected.Cast<object>()).After(1000, 100)
+                Is.EquivalentTo(expected.Cast<object>()).After(200, 20)
             );
 
             localDataSource.Data.Returns(new[] { TestItem.AddressC, TestItem.AddressD });
@@ -95,7 +95,7 @@ public void combines_contract_and_local_data_correctly()
 
             Assert.That(
                 () => testCase.ContractDataStore.GetItemsFromContractAtBlock(secondBlock.Header),
-                Is.EquivalentTo(expected.Cast<object>()).After(1000, 100)
+                Is.EquivalentTo(expected.Cast<object>()).After(200, 20)
             );
         }