Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsCalculation.cs
===================================================================
diff -u -r2bdb4415eafe18b5780dbc32408a7317d7b537e6 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsCalculation.cs	(.../MacroStabilityInwardsCalculation.cs)	(revision 2bdb4415eafe18b5780dbc32408a7317d7b537e6)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsCalculation.cs	(.../MacroStabilityInwardsCalculation.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -37,7 +37,7 @@
         public MacroStabilityInwardsCalculation()
         {
             Name = RingtoetsCommonDataResources.Calculation_DefaultName;
-            InputParameters = new MacroStabilityInwardsInput();
+            InputParameters = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
             Comments = new Comment();
         }
 
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs
===================================================================
diff -u -r10e060be0b77c159b3e99a7200e43c4326b17642 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs	(.../MacroStabilityInwardsInput.cs)	(revision 10e060be0b77c159b3e99a7200e43c4326b17642)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs	(.../MacroStabilityInwardsInput.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -58,8 +58,6 @@
         private RoundedDouble tangentLineZBottom;
         private int tangentLineNumber;
 
-        public MacroStabilityInwardsInput() : this(new ConstructionProperties()) {}
-
         /// <summary>
         /// Initializes a new instance of the <see cref="MacroStabilityInwardsInput"/> class.
         /// </summary>
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/DrainageConstructionConverterTest.cs
===================================================================
diff -u -r68f204f50eaf5f1e881c18fb2d878a17c722f75a -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/DrainageConstructionConverterTest.cs	(.../DrainageConstructionConverterTest.cs)	(revision 68f204f50eaf5f1e881c18fb2d878a17c722f75a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/DrainageConstructionConverterTest.cs	(.../DrainageConstructionConverterTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -50,7 +50,7 @@
         {
             // Setup
             var random = new Random(21);
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 DrainageConstructionPresent = true,
                 XCoordinateDrainageConstruction = random.NextRoundedDouble(),
@@ -76,7 +76,7 @@
         {
             // Setup
             var random = new Random(21);
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 DrainageConstructionPresent = false,
                 XCoordinateDrainageConstruction = random.NextRoundedDouble(),
@@ -100,7 +100,7 @@
         {
             // Setup
             var random = new Random(21);
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 DrainageConstructionPresent = true,
                 XCoordinateDrainageConstruction = random.NextRoundedDouble(),
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsInputFactory.cs
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsInputFactory.cs	(.../MacroStabilityInwardsInputFactory.cs)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsInputFactory.cs	(.../MacroStabilityInwardsInputFactory.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -66,7 +66,7 @@
                     }
                 }));
 
-            return new MacroStabilityInwardsInput
+            return new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 SurfaceLine = surfaceLine,
                 StochasticSoilProfile = stochasticSoilProfile
@@ -97,7 +97,7 @@
                 }
             }));
 
-            return new MacroStabilityInwardsInput
+            return new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 SurfaceLine = surfaceLine,
                 StochasticSoilProfile = stochasticSoilProfile
@@ -143,7 +143,7 @@
                 }
             }));
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 SurfaceLine = surfaceLine,
                 StochasticSoilProfile = stochasticSoilProfile
@@ -189,7 +189,7 @@
                 }
             }));
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 SurfaceLine = surfaceLine,
                 StochasticSoilProfile = stochasticSoilProfile
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsInputContextTest.cs
===================================================================
diff -u -r3c535420f957462c1d525a532dad033434bf2ab7 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsInputContextTest.cs	(.../MacroStabilityInwardsInputContextTest.cs)	(revision 3c535420f957462c1d525a532dad033434bf2ab7)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsInputContextTest.cs	(.../MacroStabilityInwardsInputContextTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -75,7 +75,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculationInput = new MacroStabilityInwardsInput();
+            var calculationInput = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
             var surfaceLines = new[]
             {
                 new MacroStabilityInwardsSurfaceLine(string.Empty)
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsDrainagePropertiesTest.cs
===================================================================
diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsDrainagePropertiesTest.cs	(.../MacroStabilityInwardsDrainagePropertiesTest.cs)	(revision d485f27eb5a6d688406882dce60c3229e22f2ac2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsDrainagePropertiesTest.cs	(.../MacroStabilityInwardsDrainagePropertiesTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -52,7 +52,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsDrainageProperties(input, changeHandler);
@@ -83,9 +83,11 @@
         [Test]
         public void Constructor_HandlerNull_ThrowsArgumentNullException()
         {
+            // Setup
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
+
             // Call
-            TestDelegate call = () => new MacroStabilityInwardsDrainageProperties(new MacroStabilityInwardsInput(),
-                                                                                  null);
+            TestDelegate call = () => new MacroStabilityInwardsDrainageProperties(input, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -100,7 +102,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsDrainageProperties(input, changeHandler);
@@ -147,7 +149,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsDrainageProperties(input, changeHandler);
@@ -232,7 +234,7 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 DrainageConstructionPresent = drainageConstructionPresent,
                 DikeSoilScenario = soilScenario
@@ -263,7 +265,7 @@
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 DrainageConstructionPresent = drainageConstructionPresent,
                 DikeSoilScenario = soilScenario
@@ -289,7 +291,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
             var properties = new MacroStabilityInwardsDrainageProperties(input, changeHandler);
 
             // Call
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs
===================================================================
diff -u -r10e060be0b77c159b3e99a7200e43c4326b17642 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs	(.../MacroStabilityInwardsGridSettingsPropertiesTest.cs)	(revision 10e060be0b77c159b3e99a7200e43c4326b17642)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs	(.../MacroStabilityInwardsGridSettingsPropertiesTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -57,7 +57,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsGridSettingsProperties(input, changeHandler);
@@ -88,9 +88,11 @@
         [Test]
         public void Constructor_HandlerNull_ThrowsArgumentNullException()
         {
+            // Setup
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
+
             // Call
-            TestDelegate call = () => new MacroStabilityInwardsGridSettingsProperties(new MacroStabilityInwardsInput(),
-                                                                                      null);
+            TestDelegate call = () => new MacroStabilityInwardsGridSettingsProperties(input, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -105,7 +107,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsGridSettingsProperties(input, changeHandler);
@@ -197,7 +199,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 GridDeterminationType = gridDeterminationType
             };
@@ -324,7 +326,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
             var properties = new MacroStabilityInwardsGridSettingsProperties(input, changeHandler);
 
             // Call
@@ -344,7 +346,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 GridDeterminationType = isGridDeterminationTypeAutomatic
                                             ? MacroStabilityInwardsGridDeterminationType.Automatic
@@ -374,7 +376,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 TangentLineDeterminationType = isTangentlineDeterminationTypeLayerSeparated
                                                    ? MacroStabilityInwardsTangentLineDeterminationType.LayerSeparated
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision d485f27eb5a6d688406882dce60c3229e22f2ac2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -675,7 +675,7 @@
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             var random = new Random(21);
-            var inputParameters = new MacroStabilityInwardsInput
+            var inputParameters = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 HydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(50)
             };
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs
===================================================================
diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs	(.../MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs)	(revision d485f27eb5a6d688406882dce60c3229e22f2ac2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs	(.../MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -49,7 +49,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsSlipPlaneSettingsProperties(input, changeHandler);
@@ -80,9 +80,11 @@
         [Test]
         public void Constructor_HandlerNull_ThrowsArgumentNullException()
         {
+            // Setup
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
+
             // Call
-            TestDelegate call = () => new MacroStabilityInwardsSlipPlaneSettingsProperties(new MacroStabilityInwardsInput(),
-                                                                                           null);
+            TestDelegate call = () => new MacroStabilityInwardsSlipPlaneSettingsProperties(input, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -97,7 +99,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsSlipPlaneSettingsProperties(input, changeHandler);
@@ -136,7 +138,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsSlipPlaneSettingsProperties(input, changeHandler);
@@ -176,7 +178,7 @@
             observable.Expect(o => o.NotifyObservers());
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
@@ -201,7 +203,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
             var properties = new MacroStabilityInwardsSlipPlaneSettingsProperties(input, changeHandler);
 
             // Call
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs
===================================================================
diff -u -rf5c00f7fb200387f33023622372196697c1a249b -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs	(.../MacroStabilityInwardsWaterStressesPropertiesTest.cs)	(revision f5c00f7fb200387f33023622372196697c1a249b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs	(.../MacroStabilityInwardsWaterStressesPropertiesTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -62,7 +62,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsWaterStressesProperties(input, changeHandler);
@@ -103,9 +103,11 @@
         [Test]
         public void Constructor_HandlerNull_ThrowsArgumentNullException()
         {
+            // Setup
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
+
             // Call
-            TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(new MacroStabilityInwardsInput(),
-                                                                                       null);
+            TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(input, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -120,7 +122,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsWaterStressesProperties(input, changeHandler);
@@ -245,7 +247,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsWaterStressesProperties(input, changeHandler);
@@ -432,7 +434,7 @@
             var changeHandler = mocks.Stub<IObservablePropertyChangeHandler>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
             var properties = new MacroStabilityInwardsWaterStressesProperties(input, changeHandler);
 
             // Call
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaternetPropertiesTest.cs
===================================================================
diff -u -rf5c00f7fb200387f33023622372196697c1a249b -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaternetPropertiesTest.cs	(.../MacroStabilityInwardsWaternetPropertiesTest.cs)	(revision f5c00f7fb200387f33023622372196697c1a249b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaternetPropertiesTest.cs	(.../MacroStabilityInwardsWaternetPropertiesTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -47,7 +47,7 @@
         public void Constructor_ValidWaternet_ExpectedValues()
         {
             // Setup
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsWaterStressLinesProperties(input);
@@ -65,7 +65,7 @@
         public void GetProperties_WithData_ReturnExpectedValues()
         {
             // Setup
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsWaterStressLinesProperties(input);
@@ -81,7 +81,7 @@
         public void ToString_Always_ReturnEmpty()
         {
             // Setup
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
             var properties = new MacroStabilityInwardsWaterStressLinesProperties(input);
 
             // Call
@@ -95,7 +95,7 @@
         public void Constructor_ValidData_PropertieshaveExpectedAttributeValues()
         {
             // Setup
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             var properties = new MacroStabilityInwardsWaterStressLinesProperties(input);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs
===================================================================
diff -u -rb13759ad077f9e2b4104de000b5bdeafa9abe358 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs	(.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs)	(revision b13759ad077f9e2b4104de000b5bdeafa9abe358)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs	(.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -57,7 +57,7 @@
             var calculationItem = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 StochasticSoilModel = MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel()
             };
@@ -124,7 +124,7 @@
             var calculationItem = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 SurfaceLine = surfaceLine,
                 StochasticSoilModel = stochasticSoilModel,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs
===================================================================
diff -u -rb13759ad077f9e2b4104de000b5bdeafa9abe358 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs	(.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs)	(revision b13759ad077f9e2b4104de000b5bdeafa9abe358)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs	(.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -58,7 +58,7 @@
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             MacroStabilityInwardsSoilProfile1D soilProfile = MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D();
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, soilProfile)
             };
@@ -125,7 +125,7 @@
             var calculationItem = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 SurfaceLine = surfaceLine,
                 StochasticSoilModel = stochasticSoilModel,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs
===================================================================
diff -u -rd619624819b7200ac55b357b0a0c54d198fc20e4 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs	(.../MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs)	(revision d619624819b7200ac55b357b0a0c54d198fc20e4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs	(.../MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -55,7 +55,7 @@
             var calculationItem = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 SurfaceLine = ValidSurfaceLine()
             };
@@ -110,7 +110,7 @@
             var calculationItem = new MacroStabilityInwardsCalculationScenario();
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 SurfaceLine = surfaceLine
             };
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd619624819b7200ac55b357b0a0c54d198fc20e4 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsInputContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsInputContextTreeNodeInfoTest.cs)	(revision d619624819b7200ac55b357b0a0c54d198fc20e4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsInputContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsInputContextTreeNodeInfoTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -27,12 +27,8 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.MacroStabilityInwards.Data;
-using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects;
 using Ringtoets.MacroStabilityInwards.Forms.Properties;
-using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Plugin.Test.TreeNodeInfos
 {
@@ -89,18 +85,10 @@
         public void Text_Always_ReturnsTextFromResource()
         {
             // Setup
-            var context = new MacroStabilityInwardsInputContext(
-                new MacroStabilityInwardsInput(),
-                new MacroStabilityInwardsCalculationScenario(),
-                Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
-                Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
-                new MacroStabilityInwardsFailureMechanism(),
-                mocks.Stub<IAssessmentSection>());
-
             mocks.ReplayAll();
 
             // Call
-            string text = info.Text(context);
+            string text = info.Text(null);
 
             // Assert
             Assert.AreEqual("Invoer", text);
@@ -110,18 +98,10 @@
         public void Image_Always_ReturnsSetImage()
         {
             // Setup
-            var context = new MacroStabilityInwardsInputContext(
-                new MacroStabilityInwardsInput(),
-                new MacroStabilityInwardsCalculationScenario(),
-                Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
-                Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
-                new MacroStabilityInwardsFailureMechanism(),
-                mocks.Stub<IAssessmentSection>());
-
             mocks.ReplayAll();
 
             // Call
-            Image image = info.Image(context);
+            Image image = info.Image(null);
 
             // Assert
             TestHelper.AssertImagesAreEqual(Resources.MacroStabilityInwardsInputIcon, image);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs
===================================================================
diff -u -rd619624819b7200ac55b357b0a0c54d198fc20e4 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs	(.../MacroStabilityInwardsInputViewInfoTest.cs)	(revision d619624819b7200ac55b357b0a0c54d198fc20e4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs	(.../MacroStabilityInwardsInputViewInfoTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -88,7 +88,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             var calculation = new MacroStabilityInwardsCalculationScenario();
             var calculationInputContext = new MacroStabilityInwardsInputContext(input, calculation, Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSlipPlaneConverterTest.cs
===================================================================
diff -u -r10e060be0b77c159b3e99a7200e43c4326b17642 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSlipPlaneConverterTest.cs	(.../UpliftVanSlipPlaneConverterTest.cs)	(revision 10e060be0b77c159b3e99a7200e43c4326b17642)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSlipPlaneConverterTest.cs	(.../UpliftVanSlipPlaneConverterTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Base.Data;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.MacroStabilityInwards.Data;
@@ -48,12 +47,14 @@
         public void Convert_MacroStabilityInwardsGridDeterminationTypeAutomatic_ReturnUpliftVanSlipPlane()
         {
             // Setup
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties
             {
+                TangentLineZTop = 1,
+                TangentLineZBottom = 0
+            })
+            {
                 GridDeterminationType = MacroStabilityInwardsGridDeterminationType.Automatic,
                 TangentLineDeterminationType = MacroStabilityInwardsTangentLineDeterminationType.Specified,
-                TangentLineZTop = (RoundedDouble) 1,
-                TangentLineZBottom = (RoundedDouble) 0,
                 TangentLineNumber = 10
             };
 
@@ -79,30 +80,34 @@
         {
             // Setup
             var random = new Random(11);
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties
             {
+                LeftGridXLeft = random.NextRoundedDouble(0.0, 1.0),
+                LeftGridXRight = random.NextRoundedDouble(2.0, 3.0),
+                LeftGridZTop = random.NextRoundedDouble(2.0, 3.0),
+                LeftGridZBottom = random.NextRoundedDouble(0.0, 1.0),
+
+                RightGridXLeft = random.NextRoundedDouble(0.0, 1.0),
+                RightGridXRight = random.NextRoundedDouble(2.0, 3.0),
+                RightGridZTop = random.NextRoundedDouble(2.0, 3.0),
+                RightGridZBottom = random.NextRoundedDouble(0.0, 1.0),
+
+                TangentLineZTop = 1,
+                TangentLineZBottom = 0
+            })
+            {
                 GridDeterminationType = MacroStabilityInwardsGridDeterminationType.Manual,
                 LeftGrid =
                 {
-                    XLeft = random.NextRoundedDouble(0.0, 1.0),
-                    XRight = random.NextRoundedDouble(2.0, 3.0),
-                    ZTop = random.NextRoundedDouble(2.0, 3.0),
-                    ZBottom = random.NextRoundedDouble(0.0, 1.0),
                     NumberOfVerticalPoints = random.Next(1, 100),
                     NumberOfHorizontalPoints = random.Next(1, 100)
                 },
                 RightGrid =
                 {
-                    XLeft = random.NextRoundedDouble(0.0, 1.0),
-                    XRight = random.NextRoundedDouble(2.0, 3.0),
-                    ZTop = random.NextRoundedDouble(2.0, 3.0),
-                    ZBottom = random.NextRoundedDouble(0.0, 1.0),
                     NumberOfVerticalPoints = random.Next(1, 100),
                     NumberOfHorizontalPoints = random.Next(1, 100)
                 },
                 TangentLineDeterminationType = MacroStabilityInwardsTangentLineDeterminationType.LayerSeparated,
-                TangentLineZTop = (RoundedDouble) 1,
-                TangentLineZBottom = (RoundedDouble) 0,
                 TangentLineNumber = 10
             };
 
@@ -124,30 +129,34 @@
         {
             // Setup
             var random = new Random(11);
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties
             {
+                LeftGridXLeft = random.NextRoundedDouble(0.0, 1.0),
+                LeftGridXRight = random.NextRoundedDouble(2.0, 3.0),
+                LeftGridZTop = random.NextRoundedDouble(2.0, 3.0),
+                LeftGridZBottom = random.NextRoundedDouble(0.0, 1.0),
+
+                RightGridXLeft = random.NextRoundedDouble(0.0, 1.0),
+                RightGridXRight = random.NextRoundedDouble(2.0, 3.0),
+                RightGridZTop = random.NextRoundedDouble(2.0, 3.0),
+                RightGridZBottom = random.NextRoundedDouble(0.0, 1.0),
+
+                TangentLineZTop = random.NextRoundedDouble(2.0, 3.0),
+                TangentLineZBottom = random.NextRoundedDouble(0.0, 1.0)
+            })
+            {
                 GridDeterminationType = MacroStabilityInwardsGridDeterminationType.Manual,
                 LeftGrid =
                 {
-                    XLeft = random.NextRoundedDouble(0.0, 1.0),
-                    XRight = random.NextRoundedDouble(2.0, 3.0),
-                    ZTop = random.NextRoundedDouble(2.0, 3.0),
-                    ZBottom = random.NextRoundedDouble(0.0, 1.0),
                     NumberOfVerticalPoints = random.Next(1, 100),
                     NumberOfHorizontalPoints = random.Next(1, 100)
                 },
                 RightGrid =
                 {
-                    XLeft = random.NextRoundedDouble(0.0, 1.0),
-                    XRight = random.NextRoundedDouble(2.0, 3.0),
-                    ZTop = random.NextRoundedDouble(2.0, 3.0),
-                    ZBottom = random.NextRoundedDouble(0.0, 1.0),
                     NumberOfVerticalPoints = random.Next(1, 100),
                     NumberOfHorizontalPoints = random.Next(1, 100)
                 },
                 TangentLineDeterminationType = MacroStabilityInwardsTangentLineDeterminationType.Specified,
-                TangentLineZTop = random.NextRoundedDouble(2.0, 3.0),
-                TangentLineZBottom = random.NextRoundedDouble(0.0, 1.0),
                 TangentLineNumber = random.Next(1, 51)
             };
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs
===================================================================
diff -u -ra20f5008f39cfa4fd6f94572fd07a011f76609f4 -r3d30a9febb6492e54f2082bf0a21a1602717b098
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs	(.../MacroStabilityInwardsInputServiceTest.cs)	(revision a20f5008f39cfa4fd6f94572fd07a011f76609f4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs	(.../MacroStabilityInwardsInputServiceTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
@@ -36,7 +36,7 @@
             // Setup
             MacroStabilityInwardsStochasticSoilModel soilModel =
                 MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel();
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
             MacroStabilityInwardsInputService.SetMatchingStochasticSoilModel(input, new[]
@@ -52,7 +52,7 @@
         public void SetMatchingStochasticSoilModel_SurfaceLineOverlappingMultipleSoilModels_DoesNotSetModel()
         {
             // Setup
-            var input = new MacroStabilityInwardsInput();
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
             MacroStabilityInwardsStochasticSoilModel soilModel1 =
                 MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("A");
             MacroStabilityInwardsStochasticSoilModel soilModel2 =
@@ -75,7 +75,7 @@
             // Setup
             MacroStabilityInwardsStochasticSoilModel nonOverlappingSoilModel =
                 MacroStabilityInwardsStochasticSoilModelTestFactory.CreateValidStochasticSoilModel("A");
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 StochasticSoilModel = nonOverlappingSoilModel
             };
@@ -109,7 +109,7 @@
                                                                                                        soilProfile
                                                                                                    });
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 StochasticSoilModel = soilModel
             };
@@ -132,7 +132,7 @@
                     new MacroStabilityInwardsStochasticSoilProfile(1.0, MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D())
                 });
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 StochasticSoilModel = soilModel
             };
@@ -156,7 +156,7 @@
                     soilProfile
                 });
 
-            var input = new MacroStabilityInwardsInput
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
                 StochasticSoilModel = soilModel,
                 StochasticSoilProfile = soilProfile