Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CalculatableRowTest.cs
===================================================================
diff -u -rb74aa4c8b4b8995197d3252cc299835b7e57fc47 -re468a5451f59115ec6ca32c014da1baaa38866e8
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CalculatableRowTest.cs	(.../CalculatableRowTest.cs)	(revision b74aa4c8b4b8995197d3252cc299835b7e57fc47)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CalculatableRowTest.cs	(.../CalculatableRowTest.cs)	(revision e468a5451f59115ec6ca32c014da1baaa38866e8)
@@ -19,7 +19,10 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using NUnit.Framework;
+using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.Views;
 
 namespace Ringtoets.Common.Forms.Test.Views
@@ -28,18 +31,33 @@
     public class CalculatableRowTest
     {
         [Test]
-        public void Constructor_Property_SetPropertyAsExpected()
+        public void Constructor_CalculatableObjectNull_ThrowArgumentNullException()
         {
+            // Call
+            TestDelegate test = () => new SimpleCalculatableRow(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("calculatableObject", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
             // Setup
-            var row = new SimpleCalculatableRow();
+            var calculatableObject = new TestHydraulicBoundaryLocation();
 
             // Call
-            row.ToCalculate = true;
-
+            var row = new SimpleCalculatableRow(calculatableObject);
+            
             // Assert
-            Assert.IsTrue(row.ToCalculate);
+            Assert.IsFalse(row.ToCalculate);
+            Assert.AreSame(calculatableObject, row.CalculatableObject);
         }
 
-        private class SimpleCalculatableRow : CalculatableRow {}
+        private class SimpleCalculatableRow : CalculatableRow<HydraulicBoundaryLocation> {
+            public SimpleCalculatableRow(HydraulicBoundaryLocation calculatableObject) 
+                : base(calculatableObject) {}
+        }
     }
 }
\ No newline at end of file