Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc96c84bcf4cad9cba0d75dcd299b1e62bd9d925e -r9b051949cbf6a942013de2e4ff17ee40e768b4fc
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailurePathContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailurePathContextTreeNodeInfoTest.cs)	(revision c96c84bcf4cad9cba0d75dcd299b1e62bd9d925e)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailurePathContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailurePathContextTreeNodeInfoTest.cs)	(revision 9b051949cbf6a942013de2e4ff17ee40e768b4fc)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2021. All rights reserved.
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
 //
 // This file is part of Riskeer.
 //
@@ -33,6 +33,7 @@
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.GrassCoverErosionInwards.Data;
 using Riskeer.GrassCoverErosionInwards.Forms.PresentationObjects;
@@ -115,10 +116,7 @@
         public void ChildNodeObjects_Always_ReturnChildDataNodes()
         {
             // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-            
+            var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var context = new GrassCoverErosionInwardsFailurePathContext(failureMechanism, assessmentSection);
 
@@ -167,7 +165,6 @@
 
             var outputComment = (Comment) outputsFolder.Contents.ElementAt(3);
             Assert.AreSame(failureMechanism.OutputComments, outputComment);
-            mocks.VerifyAll();
         }
 
         [Test]
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc96c84bcf4cad9cba0d75dcd299b1e62bd9d925e -r9b051949cbf6a942013de2e4ff17ee40e768b4fc
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailurePathContextTreeNodeInfoTest.cs	(.../PipingFailurePathContextTreeNodeInfoTest.cs)	(revision c96c84bcf4cad9cba0d75dcd299b1e62bd9d925e)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailurePathContextTreeNodeInfoTest.cs	(.../PipingFailurePathContextTreeNodeInfoTest.cs)	(revision 9b051949cbf6a942013de2e4ff17ee40e768b4fc)
@@ -34,6 +34,7 @@
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Probability;
+using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Piping.Data;
 using Riskeer.Piping.Forms.PresentationObjects;
@@ -116,10 +117,7 @@
         public void ChildNodeObjects_Always_ReturnChildDataNodes()
         {
             // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-            
+            var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new PipingFailureMechanism();
             var context = new PipingFailurePathContext(failureMechanism, assessmentSection);
 
@@ -171,7 +169,6 @@
 
             var commentContext = (Comment) outputsFolder.Contents.ElementAt(3);
             Assert.AreSame(failureMechanism.OutputComments, commentContext);
-            mocks.VerifyAll();
         }
 
         [Test]