Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureTreeNodeInfoTest.cs
===================================================================
diff -u -r9e3639e810a22019da1a9fdf5aa5c433a43520c1 -rf9e4f420b403e6417f5dc2ba6d7beab9424baf89
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureTreeNodeInfoTest.cs	(.../ClosingStructureTreeNodeInfoTest.cs)	(revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureTreeNodeInfoTest.cs	(.../ClosingStructureTreeNodeInfoTest.cs)	(revision f9e4f420b403e6417f5dc2ba6d7beab9424baf89)
@@ -21,14 +21,14 @@
 
 using System.Drawing;
 using System.Linq;
-using Core.Common.Base.Geometry;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Data.TestUtil;
 using Ringtoets.ClosingStructures.Plugin;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -89,7 +89,7 @@
             // Setup
             mocks.ReplayAll();
             string name = "very nice name!";
-            ClosingStructure structure = CreateSimpleClosingStructure(name);
+            ClosingStructure structure = new TestClosingStructure(name);
 
             // Call
             string text = info.Text(structure);
@@ -121,7 +121,7 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                ClosingStructure nodeData = CreateSimpleClosingStructure("A");
+                ClosingStructure nodeData = new TestClosingStructure();
 
                 var guiMock = mocks.StrictMock<IGui>();
                 guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock);
@@ -136,25 +136,5 @@
             // Assert
             // Assert expectancies are called in TearDown()
         }
-
-        private static ClosingStructure CreateSimpleClosingStructure(string name)
-        {
-            return new ClosingStructure(name, "1", new Point2D(1, 2),
-                                        1.1, 2.2,
-                                        3.3, 4.4,
-                                        5.5,
-                                        6.6, 7.7,
-                                        8.8, 9.9,
-                                        10.10, 11.11,
-                                        12.12, 13.13,
-                                        14.14, 15.15,
-                                        16.16, 17.17,
-                                        18.18, 19.19,
-                                        20.20,
-                                        21.21,
-                                        22,
-                                        23.23,
-                                        ClosingStructureInflowModelType.FloodedCulvert);
-        }
     }
 }
\ No newline at end of file