Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Utils.Test/HeightStructuresHelperTest.cs
===================================================================
diff -u -r53785e0fd2752f08a43b649e0c4cd56955ec374d -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Utils.Test/HeightStructuresHelperTest.cs	(.../HeightStructuresHelperTest.cs)	(revision 53785e0fd2752f08a43b649e0c4cd56955ec374d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Utils.Test/HeightStructuresHelperTest.cs	(.../HeightStructuresHelperTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -26,6 +26,7 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 
@@ -43,7 +44,7 @@
             // Call
             TestDelegate test = () => HeightStructuresHelper.CollectCalculationsPerSection(
                 null,
-                new HeightStructuresCalculation[]
+                new StructuresCalculation<HeightStructuresInput>[]
                 {
                     null
                 });
@@ -92,7 +93,7 @@
             // Call
             TestDelegate test = () => HeightStructuresHelper.CollectCalculationsPerSection(
                 twoSections,
-                new HeightStructuresCalculation[]
+                new StructuresCalculation<HeightStructuresInput>[]
                 {
                     null
                 });
@@ -145,7 +146,7 @@
         public void FailureMechanismSectionForCalculation_ValidSectionWithoutCalculationStructureSet_ReturnsNull()
         {
             // Setup
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             // Call
             FailureMechanismSection failureMechanismSection =
@@ -160,7 +161,7 @@
         {
             // Setup
             var emptySections = new FailureMechanismSection[0];
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             // Call
             FailureMechanismSection failureMechanismSection =
@@ -326,7 +327,7 @@
                     sectionResult
                 },
                 calculationInSectionA,
-                new HeightStructuresCalculation[]
+                new StructuresCalculation<HeightStructuresInput>[]
                 {
                     null
                 });
@@ -353,7 +354,7 @@
                     failureMechanismSectionResult
                 },
                 calculationInSectionA,
-                Enumerable.Empty<HeightStructuresCalculation>());
+                Enumerable.Empty<StructuresCalculation<HeightStructuresInput>>());
 
             // Assert
             Assert.IsNull(failureMechanismSectionResult.Calculation);
@@ -413,15 +414,15 @@
             failureMechanismSectionB
         };
 
-        private readonly HeightStructuresCalculation calculationInSectionA = new HeightStructuresCalculation
+        private readonly StructuresCalculation<HeightStructuresInput> calculationInSectionA = new StructuresCalculation<HeightStructuresInput>
         {
             InputParameters =
             {
                 Structure = new TestHeightStructure(new Point2D(1.1, 2.2))
             }
         };
 
-        private readonly HeightStructuresCalculation calculationInSectionB = new HeightStructuresCalculation
+        private readonly StructuresCalculation<HeightStructuresInput> calculationInSectionB = new StructuresCalculation<HeightStructuresInput>
         {
             InputParameters =
             {