Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r9754fefbba93c8c3c4e229cd4d59259bf4462882 -r0045dbbff0496b19ca97508be92241d3ac938007
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 9754fefbba93c8c3c4e229cd4d59259bf4462882)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 0045dbbff0496b19ca97508be92241d3ac938007)
@@ -79,7 +79,7 @@
             ConfigureGrassCoverErosionInwardsFailureMechanism(grassCoverErosionInwardsFailureMechanism, assessmentSection);
             AddSections(grassCoverErosionInwardsFailureMechanism);
             SetSectionResults(grassCoverErosionInwardsFailureMechanism.SectionResults,
-                              grassCoverErosionInwardsFailureMechanism.Calculations.OfType<GrassCoverErosionInwardsCalculation>());
+                              (GrassCoverErosionInwardsCalculation) grassCoverErosionInwardsFailureMechanism.Calculations.First());
 
             GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = assessmentSection.GrassCoverErosionOutwards;
             AddForeshoreProfiles(grassCoverErosionOutwardsFailureMechanism.ForeshoreProfiles);
@@ -103,7 +103,8 @@
             AddForeshoreProfiles(heightStructuresFailureMechanism.ForeshoreProfiles);
             ConfigureHeightStructuresFailureMechanism(heightStructuresFailureMechanism, assessmentSection);
             AddSections(heightStructuresFailureMechanism);
-            SetSectionResults(heightStructuresFailureMechanism.SectionResults);
+            SetSectionResults(heightStructuresFailureMechanism.SectionResults,
+                              (StructuresCalculation<HeightStructuresInput>) heightStructuresFailureMechanism.Calculations.First());
 
             ClosingStructuresFailureMechanism closingStructuresFailureMechanism = assessmentSection.ClosingStructures;
             AddForeshoreProfiles(closingStructuresFailureMechanism.ForeshoreProfiles);
@@ -150,16 +151,6 @@
             return fullTestProject;
         }
 
-        private static void SetSectionResults(IEnumerable<HeightStructuresFailureMechanismSectionResult> sectionResults)
-        {
-            var random = new Random(21);
-            foreach (var sectionResult in sectionResults)
-            {
-                sectionResult.AssessmentLayerOne = random.NextBoolean();
-                sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble();
-            }
-        }
-
         private static void SetSectionResults(IEnumerable<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult> sectionResults)
         {
             var random = new Random(21);
@@ -367,6 +358,28 @@
             return hydraulicBoundaryDatabase;
         }
 
+        #region ClosingStructures FailureMechanism
+
+        private static void ConfigureClosingStructuresFailureMechanism(ClosingStructuresFailureMechanism failureMechanism)
+        {
+            failureMechanism.GeneralInput.N2A = 6;
+            failureMechanism.ClosingStructures.Add(new TestClosingStructure());
+            failureMechanism.ClosingStructures.Add(new TestClosingStructure());
+        }
+
+        #endregion
+
+        #region StabilityPointStructures FailureMechanism
+
+        private static void ConfigureStabilityPointStructuresFailureMechanism(StabilityPointStructuresFailureMechanism failureMechanism)
+        {
+            failureMechanism.GeneralInput.N = 8;
+            failureMechanism.StabilityPointStructures.Add(new TestStabilityPointStructure());
+            failureMechanism.StabilityPointStructures.Add(new TestStabilityPointStructure());
+        }
+
+        #endregion
+
         #region HeightStructures FailureMechanism
 
         private static void ConfigureHeightStructuresFailureMechanism(HeightStructuresFailureMechanism failureMechanism,
@@ -437,30 +450,25 @@
             failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
         }
 
-        #endregion
-
-        #region ClosingStructures FailureMechanism
-
-        private static void ConfigureClosingStructuresFailureMechanism(ClosingStructuresFailureMechanism failureMechanism)
+        private static void SetSectionResults(IEnumerable<HeightStructuresFailureMechanismSectionResult> sectionResults,
+                                              StructuresCalculation<HeightStructuresInput> calculation)
         {
-            failureMechanism.GeneralInput.N2A = 6;
-            failureMechanism.ClosingStructures.Add(new TestClosingStructure());
-            failureMechanism.ClosingStructures.Add(new TestClosingStructure());
+            var random = new Random(21);
+            var firstSectionResultHasCalculation = false;
+            foreach (var sectionResult in sectionResults)
+            {
+                sectionResult.AssessmentLayerOne = random.NextBoolean();
+                sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble();
+                if (!firstSectionResultHasCalculation)
+                {
+                    sectionResult.Calculation = calculation;
+                    firstSectionResultHasCalculation = true;
+                }
+            }
         }
 
         #endregion
 
-        #region StabilityPointStructures FailureMechanism
-
-        private static void ConfigureStabilityPointStructuresFailureMechanism(StabilityPointStructuresFailureMechanism failureMechanism)
-        {
-            failureMechanism.GeneralInput.N = 8;
-            failureMechanism.StabilityPointStructures.Add(new TestStabilityPointStructure());
-            failureMechanism.StabilityPointStructures.Add(new TestStabilityPointStructure());
-        }
-
-        #endregion
-
         #region Piping FailureMechanism
 
         private static void ConfigurePipingFailureMechanism(PipingFailureMechanism pipingFailureMechanism, AssessmentSection assessmentSection)
@@ -742,19 +750,18 @@
                 });
         }
 
-        private static void SetSectionResults(IEnumerable<GrassCoverErosionInwardsFailureMechanismSectionResult> sectionResults, IEnumerable<GrassCoverErosionInwardsCalculation> calculations)
+        private static void SetSectionResults(IEnumerable<GrassCoverErosionInwardsFailureMechanismSectionResult> sectionResults,
+                                              GrassCoverErosionInwardsCalculation calculation)
         {
             var random = new Random(21);
-            bool firstSectionResultHasCalculation = false;
-            var grassCoverErosionInwardsCalculation = calculations.First();
-
+            var firstSectionResultHasCalculation = false;
             foreach (var sectionResult in sectionResults)
             {
                 sectionResult.AssessmentLayerOne = random.NextBoolean();
                 sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble();
                 if (!firstSectionResultHasCalculation)
                 {
-                    sectionResult.Calculation = grassCoverErosionInwardsCalculation;
+                    sectionResult.Calculation = calculation;
                     firstSectionResultHasCalculation = true;
                 }
             }