Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.TestUtil/FailureMechanismSectionAssemblyResultTestFactory.cs
===================================================================
diff -u -rc89eeb85415184f8da69e5aef657a6158b00208a -ra931024a177583c73a87f04bd731cf6166d903eb
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.TestUtil/FailureMechanismSectionAssemblyResultTestFactory.cs	(.../FailureMechanismSectionAssemblyResultTestFactory.cs)	(revision c89eeb85415184f8da69e5aef657a6158b00208a)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.TestUtil/FailureMechanismSectionAssemblyResultTestFactory.cs	(.../FailureMechanismSectionAssemblyResultTestFactory.cs)	(revision a931024a177583c73a87f04bd731cf6166d903eb)
@@ -19,6 +19,9 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using Core.Common.TestUtil;
+
 namespace Riskeer.AssemblyTool.Data.TestUtil
 {
     /// <summary>
@@ -27,6 +30,16 @@
     public static class FailureMechanismSectionAssemblyResultTestFactory
     {
         /// <summary>
+        /// Creates a configured <see cref="FailureMechanismSectionAssemblyResult"/>.
+        /// </summary>
+        /// <returns>A <see cref="FailureMechanismSectionAssemblyResult"/>.</returns>
+        public static FailureMechanismSectionAssemblyResult CreateFailureMechanismSectionAssemblyResult()
+        {
+            var random = new Random(21);
+            return CreateFailureMechanismSectionAssemblyResult(random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+        }
+        
+        /// <summary>
         /// Creates a configured <see cref="FailureMechanismSectionAssemblyResult"/> with an user defined <see cref="FailureMechanismSectionAssemblyGroup"/>.
         /// </summary>
         /// <param name="assemblyGroup">The <see cref="FailureMechanismSectionAssemblyGroup"/> of the result.</param>
Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/DefaultFailureMechanismSectionAssemblyResult.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -ra931024a177583c73a87f04bd731cf6166d903eb
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/DefaultFailureMechanismSectionAssemblyResult.cs	(.../DefaultFailureMechanismSectionAssemblyResult.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/DefaultFailureMechanismSectionAssemblyResult.cs	(.../DefaultFailureMechanismSectionAssemblyResult.cs)	(revision a931024a177583c73a87f04bd731cf6166d903eb)
@@ -31,6 +31,6 @@
         /// <summary>
         /// Creates a new instance of <see cref="DefaultFailureMechanismSectionAssemblyResult"/>.
         /// </summary>
-        public DefaultFailureMechanismSectionAssemblyResult() : base(double.NaN, double.NaN, double.NaN, FailureMechanismSectionAssemblyGroup.NoResult) {}
+        public DefaultFailureMechanismSectionAssemblyResult() : base(double.NaN, FailureMechanismSectionAssemblyGroup.NoResult) {}
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -ra931024a177583c73a87f04bd731cf6166d903eb
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs	(.../AssemblyToolHelperTest.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs	(.../AssemblyToolHelperTest.cs)	(revision a931024a177583c73a87f04bd731cf6166d903eb)
@@ -23,6 +23,7 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.Data.TestUtil;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Data.FailureMechanism;
@@ -65,9 +66,7 @@
             var sectionResult = new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             var random = new Random(21);
-            var expectedAssemblyResult = new FailureMechanismSectionAssemblyResult(
-                random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+            FailureMechanismSectionAssemblyResult expectedAssemblyResult = FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult();
 
             // Call
             FailureMechanismSectionAssemblyResult assemblyResult = AssemblyToolHelper.AssembleFailureMechanismSection(
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/DefaultFailureMechanismSectionAssemblyResultTest.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -ra931024a177583c73a87f04bd731cf6166d903eb
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/DefaultFailureMechanismSectionAssemblyResultTest.cs	(.../DefaultFailureMechanismSectionAssemblyResultTest.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/DefaultFailureMechanismSectionAssemblyResultTest.cs	(.../DefaultFailureMechanismSectionAssemblyResultTest.cs)	(revision a931024a177583c73a87f04bd731cf6166d903eb)
@@ -37,9 +37,7 @@
             // Assert
             Assert.IsInstanceOf<FailureMechanismSectionAssemblyResult>(result);
 
-            Assert.IsNaN(result.ProfileProbability);
             Assert.IsNaN(result.SectionProbability);
-            Assert.IsNaN(result.N);
             Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.FailureMechanismSectionAssemblyGroup);
         }
     }
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Riskeer.Common.Data.Test.csproj
===================================================================
diff -u -r6aed0e1e023131150fd68bf61c0b849b0e1a20b6 -ra931024a177583c73a87f04bd731cf6166d903eb
--- Riskeer/Common/test/Riskeer.Common.Data.Test/Riskeer.Common.Data.Test.csproj	(.../Riskeer.Common.Data.Test.csproj)	(revision 6aed0e1e023131150fd68bf61c0b849b0e1a20b6)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/Riskeer.Common.Data.Test.csproj	(.../Riskeer.Common.Data.Test.csproj)	(revision a931024a177583c73a87f04bd731cf6166d903eb)
@@ -12,6 +12,7 @@
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
     <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj" />
     <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj" />
+    <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.Data.TestUtil\Riskeer.AssemblyTool.Data.TestUtil.csproj" />
     <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj" />
     <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj" />
     <ProjectReference Include="..\..\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj" />
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/AssemblyMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -ra931024a177583c73a87f04bd731cf6166d903eb
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/AssemblyMapDataFeaturesFactoryTest.cs	(.../AssemblyMapDataFeaturesFactoryTest.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/AssemblyMapDataFeaturesFactoryTest.cs	(.../AssemblyMapDataFeaturesFactoryTest.cs)	(revision a931024a177583c73a87f04bd731cf6166d903eb)
@@ -70,9 +70,7 @@
             var failureMechanism = new TestFailureMechanism();
             FailureMechanismTestHelper.AddSections(failureMechanism, 2);
 
-            var expectedAssemblyResult = new FailureMechanismSectionAssemblyResult(
-                random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+            var expectedAssemblyResult = new FailureMechanismSectionAssemblyResult(random.NextDouble(), random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
 
             // Call
             var shouldThrowException = true;
@@ -100,9 +98,7 @@
             var failureMechanism = new TestFailureMechanism();
             FailureMechanismTestHelper.AddSections(failureMechanism, random.Next(0, 10));
 
-            var expectedAssemblyResult = new FailureMechanismSectionAssemblyResult(
-                random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+            var expectedAssemblyResult = new FailureMechanismSectionAssemblyResult(random.NextDouble(), random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
 
             // Call
             IEnumerable<MapFeature> features = AssemblyMapDataFeaturesFactory.CreateAssemblyGroupFeatures<FailureMechanismSectionResult>(
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/CalculatableFailureMechanismSectionResultsMapLayerTest.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -ra931024a177583c73a87f04bd731cf6166d903eb
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/CalculatableFailureMechanismSectionResultsMapLayerTest.cs	(.../CalculatableFailureMechanismSectionResultsMapLayerTest.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/CalculatableFailureMechanismSectionResultsMapLayerTest.cs	(.../CalculatableFailureMechanismSectionResultsMapLayerTest.cs)	(revision a931024a177583c73a87f04bd731cf6166d903eb)
@@ -25,6 +25,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.Data.TestUtil;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.MapLayers;
@@ -46,9 +47,7 @@
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
             }, string.Empty);
 
-            var assemblyResult = new FailureMechanismSectionAssemblyResult(
-                random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+            FailureMechanismSectionAssemblyResult assemblyResult = FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult();
 
             // Call
             using (var mapLayer = new CalculatableFailureMechanismSectionResultsMapLayer<TestCalculatableFailureMechanism, TestFailureMechanismSectionResult, TestCalculationInput>(
@@ -75,9 +74,7 @@
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
             }, string.Empty);
 
-            var assemblyResult = new FailureMechanismSectionAssemblyResult(
-                random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+            FailureMechanismSectionAssemblyResult assemblyResult = FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult();
 
             using (var mapLayer = new CalculatableFailureMechanismSectionResultsMapLayer<TestCalculatableFailureMechanism, TestFailureMechanismSectionResult, TestCalculationInput>(
                        failureMechanism, result => assemblyResult))
@@ -88,9 +85,8 @@
                 MapDataTestHelper.AssertAssemblyMapData(failureMechanism, assemblyResult, mapLayer.MapData);
 
                 // When
-                assemblyResult = new FailureMechanismSectionAssemblyResult(
-                    random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                    random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+                assemblyResult = new FailureMechanismSectionAssemblyResult(random.NextDouble(),
+                                                                           random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
 
                 failureMechanism.CalculationsGroup.Children.Add(new TestCalculation());
                 failureMechanism.CalculationsGroup.NotifyObservers();
@@ -122,9 +118,7 @@
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
             }, string.Empty);
 
-            var assemblyResult = new FailureMechanismSectionAssemblyResult(
-                random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+            FailureMechanismSectionAssemblyResult assemblyResult = FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult();
 
             using (var mapLayer = new CalculatableFailureMechanismSectionResultsMapLayer<TestCalculatableFailureMechanism, TestFailureMechanismSectionResult, TestCalculationInput>(
                        failureMechanism, result => assemblyResult))
@@ -135,9 +129,8 @@
                 MapDataTestHelper.AssertAssemblyMapData(failureMechanism, assemblyResult, mapLayer.MapData);
 
                 // When
-                assemblyResult = new FailureMechanismSectionAssemblyResult(
-                    random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                    random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+                assemblyResult = new FailureMechanismSectionAssemblyResult(random.NextDouble(),
+                                                                           random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
 
                 calculationScenario.IsRelevant = false;
                 calculationScenario.NotifyObservers();
@@ -169,9 +162,7 @@
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
             }, string.Empty);
 
-            var assemblyResult = new FailureMechanismSectionAssemblyResult(
-                random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+            FailureMechanismSectionAssemblyResult assemblyResult = FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult();
 
             using (var mapLayer = new CalculatableFailureMechanismSectionResultsMapLayer<TestCalculatableFailureMechanism, TestFailureMechanismSectionResult, TestCalculationInput>(
                        failureMechanism, result => assemblyResult))
@@ -182,9 +173,8 @@
                 MapDataTestHelper.AssertAssemblyMapData(failureMechanism, assemblyResult, mapLayer.MapData);
 
                 // When
-                assemblyResult = new FailureMechanismSectionAssemblyResult(
-                    random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                    random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+                assemblyResult = new FailureMechanismSectionAssemblyResult(random.NextDouble(),
+                                                                           random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
 
                 calculationScenario.InputParameters.HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
                 calculationScenario.InputParameters.NotifyObservers();
@@ -221,9 +211,7 @@
             nestedCalculationGroup.Children.Add(nestedCalculationScenario);
             failureMechanism.CalculationsGroup.Children.Add(nestedCalculationGroup);
 
-            var assemblyResult = new FailureMechanismSectionAssemblyResult(
-                random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+            FailureMechanismSectionAssemblyResult assemblyResult = FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult();
 
             using (var mapLayer = new CalculatableFailureMechanismSectionResultsMapLayer<TestCalculatableFailureMechanism, TestFailureMechanismSectionResult, TestCalculationInput>(
                        failureMechanism, result => assemblyResult))
@@ -234,9 +222,8 @@
                 MapDataTestHelper.AssertAssemblyMapData(failureMechanism, assemblyResult, mapLayer.MapData);
 
                 // When
-                assemblyResult = new FailureMechanismSectionAssemblyResult(
-                    random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                    random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+                assemblyResult = new FailureMechanismSectionAssemblyResult(random.NextDouble(),
+                                                                           random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
 
                 nestedCalculationScenario.InputParameters.HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
                 nestedCalculationScenario.InputParameters.NotifyObservers();
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayerTest.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -ra931024a177583c73a87f04bd731cf6166d903eb
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayerTest.cs	(.../NonCalculatableFailureMechanismSectionResultsMapLayerTest.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayerTest.cs	(.../NonCalculatableFailureMechanismSectionResultsMapLayerTest.cs)	(revision a931024a177583c73a87f04bd731cf6166d903eb)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.Data.TestUtil;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.MapLayers;
 using Riskeer.Common.Forms.TestUtil;
@@ -71,9 +72,7 @@
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
             }, string.Empty);
 
-            var assemblyResult = new FailureMechanismSectionAssemblyResult(
-                random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+            FailureMechanismSectionAssemblyResult assemblyResult = FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult();
 
             // Call
             using (var mapLayer = new NonCalculatableFailureMechanismSectionResultsMapLayer<TestFailureMechanismSectionResult>(
@@ -101,9 +100,7 @@
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
             }, string.Empty);
 
-            var assemblyResult = new FailureMechanismSectionAssemblyResult(
-                random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+            FailureMechanismSectionAssemblyResult assemblyResult = FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult();
 
             using (var mapLayer = new NonCalculatableFailureMechanismSectionResultsMapLayer<TestFailureMechanismSectionResult>(
                        failureMechanism, result => assemblyResult))
@@ -114,9 +111,8 @@
                 MapDataTestHelper.AssertAssemblyMapData(failureMechanism, assemblyResult, mapLayer.MapData);
 
                 // When
-                assemblyResult = new FailureMechanismSectionAssemblyResult(
-                    random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                    random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+                assemblyResult = new FailureMechanismSectionAssemblyResult(random.NextDouble(),
+                                                                           random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
 
                 TestFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.First();
                 sectionResult.NotifyObservers();
@@ -144,9 +140,7 @@
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
             }, string.Empty);
 
-            var assemblyResult = new FailureMechanismSectionAssemblyResult(
-                random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+            FailureMechanismSectionAssemblyResult assemblyResult = FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult();
 
             using (var mapLayer = new NonCalculatableFailureMechanismSectionResultsMapLayer<TestFailureMechanismSectionResult>(
                        failureMechanism, result => assemblyResult))
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableFailureMechanismResultViewTest.cs
===================================================================
diff -u -r3f2f42292096718c7aabf7d36b35667baef8d2ce -ra931024a177583c73a87f04bd731cf6166d903eb
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableFailureMechanismResultViewTest.cs	(.../AdoptableFailureMechanismResultViewTest.cs)	(revision 3f2f42292096718c7aabf7d36b35667baef8d2ce)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableFailureMechanismResultViewTest.cs	(.../AdoptableFailureMechanismResultViewTest.cs)	(revision a931024a177583c73a87f04bd731cf6166d903eb)
@@ -186,8 +186,7 @@
 
             var random = new Random(21);
             var failureMechanismSectionAssemblyResult = new FailureMechanismSectionAssemblyResultWrapper(
-                new FailureMechanismSectionAssemblyResult(
-                    random.NextDouble(), 0.1, random.NextDouble(), FailureMechanismSectionAssemblyGroup.I),
+                new FailureMechanismSectionAssemblyResult(0.1, FailureMechanismSectionAssemblyGroup.I),
                 random.NextEnumValue<AssemblyMethod>(), random.NextEnumValue<AssemblyMethod>());
 
             // Call
@@ -386,7 +385,7 @@
                                                                                          failureMechanism,
                                                                                          assessmentSection,
                                                                                          performFailureMechanismAssemblyFunc,
-                                                                                         ((sr, fm, ass) => FailureMechanismSectionAssemblyResultWrapperTestFactory.Create()))
+                                                                                         (sr, fm, ass) => FailureMechanismSectionAssemblyResultWrapperTestFactory.Create())
             {
                 CalculateProbabilityStrategy = calculateProbabilityStrategy,
                 RowErrorProvider = rowErrorProvider
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs
===================================================================
diff -u -r57665d128a58d11718a6c8d58f4b1e7b9a36c81c -ra931024a177583c73a87f04bd731cf6166d903eb
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs	(.../FailureMechanismResultViewTest.cs)	(revision 57665d128a58d11718a6c8d58f4b1e7b9a36c81c)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs	(.../FailureMechanismResultViewTest.cs)	(revision a931024a177583c73a87f04bd731cf6166d903eb)
@@ -34,6 +34,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.Data.TestUtil;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Data.FailureMechanism;
@@ -612,7 +613,7 @@
             public TestRow(FailureMechanismSectionResult sectionResult) : base(sectionResult)
             {
                 ColumnStateDefinitions.Add(0, new DataGridViewColumnStateDefinition());
-                AssemblyResult = new FailureMechanismSectionAssemblyResult(0, 0, 0, FailureMechanismSectionAssemblyGroup.NoResult);
+                AssemblyResult = FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult();
             }
 
             public string TestString
@@ -630,7 +631,7 @@
             public override void Update()
             {
                 Updated = true;
-                AssemblyResult = new FailureMechanismSectionAssemblyResult(1, 1, 1, FailureMechanismSectionAssemblyGroup.III);
+                AssemblyResult = FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult();
             }
         }
 
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -ra931024a177583c73a87f04bd731cf6166d903eb
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismSectionResultRowTest.cs	(.../NonAdoptableFailureMechanismSectionResultRowTest.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismSectionResultRowTest.cs	(.../NonAdoptableFailureMechanismSectionResultRowTest.cs)	(revision a931024a177583c73a87f04bd731cf6166d903eb)
@@ -29,6 +29,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.Data.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
@@ -484,10 +485,6 @@
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
-                calculator.FailureMechanismSectionAssemblyResultOutput = new FailureMechanismSectionAssemblyResultWrapper(
-                    new FailureMechanismSectionAssemblyResult(random.NextDouble(), random.NextDouble(), random.NextDouble(),
-                                                              random.NextEnumValue<FailureMechanismSectionAssemblyGroup>()),
-                    random.NextEnumValue<AssemblyMethod>(), random.NextEnumValue<AssemblyMethod>());
 
                 // Call
                 var row = new NonAdoptableFailureMechanismSectionResultRow(result, errorProvider, new AssessmentSectionStub(), ConstructionProperties);
@@ -775,7 +772,7 @@
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
                 calculator.FailureMechanismSectionAssemblyResultOutput = new FailureMechanismSectionAssemblyResultWrapper(
-                    new FailureMechanismSectionAssemblyResult(double.NaN, double.NaN, double.NaN, assemblyGroup),
+                    FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult(assemblyGroup),
                     random.NextEnumValue<AssemblyMethod>(), random.NextEnumValue<AssemblyMethod>());
 
                 // Call