Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/DikeHeightOutputContextTest.cs
===================================================================
diff -u -rb1e11dbfdf58d43200d940bdffaf02ec8bcd522d -r072d3bf153989c464a5d06968ad44dbbf615ced8
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/DikeHeightOutputContextTest.cs	(.../DikeHeightOutputContextTest.cs)	(revision b1e11dbfdf58d43200d940bdffaf02ec8bcd522d)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/DikeHeightOutputContextTest.cs	(.../DikeHeightOutputContextTest.cs)	(revision 072d3bf153989c464a5d06968ad44dbbf615ced8)
@@ -33,7 +33,7 @@
         public void ParameteredConstructor_ExpectedValues()
         {
             // Setup
-            var calculation = new GrassCoverErosionInwardsCalculation(0.1);
+            var calculation = new GrassCoverErosionInwardsCalculation();
 
             // Call
             var dikeHeightOutputContext = new DikeHeightOutputContext(calculation);
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationScenarioContextTest.cs
===================================================================
diff -u -rb1e11dbfdf58d43200d940bdffaf02ec8bcd522d -r072d3bf153989c464a5d06968ad44dbbf615ced8
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationScenarioContextTest.cs	(.../GrassCoverErosionInwardsCalculationScenarioContextTest.cs)	(revision b1e11dbfdf58d43200d940bdffaf02ec8bcd522d)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationScenarioContextTest.cs	(.../GrassCoverErosionInwardsCalculationScenarioContextTest.cs)	(revision 072d3bf153989c464a5d06968ad44dbbf615ced8)
@@ -43,7 +43,7 @@
             var assessmentSection = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1);
+            var calculation = new GrassCoverErosionInwardsCalculationScenario();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var parent = new CalculationGroup();
 
@@ -69,7 +69,7 @@
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1);
+            var calculation = new GrassCoverErosionInwardsCalculationScenario();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
 
             // Call
@@ -88,7 +88,7 @@
             private static readonly MockRepository mocks = new MockRepository();
 
             private static readonly IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
-            private static readonly GrassCoverErosionInwardsCalculationScenario calculation = new GrassCoverErosionInwardsCalculationScenario(0.1);
+            private static readonly GrassCoverErosionInwardsCalculationScenario calculation = new GrassCoverErosionInwardsCalculationScenario();
             private static readonly GrassCoverErosionInwardsFailureMechanism failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             private static readonly CalculationGroup parent = new CalculationGroup();
 
@@ -116,7 +116,7 @@
 
             private static IEnumerable<TestCaseData> GetUnequalTestCases()
             {
-                yield return new TestCaseData(new GrassCoverErosionInwardsCalculationScenarioContext(new GrassCoverErosionInwardsCalculationScenario(0.1),
+                yield return new TestCaseData(new GrassCoverErosionInwardsCalculationScenarioContext(new GrassCoverErosionInwardsCalculationScenario(),
                                                                                                      parent,
                                                                                                      failureMechanism,
                                                                                                      assessmentSection))
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsInputContextTest.cs
===================================================================
diff -u -rb1e11dbfdf58d43200d940bdffaf02ec8bcd522d -r072d3bf153989c464a5d06968ad44dbbf615ced8
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsInputContextTest.cs	(.../GrassCoverErosionInwardsInputContextTest.cs)	(revision b1e11dbfdf58d43200d940bdffaf02ec8bcd522d)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsInputContextTest.cs	(.../GrassCoverErosionInwardsInputContextTest.cs)	(revision 072d3bf153989c464a5d06968ad44dbbf615ced8)
@@ -46,8 +46,8 @@
             var assessmentSection = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
-            var input = new GrassCoverErosionInwardsInput(0.1);
-            var calculation = new GrassCoverErosionInwardsCalculation(0.1);
+            var input = new GrassCoverErosionInwardsInput();
+            var calculation = new GrassCoverErosionInwardsCalculation();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
 
             // Call
@@ -69,7 +69,7 @@
             var assessmentSection = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
-            var input = new GrassCoverErosionInwardsInput(0.1);
+            var input = new GrassCoverErosionInwardsInput();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
 
             // Call
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsOutputContextTest.cs
===================================================================
diff -u -r72ecf8d28448698d9077f780cd0afc6b07101b54 -r072d3bf153989c464a5d06968ad44dbbf615ced8
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsOutputContextTest.cs	(.../GrassCoverErosionInwardsOutputContextTest.cs)	(revision 72ecf8d28448698d9077f780cd0afc6b07101b54)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsOutputContextTest.cs	(.../GrassCoverErosionInwardsOutputContextTest.cs)	(revision 072d3bf153989c464a5d06968ad44dbbf615ced8)
@@ -33,14 +33,52 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var calculation = new GrassCoverErosionInwardsCalculation(0.1);
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
 
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
+            var calculation = new GrassCoverErosionInwardsCalculation();
+
             // Call
-            var grassCoverErosionInwardsOutputContext = new GrassCoverErosionInwardsOutputContext(calculation);
+            var grassCoverErosionInwardsOutputContext = new GrassCoverErosionInwardsOutputContext(calculation, failureMechanism, assessmentSection);
 
             // Assert
             Assert.IsInstanceOf<ObservableWrappedObjectContextBase<GrassCoverErosionInwardsCalculation>>(grassCoverErosionInwardsOutputContext);
             Assert.AreSame(calculation, grassCoverErosionInwardsOutputContext.WrappedData);
+            Assert.AreSame(failureMechanism, grassCoverErosionInwardsOutputContext.FailureMechanism);
+            Assert.AreSame(assessmentSection, grassCoverErosionInwardsOutputContext.AssessmentSection);
+            mocks.VerifyAll();
         }
+
+        [Test]
+        public void Constructror_FailureMechanismNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            // Call
+            void Call() => new GrassCoverErosionInwardsOutputContext(new GrassCoverErosionInwardsCalculation(),
+                                                                     null, assessmentSection);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
+        {
+            // Call
+            void Call() => new GrassCoverErosionInwardsOutputContext(new GrassCoverErosionInwardsCalculation(),
+                                                                     new GrassCoverErosionInwardsFailureMechanism(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("assessmentSection", exception.ParamName);
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/OvertoppingOutputContextTest.cs
===================================================================
diff -u -re9eab53fe6879727ee749dc04785e90adfb3aaf1 -r072d3bf153989c464a5d06968ad44dbbf615ced8
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/OvertoppingOutputContextTest.cs	(.../OvertoppingOutputContextTest.cs)	(revision e9eab53fe6879727ee749dc04785e90adfb3aaf1)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/OvertoppingOutputContextTest.cs	(.../OvertoppingOutputContextTest.cs)	(revision 072d3bf153989c464a5d06968ad44dbbf615ced8)
@@ -33,14 +33,48 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var calculation = new GrassCoverErosionInwardsCalculation(0.1);
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
 
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
+            var calculation = new GrassCoverErosionInwardsCalculation();
+
             // Call
             var context = new OvertoppingOutputContext(calculation);
 
             // Assert
             Assert.IsInstanceOf<ObservableWrappedObjectContextBase<GrassCoverErosionInwardsCalculation>>(context);
             Assert.AreSame(calculation, context.WrappedData);
         }
+
+        [Test]
+        public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            // Call
+            void Call() => new OvertoppingOutputContext(new GrassCoverErosionInwardsCalculation(), null, assessmentSection);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
+        {
+            // Call
+            void Call() => new OvertoppingOutputContext(new GrassCoverErosionInwardsCalculation(),
+                                                        new GrassCoverErosionInwardsFailureMechanism(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("assessmentSection", exception.ParamName);
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/OvertoppingRateOutputContextTest.cs
===================================================================
diff -u -rb1e11dbfdf58d43200d940bdffaf02ec8bcd522d -r072d3bf153989c464a5d06968ad44dbbf615ced8
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/OvertoppingRateOutputContextTest.cs	(.../OvertoppingRateOutputContextTest.cs)	(revision b1e11dbfdf58d43200d940bdffaf02ec8bcd522d)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/OvertoppingRateOutputContextTest.cs	(.../OvertoppingRateOutputContextTest.cs)	(revision 072d3bf153989c464a5d06968ad44dbbf615ced8)
@@ -33,7 +33,7 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var calculation = new GrassCoverErosionInwardsCalculation(0.1);
+            var calculation = new GrassCoverErosionInwardsCalculation();
 
             // Call
             var overtoppingRateOutputContext = new OvertoppingRateOutputContext(calculation);