Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/HydraulicBoundaryLocationCommandHandlerTest.cs
===================================================================
diff -u -r161308cb864a66713f62357c6bcdb6ede03b619f -r68fb2bea16670fc88e626118a808560690610e57
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/HydraulicBoundaryLocationCommandHandlerTest.cs	(.../HydraulicBoundaryLocationCommandHandlerTest.cs)	(revision 161308cb864a66713f62357c6bcdb6ede03b619f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/HydraulicBoundaryLocationCommandHandlerTest.cs	(.../HydraulicBoundaryLocationCommandHandlerTest.cs)	(revision 68fb2bea16670fc88e626118a808560690610e57)
@@ -52,44 +52,55 @@
         [Test]
         public void Constructor_NullMainWindow_ThrowsArgumentNullException()
         {
-            // Setup
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            mockRepository.ReplayAll();
+            // Setup & Call
+            TestDelegate test = () => new HydraulicBoundaryLocationCalculationCommandHandler(null);
 
-            // Call
-            TestDelegate test = () => new HydraulicBoundaryLocationCalculationCommandHandler(null, assessmentSectionMock);
-
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
             const string expectedParamName = "viewParent";
             Assert.AreEqual(expectedParamName, paramName);
-            mockRepository.VerifyAll();
         }
 
         [Test]
-        public void Constructor_NullIAssessmentSection_ThrowsArgumentNullException()
+        public void DefaultConstructor_DefaultValues()
         {
             // Setup & Call
-            TestDelegate test = () => new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), null);
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form());
 
             // Assert
+            Assert.IsInstanceOf<HydraulicBoundaryLocationCalculationCommandHandler>(commandHandler);
+        }
+
+        [Test]
+        public void CalculateDesignWaterLevels_NullIAssessmentSection_ThrowsArgumentNullException()
+        {
+            // Setup
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form());
+            var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
+
+            TestDelegate test = () => commandHandler.CalculateDesignWaterLevels(null, locations);
+
+            // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
             const string expectedParamName = "assessmentSection";
             Assert.AreEqual(expectedParamName, paramName);
         }
 
         [Test]
-        public void DefaultConstructor_DefaultValues()
+        public void CalculateDesignWaterLevels_NullLocations_ThrowsArgumentNullException()
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             mockRepository.ReplayAll();
 
-            // Call
-            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form());
 
+            TestDelegate test = () => commandHandler.CalculateDesignWaterLevels(assessmentSectionMock, null);
+
             // Assert
-            Assert.IsInstanceOf<HydraulicBoundaryLocationCalculationCommandHandler>(commandHandler);
+            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            const string expectedParamName = "locations";
+            Assert.AreEqual(expectedParamName, paramName);
             mockRepository.VerifyAll();
         }
 
@@ -107,13 +118,13 @@
             var observerMock = mockRepository.StrictMock<IObserver>();
             mockRepository.ReplayAll();
 
-            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form());
             var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
 
             hydraulicBoundaryDatabase.Attach(observerMock);
 
             // Call
-            Action call = () => commandHandler.CalculateDesignWaterLevels(locations);
+            Action call = () => commandHandler.CalculateDesignWaterLevels(assessmentSectionMock, locations);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -141,7 +152,7 @@
             observerMock.Expect(o => o.UpdateObserver());
             mockRepository.ReplayAll();
 
-            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form());
             var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
 
             hydraulicBoundaryDatabase.Attach(observerMock);
@@ -152,7 +163,7 @@
             };
 
             // Call
-            Action call = () => commandHandler.CalculateDesignWaterLevels(locations);
+            Action call = () => commandHandler.CalculateDesignWaterLevels(assessmentSectionMock, locations);
 
             // Assert
             TestHelper.AssertLogMessagesCount(call, 0);
@@ -193,10 +204,10 @@
                 // Expect an activity dialog which is automatically closed
             };
 
-            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form());
 
             // Call
-            Action call = () => commandHandler.CalculateDesignWaterLevels(locations);
+            Action call = () => commandHandler.CalculateDesignWaterLevels(assessmentSectionMock, locations);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -214,10 +225,43 @@
         }
 
         [Test]
-        public void CalculateWaveHeight_HydraulicDatabaseDoesNotExist_LogsErrorAndDoesNotNotifyObservers()
+        public void CalculateWaveHeights_NullIAssessmentSection_ThrowsArgumentNullException()
         {
             // Setup
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form());
+            var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
+
+            TestDelegate test = () => commandHandler.CalculateWaveHeights(null, locations);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            const string expectedParamName = "assessmentSection";
+            Assert.AreEqual(expectedParamName, paramName);
+        }
+
+        [Test]
+        public void CalculateWaveHeights_NullLocations_ThrowsArgumentNullException()
+        {
+            // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            mockRepository.ReplayAll();
+
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form());
+
+            TestDelegate test = () => commandHandler.CalculateWaveHeights(assessmentSectionMock, null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            const string expectedParamName = "locations";
+            Assert.AreEqual(expectedParamName, paramName);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void CalculateWaveHeights_HydraulicDatabaseDoesNotExist_LogsErrorAndDoesNotNotifyObservers()
+        {
+            // Setup
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 FilePath = "Does not exist"
@@ -227,13 +271,13 @@
             var observerMock = mockRepository.StrictMock<IObserver>();
             mockRepository.ReplayAll();
 
-            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form());
             var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
 
             hydraulicBoundaryDatabase.Attach(observerMock);
 
             // Call
-            Action call = () => commandHandler.CalculateWaveHeights(locations);
+            Action call = () => commandHandler.CalculateWaveHeights(assessmentSectionMock, locations);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -261,7 +305,7 @@
             observerMock.Expect(o => o.UpdateObserver());
             mockRepository.ReplayAll();
 
-            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form());
             var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
 
             hydraulicBoundaryDatabase.Attach(observerMock);
@@ -272,7 +316,7 @@
             };
 
             // Call
-            Action call = () => commandHandler.CalculateWaveHeights(locations);
+            Action call = () => commandHandler.CalculateWaveHeights(assessmentSectionMock, locations);
 
             // Assert
             TestHelper.AssertLogMessagesCount(call, 0);
@@ -313,10 +357,10 @@
                 // Expect an activity dialog which is automatically closed
             };
 
-            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form(), assessmentSectionMock);
+            var commandHandler = new HydraulicBoundaryLocationCalculationCommandHandler(new Form());
 
             // Call
-            Action call = () => commandHandler.CalculateWaveHeights(locations);
+            Action call = () => commandHandler.CalculateWaveHeights(assessmentSectionMock, locations);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>