Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationRowTest.cs
===================================================================
diff -u -r870f565685404ea85a8b54b6c863e3821929031a -r37ca3f12dc8de4a7a4abfdbf935f45e0213d4518
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationRowTest.cs	(.../HydraulicBoundaryLocationRowTest.cs)	(revision 870f565685404ea85a8b54b6c863e3821929031a)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationRowTest.cs	(.../HydraulicBoundaryLocationRowTest.cs)	(revision 37ca3f12dc8de4a7a4abfdbf935f45e0213d4518)
@@ -36,49 +36,37 @@
     public class HydraulicBoundaryLocationRowTest
     {
         [Test]
-        public void Constructor_HydraulicBoundaryLocationCalculationNull_ThrowsArgumentNullException()
+        public void Constructor_WithHydraulicBoundaryLocationCalculation_ExpectedProperties()
         {
-            // Call
-            TestDelegate call = () => new HydraulicBoundaryLocationRow(new TestHydraulicBoundaryLocation(),
-                                                                       null);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("hydraulicBoundaryLocationCalculation", paramName);
-        }
-
-        [Test]
-        public void Constructor_WithHydraulicBoundaryLocation_PropertiesFromHydraulicBoundaryLocation()
-        {
             // Setup
             const int id = 1;
-            const string locationname = "LocationName";
+            const string locationName = "LocationName";
             const double coordinateX = 1.0;
             const double coordinateY = 2.0;
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, locationname, coordinateX, coordinateY);
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, locationName, coordinateX, coordinateY);
             var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
 
             // Call
-            var row = new HydraulicBoundaryLocationRow(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var row = new HydraulicBoundaryLocationRow(hydraulicBoundaryLocationCalculation);
 
             // Assert
-            Assert.IsInstanceOf<CalculatableRow<HydraulicBoundaryLocation>>(row);
+            Assert.IsInstanceOf<CalculatableRow<HydraulicBoundaryLocationCalculation>>(row);
+
             Assert.AreEqual(id, row.Id);
-            Assert.AreEqual(locationname, row.Name);
+            Assert.AreEqual(locationName, row.Name);
             var expectedPoint2D = new Point2D(coordinateX, coordinateY);
             Assert.AreEqual(expectedPoint2D, row.Location);
 
-            TestHelper.AssertTypeConverter<HydraulicBoundaryLocationRow, NoValueRoundedDoubleConverter>(
-                nameof(HydraulicBoundaryLocationRow.Result));
+            TestHelper.AssertTypeConverter<HydraulicBoundaryLocationRow, NoValueRoundedDoubleConverter>(nameof(HydraulicBoundaryLocationRow.Result));
             Assert.IsNaN(row.Result);
 
-            Assert.AreSame(hydraulicBoundaryLocation, row.CalculatableObject);
+            Assert.AreSame(hydraulicBoundaryLocationCalculation, row.CalculatableObject);
             Assert.IsFalse(row.ShouldCalculate);
         }
 
         [Test]
-        public void IncludeIllustrationPoints_NewValue_SetsProperties(
+        public void IncludeIllustrationPoints_NewValue_SetsPropertiesAndNotifiesObservers(
             [Values(true, false)] bool setIllustrationPoints)
         {
             // Setup
@@ -87,10 +75,9 @@
             observer.Expect(o => o.UpdateObserver());
             mockRepository.ReplayAll();
 
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
-            var row = new HydraulicBoundaryLocationRow(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var row = new HydraulicBoundaryLocationRow(hydraulicBoundaryLocationCalculation);
 
             row.CalculatableObject.Attach(observer);
 
@@ -108,19 +95,18 @@
         public void Result_WithCalculationOutput_ReturnsResult()
         {
             // Setup
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
-            var row = new HydraulicBoundaryLocationRow(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var row = new HydraulicBoundaryLocationRow(hydraulicBoundaryLocationCalculation);
 
             var random = new Random(432);
-            var locationOutput = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+            var output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
 
             // Call
-            hydraulicBoundaryLocationCalculation.Output = locationOutput;
+            hydraulicBoundaryLocationCalculation.Output = output;
 
             // Assert
-            Assert.AreEqual(locationOutput.Result, row.Result);
+            Assert.AreEqual(output.Result, row.Result);
         }
     }
 }
\ No newline at end of file