Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -r20f7386757a444cb8e999208f7f6ee7dac03b301 -rda8ddd9922f0dcd9c65c959e1a249a6dce22ceb4
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 20f7386757a444cb8e999208f7f6ee7dac03b301)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision da8ddd9922f0dcd9c65c959e1a249a6dce22ceb4)
@@ -278,19 +278,18 @@
             calculationMessageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(string.Empty);
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(locationName)
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(locationName);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation
             {
-                DesignWaterLevelCalculation =
+                InputParameters =
                 {
-                    InputParameters =
-                    {
-                        ShouldIllustrationPointsBeCalculated = false
-                    },
-                    Output = new TestHydraulicBoundaryLocationOutput(3.0, CalculationConvergence.CalculatedConverged)
-                }
+                    ShouldIllustrationPointsBeCalculated = false
+                },
+                Output = new TestHydraulicBoundaryLocationOutput(3.0, CalculationConvergence.CalculatedConverged)
             };
-            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation, new HydraulicBoundaryLocationCalculation());
 
+            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+
             var activity = new DesignWaterLevelCalculationActivity(calculation,
                                                                    validFilePath,
                                                                    validPreprocessorDirectory,
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -rb1654e35046f36e8c1cf27cd9780e9ed3d5b42d6 -rda8ddd9922f0dcd9c65c959e1a249a6dce22ceb4
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision b1654e35046f36e8c1cf27cd9780e9ed3d5b42d6)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision da8ddd9922f0dcd9c65c959e1a249a6dce22ceb4)
@@ -259,19 +259,18 @@
             calculationMessageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(string.Empty);
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0)
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(locationName);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation
             {
-                WaveHeightCalculation =
+                InputParameters =
                 {
-                    InputParameters =
-                    {
-                        ShouldIllustrationPointsBeCalculated = false
-                    },
-                    Output = new TestHydraulicBoundaryLocationOutput(3.0, CalculationConvergence.CalculatedConverged)
-                }
+                    ShouldIllustrationPointsBeCalculated = false
+                },
+                Output = new TestHydraulicBoundaryLocationOutput(3.0, CalculationConvergence.CalculatedConverged)
             };
-            var calculation = new WaveHeightCalculation(hydraulicBoundaryLocation, new HydraulicBoundaryLocationCalculation());
 
+            var calculation = new WaveHeightCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+
             var activity = new WaveHeightCalculationActivity(calculation,
                                                              validFilePath,
                                                              validPreprocessorDirectory,
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -red679e2a33d8fa5f8259d4ef755bcdc122225fe7 -rda8ddd9922f0dcd9c65c959e1a249a6dce22ceb4
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision ed679e2a33d8fa5f8259d4ef755bcdc122225fe7)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision da8ddd9922f0dcd9c65c959e1a249a6dce22ceb4)
@@ -414,8 +414,8 @@
                     hydraulicBoundaryDatabaseFilePathValue = invocation.Arguments[0].ToString();
                     preprocessorDirectoryValue = invocation.Arguments[1].ToString();
                     calculatedLocationsValue = ((IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[2]).ToArray();
-                    normValue = (double) invocation.Arguments[3];
-                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[4];
+                    normValue = (double) invocation.Arguments[4];
+                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[5];
                 });
 
             mockRepository.ReplayAll();
@@ -477,8 +477,8 @@
                     hydraulicBoundaryDatabaseFilePathValue = invocation.Arguments[0].ToString();
                     preprocessorDirectoryValue = invocation.Arguments[1].ToString();
                     calculatedLocationsValue = ((IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[2]).ToArray();
-                    normValue = (double) invocation.Arguments[3];
-                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[4];
+                    normValue = (double) invocation.Arguments[4];
+                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[5];
                 });
 
             mockRepository.ReplayAll();
@@ -542,8 +542,8 @@
                     hydraulicBoundaryDatabaseFilePathValue = invocation.Arguments[0].ToString();
                     preprocessorDirectoryValue = invocation.Arguments[1].ToString();
                     calculatedLocationsValue = ((IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[2]).ToArray();
-                    normValue = (double) invocation.Arguments[3];
-                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[4];
+                    normValue = (double) invocation.Arguments[4];
+                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[5];
                 });
 
             mockRepository.ReplayAll();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -red679e2a33d8fa5f8259d4ef755bcdc122225fe7 -rda8ddd9922f0dcd9c65c959e1a249a6dce22ceb4
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision ed679e2a33d8fa5f8259d4ef755bcdc122225fe7)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision da8ddd9922f0dcd9c65c959e1a249a6dce22ceb4)
@@ -414,8 +414,8 @@
                     hydraulicBoundaryDatabaseFilePathValue = invocation.Arguments[0].ToString();
                     preprocessorDirectoryValue = invocation.Arguments[1].ToString();
                     calculatedLocationsValue = ((IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[2]).ToArray();
-                    normValue = (double) invocation.Arguments[3];
-                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[4];
+                    normValue = (double) invocation.Arguments[4];
+                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[5];
                 });
 
             mockRepository.ReplayAll();
@@ -476,8 +476,8 @@
                     hydraulicBoundaryDatabaseFilePathValue = invocation.Arguments[0].ToString();
                     preprocessorDirectoryValue = invocation.Arguments[1].ToString();
                     calculatedLocationsValue = ((IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[2]).ToArray();
-                    normValue = (double) invocation.Arguments[3];
-                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[4];
+                    normValue = (double) invocation.Arguments[4];
+                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[5];
                 });
 
             mockRepository.ReplayAll();
@@ -541,8 +541,8 @@
                     hydraulicBoundaryDatabaseFilePathValue = invocation.Arguments[0].ToString();
                     preprocessorDirectoryValue = invocation.Arguments[1].ToString();
                     calculatedLocationsValue = ((IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[2]).ToArray();
-                    normValue = (double) invocation.Arguments[3];
-                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[4];
+                    normValue = (double) invocation.Arguments[4];
+                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[5];
                 });
 
             mockRepository.ReplayAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r658e688af4aff7b9e8d387b7f61def3dc5181723 -rda8ddd9922f0dcd9c65c959e1a249a6dce22ceb4
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 658e688af4aff7b9e8d387b7f61def3dc5181723)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision da8ddd9922f0dcd9c65c959e1a249a6dce22ceb4)
@@ -367,8 +367,8 @@
                     hydraulicBoundaryDatabaseFilePathValue = invocation.Arguments[0].ToString();
                     preprocessorDirectoryValue = invocation.Arguments[1].ToString();
                     calculatedLocationsValue = ((IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[2]).ToArray();
-                    normValue = (double) invocation.Arguments[3];
-                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[4];
+                    normValue = (double) invocation.Arguments[4];
+                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[5];
                 });
 
             mockRepository.ReplayAll();
@@ -429,8 +429,8 @@
                     hydraulicBoundaryDatabaseFilePathValue = invocation.Arguments[0].ToString();
                     preprocessorDirectoryValue = invocation.Arguments[1].ToString();
                     calculatedLocationsValue = ((IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[2]).ToArray();
-                    normValue = (double) invocation.Arguments[3];
-                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[4];
+                    normValue = (double) invocation.Arguments[4];
+                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[5];
                 });
 
             mockRepository.ReplayAll();
@@ -490,8 +490,8 @@
                     hydraulicBoundaryDatabaseFilePathValue = invocation.Arguments[0].ToString();
                     preprocessorDirectoryValue = invocation.Arguments[1].ToString();
                     calculatedLocationsValue = ((IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[2]).ToArray();
-                    normValue = (double) invocation.Arguments[3];
-                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[4];
+                    normValue = (double) invocation.Arguments[4];
+                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[5];
                 });
 
             mockRepository.ReplayAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -red679e2a33d8fa5f8259d4ef755bcdc122225fe7 -rda8ddd9922f0dcd9c65c959e1a249a6dce22ceb4
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision ed679e2a33d8fa5f8259d4ef755bcdc122225fe7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision da8ddd9922f0dcd9c65c959e1a249a6dce22ceb4)
@@ -367,8 +367,8 @@
                     hydraulicBoundaryDatabaseFilePathValue = invocation.Arguments[0].ToString();
                     preprocessorDirectoryValue = invocation.Arguments[1].ToString();
                     calculatedLocationsValue = ((IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[2]).ToArray();
-                    normValue = (double) invocation.Arguments[3];
-                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[4];
+                    normValue = (double) invocation.Arguments[4];
+                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[5];
                 });
 
             mockRepository.ReplayAll();
@@ -429,8 +429,8 @@
                     hydraulicBoundaryDatabaseFilePathValue = invocation.Arguments[0].ToString();
                     preprocessorDirectoryValue = invocation.Arguments[1].ToString();
                     calculatedLocationsValue = ((IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[2]).ToArray();
-                    normValue = (double) invocation.Arguments[3];
-                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[4];
+                    normValue = (double) invocation.Arguments[4];
+                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[5];
                 });
 
             mockRepository.ReplayAll();
@@ -490,8 +490,8 @@
                     hydraulicBoundaryDatabaseFilePathValue = invocation.Arguments[0].ToString();
                     preprocessorDirectoryValue = invocation.Arguments[1].ToString();
                     calculatedLocationsValue = ((IEnumerable<HydraulicBoundaryLocation>) invocation.Arguments[2]).ToArray();
-                    normValue = (double) invocation.Arguments[3];
-                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[4];
+                    normValue = (double) invocation.Arguments[4];
+                    messageProviderValue = (ICalculationMessageProvider) invocation.Arguments[5];
                 });
 
             mockRepository.ReplayAll();