Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r63528bbe6b6682aec44ecd150560fe797ed67a5c -rd79d565a3560a7314f2e1860db1c91481edac364
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision 63528bbe6b6682aec44ecd150560fe797ed67a5c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision d79d565a3560a7314f2e1860db1c91481edac364)
@@ -217,7 +217,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
+                TestHydraulicLoadsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
                 calculator.Value = double.NaN;
                 calculator.EndInFailure = true;
 
@@ -366,7 +366,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
+                TestHydraulicLoadsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
                 calculator.Value = 2;
                 calculator.ReliabilityIndex = -1;
 
@@ -595,7 +595,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
+                TestHydraulicLoadsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
                 calculator.Value = double.NaN;
                 calculator.EndInFailure = true;
 
@@ -774,7 +774,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
+                TestHydraulicLoadsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
                 calculator.LastErrorFileContent = "An error occurred";
                 calculator.EndInFailure = true;
 
@@ -822,7 +822,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
+                TestHydraulicLoadsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
                 calculator.EndInFailure = true;
 
                 var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFile, assessmentSection.GrassCoverErosionInwards, assessmentSection);
@@ -869,7 +869,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
+                TestHydraulicLoadsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
                 calculator.EndInFailure = false;
                 calculator.LastErrorFileContent = "An error occurred";
 
@@ -988,7 +988,7 @@
                 activity.Run();
 
                 // Assert
-                TestDikeHeightCalculator dikeHeightCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
+                TestHydraulicLoadsCalculator dikeHeightCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
                 HydraulicLoadsCalculationInput[] dikeHeightCalculationInputs = dikeHeightCalculator.ReceivedInputs.ToArray();
                 Assert.AreEqual(1, dikeHeightCalculationInputs.Length);
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs
===================================================================
diff -u -r63528bbe6b6682aec44ecd150560fe797ed67a5c -rd79d565a3560a7314f2e1860db1c91481edac364
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs	(.../GrassCoverErosionInwardsCalculationServiceTest.cs)	(revision 63528bbe6b6682aec44ecd150560fe797ed67a5c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs	(.../GrassCoverErosionInwardsCalculationServiceTest.cs)	(revision d79d565a3560a7314f2e1860db1c91481edac364)
@@ -600,7 +600,7 @@
                 {
                     using (new HydraRingCalculatorFactoryConfig())
                     {
-                        TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
+                        TestHydraulicLoadsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
                         calculator.EndInFailure = true;
                         new GrassCoverErosionInwardsCalculationService().Calculate(calculation,
                                                                                    assessmentSectionStub,
@@ -712,7 +712,7 @@
             {
                 var testFactory = (TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance;
                 TestOvertoppingCalculator overToppingCalculator = testFactory.OvertoppingCalculator;
-                TestDikeHeightCalculator dikeHeightCalculator = testFactory.DikeHeightCalculator;
+                TestHydraulicLoadsCalculator dikeHeightCalculator = testFactory.DikeHeightCalculator;
 
                 if (cancelBeforeDikeHeightCalculationStarts)
                 {
@@ -968,7 +968,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
+                TestHydraulicLoadsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
                 calculator.LastErrorFileContent = "An error occurred";
                 calculator.EndInFailure = true;
                 var exceptionThrown = false;
@@ -1033,7 +1033,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
+                TestHydraulicLoadsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
                 calculator.EndInFailure = true;
                 var exceptionThrown = false;
 
@@ -1098,7 +1098,7 @@
 
             using (new HydraRingCalculatorFactoryConfig())
             {
-                TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
+                TestHydraulicLoadsCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
                 calculator.EndInFailure = false;
                 calculator.LastErrorFileContent = "An error occurred";
                 var exceptionThrown = false;
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs
===================================================================
diff -u -radd49dd7a9fbfed57cd9ce8faba5708d497b46c3 -rd79d565a3560a7314f2e1860db1c91481edac364
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs	(.../TestHydraRingCalculatorFactory.cs)	(revision add49dd7a9fbfed57cd9ce8faba5708d497b46c3)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs	(.../TestHydraRingCalculatorFactory.cs)	(revision d79d565a3560a7314f2e1860db1c91481edac364)
@@ -35,8 +35,8 @@
     {
         public readonly TestDesignWaterLevelCalculator DesignWaterLevelCalculator = new TestDesignWaterLevelCalculator();
         public readonly TestOvertoppingCalculator OvertoppingCalculator = new TestOvertoppingCalculator();
-        public readonly TestDikeHeightCalculator DikeHeightCalculator = new TestDikeHeightCalculator();
-        public readonly TestOvertoppingRateCalculator OvertoppingRateCalculator = new TestOvertoppingRateCalculator();
+        public readonly TestHydraulicLoadsCalculator DikeHeightCalculator = new TestHydraulicLoadsCalculator();
+        public readonly TestHydraulicLoadsCalculator OvertoppingRateCalculator = new TestHydraulicLoadsCalculator();
         public readonly TestWaveConditionsCosineCalculator WaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator();
         public readonly TestWaveHeightCalculator WaveHeightCalculator = new TestWaveHeightCalculator();
         public readonly TestStructuresOvertoppingCalculator StructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator();
@@ -135,7 +135,7 @@
         public string LastErrorFileContent { get; set; }
     }
 
-    public class TestDikeHeightCalculator : TestHydraRingCalculator<HydraulicLoadsCalculationInput>, IHydraulicLoadsCalculator
+    public class TestHydraulicLoadsCalculator : TestHydraRingCalculator<HydraulicLoadsCalculationInput>, IHydraulicLoadsCalculator
     {
         public double Value { get; set; }
         public double ReliabilityIndex { get; set; }
@@ -144,15 +144,6 @@
         public bool? Converged { get; set; }
     }
 
-    public class TestOvertoppingRateCalculator : TestHydraRingCalculator<HydraulicLoadsCalculationInput>, IHydraulicLoadsCalculator
-    {
-        public double Value { get; set; }
-        public double ReliabilityIndex { get; set; }
-        public string OutputDirectory { get; set; }
-        public string LastErrorFileContent { get; set; }
-        public bool? Converged { get; set; }
-    }
-
     public class TestDesignWaterLevelCalculator : TestHydraRingCalculator<AssessmentLevelCalculationInput>, IDesignWaterLevelCalculator
     {
         public string OutputDirectory { get; set; }