Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r72734a3bee237874197b37fe2bd23f1ad51e6a69 -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 72734a3bee237874197b37fe2bd23f1ad51e6a69)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -84,11 +84,12 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                FailureMechanismSectionAssembly simpleAssessment = DuneErosionFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
+                FailureMechanismSectionAssembly actualOutput = 
+                    DuneErosionFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
                 FailureMechanismSectionAssembly calculatorOutput = calculator.SimpleAssessmentAssemblyOutput;
-                Assert.AreSame(calculatorOutput, simpleAssessment);
+                Assert.AreSame(calculatorOutput, actualOutput);
             }
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r0ea8ce11449d4befadb2b80492479e6f74f9fae8 -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 0ea8ce11449d4befadb2b80492479e6f74f9fae8)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -84,7 +84,8 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                FailureMechanismSectionAssembly actualOutput = GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
+                FailureMechanismSectionAssembly actualOutput = 
+                    GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
                 FailureMechanismSectionAssembly calculatorOutput = calculator.SimpleAssessmentAssemblyOutput;
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r893ae543428122bb3679f721754f6a7078c74a06 -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 893ae543428122bb3679f721754f6a7078c74a06)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -97,7 +97,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_DoesNothing()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r31cebdb0b8bec75e893dcb43899b26f52afb3f67 -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs	(.../MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs)	(revision 31cebdb0b8bec75e893dcb43899b26f52afb3f67)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs	(.../MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -30,7 +30,7 @@
 namespace Ringtoets.Integration.Data.StandAlone.AssemblyFactories
 {
     /// <summary>
-    /// Factory for assembling the assembly tool results for micro stability failure mechanism section results.
+    /// Factory for assembling the assembly tool results for microstability failure mechanism section results.
     /// </summary>
     public static class MicrostabilityFailureMechanismSectionResultAssemblyFactory
     {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r61665ae42b8bbe4420848e7f55c1da149da66fc8 -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 61665ae42b8bbe4420848e7f55c1da149da66fc8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -89,7 +89,8 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                FailureMechanismSectionAssembly actualOutput = GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
+                FailureMechanismSectionAssembly actualOutput =
+                    GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
                 FailureMechanismSectionAssembly calculatorOutput = calculator.SimpleAssessmentAssemblyOutput;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -rbf11aca2d6743dbafdac089ceec8cc225095ee20 -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision bf11aca2d6743dbafdac089ceec8cc225095ee20)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -89,7 +89,8 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                FailureMechanismSectionAssembly actualOutput = GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
+                FailureMechanismSectionAssembly actualOutput =
+                    GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
                 FailureMechanismSectionAssembly calculatorOutput = calculator.SimpleAssessmentAssemblyOutput;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r36ffb8edb680c9868f18bc8ccf5a45df074c5b61 -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 36ffb8edb680c9868f18bc8ccf5a45df074c5b61)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -89,7 +89,8 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                FailureMechanismSectionAssembly actualOutput = MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
+                FailureMechanismSectionAssembly actualOutput =
+                    MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
                 FailureMechanismSectionAssembly calculatorOutput = calculator.SimpleAssessmentAssemblyOutput;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r31cebdb0b8bec75e893dcb43899b26f52afb3f67 -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../MicrostabilityFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 31cebdb0b8bec75e893dcb43899b26f52afb3f67)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../MicrostabilityFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -89,7 +89,8 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                FailureMechanismSectionAssembly actualOutput = MicrostabilityFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
+                FailureMechanismSectionAssembly actualOutput = 
+                    MicrostabilityFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
                 FailureMechanismSectionAssembly calculatorOutput = calculator.SimpleAssessmentAssemblyOutput;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r861bdfe47ab5b11fac59a4a0ec494bb21af6a5c0 -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../PipingStructureFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 861bdfe47ab5b11fac59a4a0ec494bb21af6a5c0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../PipingStructureFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -89,7 +89,8 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                FailureMechanismSectionAssembly actualOutput = PipingStructureFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
+                FailureMechanismSectionAssembly actualOutput =
+                    PipingStructureFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
                 FailureMechanismSectionAssembly calculatorOutput = calculator.SimpleAssessmentAssemblyOutput;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r4d46737b997caa1e5b09d6b26d6eac3626e89e77 -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 4d46737b997caa1e5b09d6b26d6eac3626e89e77)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -42,7 +42,8 @@
         public void AssembleSimpleAssessment_FailureMechanismSectionResultNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(null);
+            TestDelegate call = () =>
+                StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -89,7 +90,7 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                var actualOutput =
+                FailureMechanismSectionAssembly actualOutput =
                     StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultsAssemblyFactory.cs
===================================================================
diff -u -rce1c65c74f261ff4ec99aff070966149488cd5d1 -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultsAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultsAssemblyFactory.cs)	(revision ce1c65c74f261ff4ec99aff070966149488cd5d1)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultsAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultsAssemblyFactory.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -29,7 +29,7 @@
 namespace Ringtoets.MacroStabilityInwards.Data
 {
     /// <summary>
-    /// Factory for assembling the assembly tool results for macro stability inwards failur emechanism section results.
+    /// Factory for assembling the assembly tool results for macro stability inwards failure mechanism section results.
     /// </summary>
     public static class MacroStabilityInwardsFailureMechanismSectionResultsAssemblyFactory
     {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r9a511d8b3e8d04cc8543be3bd3c130f86779a20d -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../PipingFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 9a511d8b3e8d04cc8543be3bd3c130f86779a20d)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../PipingFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -87,7 +87,8 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                var actualOutput = PipingFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
+                FailureMechanismSectionAssembly actualOutput =
+                    PipingFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
                 FailureMechanismSectionAssembly calculatorOutput = calculator.SimpleAssessmentAssemblyOutput;
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r302020d286e7e5af3f769fb52bb73723e5afa804 -r9e2b9b542b21fb1b37a68ee03c87d647384a72ad
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 302020d286e7e5af3f769fb52bb73723e5afa804)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision 9e2b9b542b21fb1b37a68ee03c87d647384a72ad)
@@ -87,7 +87,8 @@
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
 
                 // Call
-                FailureMechanismSectionAssembly actualOutput = StabilityStoneCoverFailureMechanismSectionAssemblyFactory.AssembleSimpleAssessment(sectionResult);
+                FailureMechanismSectionAssembly actualOutput =
+                    StabilityStoneCoverFailureMechanismSectionAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
                 FailureMechanismSectionAssembly calculatorOutput = calculator.SimpleAssessmentAssemblyOutput;