diff --git a/CodexContractsPlugin/CodexContractsAccess.cs b/CodexContractsPlugin/CodexContractsAccess.cs
index f4a4bf5..c807c40 100644
--- a/CodexContractsPlugin/CodexContractsAccess.cs
+++ b/CodexContractsPlugin/CodexContractsAccess.cs
@@ -7,7 +7,9 @@ namespace CodexContractsPlugin
     {
         string MarketplaceAddress { get; }
 
+        void MintTestTokens(IGethNode gethNode, IHasEthAddress owner, TestToken testTokens);
         void MintTestTokens(IGethNode gethNode, IEthAddress ethAddress, TestToken testTokens);
+        TestToken GetTestTokenBalance(IGethNode gethNode, IHasEthAddress owner);
         TestToken GetTestTokenBalance(IGethNode gethNode, IEthAddress ethAddress);
     }
 
@@ -27,12 +29,22 @@ namespace CodexContractsPlugin
         public string Abi { get; }
         public string TokenAddress { get; }
 
+        public void MintTestTokens(IGethNode gethNode, IHasEthAddress owner, TestToken testTokens)
+        {
+            MintTestTokens(gethNode, owner.EthAddress, testTokens);
+        }
+
         public void MintTestTokens(IGethNode gethNode, IEthAddress ethAddress, TestToken testTokens)
         {
             var interaction = new ContractInteractions(log, gethNode);
             interaction.MintTestTokens(ethAddress, testTokens.Amount, TokenAddress);
         }
 
+        public TestToken GetTestTokenBalance(IGethNode gethNode, IHasEthAddress owner)
+        {
+            return GetTestTokenBalance(gethNode, owner.EthAddress);
+        }
+
         public TestToken GetTestTokenBalance(IGethNode gethNode, IEthAddress ethAddress)
         {
             var interaction = new ContractInteractions(log, gethNode);
diff --git a/Tests/BasicTests/ExampleTests.cs b/Tests/BasicTests/ExampleTests.cs
index 5faaec1..9a00c18 100644
--- a/Tests/BasicTests/ExampleTests.cs
+++ b/Tests/BasicTests/ExampleTests.cs
@@ -9,12 +9,12 @@ using Utils;
 namespace Tests.BasicTests
 {
     [TestFixture]
-    public class ExampleTests : DistTest
+    public class ExampleTests : CodexDistTest
     {
         [Test]
         public void CodexLogExample()
         {
-            var primary = Ci.SetupCodexNode();
+            var primary = AddCodex();
 
             primary.UploadFile(GenerateTestFile(5.MB()));
 
@@ -26,8 +26,8 @@ namespace Tests.BasicTests
         [Test]
         public void TwoMetricsExample()
         {
-            var group = Ci.SetupCodexNodes(2, s => s.EnableMetrics());
-            var group2 = Ci.SetupCodexNodes(2, s => s.EnableMetrics());
+            var group = AddCodex(2, s => s.EnableMetrics());
+            var group2 = AddCodex(2, s => s.EnableMetrics());
 
             var primary = group[0];
             var secondary = group[1];
@@ -48,58 +48,52 @@ namespace Tests.BasicTests
         [Test]
         public void MarketplaceExample()
         {
-            var geth = Ci.StartGethNode(s => s.IsMiner().WithName("disttest-geth"));
+            var sellerInitialBalance = 234.TestTokens();
+            var buyerInitialBalance = 1000.TestTokens();
+            var fileSize = 10.MB();
 
+            var geth = Ci.StartGethNode(s => s.IsMiner().WithName("disttest-geth"));
             var contracts = Ci.DeployCodexContracts(geth);
 
-            var node = Ci.SetupCodexNode(s => s.EnableMarketplace(geth, contracts));
-
-            var myBalance = geth.GetEthBalance();
-            geth.SendEth(node, 10.Eth());
-            var nodeBalance = geth.GetEthBalance(node);
-
-            contracts.MintTestTokens(geth, node.EthAddress, 100.TestTokens());
-            contracts.GetTestTokenBalance(geth, node.EthAddress);
-
-            //var sellerInitialBalance = 234.TestTokens();
-            //var buyerInitialBalance = 1000.TestTokens();
-            //var fileSize = 10.MB();
-
-            //var seller = Ci.SetupCodexNode(s => s
-            //                .WithStorageQuota(11.GB())
-            //                .EnableMarketplace(sellerInitialBalance));
-
-            //seller.Marketplace.AssertThatBalance(Is.EqualTo(sellerInitialBalance));
-            //seller.Marketplace.MakeStorageAvailable(
-            //    size: 10.GB(),
-            //    minPricePerBytePerSecond: 1.TestTokens(),
-            //    maxCollateral: 20.TestTokens(),
-            //    maxDuration: TimeSpan.FromMinutes(3));
-
-            //var testFile = GenerateTestFile(fileSize);
-
-            //var buyer = Ci.SetupCodexNode(s => s
-            //    .WithBootstrapNode(seller)
-            //    .EnableMarketplace(buyerInitialBalance));
-
-            //buyer.Marketplace.AssertThatBalance(Is.EqualTo(buyerInitialBalance));
+            var seller = AddCodex(s => s
+                            .WithStorageQuota(11.GB())
+                            .EnableMarketplace(geth, contracts));
+            geth.SendEth(seller, 10.Eth());
+            contracts.MintTestTokens(geth, seller, sellerInitialBalance);
             
-            //var contentId = buyer.UploadFile(testFile);
-            //var purchaseContract = buyer.Marketplace.RequestStorage(contentId,
-            //    pricePerSlotPerSecond: 2.TestTokens(),
-            //    requiredCollateral: 10.TestTokens(),
-            //    minRequiredNumberOfNodes: 1,
-            //    proofProbability: 5,
-            //    duration: TimeSpan.FromMinutes(1));
+            AssertBalance(geth, contracts, seller, Is.EqualTo(sellerInitialBalance));
+            seller.Marketplace.MakeStorageAvailable(
+                size: 10.GB(),
+                minPricePerBytePerSecond: 1.TestTokens(),
+                maxCollateral: 20.TestTokens(),
+                maxDuration: TimeSpan.FromMinutes(3));
 
-            //purchaseContract.WaitForStorageContractStarted(fileSize);
+            var testFile = GenerateTestFile(fileSize);
 
-            //seller.Marketplace.AssertThatBalance(Is.LessThan(sellerInitialBalance), "Collateral was not placed.");
+            var buyer = AddCodex(s => s
+                            .WithBootstrapNode(seller)
+                            .EnableMarketplace(geth, contracts));
+            geth.SendEth(seller, 10.Eth());
+            contracts.MintTestTokens(geth, seller, buyerInitialBalance);
 
-            //purchaseContract.WaitForStorageContractFinished();
+            AssertBalance(geth, contracts, buyer, Is.EqualTo(buyerInitialBalance));
 
-            //seller.Marketplace.AssertThatBalance(Is.GreaterThan(sellerInitialBalance), "Seller was not paid for storage.");
-            //buyer.Marketplace.AssertThatBalance(Is.LessThan(buyerInitialBalance), "Buyer was not charged for storage.");
+            var contentId = buyer.UploadFile(testFile);
+            var purchaseContract = buyer.Marketplace.RequestStorage(contentId,
+                pricePerSlotPerSecond: 2.TestTokens(),
+                requiredCollateral: 10.TestTokens(),
+                minRequiredNumberOfNodes: 1,
+                proofProbability: 5,
+                duration: TimeSpan.FromMinutes(1));
+
+            purchaseContract.WaitForStorageContractStarted(fileSize);
+
+            AssertBalance(geth, contracts, seller, Is.LessThan(sellerInitialBalance), "Collateral was not placed.");
+
+            purchaseContract.WaitForStorageContractFinished();
+
+            AssertBalance(geth, contracts, seller, Is.GreaterThan(sellerInitialBalance), "Seller was not paid for storage.");
+            AssertBalance(geth, contracts, buyer, Is.LessThan(buyerInitialBalance), "Buyer was not charged for storage.");
         }
     }
 }
diff --git a/Tests/CodexDistTest.cs b/Tests/CodexDistTest.cs
index d52fc79..6c33676 100644
--- a/Tests/CodexDistTest.cs
+++ b/Tests/CodexDistTest.cs
@@ -1,6 +1,10 @@
-using CodexPlugin;
+using CodexContractsPlugin;
+using CodexPlugin;
 using DistTestCore;
 using DistTestCore.Helpers;
+using GethPlugin;
+using NUnit.Framework.Constraints;
+using Utils;
 
 namespace Tests
 {
@@ -49,6 +53,11 @@ namespace Tests
             return onlineCodexNodes;
         }
 
+        public void AssertBalance(IGethNode gethNode, ICodexContracts contracts, ICodexNode codexNode, Constraint constraint, string msg = "")
+        {
+            AssertHelpers.RetryAssert(constraint, () => contracts.GetTestTokenBalance(gethNode, codexNode), nameof(AssertBalance) + msg);
+        }
+
         protected virtual void OnCodexSetup(ICodexSetup setup)
         {
         }