Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r80c86231452b9beb7e8b8eba3698ceb9c0551de3 -r80404901c704ca22397f36ebe46f81e73059e30a
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs	(.../PipingFailureMechanismSectionResultTest.cs)	(revision 80c86231452b9beb7e8b8eba3698ceb9c0551de3)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs	(.../PipingFailureMechanismSectionResultTest.cs)	(revision 80404901c704ca22397f36ebe46f81e73059e30a)
@@ -20,13 +20,10 @@
 // All rights reserved.
 
 using System;
-using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Piping.Data.TestUtil;
 
 namespace Ringtoets.Piping.Data.Test
 {
@@ -77,119 +74,6 @@
         }
 
         [Test]
-        public void AssessmentLayerTwoA_MultipleScenarios_ReturnsValueBasedOnRelevantAndDoneScenarios()
-        {
-            // Setup
-            FailureMechanismSection section = CreateSection();
-            var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
-
-            var contribution1 = 0.2;
-            var contribution2 = 0.8;
-            var probability1 = 1.0 / 1000000;
-            var probability2 = 1.0 / 2000000;
-
-            var pipingCalculationScenario1 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(probability1, section);
-            var pipingCalculationScenario2 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(probability2, section);
-            var pipingCalculationScenario3 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(0.0, section);
-            var pipingCalculationScenario4 = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section);
-
-            pipingCalculationScenario1.IsRelevant = true;
-            pipingCalculationScenario1.Contribution = (RoundedDouble)contribution1;
-
-            pipingCalculationScenario2.IsRelevant = true;
-            pipingCalculationScenario2.Contribution = (RoundedDouble)contribution2;
-
-            pipingCalculationScenario3.IsRelevant = false;
-
-            pipingCalculationScenario4.IsRelevant = true;
-
-            var calculations = new []
-            {
-                pipingCalculationScenario1, pipingCalculationScenario2, pipingCalculationScenario3, pipingCalculationScenario4
-            };
-
-            // Call
-            RoundedDouble? assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(calculations);
-
-            // Assert
-            Assert.AreEqual(1.0 / ((probability1) * contribution1 + (probability2) * contribution2), assessmentLayerTwoA, 1e-8);
-        }
-
-        [Test]
-        public void AssessmentLayerTwoA_ScenarioInvalidOutput_ReturnsZero()
-        {
-            // Setup
-            FailureMechanismSection section = CreateSection();
-            var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
-
-            var pipingCalculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section);
-            pipingCalculationScenario.Contribution = (RoundedDouble) 1.0;
-
-            // Call
-            RoundedDouble assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new[] { pipingCalculationScenario });
-
-            // Assert
-            Assert.AreEqual((RoundedDouble) 0, assessmentLayerTwoA);
-        }
-
-        [Test]
-        public void AssessmentLayerTwoA_NoScenarios_ReturnsZero()
-        {
-            // Setup
-            FailureMechanismSection section = CreateSection();
-            var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
-
-            // Call
-            RoundedDouble? assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(Enumerable.Empty<PipingCalculationScenario>());
-
-            // Assert
-            Assert.AreEqual((RoundedDouble) 0.0, assessmentLayerTwoA);
-        }
-
-        [Test]
-        public void AssessmentLayerTwoA_NoRelevantScenarios_ReturnsZero()
-        {
-            // Setup
-            FailureMechanismSection section = CreateSection();
-            var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
-
-            var calculationScenarioMock = PipingCalculationScenarioFactory.CreateIrreleveantPipingCalculationScenario(section);
-            var calculationScenarioMock2 = PipingCalculationScenarioFactory.CreateIrreleveantPipingCalculationScenario(section);
-
-            var calculationScenarios = new[] { calculationScenarioMock, calculationScenarioMock2 };
-
-            // Call
-            RoundedDouble assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(calculationScenarios);
-
-            // Assert
-            Assert.AreEqual((RoundedDouble) 0.0, assessmentLayerTwoA);
-        }
-
-        [Test]
-        public void TotalContribution_Always_ReturnsTotalRelevantScenarioContribution()
-        {
-            // Setup
-            FailureMechanismSection section = CreateSection();
-            var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
-
-            var pipingCalculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section);
-            pipingCalculationScenario.Contribution = (RoundedDouble) 0.3;
-
-            var pipingCalculationScenario2 = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section);
-            pipingCalculationScenario2.Contribution = (RoundedDouble)0.5;
-
-            var pipingCalculationScenario3 = PipingCalculationScenarioFactory.CreateIrreleveantPipingCalculationScenario(section);
-
-            var calculationScenarios = new[] { pipingCalculationScenario, pipingCalculationScenario2, pipingCalculationScenario3 };
-
-            // Call
-            RoundedDouble totalContribution = failureMechanismSectionResult.GetTotalContribution(calculationScenarios);
-
-            // Assert
-            Assert.AreEqual((RoundedDouble) 0.8, totalContribution);
-        }
-
-        [Test]
         public void AssessmentLayerThree_Always_ReturnsSetValue()
         {
             // Setup
@@ -204,109 +88,6 @@
             Assert.AreEqual(assessmentLayerThreeValue, failureMechanismSectionResult.AssessmentLayerThree);
         }
 
-        [Test]
-        public void CalculationScenarioStatus_ScenarioNotCalculated_ReturnsStatusNotCalculated()
-        {
-            // Setup
-            FailureMechanismSection section = CreateSection();
-            var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
-
-            var pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section);
-
-            // Call
-            CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] { pipingCalculationScenario });
-
-            // Assert
-            Assert.AreEqual(CalculationScenarioStatus.NotCalculated, status);
-        }
-
-        [Test]
-        public void CalculationScenarioStatus_ScenarioInvalidOutput_ReturnsStatusFailed()
-        {
-            // Setup
-            FailureMechanismSection section = CreateSection();
-            var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
-
-            var pipingCalculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section);
-            pipingCalculationScenario.Contribution = (RoundedDouble) 1.0;
-
-            // Call
-            CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] { pipingCalculationScenario });
-
-            // Assert
-            Assert.AreEqual(CalculationScenarioStatus.Failed, status);
-        }
-
-        [Test]
-        public void CalculationScenarioStatus_ScenarioInvalidOutputAndNotCalculated_ReturnsStatusFailed()
-        {
-            // Setup
-            FailureMechanismSection section = CreateSection();
-            var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
-
-            var pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section);
-            pipingCalculationScenario.IsRelevant = true;
-
-            var pipingCalculationScenario2 = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section);
-            pipingCalculationScenario2.Contribution = (RoundedDouble) 1.0;
-            
-            var calculationScenarios = new[] { pipingCalculationScenario, pipingCalculationScenario2 };
-
-            // Call
-            CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(calculationScenarios);
-
-            // Assert
-            Assert.AreEqual(CalculationScenarioStatus.Failed, status);
-        }
-
-        [Test]
-        public void CalculationScenarioStatus_ScenariosCalculated_ReturnsStatusDone()
-        {
-            // Setup
-            FailureMechanismSection section = CreateSection();
-            var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
-
-            var expectedProbability = 41661830;
-            var pipingCalculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(expectedProbability, section);
-            pipingCalculationScenario.Contribution = (RoundedDouble) 1.0;
-
-            // Call
-            CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] { pipingCalculationScenario });
-
-            // Assert
-            Assert.AreEqual(CalculationScenarioStatus.Done, status);
-        }
-
-        [Test]
-        public void CalculationScenarioStatus_NoScenarios_ReturnsStatusDone()
-        {
-            // Setup
-            FailureMechanismSection section = CreateSection();
-            var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
-
-            // Call
-            CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(Enumerable.Empty<PipingCalculationScenario>());
-
-            // Assert
-            Assert.AreEqual(CalculationScenarioStatus.Done, status);
-        }
-
-        [Test]
-        public void AssessmentLayerTwoA_ScenarioNotCalculated_ReturnsZero()
-        {
-            // Setup
-            FailureMechanismSection section = CreateSection();
-            var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
-
-            var pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section);
-
-            // Call
-            RoundedDouble assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new [] { pipingCalculationScenario });
-
-            // Assert
-            Assert.AreEqual((RoundedDouble) 0, assessmentLayerTwoA);
-        }
-
         private static FailureMechanismSection CreateSection()
         {
             return new FailureMechanismSection("test", new[]