Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -re6671f07e31bef1e5617d8998ce01be60cc648d2 -rb28a844780b613e1901fa82328ba3917f485c729
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs	(.../HeightStructuresFailureMechanismSectionResultRowTest.cs)	(revision e6671f07e31bef1e5617d8998ce01be60cc648d2)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs	(.../HeightStructuresFailureMechanismSectionResultRowTest.cs)	(revision b28a844780b613e1901fa82328ba3917f485c729)
@@ -24,10 +24,8 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.IllustrationPoints;
-using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.Structures;
-using Ringtoets.Common.Data.TestUtil.IllustrationPoints;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.TypeConverters;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.HeightStructures.Data;
@@ -75,20 +73,15 @@
         }
 
         [Test]
-        [Combinatorial]
-        public void AssessmentLayerTwoA_CalculationNotDone_ReturnNaN(
-            [Values(CalculationScenarioStatus.Failed, CalculationScenarioStatus.NotCalculated)] CalculationScenarioStatus status,
-            [Values(true, false)] bool withIllustrationPoints)
+        [TestCase(CalculationScenarioStatus.Failed)]
+        [TestCase(CalculationScenarioStatus.NotCalculated)]
+        public void AssessmentLayerTwoA_CalculationNotDone_ReturnNaN(CalculationScenarioStatus status)
         {
             // Setup
             var calculation = new StructuresCalculation<HeightStructuresInput>();
-            GeneralResult<TopLevelFaultTreeIllustrationPoint> generalResult = withIllustrationPoints
-                                                                                  ? new TestGeneralResultFaultTreeIllustrationPoint()
-                                                                                  : null;
             if (status == CalculationScenarioStatus.Failed)
             {
-                calculation.Output = new StructuresOutput(new ProbabilityAssessmentOutput(0.9, 1.0, double.NaN, 1.0, 1.0),
-                                                          generalResult);
+                calculation.Output = new TestStructuresOutput(double.NaN);
             }
 
             FailureMechanismSection section = CreateSection();
@@ -107,18 +100,13 @@
         }
 
         [Test]
-        [TestCase(true)]
-        [TestCase(false)]
-        public void AssessmentLayerTwoA_CalculationSuccessful_ReturnAssessmentLayerTwoA(bool withIllustrationPoints)
+        public void AssessmentLayerTwoA_CalculationSuccessful_ReturnAssessmentLayerTwoA()
         {
             // Setup
-            var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(0.9, 1.0, 0.95, 1.0, 1.0);
-            GeneralResult<TopLevelFaultTreeIllustrationPoint> generalResult = withIllustrationPoints
-                                                                                  ? new TestGeneralResultFaultTreeIllustrationPoint()
-                                                                                  : null;
+            const double probability = 0.95;
             var calculation = new StructuresCalculation<HeightStructuresInput>
             {
-                Output = new StructuresOutput(probabilityAssessmentOutput, generalResult)
+                Output = new TestStructuresOutput(probability)
             };
 
             FailureMechanismSection section = CreateSection();
@@ -133,7 +121,7 @@
             double assessmentLayerTwoA = resultRow.AssessmentLayerTwoA;
 
             // Assert
-            Assert.AreEqual(probabilityAssessmentOutput.Probability, assessmentLayerTwoA);
+            Assert.AreEqual(probability, assessmentLayerTwoA);
         }
 
         [Test]