Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestDesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -r1e533850c7711172462df1e8f569b9f3ff950045 -rbb32237c29a9f16a3d7e65c1baf833f5fb0c1988
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestDesignWaterLevelCalculationServiceTest.cs	(.../TestDesignWaterLevelCalculationServiceTest.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestDesignWaterLevelCalculationServiceTest.cs	(.../TestDesignWaterLevelCalculationServiceTest.cs)	(revision bb32237c29a9f16a3d7e65c1baf833f5fb0c1988)
@@ -45,17 +45,48 @@
         }
 
         [Test]
-        public void Calculate_SetCalculationConvergenceOutputDefault_ReturnsExpectedValue()
+        public void Calculate_Always_SetsInputParameters()
         {
             // Setup
+            const double norm = 12.34;
+            const string filePath = "C:/temp";
+            const string ringId = "11-1";
+
             var mockRepository = new MockRepository();
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
             var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
 
             mockRepository.ReplayAll();
             var service = new TestDesignWaterLevelCalculationService();
+
+            // Call
+            service.Calculate(calculationMessageProviderMock,
+                              hydraulicBoundaryLocationMock,
+                              filePath,
+                              ringId,
+                              norm);
+
+            // Assert
+            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
+            Assert.AreSame(hydraulicBoundaryLocationMock, service.HydraulicBoundaryLocation);
+            Assert.AreEqual(filePath, service.HydraulicBoundaryDatabaseFilePath);
+            Assert.AreEqual(ringId, service.RingId);
+            Assert.AreEqual(norm, service.Norm);
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputDefault_ReturnsExpectedValue()
+        {
+            // Setup
             const double norm = 12.34;
 
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestDesignWaterLevelCalculationService();
+
             // Call
             ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
                                                                          hydraulicBoundaryLocationMock,
@@ -72,6 +103,8 @@
         public void Calculate_SetCalculationConvergenceOutputCalculatedConverged_ReturnsExpectedValue()
         {
             // Setup
+            const double norm = 12.34;
+
             var mockRepository = new MockRepository();
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
             var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
@@ -81,7 +114,6 @@
             {
                 SetCalculationConvergenceOutput = CalculationConvergence.CalculatedConverged
             };
-            const double norm = 12.34;
 
             // Call
             ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
@@ -100,6 +132,8 @@
         public void Calculate_SetCalculationConvergenceOutputNotCalculated_ReturnsNull()
         {
             // Setup
+            const double norm = 12.34;
+
             var mockRepository = new MockRepository();
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
             var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
@@ -109,7 +143,6 @@
             {
                 SetCalculationConvergenceOutput = CalculationConvergence.NotCalculated
             };
-            const double norm = 12.34;
 
             // Call
             ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
@@ -127,6 +160,8 @@
         public void Calculate_SetCalculationConvergenceOutputCalculatedNotConverged_ReturnsExpectedValue()
         {
             // Setup
+            const double norm = 12.34;
+
             var mockRepository = new MockRepository();
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
             var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
@@ -136,7 +171,6 @@
             {
                 SetCalculationConvergenceOutput = CalculationConvergence.CalculatedNotConverged
             };
-            const double norm = 12.34;
 
             // Call
             ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,