Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs
===================================================================
diff -u -r7f03cf30ae8d2351d8ddede137406d2bc25ef2ab -r504dee06516e9e4eae43575eb3f519277baf2bfe
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 7f03cf30ae8d2351d8ddede137406d2bc25ef2ab)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 504dee06516e9e4eae43575eb3f519277baf2bfe)
@@ -964,28 +964,23 @@
         }
 
         [Test]
-        public void Calculate_ValidPipingCalculation_LogStartAndEndOfValidatingInputsAndCalculation()
+        public void Calculate_ValidPipingCalculation_LogStartAndEndOfCalculation()
         {
-            // Setup
-            RoundedDouble normativeAssessmentLevel = AssessmentSectionHelper.GetTestAssessmentLevel();
-
+            // Call
             Action call = () =>
             {
-                // Precondition
-                Assert.IsTrue(PipingCalculationService.Validate(testCalculation, normativeAssessmentLevel));
-
-                // Call
-                PipingCalculationService.Calculate(testCalculation, normativeAssessmentLevel);
+                using (new PipingSubCalculatorFactoryConfig())
+                {
+                    PipingCalculationService.Calculate(testCalculation, AssessmentSectionHelper.GetTestAssessmentLevel());
+                }
             };
 
             // 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]);
+                CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
+                CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[1]);
             });
         }
 
@@ -997,10 +992,12 @@
 
             // Precondition
             Assert.IsNull(testCalculation.Output);
-            Assert.IsTrue(PipingCalculationService.Validate(testCalculation, normativeAssessmentLevel));
 
             // Call
-            PipingCalculationService.Calculate(testCalculation, normativeAssessmentLevel);
+            using (new PipingSubCalculatorFactoryConfig())
+            {
+                PipingCalculationService.Calculate(testCalculation, normativeAssessmentLevel);
+            }
 
             // Assert
             PipingOutput pipingOutput = testCalculation.Output;
@@ -1023,11 +1020,11 @@
 
             testCalculation.Output = output;
 
-            // Precondition
-            Assert.IsTrue(PipingCalculationService.Validate(testCalculation, normativeAssessmentLevel));
-
             // Call
-            PipingCalculationService.Calculate(testCalculation, normativeAssessmentLevel);
+            using (new PipingSubCalculatorFactoryConfig())
+            {
+                PipingCalculationService.Calculate(testCalculation, normativeAssessmentLevel);
+            }
 
             // Assert
             Assert.AreNotSame(output, testCalculation.Output);