Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsViewTest.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r69e16af46b31bc5e172f5548603e9ca2f99cd837
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsViewTest.cs	(.../ClosingStructuresCalculationsViewTest.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsViewTest.cs	(.../ClosingStructuresCalculationsViewTest.cs)	(revision 69e16af46b31bc5e172f5548603e9ca2f99cd837)
@@ -622,11 +622,14 @@
 
             // Then
             StructuresCalculationScenario<ClosingStructuresInput>[] calculationScenarios = failureMechanism.Calculations.OfType<StructuresCalculationScenario<ClosingStructuresInput>>().ToArray();
-            ClosingStructuresFailureMechanismSectionResultOld failureMechanismSectionResult1 = failureMechanism.SectionResultsOld.First();
-            ClosingStructuresFailureMechanismSectionResultOld failureMechanismSectionResult2 = failureMechanism.SectionResultsOld.ElementAt(1);
+            AdoptableFailureMechanismSectionResult failureMechanismSectionResult1 = failureMechanism.SectionResults.First();
+            AdoptableFailureMechanismSectionResult failureMechanismSectionResult2 = failureMechanism.SectionResults.ElementAt(1);
 
-            Assert.AreEqual(1, failureMechanismSectionResult1.GetCalculationScenarios(calculationScenarios).Count());
-            CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetCalculationScenarios(calculationScenarios));
+            Func<StructuresCalculationScenario<ClosingStructuresInput>,IEnumerable<Segment2D>,bool> intersectionFunc = 
+                (scenario, lineSegments) => scenario.IsStructureIntersectionWithReferenceLineInSection(lineSegments);
+            
+            Assert.AreEqual(1, failureMechanismSectionResult1.GetRelevantCalculationScenarios(calculationScenarios, intersectionFunc).Count());
+            CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetRelevantCalculationScenarios(calculationScenarios, intersectionFunc));
             mocks.VerifyAll();
         }
 
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationsViewTest.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r69e16af46b31bc5e172f5548603e9ca2f99cd837
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationsViewTest.cs	(.../GrassCoverErosionInwardsCalculationsViewTest.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationsViewTest.cs	(.../GrassCoverErosionInwardsCalculationsViewTest.cs)	(revision 69e16af46b31bc5e172f5548603e9ca2f99cd837)
@@ -670,11 +670,14 @@
 
             // Then
             GrassCoverErosionInwardsCalculationScenario[] calculationScenarios = failureMechanism.Calculations.OfType<GrassCoverErosionInwardsCalculationScenario>().ToArray();
-            GrassCoverErosionInwardsFailureMechanismSectionResultOld failureMechanismSectionResult1 = failureMechanism.SectionResultsOld.First();
-            GrassCoverErosionInwardsFailureMechanismSectionResultOld failureMechanismSectionResult2 = failureMechanism.SectionResultsOld.ElementAt(1);
+            AdoptableWithProfileProbabilityFailureMechanismSectionResult failureMechanismSectionResult1 = failureMechanism.SectionResults.First();
+            AdoptableWithProfileProbabilityFailureMechanismSectionResult failureMechanismSectionResult2 = failureMechanism.SectionResults.ElementAt(1);
 
-            Assert.AreEqual(1, failureMechanismSectionResult1.GetCalculationScenarios(calculationScenarios).Count());
-            CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetCalculationScenarios(calculationScenarios));
+            Func<GrassCoverErosionInwardsCalculationScenario,IEnumerable<Segment2D>,bool> intersectionFunc = 
+                (scenario, lineSegments) => scenario.IsDikeProfileIntersectionWithReferenceLineInSection(lineSegments);
+            
+            Assert.AreEqual(1, failureMechanismSectionResult1.GetRelevantCalculationScenarios(calculationScenarios, intersectionFunc).Count());
+            CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetRelevantCalculationScenarios(calculationScenarios, intersectionFunc));
             mocks.VerifyAll();
         }
 
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresCalculationsViewTest.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r69e16af46b31bc5e172f5548603e9ca2f99cd837
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresCalculationsViewTest.cs	(.../HeightStructuresCalculationsViewTest.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresCalculationsViewTest.cs	(.../HeightStructuresCalculationsViewTest.cs)	(revision 69e16af46b31bc5e172f5548603e9ca2f99cd837)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -615,11 +616,14 @@
 
             // Then
             StructuresCalculationScenario<HeightStructuresInput>[] calculationScenarios = failureMechanism.Calculations.OfType<StructuresCalculationScenario<HeightStructuresInput>>().ToArray();
-            HeightStructuresFailureMechanismSectionResultOld failureMechanismSectionResult1 = failureMechanism.SectionResultsOld.First();
-            HeightStructuresFailureMechanismSectionResultOld failureMechanismSectionResult2 = failureMechanism.SectionResultsOld.ElementAt(1);
+            AdoptableFailureMechanismSectionResult failureMechanismSectionResult1 = failureMechanism.SectionResults.First();
+            AdoptableFailureMechanismSectionResult failureMechanismSectionResult2 = failureMechanism.SectionResults.ElementAt(1);
 
-            Assert.AreEqual(1, failureMechanismSectionResult1.GetCalculationScenarios(calculationScenarios).Count());
-            CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetCalculationScenarios(calculationScenarios));
+            Func<StructuresCalculationScenario<HeightStructuresInput>,IEnumerable<Segment2D>,bool> intersectionFunc = 
+                (scenario, lineSegments) => scenario.IsStructureIntersectionWithReferenceLineInSection(lineSegments);
+            
+            Assert.AreEqual(1, failureMechanismSectionResult1.GetRelevantCalculationScenarios(calculationScenarios, intersectionFunc).Count());
+            CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetRelevantCalculationScenarios(calculationScenarios, intersectionFunc));
             mocks.VerifyAll();
         }
 
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r69e16af46b31bc5e172f5548603e9ca2f99cd837
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs	(.../MacroStabilityInwardsCalculationsViewTest.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs	(.../MacroStabilityInwardsCalculationsViewTest.cs)	(revision 69e16af46b31bc5e172f5548603e9ca2f99cd837)
@@ -19,6 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
@@ -643,17 +645,14 @@
 
             // Then
             MacroStabilityInwardsCalculationScenario[] calculationScenarios = failureMechanism.Calculations.OfType<MacroStabilityInwardsCalculationScenario>().ToArray();
-            MacroStabilityInwardsFailureMechanismSectionResultOld failureMechanismSectionResult1 = failureMechanism.SectionResultsOld.First();
-            MacroStabilityInwardsFailureMechanismSectionResultOld failureMechanismSectionResult2 = failureMechanism.SectionResultsOld.ElementAt(1);
+            AdoptableWithProfileProbabilityFailureMechanismSectionResult failureMechanismSectionResult1 = failureMechanism.SectionResults.First();
+            AdoptableWithProfileProbabilityFailureMechanismSectionResult failureMechanismSectionResult2 = failureMechanism.SectionResults.ElementAt(1);
 
-            Assert.AreEqual(2, failureMechanismSectionResult1.GetCalculationScenarios(calculationScenarios).Count());
-
-            foreach (MacroStabilityInwardsCalculationScenario calculationScenario in failureMechanismSectionResult1.GetCalculationScenarios(calculationScenarios))
-            {
-                Assert.IsInstanceOf<ICalculationScenario>(calculationScenario);
-            }
-
-            CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetCalculationScenarios(calculationScenarios));
+            Func<MacroStabilityInwardsCalculationScenario,IEnumerable<Segment2D>,bool> intersectionFunc = 
+                (scenario, lineSegments) => scenario.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments);
+            
+            Assert.AreEqual(2, failureMechanismSectionResult1.GetRelevantCalculationScenarios(calculationScenarios, intersectionFunc).Count());
+            CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetRelevantCalculationScenarios(calculationScenarios, intersectionFunc));
             mocks.VerifyAll();
         }
 
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresCalculationsViewTest.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r69e16af46b31bc5e172f5548603e9ca2f99cd837
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresCalculationsViewTest.cs	(.../StabilityPointStructuresCalculationsViewTest.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresCalculationsViewTest.cs	(.../StabilityPointStructuresCalculationsViewTest.cs)	(revision 69e16af46b31bc5e172f5548603e9ca2f99cd837)
@@ -648,11 +648,14 @@
 
             // Then
             StructuresCalculationScenario<StabilityPointStructuresInput>[] calculationScenarios = failureMechanism.Calculations.OfType<StructuresCalculationScenario<StabilityPointStructuresInput>>().ToArray();
-            StabilityPointStructuresFailureMechanismSectionResultOld failureMechanismSectionResult1 = failureMechanism.SectionResultsOld.First();
-            StabilityPointStructuresFailureMechanismSectionResultOld failureMechanismSectionResult2 = failureMechanism.SectionResultsOld.ElementAt(1);
+            AdoptableFailureMechanismSectionResult failureMechanismSectionResult1 = failureMechanism.SectionResults.First();
+            AdoptableFailureMechanismSectionResult failureMechanismSectionResult2 = failureMechanism.SectionResults.ElementAt(1);
 
-            Assert.AreEqual(1, failureMechanismSectionResult1.GetCalculationScenarios(calculationScenarios).Count());
-            CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetCalculationScenarios(calculationScenarios));
+            Func<StructuresCalculationScenario<StabilityPointStructuresInput>,IEnumerable<Segment2D>,bool> intersectionFunc = 
+                (scenario, lineSegments) => scenario.IsStructureIntersectionWithReferenceLineInSection(lineSegments);
+            
+            Assert.AreEqual(1, failureMechanismSectionResult1.GetRelevantCalculationScenarios(calculationScenarios, intersectionFunc).Count());
+            CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetRelevantCalculationScenarios(calculationScenarios, intersectionFunc));
             mocks.VerifyAll();
         }