Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r4fd4b13639f6d6f3657c02916f60571bf940ee9c -r9190fc76563879702e7b3a30e79ed17f1dbd0985
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs	(.../ClosingStructuresCalculationConfigurationImporterTest.cs)	(revision 4fd4b13639f6d6f3657c02916f60571bf940ee9c)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs	(.../ClosingStructuresCalculationConfigurationImporterTest.cs)	(revision 9190fc76563879702e7b3a30e79ed17f1dbd0985)
@@ -32,7 +32,6 @@
 using Ringtoets.ClosingStructures.IO.Configurations;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
@@ -681,11 +680,12 @@
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
-            failureMechanism.AddSection(new FailureMechanismSection("name", new[]
-            {
-                new Point2D(0, 0),
-                new Point2D(10, 10)
-            }));
+            failureMechanism.AddSection(
+                FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
+                {
+                    new Point2D(0, 0),
+                    new Point2D(10, 10)
+                }));
 
             var calculation = new StructuresCalculation<ClosingStructuresInput>
             {
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4fd4b13639f6d6f3657c02916f60571bf940ee9c -r9190fc76563879702e7b3a30e79ed17f1dbd0985
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 4fd4b13639f6d6f3657c02916f60571bf940ee9c)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 9190fc76563879702e7b3a30e79ed17f1dbd0985)
@@ -25,7 +25,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Base.Geometry;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
@@ -41,11 +40,9 @@
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
@@ -190,6 +187,7 @@
                 // Call
                 info.ContextMenuStrip(nodeData, null, treeViewControl);
             }
+
             // Assert
             // Assert expectancies are called in TearDown()
         }
@@ -1150,10 +1148,7 @@
 
             group.Children.Add(elementToBeRemoved);
 
-            failureMechanism.AddSection(new FailureMechanismSection("section", new[]
-            {
-                new Point2D(0, 0)
-            }));
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             ClosingStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.First();
             result.Calculation = elementToBeRemoved;
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4fd4b13639f6d6f3657c02916f60571bf940ee9c -r9190fc76563879702e7b3a30e79ed17f1dbd0985
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4fd4b13639f6d6f3657c02916f60571bf940ee9c)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 9190fc76563879702e7b3a30e79ed17f1dbd0985)
@@ -25,7 +25,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Base.Geometry;
 using Core.Common.Controls.DataGrid;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
@@ -42,7 +41,6 @@
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
@@ -1599,10 +1597,7 @@
 
             parentGroup.Children.Add(group);
 
-            failureMechanism.AddSection(new FailureMechanismSection("section", new[]
-            {
-                new Point2D(0, 0)
-            }));
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             var calculation = new StructuresCalculation<ClosingStructuresInput>();
             group.Children.Add(calculation);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs
===================================================================
diff -u -r4fd4b13639f6d6f3657c02916f60571bf940ee9c -r9190fc76563879702e7b3a30e79ed17f1dbd0985
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs	(.../ClosingStructureDataSynchronizationServiceTest.cs)	(revision 4fd4b13639f6d6f3657c02916f60571bf940ee9c)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs	(.../ClosingStructureDataSynchronizationServiceTest.cs)	(revision 9190fc76563879702e7b3a30e79ed17f1dbd0985)
@@ -118,21 +118,19 @@
                 calculationWithStructureToRemoveAndOutput
             });
 
-            var affectedSection = new FailureMechanismSection(string.Empty, new[]
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
             {
-                new Point2D(0, 0),
+                locationStructureToRemove,
                 new Point2D(1, 1)
-            });
-            failureMechanism.AddSection(affectedSection);
+            }));
             ClosingStructuresFailureMechanismSectionResult sectionWithCalculationAtStructureToRemove = failureMechanism.SectionResults.ElementAt(0);
             sectionWithCalculationAtStructureToRemove.Calculation = calculationWithStructureToRemove;
 
-            var unaffectedSection = new FailureMechanismSection(string.Empty, new[]
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
             {
                 new Point2D(1, 1),
-                new Point2D(2, 2)
-            });
-            failureMechanism.AddSection(unaffectedSection);
+                locationStructureToKeep
+            }));
             ClosingStructuresFailureMechanismSectionResult sectionWithCalculationAtStructureToKeep = failureMechanism.SectionResults.ElementAt(1);
             sectionWithCalculationAtStructureToKeep.Calculation = calculationWithStructureToKeepAndOutput;
 
@@ -228,18 +226,18 @@
                 calculationWithStructureAAndOutput
             });
 
-            failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[]
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
             {
-                new Point2D(0, 0),
+                locationStructureA,
                 new Point2D(1, 1)
             }));
             ClosingStructuresFailureMechanismSectionResult sectionWithCalculationAtStructureA = failureMechanism.SectionResults.ElementAt(0);
             sectionWithCalculationAtStructureA.Calculation = calculationWithStructureA;
 
-            failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[]
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
             {
                 new Point2D(1, 1),
-                new Point2D(2, 2)
+                locationStructureB
             }));
             ClosingStructuresFailureMechanismSectionResult sectionWithCalculationAtStructureB = failureMechanism.SectionResults.ElementAt(1);
             sectionWithCalculationAtStructureB.Calculation = calculationWithStructureBAndOutput;