Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/CalculationConfigurationImporterTest.cs
===================================================================
diff -u -r7873497cf540dfda42b438915db8301b49bfac1e -r0df1fcd08ac24bef9d2ca6dc5e61c41071158b82
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/CalculationConfigurationImporterTest.cs	(.../CalculationConfigurationImporterTest.cs)	(revision 7873497cf540dfda42b438915db8301b49bfac1e)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/CalculationConfigurationImporterTest.cs	(.../CalculationConfigurationImporterTest.cs)	(revision 0df1fcd08ac24bef9d2ca6dc5e61c41071158b82)
@@ -44,8 +44,8 @@
         public void Constructor_ExpectedValues()
         {
             // Call
-            var importer = new TestCalculationConfigurationImporter("",
-                                                                    new CalculationGroup());
+            var importer = new CalculationConfigurationImporter("",
+                                                                new CalculationGroup());
 
             // Assert
             Assert.IsInstanceOf<FileImporterBase<CalculationGroup>>(importer);
@@ -57,8 +57,8 @@
             // Setup
             string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, Path.DirectorySeparatorChar.ToString());
 
-            var importer = new TestCalculationConfigurationImporter(filePath,
-                                                                    new CalculationGroup());
+            var importer = new CalculationConfigurationImporter(filePath,
+                                                                new CalculationGroup());
 
             // Call
             var importSuccessful = true;
@@ -77,8 +77,8 @@
             // Setup
             string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "I_dont_exist");
 
-            var importer = new TestCalculationConfigurationImporter(filePath,
-                                                                    new CalculationGroup());
+            var importer = new CalculationConfigurationImporter(filePath,
+                                                                new CalculationGroup());
 
             // Call
             var importSuccessful = true;
@@ -96,8 +96,8 @@
         {
             // Setup
             string filePath = Path.Combine(readerPath, "invalidFolderNoName.xml");
-            var importer = new TestCalculationConfigurationImporter(filePath,
-                                                                    new CalculationGroup());
+            var importer = new CalculationConfigurationImporter(filePath,
+                                                                new CalculationGroup());
 
             // Call
             var importSuccessful = true;
@@ -123,8 +123,8 @@
             var calculationGroup = new CalculationGroup();
 
             string filePath = Path.Combine(readerPath, "validConfiguration.xml");
-            var importer = new TestCalculationConfigurationImporter(filePath,
-                                                                    calculationGroup);
+            var importer = new CalculationConfigurationImporter(filePath,
+                                                                calculationGroup);
 
             importer.SetProgressChanged((description, step, steps) =>
             {
@@ -149,8 +149,8 @@
         {
             // Given
             string filePath = Path.Combine(readerPath, "validConfiguration.xml");
-            var importer = new TestCalculationConfigurationImporter(filePath,
-                                                                    new CalculationGroup());
+            var importer = new CalculationConfigurationImporter(filePath,
+                                                                new CalculationGroup());
 
             var expectedProgressMessages = new[]
             {
@@ -192,8 +192,8 @@
 
             var calculationGroup = new CalculationGroup();
 
-            var importer = new TestCalculationConfigurationImporter(filePath,
-                                                                    calculationGroup);
+            var importer = new CalculationConfigurationImporter(filePath,
+                                                                calculationGroup);
 
             // Call
             bool successful = importer.Import();
@@ -203,14 +203,14 @@
             AssertCalculationGroup(GetExpectedNestedData(), calculationGroup);
         }
 
-        private class TestCalculationConfigurationImporter : CalculationConfigurationImporter<TestCalculationConfigurationReader, ReadCalculation>
+        private class CalculationConfigurationImporter : CalculationConfigurationImporter<CalculationConfigurationReader, ReadCalculation>
         {
-            public TestCalculationConfigurationImporter(string filePath, CalculationGroup importTarget)
+            public CalculationConfigurationImporter(string filePath, CalculationGroup importTarget)
                 : base(filePath, importTarget) {}
 
-            protected override TestCalculationConfigurationReader CreateConfigurationReader(string xmlFilePath)
+            protected override CalculationConfigurationReader CreateConfigurationReader(string xmlFilePath)
             {
-                return new TestCalculationConfigurationReader(xmlFilePath);
+                return new CalculationConfigurationReader(xmlFilePath);
             }
 
             protected override ICalculationBase ParseReadCalculation(ReadCalculation readCalculation)
@@ -222,15 +222,15 @@
             }
         }
 
-        private class TestCalculationConfigurationReader : CalculationConfigurationReader<ReadCalculation>
+        private class CalculationConfigurationReader : CalculationConfigurationReader<ReadCalculation>
         {
             private static readonly string mainSchemaDefinition =
                 File.ReadAllText(Path.Combine(TestHelper.GetTestDataPath(
                                                   TestDataPath.Ringtoets.Common.IO,
                                                   "CalculationConfigurationReader"),
                                               "validConfigurationSchema.xsd"));
 
-            public TestCalculationConfigurationReader(string xmlFilePath)
+            public CalculationConfigurationReader(string xmlFilePath)
                 : base(xmlFilePath, mainSchemaDefinition, new Dictionary<string, string>()) {}
 
             protected override ReadCalculation ParseCalculationElement(XElement calculationElement)
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs
===================================================================
diff -u -r7873497cf540dfda42b438915db8301b49bfac1e -r0df1fcd08ac24bef9d2ca6dc5e61c41071158b82
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs	(.../PipingConfigurationImporterTest.cs)	(revision 7873497cf540dfda42b438915db8301b49bfac1e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs	(.../PipingConfigurationImporterTest.cs)	(revision 0df1fcd08ac24bef9d2ca6dc5e61c41071158b82)
@@ -452,10 +452,10 @@
             }
 
             Assert.AreEqual(1, calculationGroup.Children.Count);
-            AssertCalculation(expectedCalculation, (PipingCalculationScenario) calculationGroup.Children[0]);
+            AssertPipingCalculationScenario(expectedCalculation, (PipingCalculationScenario) calculationGroup.Children[0]);
         }
 
-        private static void AssertCalculation(PipingCalculationScenario expectedCalculation, PipingCalculationScenario actualCalculation)
+        private static void AssertPipingCalculationScenario(PipingCalculationScenario expectedCalculation, PipingCalculationScenario actualCalculation)
         {
             Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name);
             Assert.AreEqual(expectedCalculation.InputParameters.UseAssessmentLevelManualInput, actualCalculation.InputParameters.UseAssessmentLevelManualInput);