Index: Riskeer/Integration/src/Riskeer.Integration.IO/Converters/ExportableFailureMechanismSectionAssemblyGroupConverter.cs
===================================================================
diff -u -r17efbc2697a98e22b078162cef888e2608b17944 -rbcf0420076bfeba700c32ead5237bc1acff06b18
--- Riskeer/Integration/src/Riskeer.Integration.IO/Converters/ExportableFailureMechanismSectionAssemblyGroupConverter.cs	(.../ExportableFailureMechanismSectionAssemblyGroupConverter.cs)	(revision 17efbc2697a98e22b078162cef888e2608b17944)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Converters/ExportableFailureMechanismSectionAssemblyGroupConverter.cs	(.../ExportableFailureMechanismSectionAssemblyGroupConverter.cs)	(revision bcf0420076bfeba700c32ead5237bc1acff06b18)
@@ -32,7 +32,7 @@
     public static class ExportableFailureMechanismSectionAssemblyGroupConverter
     {
         /// <summary>
-        /// Converts an <see cref="FailureMechanismSectionAssemblyGroup"/> into an <see cref="ExportableFailureMechanismSectionAssemblyGroup"/>.
+        /// Converts a <see cref="FailureMechanismSectionAssemblyGroup"/> into an <see cref="ExportableFailureMechanismSectionAssemblyGroup"/>.
         /// </summary>
         /// <param name="failureMechanismSectionAssemblyGroup">The <see cref="FailureMechanismSectionAssemblyGroup"/>
         /// to convert into an <see cref="ExportableFailureMechanismSectionAssemblyGroup"/>.</param>
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs
===================================================================
diff -u -r17efbc2697a98e22b078162cef888e2608b17944 -rbcf0420076bfeba700c32ead5237bc1acff06b18
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs	(.../ExportableAssessmentSectionFactory.cs)	(revision 17efbc2697a98e22b078162cef888e2608b17944)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs	(.../ExportableAssessmentSectionFactory.cs)	(revision bcf0420076bfeba700c32ead5237bc1acff06b18)
@@ -306,7 +306,7 @@
         /// <param name="registry">The <see cref="ExportableModelRegistry"/> to keep track of the created items.</param>
         /// <param name="assessmentSection">The assessment section to create a collection of
         /// <see cref="ExportableCombinedSectionAssembly"/> for.</param>
-        /// <param name="failureMechanismSectionCollections">The collection of
+        /// <param name="failureMechanismSectionCollections">The <see cref="List{T}"/> of
         /// <see cref="ExportableFailureMechanismSectionCollection"/>.</param>
         /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ExportableCombinedSectionAssembly"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when assembly results cannot be created for <paramref name="assessmentSection"/>.</exception>
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Converters/ExportableFailureMechanismSectionAssemblyGroupConverterTest.cs
===================================================================
diff -u -r17efbc2697a98e22b078162cef888e2608b17944 -rbcf0420076bfeba700c32ead5237bc1acff06b18
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Converters/ExportableFailureMechanismSectionAssemblyGroupConverterTest.cs	(.../ExportableFailureMechanismSectionAssemblyGroupConverterTest.cs)	(revision 17efbc2697a98e22b078162cef888e2608b17944)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Converters/ExportableFailureMechanismSectionAssemblyGroupConverterTest.cs	(.../ExportableFailureMechanismSectionAssemblyGroupConverterTest.cs)	(revision bcf0420076bfeba700c32ead5237bc1acff06b18)
@@ -37,7 +37,7 @@
             // Setup
             const FailureMechanismSectionAssemblyGroup failureMechanismSectionAssemblyGroup = (FailureMechanismSectionAssemblyGroup) 999;
 
-            // ExportableAssemblyMethodFactory
+            // Call
             void Call() => ExportableFailureMechanismSectionAssemblyGroupConverter.ConvertTo(failureMechanismSectionAssemblyGroup);
 
             // Assert
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
===================================================================
diff -u -r17efbc2697a98e22b078162cef888e2608b17944 -rbcf0420076bfeba700c32ead5237bc1acff06b18
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision 17efbc2697a98e22b078162cef888e2608b17944)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision bcf0420076bfeba700c32ead5237bc1acff06b18)
@@ -99,16 +99,19 @@
                 AssessmentSectionAssemblyCalculatorStub assessmentSectionCalculator = factory.LastCreatedAssessmentSectionAssemblyCalculator;
                 FailureMechanismAssemblyCalculatorStub failureMechanismCalculator = factory.LastCreatedFailureMechanismAssemblyCalculator;
 
-                AssertExportableAssessmentSection(assessmentSection, exportableAssessmentSection, assessmentSectionCalculator);
+                AssertExportableAssessmentSection(assessmentSection, assessmentSectionCalculator.AssessmentSectionAssemblyResult, exportableAssessmentSection);
                 AssertExportableFailureMechanisms(assessmentSection.GetFailureMechanisms()
                                                                    .Concat(assessmentSection.SpecificFailureMechanisms)
                                                                    .Cast<IFailureMechanism<FailureMechanismSectionResult>>(),
                                                   failureMechanismCalculator.AssemblyResultOutput,
                                                   exportableAssessmentSection.FailureMechanisms);
-                AssertExportableFailureMechanismSectionCollections(assessmentSection, exportableAssessmentSection.FailureMechanismSectionCollections);
+
+                CombinedFailureMechanismSectionAssemblyResultWrapper combinedFailureMechanismAssemblyResult = assessmentSectionCalculator.CombinedFailureMechanismSectionAssemblyOutput;
+                AssertExportableFailureMechanismSectionCollections(assessmentSection, combinedFailureMechanismAssemblyResult.AssemblyResults.Count(), 
+                                                                   exportableAssessmentSection.FailureMechanismSectionCollections);
                 AssertExportableCombinedFailureMechanismSectionAssemblyOutput(
-                    assessmentSectionCalculator.CombinedFailureMechanismSectionAssemblyOutput, exportableAssessmentSection.CombinedSectionAssemblies,
-                    exportableAssessmentSection.FailureMechanisms);
+                    combinedFailureMechanismAssemblyResult, exportableAssessmentSection.FailureMechanisms,
+                    exportableAssessmentSection.CombinedSectionAssemblies);
             }
         }
 
@@ -148,14 +151,14 @@
                 ExportableAssessmentSection exportableAssessmentSection = ExportableAssessmentSectionFactory.CreateExportableAssessmentSection(idGenerator, assessmentSection);
 
                 // Assert
-                AssertExportableAssessmentSection(assessmentSection, exportableAssessmentSection, assessmentSectionCalculator);
+                AssertExportableAssessmentSection(assessmentSection, assessmentSectionCalculator.AssessmentSectionAssemblyResult, exportableAssessmentSection);
 
                 CollectionAssert.IsEmpty(exportableAssessmentSection.FailureMechanisms);
                 CollectionAssert.IsEmpty(exportableAssessmentSection.FailureMechanismSectionCollections);
 
                 AssertExportableCombinedFailureMechanismSectionAssemblyOutput(
-                    assessmentSectionCalculator.CombinedFailureMechanismSectionAssemblyOutput, exportableAssessmentSection.CombinedSectionAssemblies,
-                    exportableAssessmentSection.FailureMechanisms);
+                    assessmentSectionCalculator.CombinedFailureMechanismSectionAssemblyOutput,
+                    exportableAssessmentSection.FailureMechanisms, exportableAssessmentSection.CombinedSectionAssemblies);
             }
         }
 
@@ -205,27 +208,27 @@
             }
         }
 
-        private static void AssertExportableAssessmentSection(
-            IAssessmentSection assessmentSection, ExportableAssessmentSection exportableAssessmentSection,
-            AssessmentSectionAssemblyCalculatorStub calculator)
+        private static void AssertExportableAssessmentSection
+        (IAssessmentSection assessmentSection, AssessmentSectionAssemblyResultWrapper assessmentSectionAssemblyResult,
+         ExportableAssessmentSection exportableAssessmentSection)
         {
             Assert.AreEqual(assessmentSection.Name, exportableAssessmentSection.Name);
             Assert.AreEqual($"Wks.{assessmentSection.Id}", exportableAssessmentSection.Id);
             CollectionAssert.AreEqual(assessmentSection.ReferenceLine.Points, exportableAssessmentSection.Geometry);
 
-            AssessmentSectionAssemblyResultWrapper calculatorAssessmentSectionAssemblyResult = calculator.AssessmentSectionAssemblyResult;
             ExportableAssessmentSectionAssemblyResult exportableAssessmentSectionAssemblyResult = exportableAssessmentSection.AssessmentSectionAssembly;
-            Assert.AreEqual(ExportableAssemblyMethodConverter.ConvertTo(calculatorAssessmentSectionAssemblyResult.ProbabilityMethod),
+            Assert.AreEqual(ExportableAssemblyMethodConverter.ConvertTo(assessmentSectionAssemblyResult.ProbabilityMethod),
                             exportableAssessmentSectionAssemblyResult.ProbabilityAssemblyMethod);
-            Assert.AreEqual(ExportableAssemblyMethodConverter.ConvertTo(calculatorAssessmentSectionAssemblyResult.AssemblyGroupMethod),
+            Assert.AreEqual(ExportableAssemblyMethodConverter.ConvertTo(assessmentSectionAssemblyResult.AssemblyGroupMethod),
                             exportableAssessmentSectionAssemblyResult.AssemblyGroupAssemblyMethod);
-            Assert.AreEqual(ConvertAssemblyGroup(calculatorAssessmentSectionAssemblyResult.AssemblyResult.AssemblyGroup),
+            Assert.AreEqual(ConvertAssemblyGroup(assessmentSectionAssemblyResult.AssemblyResult.AssemblyGroup),
                             exportableAssessmentSectionAssemblyResult.AssemblyGroup);
-            Assert.AreEqual(calculatorAssessmentSectionAssemblyResult.AssemblyResult.Probability, exportableAssessmentSectionAssemblyResult.Probability);
+            Assert.AreEqual(assessmentSectionAssemblyResult.AssemblyResult.Probability, exportableAssessmentSectionAssemblyResult.Probability);
         }
 
         private static void AssertExportableFailureMechanismSectionCollections(
-            IAssessmentSection assessmentSection, IEnumerable<ExportableFailureMechanismSectionCollection> failureMechanismSectionCollections)
+            IAssessmentSection assessmentSection, int nrOfCombinedSectionAssemblyResults,
+            IEnumerable<ExportableFailureMechanismSectionCollection> failureMechanismSectionCollections)
         {
             IEnumerable<IFailureMechanism> failureMechanismsInAssembly = assessmentSection.GetFailureMechanisms()
                                                                                           .Concat(assessmentSection.SpecificFailureMechanisms)
@@ -244,7 +247,7 @@
             ExportableFailureMechanismSectionCollection combinedFailureMechanismSectionCollection = failureMechanismSectionCollections.Last();
             IEnumerable<ExportableFailureMechanismSection> exportableCombinedFailureMechanismSections = combinedFailureMechanismSectionCollection.Sections;
             CollectionAssert.AllItemsAreInstancesOfType(exportableCombinedFailureMechanismSections, typeof(ExportableCombinedFailureMechanismSection));
-            Assert.AreEqual(1, exportableCombinedFailureMechanismSections.Count());
+            Assert.AreEqual(nrOfCombinedSectionAssemblyResults, exportableCombinedFailureMechanismSections.Count());
         }
 
         private static void AssertExportableFailureMechanisms(IEnumerable<IFailureMechanism<FailureMechanismSectionResult>> failureMechanisms,
@@ -302,8 +305,8 @@
 
         private static void AssertExportableCombinedFailureMechanismSectionAssemblyOutput(
             CombinedFailureMechanismSectionAssemblyResultWrapper calculatorCombinedFailureMechanismSectionAssemblyOutput,
-            IEnumerable<ExportableCombinedSectionAssembly> exportableCombinedSectionAssemblies,
-            IEnumerable<ExportableFailureMechanism> exportableFailureMechanisms)
+            IEnumerable<ExportableFailureMechanism> exportableFailureMechanisms,
+            IEnumerable<ExportableCombinedSectionAssembly> exportableCombinedSectionAssemblies)
         {
             Assert.AreEqual(calculatorCombinedFailureMechanismSectionAssemblyOutput.AssemblyResults.Count(),
                             exportableCombinedSectionAssemblies.Count());
@@ -339,22 +342,22 @@
             IEnumerable<ExportableFailureMechanismCombinedSectionAssemblyResult> exportableFailureMechanismCombinedSectionAssemblyResults,
             IEnumerable<FailureMechanismSectionAssemblyGroup> failureMechanismSectionAssemblyGroupResults)
         {
-            Assert.AreEqual(17, exportableFailureMechanismCombinedSectionAssemblyResults.Count());
+            const int expectedNrOfFailureMechanisms = 17;
+            Assert.AreEqual(expectedNrOfFailureMechanisms, exportableFailureMechanismCombinedSectionAssemblyResults.Count());
 
-            for (var i = 0; i < 17; i++)
+            for (var i = 0; i < expectedNrOfFailureMechanisms; i++)
             {
                 AssertExportableFailureMechanismCombinedSectionAssemblyResult(
                     combinedFailureMechanismSection, exportableFailureMechanisms.ElementAt(i).SectionAssemblyResults,
-                    exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(i),
-                    failureMechanismSectionAssemblyGroupResults.ElementAt(i));
+                    failureMechanismSectionAssemblyGroupResults.ElementAt(i), exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(i));
             }
         }
 
         private static void AssertExportableFailureMechanismCombinedSectionAssemblyResult(
             ExportableFailureMechanismSection combinedFailureMechanismSectionAssembly,
             IEnumerable<ExportableFailureMechanismSectionAssemblyResult> failureMechanismSectionAssemblyResults,
-            ExportableFailureMechanismCombinedSectionAssemblyResult actualExportableFailureMechanismCombinedSectionAssemblyResult,
-            FailureMechanismSectionAssemblyGroup failureMechanismSectionAssemblyGroup)
+            FailureMechanismSectionAssemblyGroup failureMechanismSectionAssemblyGroup,
+            ExportableFailureMechanismCombinedSectionAssemblyResult actualExportableFailureMechanismCombinedSectionAssemblyResult)
         {
             ExportableFailureMechanismSectionAssemblyResult associatedAssemblyResult = GetCorrespondingSectionAssemblyResultResult(
                 combinedFailureMechanismSectionAssembly, failureMechanismSectionAssemblyResults);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/IdentifierGeneratorTest.cs
===================================================================
diff -u -rdb35fac9d09304befdae9dc51aa4ef734657f11b -rbcf0420076bfeba700c32ead5237bc1acff06b18
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/IdentifierGeneratorTest.cs	(.../IdentifierGeneratorTest.cs)	(revision db35fac9d09304befdae9dc51aa4ef734657f11b)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/IdentifierGeneratorTest.cs	(.../IdentifierGeneratorTest.cs)	(revision bcf0420076bfeba700c32ead5237bc1acff06b18)
@@ -79,7 +79,7 @@
         }
 
         [Test]
-        public void GetUniqueId_NewPrefix_ReturnsExpectedValues()
+        public void GetUniqueId_NewPrefix_ReturnsExpectedValue()
         {
             // Given
             const string prefix = "prefix";
@@ -126,7 +126,7 @@
         }
 
         [Test]
-        public void GenerateId_WithAssessmentSection_GeneratesId()
+        public void GenerateId_WithValidArguments_GeneratesId()
         {
             // Setup
             const string prefix = "prefix";