Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssessmentSectionAssemblyGroupBoundariesFactoryTest.cs
===================================================================
diff -u -rafed83a0655d0c6f8527d6bc41417db7cce91931 -r93a394f6cd03ff9bf45bee15d390125b0ce64070
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssessmentSectionAssemblyGroupBoundariesFactoryTest.cs	(.../AssessmentSectionAssemblyGroupBoundariesFactoryTest.cs)	(revision afed83a0655d0c6f8527d6bc41417db7cce91931)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssessmentSectionAssemblyGroupBoundariesFactoryTest.cs	(.../AssessmentSectionAssemblyGroupBoundariesFactoryTest.cs)	(revision 93a394f6cd03ff9bf45bee15d390125b0ce64070)
@@ -43,9 +43,9 @@
             double signalingNorm = random.NextDouble();
             double lowerLimitNorm = random.NextDouble();
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
+            using (new AssemblyToolCalculatorFactoryConfig())
             {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 AssessmentSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyGroupBoundariesCalculator;
 
                 // Call
@@ -65,9 +65,9 @@
             double signalingNorm = random.NextDouble();
             double lowerLimitNorm = random.NextDouble();
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
+            using (new AssemblyToolCalculatorFactoryConfig())
             {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 AssessmentSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyGroupBoundariesCalculator;
 
                 // Call
@@ -87,9 +87,9 @@
         public void CreateAssessmentSectionAssemblyGroupBoundaries_CalculatorThrowsException_ThrowsAssemblyException()
         {
             // Setup
-            using (new AssemblyToolCalculatorFactoryConfigOld())
+            using (new AssemblyToolCalculatorFactoryConfig())
             {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 AssessmentSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyGroupBoundariesCalculator;
                 calculator.ThrowExceptionOnCalculate = true;