Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssessmentSectionAssemblyGroupsViewTest.cs
===================================================================
diff -u -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 -r08313961495651ac73979757e64a38dcfcde58e8
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssessmentSectionAssemblyGroupsViewTest.cs	(.../AssessmentSectionAssemblyGroupsViewTest.cs)	(revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssessmentSectionAssemblyGroupsViewTest.cs	(.../AssessmentSectionAssemblyGroupsViewTest.cs)	(revision 08313961495651ac73979757e64a38dcfcde58e8)
@@ -59,7 +59,7 @@
             FailureMechanismContribution failureMechanismContribution = FailureMechanismContributionTestFactory.CreateFailureMechanismContribution();
 
             // Call
-            using (new AssemblyToolCalculatorFactoryConfigOld())
+            using (new AssemblyToolCalculatorFactoryConfig())
             using (var view = new AssessmentSectionAssemblyGroupsView(failureMechanismContribution))
             {
                 // Assert
@@ -72,7 +72,7 @@
                 AssemblyGroupsTable<AssessmentSectionAssemblyGroup> tableControl = GetCategoriesTable(view);
                 Assert.AreEqual(DockStyle.Fill, tableControl.Dock);
 
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 AssessmentSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyGroupBoundariesCalculator;
                 Assert.AreEqual(calculator.AssessmentSectionAssemblyGroupBoundariesOutput.Count(), tableControl.Rows.Count);
             }
@@ -92,10 +92,10 @@
             FailureMechanismContribution failureMechanismContribution = FailureMechanismContributionTestFactory.CreateFailureMechanismContribution();
             failureMechanismContribution.Attach(observer);
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
+            using (new AssemblyToolCalculatorFactoryConfig())
             using (var view = new AssessmentSectionAssemblyGroupsView(failureMechanismContribution))
             {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 AssessmentSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyGroupBoundariesCalculator;
 
                 AssemblyGroupsTable<AssessmentSectionAssemblyGroup> groupsTable = GetCategoriesTable(view);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionAssemblyGroupsViewInfoTest.cs
===================================================================
diff -u -r0b54409df4232651752190919a46d6c866bb0ad5 -r08313961495651ac73979757e64a38dcfcde58e8
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionAssemblyGroupsViewInfoTest.cs	(.../AssessmentSectionAssemblyGroupsViewInfoTest.cs)	(revision 0b54409df4232651752190919a46d6c866bb0ad5)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/AssessmentSectionAssemblyGroupsViewInfoTest.cs	(.../AssessmentSectionAssemblyGroupsViewInfoTest.cs)	(revision 08313961495651ac73979757e64a38dcfcde58e8)
@@ -69,7 +69,7 @@
             mocks.ReplayAll();
 
             var context = new AssessmentSectionAssemblyGroupsContext(assessmentSection);
-            using (new AssemblyToolCalculatorFactoryConfigOld())
+            using (new AssemblyToolCalculatorFactoryConfig())
             {
                 // Call
                 var view = (AssessmentSectionAssemblyGroupsView) info.CreateInstance(context);
@@ -109,7 +109,7 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks);
             mocks.ReplayAll();
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
+            using (new AssemblyToolCalculatorFactoryConfig())
             using (var view = new AssessmentSectionAssemblyGroupsView(assessmentSection.FailureMechanismContribution))
             {
                 // Call
@@ -131,7 +131,7 @@
             IAssessmentSection assessmentSection2 = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks);
             mocks.ReplayAll();
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
+            using (new AssemblyToolCalculatorFactoryConfig())
             using (var view = new AssessmentSectionAssemblyGroupsView(assessmentSection1.FailureMechanismContribution))
             {
                 // Call