Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs
===================================================================
diff -u -r04ffe9435f3031323b2eeac4718e85dfd6022dbe -r07ee3d6f4986ef01277906824f02ef1fe7406221
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs	(.../HydraulicBoundaryLocationCalculationPropertiesTest.cs)	(revision 04ffe9435f3031323b2eeac4718e85dfd6022dbe)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs	(.../HydraulicBoundaryLocationCalculationPropertiesTest.cs)	(revision 07ee3d6f4986ef01277906824f02ef1fe7406221)
@@ -51,17 +51,6 @@
         private const int illustrationPointsIndex = 13;
 
         [Test]
-        public void Constructor_HydraulicBoundaryLocationCalculationNull_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate test = () => new TestHydraulicBoundaryLocationCalculationProperties(null);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("hydraulicBoundaryLocationCalculation", paramName);
-        }
-
-        [Test]
         public void Constructor_ExpectedProperties()
         {
             // Setup
@@ -72,6 +61,7 @@
 
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationCalculationBaseProperties>(properties);
+            Assert.AreSame(hydraulicBoundaryLocationCalculation, properties.Data);
         }
 
         [Test]
@@ -290,18 +280,9 @@
             const string name = "<some name>";
             var calculationConvergence = random.NextEnumValue<CalculationConvergence>();
 
-            var hydraulicBoundaryLocationCalculationOutput = new HydraulicBoundaryLocationCalculationOutput(random.NextDouble(),
-                                                                                                            random.NextDouble(),
-                                                                                                            random.NextDouble(),
-                                                                                                            random.NextDouble(),
-                                                                                                            random.NextDouble(),
-                                                                                                            calculationConvergence,
-                                                                                                            null);
-
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(id, name, x, y))
             {
-                Output = hydraulicBoundaryLocationCalculationOutput
+                Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble(), calculationConvergence)
             };
 
             // Call