Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs
===================================================================
diff -u -rbd3d9017ec57de410afdb274e44cd933d670ce86 -r0adc6562a9cedb81859034ef5d62e9b11db4d9c7
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision bd3d9017ec57de410afdb274e44cd933d670ce86)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 0adc6562a9cedb81859034ef5d62e9b11db4d9c7)
@@ -7,6 +7,7 @@
 using NUnit.Framework;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.TestUtil;
+using Ringtoets.Piping.KernelWrapper.SubCalculator;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.KernelWrapper.TestUtil.SubCalculator;
 using Ringtoets.Piping.Service.TestUtil;
@@ -121,7 +122,7 @@
             PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
             PipingInput input = validPipingCalculation.InputParameters;
 
-            using (new PipingCalculationServiceConfig())
+            using (new PipingSubCalculatorFactoryConfig())
             {
                 // Call
                 PipingCalculationService.Validate(validPipingCalculation);
@@ -138,7 +139,7 @@
             PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
             PipingInput input = validPipingCalculation.InputParameters;
 
-            using (new PipingCalculationServiceConfig())
+            using (new PipingSubCalculatorFactoryConfig())
             {
                 // Call
                 PipingCalculationService.Calculate(validPipingCalculation);
@@ -150,7 +151,7 @@
 
         private void AssertSubCalculatorInputs(PipingInput input)
         {
-            var testFactory = (TestPipingSubCalculatorFactory) PipingCalculationService.SubCalculatorFactory;
+            var testFactory = (TestPipingSubCalculatorFactory)PipingSubCalculatorFactory.Instance;
             var heaveCalculator = testFactory.LastCreatedHeaveCalculator;
             var upliftCalculator = testFactory.LastCreatedUpliftCalculator;
             var sellmeijerCalculator = testFactory.LastCreatedSellmeijerCalculator;