Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u -r6aaa17dbb25d6299115d68b221312aa1482d97a9 -ra8557d0292f7cca077c69756d6b3511385da6c77
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision 6aaa17dbb25d6299115d68b221312aa1482d97a9)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision a8557d0292f7cca077c69756d6b3511385da6c77)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -35,6 +36,7 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
@@ -131,6 +133,54 @@
         }
 
         [Test]
+        public void ParameteredConstructor_HandlerNull_ThrowArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => new PipingCalculationsView(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("handler", exception.ParamName);
+        }
+
+        [Test]
+        public void ParameteredConstructor_ValidHandler_DataGridViewCorrectlyInitialized()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var handler = mocks.Stub<ICalculationInputPropertyChangeHandler<PipingInput, PipingCalculationScenario>>();
+            mocks.ReplayAll();
+
+            // Call
+            using (var pipingCalculationsView = new PipingCalculationsView(handler))
+            {
+                testForm.Controls.Add(pipingCalculationsView);
+                testForm.Show();
+
+                var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+
+                // Assert
+                Assert.IsFalse(dataGridView.AutoGenerateColumns);
+                Assert.AreEqual(9, dataGridView.ColumnCount);
+
+                foreach (var column in dataGridView.Columns.OfType<DataGridViewComboBoxColumn>())
+                {
+                    Assert.AreEqual("This", column.ValueMember);
+                    Assert.AreEqual("DisplayName", column.DisplayMember);
+                }
+
+                var soilProfilesCombobox = (DataGridViewComboBoxColumn)dataGridView.Columns[stochasticSoilProfilesColumnIndex];
+                var soilProfilesComboboxItems = soilProfilesCombobox.Items;
+                Assert.AreEqual(0, soilProfilesComboboxItems.Count); // Row dependent
+
+                var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn)dataGridView.Columns[selectableHydraulicBoundaryLocationsColumnIndex];
+                var hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items;
+                Assert.AreEqual(0, hydraulicBoundaryLocationComboboxItems.Count); // Row dependent
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void Data_SetToNull_DoesNotThrow()
         {
             // Setup