Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -rf2ba7f68f5de2fc3c8dec8baf7326808120cee52 -r966dc7335defa901104fd4168d57c08315db2de0
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision f2ba7f68f5de2fc3c8dec8baf7326808120cee52)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 966dc7335defa901104fd4168d57c08315db2de0)
@@ -28,6 +28,7 @@
 using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Service.Test
 {
@@ -245,39 +246,46 @@
 
             testCalculation.Name = name;
 
-            Action call = () =>
+            using (new MacroStabilityInwardsCalculatorFactoryConfig(new TestMacroStabilityInwardsCalculatorFactory()))
             {
-                // Precondition
-                Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation));
+                Action call = () =>
+                {
+                    // Precondition
+                    Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation));
 
-                // Call
-                MacroStabilityInwardsCalculationService.Calculate(testCalculation);
-            };
+                    // Call
+                    MacroStabilityInwardsCalculationService.Calculate(testCalculation);
+                };
 
-            // Assert
-            TestHelper.AssertLogMessages(call, messages =>
-            {
-                string[] msgs = messages.ToArray();
-                CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
-                CalculationServiceTestHelper.AssertValidationEndMessage(msgs[1]);
-                CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[2]);
-                CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
-            });
+                // Assert
+                TestHelper.AssertLogMessages(call, messages =>
+                {
+                    string[] msgs = messages.ToArray();
+                    CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
+                    CalculationServiceTestHelper.AssertValidationEndMessage(msgs[1]);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[2]);
+                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
+                });
+            }
         }
 
         [Test]
         public void Calculate_ValidCalculationNoOutput_ShouldSetOutput()
         {
-            // Precondition
-            Assert.IsNull(testCalculation.Output);
-            Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation));
+            // Setup
+            using (new MacroStabilityInwardsCalculatorFactoryConfig(new TestMacroStabilityInwardsCalculatorFactory()))
+            {
+                // Precondition
+                Assert.IsNull(testCalculation.Output);
+                Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation));
 
-            // Call
-            MacroStabilityInwardsCalculationService.Calculate(testCalculation);
+                // Call
+                MacroStabilityInwardsCalculationService.Calculate(testCalculation);
 
-            // Assert
-            MacroStabilityInwardsOutput macroStabilityInwardsOutput = testCalculation.Output;
-            Assert.IsNotNull(macroStabilityInwardsOutput);
+                // Assert
+                MacroStabilityInwardsOutput macroStabilityInwardsOutput = testCalculation.Output;
+                Assert.IsNotNull(macroStabilityInwardsOutput);
+            }
         }
 
         [Test]
@@ -288,14 +296,17 @@
 
             testCalculation.Output = output;
 
-            // Precondition
-            Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation));
+            using (new MacroStabilityInwardsCalculatorFactoryConfig(new TestMacroStabilityInwardsCalculatorFactory()))
+            {
+                // Precondition
+                Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation));
 
-            // Call
-            MacroStabilityInwardsCalculationService.Calculate(testCalculation);
+                // Call
+                MacroStabilityInwardsCalculationService.Calculate(testCalculation);
 
-            // Assert
-            Assert.AreNotSame(output, testCalculation.Output);
+                // Assert
+                Assert.AreNotSame(output, testCalculation.Output);
+            }
         }
     }
 }
\ No newline at end of file