Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -r1a6804681b0758a5761e39099e4b6de65f9cf4a2 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 1a6804681b0758a5761e39099e4b6de65f9cf4a2)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -32,6 +32,7 @@
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
@@ -60,7 +61,7 @@
 
             const string name = "<very nice name>";
 
-            HeightStructuresCalculation calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Name = name,
                 InputParameters =
@@ -100,7 +101,7 @@
 
             const string name = "<very nice name>";
 
-            HeightStructuresCalculation calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Name = name,
                 InputParameters =
@@ -139,7 +140,7 @@
 
             const string name = "<very nice name>";
 
-            HeightStructuresCalculation calculation = new TestHeightStructuresCalculation()
+            var calculation = new TestHeightStructuresCalculation()
             {
                 Name = name,
                 InputParameters =
@@ -456,7 +457,7 @@
 
             const string name = "<very nice name>";
 
-            HeightStructuresCalculation calculation = new TestHeightStructuresCalculation()
+            var calculation = new TestHeightStructuresCalculation()
             {
                 Name = name,
                 InputParameters =
@@ -547,7 +548,7 @@
                 new Point2D(1, 1)
             }));
 
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
@@ -611,7 +612,7 @@
                 new Point2D(1, 1)
             }));
 
-            HeightStructuresCalculation calculation = new TestHeightStructuresCalculation
+            var calculation = new TestHeightStructuresCalculation
             {
                 InputParameters =
                 {
@@ -697,7 +698,7 @@
                 new Point2D(1, 1)
             }));
 
-            HeightStructuresCalculation calculation = new TestHeightStructuresCalculation
+            var calculation = new TestHeightStructuresCalculation
             {
                 InputParameters =
                 {