Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryTest.cs
===================================================================
diff -u -r7d4dbbbd491634aba27874344b308618e90365df -r4a4f7076fe7c2e9b1b2f9e46adb0b1a624db5e9c
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryTest.cs	(.../FailureMechanismAssemblyResultFactoryTest.cs)	(revision 7d4dbbbd491634aba27874344b308618e90365df)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryTest.cs	(.../FailureMechanismAssemblyResultFactoryTest.cs)	(revision 4a4f7076fe7c2e9b1b2f9e46adb0b1a624db5e9c)
@@ -169,7 +169,9 @@
         }
 
         [Test]
-        public void AssembleFailureMechanism_CalculatorRan_ReturnsOutput()
+        [TestCase(FailureMechanismAssemblyProbabilityResultType.AutomaticP1)]
+        [TestCase(FailureMechanismAssemblyProbabilityResultType.AutomaticP2)]
+        public void AssembleFailureMechanism_CalculatorRan_ReturnsOutput(FailureMechanismAssemblyProbabilityResultType failureMechanismAssemblyProbabilityResultType)
         {
             // Setup
             using (new AssemblyToolCalculatorFactoryConfig())
@@ -179,7 +181,7 @@
 
                 var failureMechanismAssemblyResult = new FailureMechanismAssemblyResult
                 {
-                    ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.AutomaticP1
+                    ProbabilityResultType = failureMechanismAssemblyProbabilityResultType
                 };
 
                 // Call
@@ -220,29 +222,21 @@
         }
 
         [Test]
-        public void AssembleFailureMechanism_CalculatorThrowsNotSupportedException_ThrowsAssemblyException()
+        public void AssembleFailureMechanism_NotSupportedProbabilityResultType_ThrowsNotSupportedException()
         {
             // Setup
-            using (new AssemblyToolCalculatorFactoryConfig())
+            var failureMechanismAssemblyResult = new FailureMechanismAssemblyResult
             {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
-                calculator.ThrowExceptionOnCalculate = true;
+                ProbabilityResultType = 0
+            };
 
-                var failureMechanismAssemblyResult = new FailureMechanismAssemblyResult
-                {
-                    ProbabilityResultType = 0
-                };
+            // Call
+            void Call() => FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(
+                0, Enumerable.Empty<FailureMechanismSectionAssemblyResult>(), false, failureMechanismAssemblyResult);
 
-                // Call
-                void Call() =>
-                    FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(
-                        0, Enumerable.Empty<FailureMechanismSectionAssemblyResult>(), false, failureMechanismAssemblyResult);
-
-                // Assert
-                var exception = Assert.Throws<NotSupportedException>(Call);
-                Assert.AreEqual("Specified method is not supported.", exception.Message);
-            }
+            // Assert
+            var exception = Assert.Throws<NotSupportedException>(Call);
+            Assert.AreEqual("Specified method is not supported.", exception.Message);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultExtensionsTest.cs
===================================================================
diff -u -r7d4dbbbd491634aba27874344b308618e90365df -r4a4f7076fe7c2e9b1b2f9e46adb0b1a624db5e9c
--- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultExtensionsTest.cs	(.../FailureMechanismAssemblyResultExtensionsTest.cs)	(revision 7d4dbbbd491634aba27874344b308618e90365df)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultExtensionsTest.cs	(.../FailureMechanismAssemblyResultExtensionsTest.cs)	(revision 4a4f7076fe7c2e9b1b2f9e46adb0b1a624db5e9c)
@@ -40,6 +40,7 @@
         }
 
         [Test]
+        [TestCase(FailureMechanismAssemblyProbabilityResultType.None, false)]
         [TestCase(FailureMechanismAssemblyProbabilityResultType.AutomaticP1, false)]
         [TestCase(FailureMechanismAssemblyProbabilityResultType.AutomaticP2, false)]
         [TestCase(FailureMechanismAssemblyProbabilityResultType.Manual, true)]