Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r4fe18530ce01d02e59d52bf8b334710236466abe -rc28810d9b3079290aeef62b6b9c0eb9fd6b49ac4
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs)	(revision 4fe18530ce01d02e59d52bf8b334710236466abe)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs)	(revision c28810d9b3079290aeef62b6b9c0eb9fd6b49ac4)
@@ -151,7 +151,10 @@
             mocks.ReplayAll();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
-            var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section);
+            var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section)
+            {
+                Calculation = CreateCompleteCalculation()
+            };
 
             using (new AssemblyToolCalculatorFactoryConfig())
             {
@@ -467,6 +470,7 @@
             var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section)
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
+                Calculation = CreateCompleteCalculation(),
                 TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.Probability
             };
 
@@ -480,16 +484,8 @@
                 IDictionary<int, DataGridViewColumnStateDefinition> columnStateDefinitions = row.ColumnStateDefinitions;
 
                 AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex], cellsEnabled);
+                AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], cellsEnabled, true);
 
-                if (cellsEnabled)
-                {
-                    AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], true);
-                }
-                else
-                {
-                    AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex]);
-                }
-
                 AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex], cellsEnabled);
                 AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], cellsEnabled);
 
@@ -513,7 +509,8 @@
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section)
             {
-                DetailedAssessmentResult = detailedAssessmentResult
+                DetailedAssessmentResult = detailedAssessmentResult,
+                Calculation = CreateCompleteCalculation()
             };
 
             using (new AssemblyToolCalculatorFactoryConfig())
@@ -579,6 +576,7 @@
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section)
             {
+                Calculation = CreateCompleteCalculation(),
                 TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.Probability,
                 UseManualAssemblyProbability = useManualAssemblyProbability
             };
@@ -959,12 +957,7 @@
 
             var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
-                Calculation = new GrassCoverErosionInwardsCalculation
-                {
-                    Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(0.56789),
-                                                                new TestDikeHeightOutput(0),
-                                                                new TestOvertoppingRateOutput(0))
-                }
+                Calculation = CreateCompleteCalculation()
             };
 
             using (new AssemblyToolCalculatorFactoryConfig())
@@ -1198,15 +1191,20 @@
             yield return new TestCaseData(new GrassCoverErosionInwardsFailureMechanismSectionResult(section)
             {
                 SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable,
-                Calculation = new GrassCoverErosionInwardsCalculation
-                {
-                    Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(0.56789),
-                                                                new TestDikeHeightOutput(0),
-                                                                new TestOvertoppingRateOutput(0))
-                }
+                Calculation = CreateCompleteCalculation()
             }).SetName("SectionWithValidCalculationOutput");
         }
 
+        private static GrassCoverErosionInwardsCalculation CreateCompleteCalculation()
+        {
+            return new GrassCoverErosionInwardsCalculation
+            {
+                Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(0.56789),
+                                                            new TestDikeHeightOutput(0),
+                                                            new TestOvertoppingRateOutput(0))
+            };
+        }
+
         #endregion
     }
 }
\ No newline at end of file