Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -r105bf942dafea23515d9d10b37dc23ba370ad0a4 -r1513447d61c0a667d233af5da6ba0480ffe5c3c3
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 105bf942dafea23515d9d10b37dc23ba370ad0a4)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 1513447d61c0a667d233af5da6ba0480ffe5c3c3)
@@ -135,7 +135,7 @@
         }
 
         [Test]
-        public void Calculate_HydraulicBoundaryLocationNull_ThrowArgumentNullException()
+        public void Calculate_HydraulicBoundaryLocationCalculationNull_ThrowArgumentNullException()
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -144,49 +144,22 @@
 
             // Call
             TestDelegate test = () => new WaveHeightCalculationService().Calculate(null,
-                                                                                   new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
                                                                                    testDataPath,
                                                                                    validPreprocessorDirectory,
                                                                                    1,
                                                                                    calculationMessageProvider);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("hydraulicBoundaryLocation", exception.ParamName);
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void Calculate_HydraulicBoundaryLocationCalculationNull_ThrowArgumentNullException()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var calculationMessageProvider = mockRepository.Stub<ICalculationMessageProvider>();
-            mockRepository.ReplayAll();
-
-            // Call
-            TestDelegate test = () => new WaveHeightCalculationService().Calculate(new TestHydraulicBoundaryLocation(),
-                                                                                   null,
-                                                                                   testDataPath,
-                                                                                   validPreprocessorDirectory,
-                                                                                   1,
-                                                                                   calculationMessageProvider);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("hydraulicBoundaryLocationCalculation", exception.ParamName);
             mockRepository.VerifyAll();
         }
 
         [Test]
         public void Calculate_MessageProviderNull_ThrowArgumentNullException()
         {
-            // Setup
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-
             // Call
-            TestDelegate test = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation,
-                                                                                   new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation),
+            TestDelegate test = () => new WaveHeightCalculationService().Calculate(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
                                                                                    string.Empty,
                                                                                    string.Empty,
                                                                                    1,
@@ -218,8 +191,7 @@
             var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
             {
                 InputParameters =
                 {
@@ -229,8 +201,7 @@
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation,
-                                                                                 hydraulicBoundaryLocationCalculation,
+                Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocationCalculation,
                                                                                  validFilePath,
                                                                                  validPreprocessorDirectory,
                                                                                  norm,
@@ -280,14 +251,12 @@
             var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
-                new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation,
-                                                             hydraulicBoundaryLocationCalculation,
+                new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocationCalculation,
                                                              validFilePath,
                                                              preprocessorDirectory,
                                                              1.0 / 30,
@@ -321,8 +290,7 @@
             calculationMessageProvider.Expect(mp => mp.GetCalculatedNotConvergedMessage("punt_flw_ 1")).Return(failedConvergenceMessage);
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
             {
                 InputParameters =
                 {
@@ -332,8 +300,7 @@
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation,
-                                                                                 hydraulicBoundaryLocationCalculation,
+                Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocationCalculation,
                                                                                  validFilePath,
                                                                                  validPreprocessorDirectory,
                                                                                  1.0 / 30,
@@ -375,8 +342,7 @@
             var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
             {
                 InputParameters =
                 {
@@ -387,8 +353,7 @@
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
-                Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation,
-                                                                                 hydraulicBoundaryLocationCalculation,
+                Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocationCalculation,
                                                                                  validFilePath,
                                                                                  validPreprocessorDirectory,
                                                                                  1.0 / 30,
@@ -434,8 +399,7 @@
             var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
             {
                 InputParameters =
                 {
@@ -446,8 +410,7 @@
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
-                Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation,
-                                                                                 hydraulicBoundaryLocationCalculation,
+                Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocationCalculation,
                                                                                  validFilePath,
                                                                                  validPreprocessorDirectory,
                                                                                  1.0 / 30,
@@ -496,14 +459,12 @@
             calculationMessageProvider.Stub(mp => mp.GetCalculatedNotConvergedMessage("punt_flw_ 1")).Return(string.Empty);
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
-                TestDelegate call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation,
-                                                                                       hydraulicBoundaryLocationCalculation,
+                TestDelegate call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocationCalculation,
                                                                                        validFilePath,
                                                                                        validPreprocessorDirectory,
                                                                                        1.0 / 30,
@@ -535,8 +496,7 @@
             var calculationMessageProvider = mockRepository.Stub<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
             {
                 InputParameters =
                 {
@@ -547,8 +507,7 @@
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
-                Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation,
-                                                                                 hydraulicBoundaryLocationCalculation,
+                Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocationCalculation,
                                                                                  validFilePath,
                                                                                  validPreprocessorDirectory,
                                                                                  1.0 / 30,
@@ -588,14 +547,12 @@
             var calculationMessageProvider = mockRepository.Stub<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
-                Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation,
-                                                                                 hydraulicBoundaryLocationCalculation,
+                Action call = () => new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocationCalculation,
                                                                                  validFilePath,
                                                                                  validPreprocessorDirectory,
                                                                                  1.0 / 30,
@@ -629,8 +586,7 @@
             var calculationMessageProvider = mockRepository.Stub<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, "punt_flw_ 1", 0.0, 0.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             const double norm = 1.0 / 30;
 
@@ -640,8 +596,7 @@
                 calculator.CalculationFinishedHandler += (s, e) => service.Cancel();
 
                 // Call
-                service.Calculate(hydraulicBoundaryLocation,
-                                  hydraulicBoundaryLocationCalculation,
+                service.Calculate(hydraulicBoundaryLocationCalculation,
                                   validFilePath,
                                   validPreprocessorDirectory,
                                   norm,
@@ -692,8 +647,7 @@
 
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(100, locationName, 0.0, 0.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName));
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -704,8 +658,7 @@
                 {
                     try
                     {
-                        new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation,
-                                                                     hydraulicBoundaryLocationCalculation,
+                        new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocationCalculation,
                                                                      validFilePath,
                                                                      validPreprocessorDirectory,
                                                                      norm,