Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs
===================================================================
diff -u -r89f263f074499111fd54b421916b015bacc60686 -rf08d80ff73aa6e92788ad00f00f1128257b5f287
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs	(.../MacroStabilityInwardsOutputViewTest.cs)	(revision 89f263f074499111fd54b421916b015bacc60686)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs	(.../MacroStabilityInwardsOutputViewTest.cs)	(revision f08d80ff73aa6e92788ad00f00f1128257b5f287)
@@ -104,8 +104,8 @@
             calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput();
 
             // Call
-            using (var view = new MacroStabilityInwardsOutputView(calculation,
-                                                                  AssessmentSectionTestHelper.GetTestAssessmentLevel))
+            using (new MacroStabilityInwardsCalculatorFactoryConfig())
+            using (var view = new MacroStabilityInwardsOutputView(calculation, AssessmentSectionTestHelper.GetTestAssessmentLevel))
             using (var form = new Form())
             {
                 form.Controls.Add(view);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Exporters/MacroStabilityInwardsCalculationExporterTest.cs
===================================================================
diff -u -ra206b997ecdc2e76de7d46e3f39ee4fa467629ea -rf08d80ff73aa6e92788ad00f00f1128257b5f287
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Exporters/MacroStabilityInwardsCalculationExporterTest.cs	(.../MacroStabilityInwardsCalculationExporterTest.cs)	(revision a206b997ecdc2e76de7d46e3f39ee4fa467629ea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Exporters/MacroStabilityInwardsCalculationExporterTest.cs	(.../MacroStabilityInwardsCalculationExporterTest.cs)	(revision f08d80ff73aa6e92788ad00f00f1128257b5f287)
@@ -133,21 +133,24 @@
             MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
             calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateRandomOutput();
 
-            var persistenceFactory = new MacroStabilityInwardsTestPersistenceFactory
+            using (new MacroStabilityInwardsCalculatorFactoryConfig())
             {
-                ThrowException = true
-            };
+                var persistenceFactory = new MacroStabilityInwardsTestPersistenceFactory
+                {
+                    ThrowException = true
+                };
 
-            var exporter = new MacroStabilityInwardsCalculationExporter(calculation, persistenceFactory, filePath, AssessmentSectionTestHelper.GetTestAssessmentLevel);
+                var exporter = new MacroStabilityInwardsCalculationExporter(calculation, persistenceFactory, filePath, AssessmentSectionTestHelper.GetTestAssessmentLevel);
 
-            // Call
-            var exportResult = true;
-            void Call() => exportResult = exporter.Export();
+                // Call
+                var exportResult = true;
+                void Call() => exportResult = exporter.Export();
 
-            // Assert
-            string expectedMessage = $"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{filePath}'. Er is geen D-GEO Suite Stability Project geëxporteerd.";
-            TestHelper.AssertLogMessageWithLevelIsGenerated(Call, new Tuple<string, LogLevelConstant>(expectedMessage, LogLevelConstant.Error));
-            Assert.IsFalse(exportResult);
+                // Assert
+                string expectedMessage = $"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{filePath}'. Er is geen D-GEO Suite Stability Project geëxporteerd.";
+                TestHelper.AssertLogMessageWithLevelIsGenerated(Call, new Tuple<string, LogLevelConstant>(expectedMessage, LogLevelConstant.Error));
+                Assert.IsFalse(exportResult);
+            }
         }
 
         [Test]
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Exporters/MacroStabilityInwardsCalculationGroupExporterTest.cs
===================================================================
diff -u -r62d53cd1f3e85be9b340e24d3a84d71493a8fe71 -rf08d80ff73aa6e92788ad00f00f1128257b5f287
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Exporters/MacroStabilityInwardsCalculationGroupExporterTest.cs	(.../MacroStabilityInwardsCalculationGroupExporterTest.cs)	(revision 62d53cd1f3e85be9b340e24d3a84d71493a8fe71)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Exporters/MacroStabilityInwardsCalculationGroupExporterTest.cs	(.../MacroStabilityInwardsCalculationGroupExporterTest.cs)	(revision f08d80ff73aa6e92788ad00f00f1128257b5f287)
@@ -134,29 +134,32 @@
             var calculationGroup = new CalculationGroup();
             calculationGroup.Children.Add(calculation);
 
-            var persistenceFactory = new MacroStabilityInwardsTestPersistenceFactory
+            using (new MacroStabilityInwardsCalculatorFactoryConfig())
             {
-                ThrowException = true
-            };
+                var persistenceFactory = new MacroStabilityInwardsTestPersistenceFactory
+                {
+                    ThrowException = true
+                };
 
-            var exporter = new MacroStabilityInwardsCalculationGroupExporter(calculationGroup, persistenceFactory, folderPath, fileExtension, c => AssessmentSectionTestHelper.GetTestAssessmentLevel());
+                var exporter = new MacroStabilityInwardsCalculationGroupExporter(calculationGroup, persistenceFactory, folderPath, fileExtension, c => AssessmentSectionTestHelper.GetTestAssessmentLevel());
 
-            try
-            {
-                // Call
-                var exportResult = true;
-                void Call() => exportResult = exporter.Export();
+                try
+                {
+                    // Call
+                    var exportResult = true;
+                    void Call() => exportResult = exporter.Export();
 
-                // Assert
-                string filePath = Path.Combine(folderPath, $"{calculation.Name}.stix");
-                string expectedMessage = $"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{filePath}'. Er is geen D-GEO Suite Stability Project geëxporteerd.";
-                TestHelper.AssertLogMessageWithLevelIsGenerated(Call, new Tuple<string, LogLevelConstant>(expectedMessage, LogLevelConstant.Error));
-                Assert.IsFalse(exportResult);
+                    // Assert
+                    string filePath = Path.Combine(folderPath, $"{calculation.Name}.stix");
+                    string expectedMessage = $"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{filePath}'. Er is geen D-GEO Suite Stability Project geëxporteerd.";
+                    TestHelper.AssertLogMessageWithLevelIsGenerated(Call, new Tuple<string, LogLevelConstant>(expectedMessage, LogLevelConstant.Error));
+                    Assert.IsFalse(exportResult);
+                }
+                finally
+                {
+                    Directory.Delete(folderPath, true);
+                }
             }
-            finally
-            {
-                Directory.Delete(folderPath, true);
-            }
         }
 
         [Test]
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTestFactoryTest.cs
===================================================================
diff -u -r1ff6856c055a47896637a72ac196436c30801503 -rf08d80ff73aa6e92788ad00f00f1128257b5f287
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTestFactoryTest.cs	(.../UpliftVanCalculatorInputTestFactoryTest.cs)	(revision 1ff6856c055a47896637a72ac196436c30801503)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTestFactoryTest.cs	(.../UpliftVanCalculatorInputTestFactoryTest.cs)	(revision f08d80ff73aa6e92788ad00f00f1128257b5f287)
@@ -42,10 +42,10 @@
             Assert.AreEqual(-1, input.WaterLevelPolderDaily);
             Assert.AreEqual(0.1, input.MinimumLevelPhreaticLineAtDikeTopRiver);
             Assert.AreEqual(0.2, input.MinimumLevelPhreaticLineAtDikeTopPolder);
-            Assert.AreEqual(1.3, input.LeakageLengthInwardsPhreaticLine3);
-            Assert.AreEqual(1.4, input.LeakageLengthOutwardsPhreaticLine3);
-            Assert.AreEqual(1.5, input.LeakageLengthInwardsPhreaticLine4);
-            Assert.AreEqual(1.6, input.LeakageLengthOutwardsPhreaticLine4);
+            Assert.AreEqual(1.3, input.LeakageLengthOutwardsPhreaticLine3);
+            Assert.AreEqual(1.4, input.LeakageLengthInwardsPhreaticLine3);
+            Assert.AreEqual(1.5, input.LeakageLengthOutwardsPhreaticLine4);
+            Assert.AreEqual(1.6, input.LeakageLengthInwardsPhreaticLine4);
             Assert.AreEqual(0.3, input.PiezometricHeadPhreaticLine2Outwards);
             Assert.AreEqual(0.4, input.PiezometricHeadPhreaticLine2Inwards);
             Assert.AreEqual(0.5, input.PenetrationLengthExtreme);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/UpliftVan/UpliftVanKernelStubTest.cs
===================================================================
diff -u -r68eb3c2f78606e4ce48b070e472b9672c8bdc2fa -rf08d80ff73aa6e92788ad00f00f1128257b5f287
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/UpliftVan/UpliftVanKernelStubTest.cs	(.../UpliftVanKernelStubTest.cs)	(revision 68eb3c2f78606e4ce48b070e472b9672c8bdc2fa)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/UpliftVan/UpliftVanKernelStubTest.cs	(.../UpliftVanKernelStubTest.cs)	(revision f08d80ff73aa6e92788ad00f00f1128257b5f287)
@@ -133,9 +133,9 @@
             IEnumerable<Message> results = calculator.CalculationMessages.ToList();
             Assert.IsTrue(calculator.Calculated);
             Assert.AreEqual(3, results.Count());
-            MessageHelper.AssertMessage(MessageType.Info, "Calculation Info", results.ElementAt(0));
-            MessageHelper.AssertMessage(MessageType.Warning, "Calculation Warning", results.ElementAt(1));
-            MessageHelper.AssertMessage(MessageType.Error, "Calculation Error", results.ElementAt(2));
+            MessageHelper.AssertMessage(MessageType.Warning, "Calculation Warning", results.ElementAt(0));
+            MessageHelper.AssertMessage(MessageType.Error, "Calculation Error", results.ElementAt(1));
+            MessageHelper.AssertMessage(MessageType.Info, "Calculation Info", results.ElementAt(2));
         }
 
         [Test]