Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs
===================================================================
diff -u -r1a7e949a3a94f976dd41a7a568701a7674685427 -ra9238f94c62a8feaa5d84250b1c99e2eca163afc
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs	(.../FailureMechanismSectionAssemblyCalculatorStubTest.cs)	(revision 1a7e949a3a94f976dd41a7a568701a7674685427)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs	(.../FailureMechanismSectionAssemblyCalculatorStubTest.cs)	(revision a9238f94c62a8feaa5d84250b1c99e2eca163afc)
@@ -54,7 +54,7 @@
 
             Assert.IsNull(calculator.TailorMadeAssessmentCategoriesInput);
             Assert.AreEqual(0.0, calculator.TailorMadeAssessmentProbabilityInput);
-            Assert.AreEqual((TailorMadeAssessmentProbabilityAndDetailedCalculationResultType) 0, calculator.TailorMadeAssessmentProbabilityAndDetailedCalculationResult);
+            Assert.AreEqual((TailorMadeAssessmentProbabilityAndDetailedCalculationResultType) 0, calculator.TailorMadeAssessmentProbabilityAndDetailedCalculationResultInput);
             Assert.IsNull(calculator.TailorMadeAssessmentAssemblyOutput);
 
             Assert.IsNull(calculator.CombinedSimpleAssemblyInput);
@@ -66,7 +66,7 @@
         #region Simple Assessment
 
         [Test]
-        public void AssembleSimpleAssessment_ThrowExceptionOnCalculateFalse_ReturnOutput()
+        public void AssembleSimpleAssessment_ThrowExceptionOnCalculateFalseAndOutputNotSet_ReturnOutput()
         {
             // Setup
             var calculator = new FailureMechanismSectionAssemblyCalculatorStub();
@@ -80,6 +80,25 @@
         }
 
         [Test]
+        public void AssembleSimpleAssessment_ThrowExceptionOnCalculateFalseAndOutputSet_ReturnOutput()
+        {
+            // Setup
+            var random = new Random(39);
+            var calculator = new FailureMechanismSectionAssemblyCalculatorStub
+            {
+                SimpleAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(
+                    random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+            };
+
+            // Call
+            FailureMechanismSectionAssembly assembly = calculator.AssembleSimpleAssessment(SimpleAssessmentResultType.None);
+
+            // Assert
+            Assert.AreSame(calculator.SimpleAssessmentAssemblyOutput, assembly);
+        }
+
+        [Test]
         public void AssembleSimpleAssessment_ThrowExceptionOnCalculateFalse_SetsInput()
         {
             // Setup
@@ -112,7 +131,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessmentValidityOnly_ThrowExceptionOnCalculateFalse_ReturnOutput()
+        public void AssembleSimpleAssessmentValidityOnly_ThrowExceptionOnCalculateFalseAndOutputNotSet_ReturnOutput()
         {
             // Setup
             var calculator = new FailureMechanismSectionAssemblyCalculatorStub();
@@ -126,6 +145,25 @@
         }
 
         [Test]
+        public void AssembleSimpleAssessmentValidityOnly_ThrowExceptionOnCalculateFalseAndOutputSet_ReturnOutput()
+        {
+            // Setup
+            var random = new Random(39);
+            var calculator = new FailureMechanismSectionAssemblyCalculatorStub
+            {
+                SimpleAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(
+                    random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+            };
+
+            // Call
+            FailureMechanismSectionAssembly assembly = calculator.AssembleSimpleAssessment(SimpleAssessmentResultValidityOnlyType.None);
+
+            // Assert
+            Assert.AreSame(calculator.SimpleAssessmentAssemblyOutput, assembly);
+        }
+
+        [Test]
         public void AssembleSimpleAssessmentValidityOnly_ThrowExceptionOnCalculateFalse_SetsInput()
         {
             // Setup
@@ -162,7 +200,7 @@
         #region Detailed Assessment
 
         [Test]
-        public void AssembleDetailedAssessment_ThrowExceptionOnCalculateFalse_ReturnOutput()
+        public void AssembleDetailedAssessment_ThrowExceptionOnCalculateFalseAndOutputNotSet_ReturnOutput()
         {
             // Setup
             var random = new Random(39);
@@ -185,6 +223,33 @@
         }
 
         [Test]
+        public void AssembleDetailedAssessment_ThrowExceptionOnCalculateFalseAndOutputSet_ReturnOutput()
+        {
+            // Setup
+            var random = new Random(39);
+            var calculator = new FailureMechanismSectionAssemblyCalculatorStub
+            {
+                DetailedAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(
+                    random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+            };
+
+            // Call
+            FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment(
+                random.NextEnumValue<DetailedAssessmentResultType>(),
+                random.NextDouble(),
+                new[]
+                {
+                    new FailureMechanismSectionAssemblyCategory(random.NextRoundedDouble(0.0, 0.5),
+                                                                random.NextRoundedDouble(0.6, 1.0),
+                                                                random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+                });
+
+            // Assert
+            Assert.AreSame(calculator.DetailedAssessmentAssemblyOutput, assembly);
+        }
+
+        [Test]
         public void AssembleDetailedAssessment_ThrowExceptionOnCalculateFalse_SetsInput()
         {
             // Setup
@@ -232,7 +297,7 @@
         }
 
         [Test]
-        public void AssembleDetailedAssessmentWithLengthEffect_ThrowExceptionOnCalculateFalse_ReturnOutput()
+        public void AssembleDetailedAssessmentWithLengthEffect_ThrowExceptionOnCalculateFalseAndOutputNotSet_ReturnOutput()
         {
             // Setup
             var random = new Random(39);
@@ -255,6 +320,33 @@
         }
 
         [Test]
+        public void AssembleDetailedAssessmentWithLengthEffect_ThrowExceptionOnCalculateFalseAndOutputSet_ReturnOutput()
+        {
+            // Setup
+            var random = new Random(39);
+            var calculator = new FailureMechanismSectionAssemblyCalculatorStub
+            {
+                DetailedAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(
+                    random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+            };
+
+            // Call
+            FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment(
+                random.NextDouble(),
+                new[]
+                {
+                    new FailureMechanismSectionAssemblyCategory(random.NextRoundedDouble(0.0, 0.5),
+                                                                random.NextRoundedDouble(0.6, 1.0),
+                                                                random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+                },
+                random.NextRoundedDouble(1.0, 10.0));
+
+            // Assert
+            Assert.AreSame(calculator.DetailedAssessmentAssemblyOutput, assembly);
+        }
+
+        [Test]
         public void AssembleDetailedAssessmentWithLengthEffect_ThrowExceptionOnCalculateFalse_SetsInput()
         {
             // Setup
@@ -307,7 +399,7 @@
         #region Tailor Made Assessment
 
         [Test]
-        public void AssembleTailorMadeAssessmentWithProbabilityAndDetailedCalculationResult_ThrowExceptionOnCalculateFalse_ReturnOutput()
+        public void AssembleTailorMadeAssessmentWithProbabilityAndDetailedCalculationResult_ThrowExceptionOnCalculateFalseAndOutputNotSet_ReturnOutput()
         {
             // Setup
             var random = new Random(39);
@@ -330,6 +422,33 @@
         }
 
         [Test]
+        public void AssembleTailorMadeAssessmentWithProbabilityAndDetailedCalculationResult_ThrowExceptionOnCalculateFalseAndOutputSet_ReturnOutput()
+        {
+            // Setup
+            var random = new Random(39);
+            var calculator = new FailureMechanismSectionAssemblyCalculatorStub
+            {
+                TailorMadeAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(
+                    random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+            };
+
+            // Call
+            FailureMechanismSectionAssembly assembly = calculator.AssembleTailorMadeAssessment(
+                random.NextEnumValue<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>(),
+                random.NextDouble(),
+                new[]
+                {
+                    new FailureMechanismSectionAssemblyCategory(random.NextRoundedDouble(0.0, 0.5),
+                                                                random.NextRoundedDouble(0.6, 1.0),
+                                                                random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+                });
+
+            // Assert
+            Assert.AreSame(calculator.TailorMadeAssessmentAssemblyOutput, assembly);
+        }
+
+        [Test]
         public void AssembleTailorMadeAssessmentWithProbabilityAndDetailedCalculationResult_ThrowExceptionOnCalculateFalse_SetsInput()
         {
             // Setup
@@ -344,7 +463,7 @@
             calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, categoryInput);
 
             // Assert
-            Assert.AreEqual(tailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityAndDetailedCalculationResult);
+            Assert.AreEqual(tailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityAndDetailedCalculationResultInput);
             Assert.AreEqual(probability, calculator.TailorMadeAssessmentProbabilityInput);
             Assert.AreSame(categoryInput, calculator.TailorMadeAssessmentCategoriesInput);
         }
@@ -377,7 +496,7 @@
         }
 
         [Test]
-        public void AssembleTailorMadeAssessmentWithProbabilityCalculationResult_ThrowExceptionOnCalculateFalse_ReturnOutput()
+        public void AssembleTailorMadeAssessmentWithProbabilityCalculationResult_ThrowExceptionOnCalculateFalseAndOutputNotSet_ReturnOutput()
         {
             // Setup
             var random = new Random(39);
@@ -400,6 +519,33 @@
         }
 
         [Test]
+        public void AssembleTailorMadeAssessmentWithProbabilityCalculationResult_ThrowExceptionOnCalculateFalseAndOutputSet_ReturnOutput()
+        {
+            // Setup
+            var random = new Random(39);
+            var calculator = new FailureMechanismSectionAssemblyCalculatorStub
+            {
+                TailorMadeAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(
+                    random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+            };
+
+            // Call
+            FailureMechanismSectionAssembly assembly = calculator.AssembleTailorMadeAssessment(
+                random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>(),
+                random.NextDouble(),
+                new[]
+                {
+                    new FailureMechanismSectionAssemblyCategory(random.NextRoundedDouble(0.0, 0.5),
+                                                                random.NextRoundedDouble(0.6, 1.0),
+                                                                random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+                });
+
+            // Assert
+            Assert.AreSame(calculator.TailorMadeAssessmentAssemblyOutput, assembly);
+        }
+
+        [Test]
         public void AssembleTailorMadeAssessmentWithProbabilityCalculationResult_ThrowExceptionOnCalculateFalse_SetsInput()
         {
             // Setup
@@ -414,7 +560,7 @@
             calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, categoryInput);
 
             // Assert
-            Assert.AreEqual(tailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultType);
+            Assert.AreEqual(tailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput);
             Assert.AreEqual(probability, calculator.TailorMadeAssessmentProbabilityInput);
             Assert.AreSame(categoryInput, calculator.TailorMadeAssessmentCategoriesInput);
         }
@@ -451,7 +597,7 @@
         #region Combined Assembly
 
         [Test]
-        public void AssembleCombinedWithProbabilities_ThrowExceptionOnCalculateCombinedAssemblyFalse_ReturnOutput()
+        public void AssembleCombinedWithProbabilities_ThrowExceptionOnCalculateCombinedAssemblyFalseAndOutputNotSet_ReturnOutput()
         {
             // Setup
             var random = new Random(39);
@@ -469,6 +615,25 @@
         }
 
         [Test]
+        public void AssembleCombinedWithProbabilities_ThrowExceptionOnCalculateCombinedAssemblyFalseAndOutputSet_ReturnOutput()
+        {
+            // Setup
+            var random = new Random(39);
+            var calculator = new FailureMechanismSectionAssemblyCalculatorStub
+            {
+                CombinedAssemblyOutput = new FailureMechanismSectionAssembly(
+                    random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+            };
+
+            // Call
+            FailureMechanismSectionAssembly combinedAssembly = calculator.AssembleCombined(null, null, null);
+
+            // Assert
+            Assert.AreSame(calculator.CombinedAssemblyOutput, combinedAssembly);
+        }
+
+        [Test]
         public void AssembleCombinedWithProbabilities_ThrowExceptionOnCalculateCombinedAssemblyFalse_SetsInput()
         {
             // Setup
@@ -513,7 +678,7 @@
         }
 
         [Test]
-        public void AssembleCombined_ThrowExceptionOnCalculateCombinedAssemblyFalse_ReturnOutput()
+        public void AssembleCombined_ThrowExceptionOnCalculateCombinedAssemblyFalseAndOutputNotSet_ReturnOutput()
         {
             // Setup
             var random = new Random(39);
@@ -529,6 +694,23 @@
         }
 
         [Test]
+        public void AssembleCombined_ThrowExceptionOnCalculateCombinedAssemblyFalseAndOutputSet_ReturnOutput()
+        {
+            // Setup
+            var random = new Random(39);
+            var calculator = new FailureMechanismSectionAssemblyCalculatorStub
+            {
+                CombinedAssemblyCategoryOutput = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>()
+            };
+
+            // Call
+            FailureMechanismSectionAssemblyCategoryGroup combinedAssembly = calculator.AssembleCombined(0, 0, 0);
+
+            // Assert
+            Assert.AreEqual(calculator.CombinedAssemblyCategoryOutput, combinedAssembly);
+        }
+
+        [Test]
         public void AssembleCombined_ThrowExceptionOnCalculateCombinedAssemblyFalse_SetsInput()
         {
             // Setup
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs
===================================================================
diff -u -r1a7e949a3a94f976dd41a7a568701a7674685427 -ra9238f94c62a8feaa5d84250b1c99e2eca163afc
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs	(.../FailureMechanismSectionAssemblyCalculatorStub.cs)	(revision 1a7e949a3a94f976dd41a7a568701a7674685427)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs	(.../FailureMechanismSectionAssemblyCalculatorStub.cs)	(revision a9238f94c62a8feaa5d84250b1c99e2eca163afc)
@@ -33,9 +33,9 @@
     public class FailureMechanismSectionAssemblyCalculatorStub : IFailureMechanismSectionAssemblyCalculator
     {
         /// <summary>
-        /// Gets the output of the simple assessment calculation.
+        /// Gets or sets the output of the simple assessment calculation.
         /// </summary>
-        public FailureMechanismSectionAssembly SimpleAssessmentAssemblyOutput { get; private set; }
+        public FailureMechanismSectionAssembly SimpleAssessmentAssemblyOutput { get; set; }
 
         /// <summary>
         /// Gets the input of the simple assessment calculation.
@@ -48,9 +48,9 @@
         public SimpleAssessmentResultValidityOnlyType SimpleAssessmentValidityOnlyInput { get; private set; }
 
         /// <summary>
-        /// Gets the output of the detailed assessment calculation.
+        /// Gets or sets the output of the detailed assessment calculation.
         /// </summary>
-        public FailureMechanismSectionAssembly DetailedAssessmentAssemblyOutput { get; private set; }
+        public FailureMechanismSectionAssembly DetailedAssessmentAssemblyOutput { get; set; }
 
         /// <summary>
         /// Gets the result type of the detailed assessment calculation.
@@ -73,19 +73,19 @@
         public double DetailedAssessmentNInput { get; private set; }
 
         /// <summary>
-        /// Gets the output of the tailor made assessment calculation.
+        /// Gets or sets the output of the tailor made assessment calculation.
         /// </summary>
-        public FailureMechanismSectionAssembly TailorMadeAssessmentAssemblyOutput { get; private set; }
+        public FailureMechanismSectionAssembly TailorMadeAssessmentAssemblyOutput { get; set; }
 
         /// <summary>
         /// Gets the result type of the tailor made assessment calculation with probability or detailed calculation result.
         /// </summary>
-        public TailorMadeAssessmentProbabilityAndDetailedCalculationResultType TailorMadeAssessmentProbabilityAndDetailedCalculationResult { get; private set; }
+        public TailorMadeAssessmentProbabilityAndDetailedCalculationResultType TailorMadeAssessmentProbabilityAndDetailedCalculationResultInput { get; private set; }
 
         /// <summary>
         /// Gets the result type of the tailor made assessment calculation with a probability calculation.
         /// </summary>
-        public TailorMadeAssessmentProbabilityCalculationResultType TailorMadeAssessmentProbabilityCalculationResultType { get; private set; }
+        public TailorMadeAssessmentProbabilityCalculationResultType TailorMadeAssessmentProbabilityCalculationResultInput { get; private set; }
 
         /// <summary>
         /// Gets the probability input of the tailor made assessment calculation.
@@ -98,9 +98,9 @@
         public IEnumerable<FailureMechanismSectionAssemblyCategory> TailorMadeAssessmentCategoriesInput { get; private set; }
 
         /// <summary>
-        /// Gets the output of the combined assembly calculation.
+        /// Gets or sets the output of the combined assembly calculation.
         /// </summary>
-        public FailureMechanismSectionAssembly CombinedAssemblyOutput { get; private set; }
+        public FailureMechanismSectionAssembly CombinedAssemblyOutput { get; set; }
 
         /// <summary>
         /// Gets the simple assembly input of the combined assembly calculation.
@@ -118,9 +118,9 @@
         public FailureMechanismSectionAssembly CombinedTailorMadeAssemblyInput { get; private set; }
 
         /// <summary>
-        /// Gets the output of the combined assembly calculation.
+        /// Gets or sets the output of the combined assembly calculation.
         /// </summary>
-        public FailureMechanismSectionAssemblyCategoryGroup CombinedAssemblyCategoryOutput { get; private set; }
+        public FailureMechanismSectionAssemblyCategoryGroup CombinedAssemblyCategoryOutput { get; set; }
 
         /// <summary>
         /// Gets the simple assembly input of the combined assembly calculation.
@@ -145,7 +145,7 @@
         /// <summary>
         /// Sets an indicator whether an exception must be thrown when performing a combined assembly calculation.
         /// </summary>
-        public bool ThrowExceptionOnCalculateCombinedAssembly { get; set; }
+        public bool ThrowExceptionOnCalculateCombinedAssembly { private get; set; }
 
         public FailureMechanismSectionAssembly AssembleSimpleAssessment(SimpleAssessmentResultType input)
         {
@@ -156,7 +156,8 @@
 
             SimpleAssessmentInput = input;
 
-            return SimpleAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(0, FailureMechanismSectionAssemblyCategoryGroup.Iv);
+            return SimpleAssessmentAssemblyOutput ??
+                   (SimpleAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(0, FailureMechanismSectionAssemblyCategoryGroup.Iv));
         }
 
         public FailureMechanismSectionAssembly AssembleSimpleAssessment(SimpleAssessmentResultValidityOnlyType input)
@@ -168,7 +169,8 @@
 
             SimpleAssessmentValidityOnlyInput = input;
 
-            return SimpleAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIIv);
+            return SimpleAssessmentAssemblyOutput ?? 
+                   (SimpleAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIIv));
         }
 
         public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentResultType detailedAssessmentResult,
@@ -184,7 +186,8 @@
             DetailedAssessmentProbabilityInput = probability;
             DetailedAssessmentCategoriesInput = categories;
 
-            return DetailedAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv);
+            return DetailedAssessmentAssemblyOutput ??
+                   (DetailedAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv));
         }
 
         public FailureMechanismSectionAssembly AssembleDetailedAssessment(double probability,
@@ -200,7 +203,8 @@
             DetailedAssessmentCategoriesInput = categories;
             DetailedAssessmentNInput = n;
 
-            return DetailedAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(0, FailureMechanismSectionAssemblyCategoryGroup.VIv);
+            return DetailedAssessmentAssemblyOutput ??
+                   (DetailedAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(0, FailureMechanismSectionAssemblyCategoryGroup.VIv));
         }
 
         public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult,
@@ -212,11 +216,12 @@
                 throw new FailureMechanismSectionAssemblyCalculatorException("Message", new Exception());
             }
 
-            TailorMadeAssessmentProbabilityAndDetailedCalculationResult = tailorMadeAssessmentResult;
+            TailorMadeAssessmentProbabilityAndDetailedCalculationResultInput = tailorMadeAssessmentResult;
             TailorMadeAssessmentProbabilityInput = probability;
             TailorMadeAssessmentCategoriesInput = categories;
 
-            return TailorMadeAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv);
+            return TailorMadeAssessmentAssemblyOutput ?? 
+                   (TailorMadeAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv));
         }
 
         public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult, double probability, IEnumerable<FailureMechanismSectionAssemblyCategory> categories)
@@ -226,11 +231,12 @@
                 throw new FailureMechanismSectionAssemblyCalculatorException("Message", new Exception());
             }
 
-            TailorMadeAssessmentProbabilityCalculationResultType = tailorMadeAssessmentResult;
+            TailorMadeAssessmentProbabilityCalculationResultInput = tailorMadeAssessmentResult;
             TailorMadeAssessmentProbabilityInput = probability;
             TailorMadeAssessmentCategoriesInput = categories;
 
-            return TailorMadeAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv);
+            return TailorMadeAssessmentAssemblyOutput ?? 
+                   (TailorMadeAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv));
         }
 
         public FailureMechanismSectionAssembly AssembleCombined(FailureMechanismSectionAssembly simpleAssembly,
@@ -246,7 +252,7 @@
             CombinedDetailedAssemblyInput = detailedAssembly;
             CombinedTailorMadeAssemblyInput = tailorMadeAssembly;
 
-            return CombinedAssemblyOutput = tailorMadeAssembly;
+            return CombinedAssemblyOutput ?? (CombinedAssemblyOutput = tailorMadeAssembly);
         }
 
         public FailureMechanismSectionAssemblyCategoryGroup AssembleCombined(FailureMechanismSectionAssemblyCategoryGroup simpleAssembly,
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r70df02232e2470ca8edfa1181512e96c580d264a -ra9238f94c62a8feaa5d84250b1c99e2eca163afc
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 70df02232e2470ca8edfa1181512e96c580d264a)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision a9238f94c62a8feaa5d84250b1c99e2eca163afc)
@@ -362,7 +362,7 @@
 
                 // Assert
                 Assert.AreEqual(sectionResult.TailorMadeAssessmentProbability, calculator.TailorMadeAssessmentProbabilityInput);
-                Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultType);
+                Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput);
 
                 Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm);
                 Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r1a7e949a3a94f976dd41a7a568701a7674685427 -ra9238f94c62a8feaa5d84250b1c99e2eca163afc
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 1a7e949a3a94f976dd41a7a568701a7674685427)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision a9238f94c62a8feaa5d84250b1c99e2eca163afc)
@@ -370,7 +370,7 @@
 
                 // Assert
                 Assert.AreEqual(sectionResult.TailorMadeAssessmentProbability, calculator.TailorMadeAssessmentProbabilityInput);
-                Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityAndDetailedCalculationResult);
+                Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityAndDetailedCalculationResultInput);
 
                 Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm);
                 Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm);