Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresContextTreeNodeInfoTest.cs
===================================================================
diff -u -r078878de01a4c060d2366b7406fe5236940827ad -r75366b1f87ffc26146191733482070b6acb68837
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresContextTreeNodeInfoTest.cs	(.../ClosingStructuresContextTreeNodeInfoTest.cs)	(revision 078878de01a4c060d2366b7406fe5236940827ad)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresContextTreeNodeInfoTest.cs	(.../ClosingStructuresContextTreeNodeInfoTest.cs)	(revision 75366b1f87ffc26146191733482070b6acb68837)
@@ -29,6 +29,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Data.TestUtil;
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
 using Ringtoets.ClosingStructures.Plugin;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -130,7 +131,7 @@
 
             var closingStructures = new ObservableList<ClosingStructure>
             {
-                CreateClosingStructure()
+                new TestClosingStructure()
             };
 
             // Precondition
@@ -154,8 +155,8 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            ClosingStructure closingStructure1 = CreateClosingStructure();
-            ClosingStructure closingStructure2 = CreateClosingStructure();
+            ClosingStructure closingStructure1 = new TestClosingStructure();
+            ClosingStructure closingStructure2 = new TestClosingStructure();
             var closingStructures = new ObservableList<ClosingStructure>
             {
                 closingStructure1,
@@ -224,11 +225,5 @@
             // Assert
             mocks.VerifyAll();
         }
-
-        private static ClosingStructure CreateClosingStructure()
-        {
-            // Creation of closing structure object will be defined by issue WTI-590
-            return null;
-        }
     }
 }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/TestHeightStructure.cs
===================================================================
diff -u -r5d503cf8885ced4799e5ad44242038d99e04b162 -r75366b1f87ffc26146191733482070b6acb68837
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/TestHeightStructure.cs	(.../TestHeightStructure.cs)	(revision 5d503cf8885ced4799e5ad44242038d99e04b162)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/TestHeightStructure.cs	(.../TestHeightStructure.cs)	(revision 75366b1f87ffc26146191733482070b6acb68837)
@@ -35,7 +35,7 @@
         public TestHeightStructure(string name)
             : this(name, new Point2D(0.0, 0.0)) {}
 
-        public TestHeightStructure(string name, Point2D location)
+        private TestHeightStructure(string name, Point2D location)
             : base(new ConstructionProperties
             {
                 Name = name,