diff --git a/ProjectPlugins/CodexClient/CodexNode.cs b/ProjectPlugins/CodexClient/CodexNode.cs
index 14c33fbb..4a444117 100644
--- a/ProjectPlugins/CodexClient/CodexNode.cs
+++ b/ProjectPlugins/CodexClient/CodexNode.cs
@@ -318,6 +318,14 @@ namespace CodexClient
             log.AddStringReplace(CodexUtils.ToShortId(peerId), nodeName);
             log.AddStringReplace(nodeId, nodeName);
             log.AddStringReplace(CodexUtils.ToShortId(nodeId), nodeName);
+
+            var ethAccount = codexAccess.GetEthAccount();
+            if (ethAccount != null)
+            {
+                var addr = ethAccount.EthAddress.ToString();
+                log.AddStringReplace(addr, nodeName);
+                log.AddStringReplace(addr.ToLowerInvariant(), nodeName);
+            }
         }
 
         private string[] GetPeerMultiAddresses(CodexNode peer, DebugInfo peerInfo)
diff --git a/Tests/CodexReleaseTests/MarketTests/ContractSuccessfulTest.cs b/Tests/CodexReleaseTests/MarketTests/ContractSuccessfulTest.cs
index 51f9b79b..661ff7f0 100644
--- a/Tests/CodexReleaseTests/MarketTests/ContractSuccessfulTest.cs
+++ b/Tests/CodexReleaseTests/MarketTests/ContractSuccessfulTest.cs
@@ -4,11 +4,9 @@ using Utils;
 
 namespace CodexReleaseTests.MarketTests
 {
-    [TestFixture(6, 3, 1)]
-    [TestFixture(6, 4, 2)]
-    [TestFixture(8, 5, 1)]
-    [TestFixture(8, 6, 1)]
-    [TestFixture(8, 6, 3)]
+    [TestFixture(5, 3, 1)]
+    //[TestFixture(10, 6, 3)]
+    //[TestFixture(10, 20, 10)]
     public class ContractSuccessfulTest : MarketplaceAutoBootstrapDistTest
     {
         public ContractSuccessfulTest(int hosts, int slots, int tolerance)
@@ -43,9 +41,6 @@ namespace CodexReleaseTests.MarketTests
             WaitForContractStarted(request);
             AssertContractSlotsAreFilledByHosts(request, hosts);
 
-            Thread.Sleep(TimeSpan.FromSeconds(12.0));
-            return;
-
             request.WaitForStorageContractFinished();
 
             AssertClientHasPaidForContract(pricePerBytePerSecond, client, request, hosts);
@@ -76,7 +71,7 @@ namespace CodexReleaseTests.MarketTests
 
         private TimeSpan GetContractDuration()
         {
-            return Get8TimesConfiguredPeriodDuration() * 4;
+            return Get8TimesConfiguredPeriodDuration() / 2;
         }
 
         private TimeSpan Get8TimesConfiguredPeriodDuration()
diff --git a/Tests/CodexReleaseTests/MarketTests/MarketplaceAutoBootstrapDistTest.cs b/Tests/CodexReleaseTests/MarketTests/MarketplaceAutoBootstrapDistTest.cs
index 390e138b..c14222df 100644
--- a/Tests/CodexReleaseTests/MarketTests/MarketplaceAutoBootstrapDistTest.cs
+++ b/Tests/CodexReleaseTests/MarketTests/MarketplaceAutoBootstrapDistTest.cs
@@ -274,6 +274,7 @@ namespace CodexReleaseTests.MarketTests
                 {
                     Log($" - {c.Block.Utc} Host: {c.FromAddress} RequestId: {c.RequestId.ToHex()} SlotIndex: {c.SlotIndex}");
                 }
+                throw;
             }
         }
 
diff --git a/Tests/CodexReleaseTests/MarketTests/MultipleContractsTest.cs b/Tests/CodexReleaseTests/MarketTests/MultipleContractsTest.cs
index df71eb3b..99d23554 100644
--- a/Tests/CodexReleaseTests/MarketTests/MultipleContractsTest.cs
+++ b/Tests/CodexReleaseTests/MarketTests/MultipleContractsTest.cs
@@ -6,7 +6,7 @@ using Utils;
 namespace CodexReleaseTests.MarketTests
 {
     //[TestFixture(8, 3, 1)]
-    [TestFixture(8, 4, 1)]
+    [TestFixture(12, 48, 12)]
     //[TestFixture(10, 5, 1)]
     //[TestFixture(10, 6, 1)]
     //[TestFixture(10, 6, 3)]
diff --git a/Tests/ExperimentalTests/BasicTests/MarketplaceTests.cs b/Tests/ExperimentalTests/BasicTests/MarketplaceTests.cs
index af213342..f56ac0f5 100644
--- a/Tests/ExperimentalTests/BasicTests/MarketplaceTests.cs
+++ b/Tests/ExperimentalTests/BasicTests/MarketplaceTests.cs
@@ -48,7 +48,7 @@ namespace ExperimentalTests.BasicTests
 
             foreach (var host in hosts)
             {
-                AssertBalance(contracts, host, Is.EqualTo(hostInitialBalance));
+                AssertBalance(contracts, host, Is.EqualTo(hostInitialBalance), "Host initial balance");
 
                 var availability = new StorageAvailability(
                     totalSpace: 10.GB(),
@@ -66,7 +66,7 @@ namespace ExperimentalTests.BasicTests
                 .EnableMarketplace(geth, contracts, m => m
                     .WithInitial(10.Eth(), clientInitialBalance)));
 
-            AssertBalance(contracts, client, Is.EqualTo(clientInitialBalance));
+            AssertBalance(contracts, client, Is.EqualTo(clientInitialBalance), "Client initial balance");
 
             var uploadCid = client.UploadFile(testFile);
 
diff --git a/Tests/ExperimentalTests/CodexDistTest.cs b/Tests/ExperimentalTests/CodexDistTest.cs
index 422b5bd7..77345297 100644
--- a/Tests/ExperimentalTests/CodexDistTest.cs
+++ b/Tests/ExperimentalTests/CodexDistTest.cs
@@ -95,7 +95,7 @@ namespace CodexTests
             return new PeerDownloadTestHelpers(GetTestLog(), GetFileManager());
         }
 
-        public void AssertBalance(ICodexContracts contracts, ICodexNode codexNode, Constraint constraint, string msg = "")
+        public void AssertBalance(ICodexContracts contracts, ICodexNode codexNode, Constraint constraint, string msg)
         {
             AssertHelpers.RetryAssert(constraint, () => contracts.GetTestTokenBalance(codexNode), nameof(AssertBalance) + msg);
         }