Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -343,7 +343,7 @@
         {
             foreach (var calculation in closingStructuresCalculations)
             {
-                new ClosingStructuresCalculationService().Validate(calculation, assessmentSection);
+                ClosingStructuresCalculationService.Validate(calculation, assessmentSection);
             }
         }
 
@@ -501,7 +501,7 @@
 
             return builder.AddValidateCalculationItem(
                 context,
-                c => new ClosingStructuresCalculationService().Validate(c.WrappedData, c.AssessmentSection),
+                c => ClosingStructuresCalculationService.Validate(c.WrappedData, c.AssessmentSection),
                 ValidateAllDataAvailableAndGetErrorMessageForCalculation)
                           .AddPerformCalculationItem(calculation, context, Calculate, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
                           .AddClearCalculationOutputItem(calculation)
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs	(.../ClosingStructuresCalculationActivity.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs	(.../ClosingStructuresCalculationActivity.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -83,7 +83,7 @@
 
         protected override bool Validate()
         {
-            return calculationService.Validate(calculation, assessmentSection);
+            return ClosingStructuresCalculationService.Validate(calculation, assessmentSection);
         }
 
         protected override void PerformCalculation()
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs
===================================================================
diff -u -r5d5d353c6b6bdda426324c591029b096621abaa4 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(.../ClosingStructuresCalculationService.cs)	(revision 5d5d353c6b6bdda426324c591029b096621abaa4)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(.../ClosingStructuresCalculationService.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -128,7 +128,7 @@
             canceled = true;
         }
 
-        public bool Validate(StructuresCalculation<ClosingStructuresInput> calculation, IAssessmentSection assessmentSection)
+        public static bool Validate(StructuresCalculation<ClosingStructuresInput> calculation, IAssessmentSection assessmentSection)
         {
             CalculationServiceHelper.LogValidationBeginTime(calculation.Name);
             var messages = ValidateInput(calculation.InputParameters, assessmentSection);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -71,7 +71,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new ClosingStructuresCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = ClosingStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -110,7 +110,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new ClosingStructuresCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = ClosingStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs
===================================================================
diff -u -r73d7f318e9a02087ac21dde7d3728d8eac27a9f5 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs	(.../DesignWaterLevelCalculationActivity.cs)	(revision 73d7f318e9a02087ac21dde7d3728d8eac27a9f5)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs	(.../DesignWaterLevelCalculationActivity.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -78,7 +78,7 @@
 
         protected override bool Validate()
         {
-            return calculationService.Validate(
+            return DesignWaterLevelCalculationService.Validate(
                 hydraulicBoundaryLocation.Name,
                 hydraulicBoundaryDatabaseFilePath,
                 messageProvider);
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -r73d7f318e9a02087ac21dde7d3728d8eac27a9f5 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 73d7f318e9a02087ac21dde7d3728d8eac27a9f5)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -52,7 +52,7 @@
         /// <param name="hydraulicBoundaryDatabaseFilePath">The file path of the hydraulic boundary database file which to validate.</param>
         /// <param name="messageProvider">The object which is used to build log messages.</param>
         /// <returns><c>True</c>c> if there were no validation errors; <c>False</c>c> otherwise.</returns>
-        public bool Validate(string name, string hydraulicBoundaryDatabaseFilePath, ICalculationMessageProvider messageProvider)
+        public static bool Validate(string name, string hydraulicBoundaryDatabaseFilePath, ICalculationMessageProvider messageProvider)
         {
             string calculationName = messageProvider.GetCalculationName(name);
 
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs
===================================================================
diff -u -r73d7f318e9a02087ac21dde7d3728d8eac27a9f5 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 73d7f318e9a02087ac21dde7d3728d8eac27a9f5)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -78,7 +78,7 @@
 
         protected override bool Validate()
         {
-            return calculationService.Validate(
+            return WaveHeightCalculationService.Validate(
                 hydraulicBoundaryLocation.Name,
                 hydraulicBoundaryDatabaseFilePath,
                 messageProvider);
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r73d7f318e9a02087ac21dde7d3728d8eac27a9f5 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 73d7f318e9a02087ac21dde7d3728d8eac27a9f5)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -53,7 +53,7 @@
         /// <param name="hydraulicBoundaryDatabaseFilePath">The file path of the hydraulic boundary database file which to validate.</param>
         /// <param name="messageProvider">The object which is used to build log messages.</param>
         /// <returns><c>True</c>c> if there were no validation errors; <c>False</c>c> otherwise.</returns>
-        public bool Validate(string name, string hydraulicBoundaryDatabaseFilePath, ICalculationMessageProvider messageProvider)
+        public static bool Validate(string name, string hydraulicBoundaryDatabaseFilePath, ICalculationMessageProvider messageProvider)
         {
             string calculationName = messageProvider.GetCalculationName(name);
 
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -r87b3dec8abf9077375a10deb16d508d9cc2711e4 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 87b3dec8abf9077375a10deb16d508d9cc2711e4)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -56,7 +56,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            Action call = () => valid = new DesignWaterLevelCalculationService().Validate(calculationName, validFilePath, messageProvider);
+            Action call = () => valid = DesignWaterLevelCalculationService.Validate(calculationName, validFilePath, messageProvider);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -84,7 +84,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            Action call = () => valid = new DesignWaterLevelCalculationService().Validate(calculationName, notValidFilePath, messageProviderStub);
+            Action call = () => valid = DesignWaterLevelCalculationService.Validate(calculationName, notValidFilePath, messageProviderStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -r673e35de0df920529e5dda63ea8b4dfb08ed65a8 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 673e35de0df920529e5dda63ea8b4dfb08ed65a8)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -57,7 +57,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            Action call = () => valid = new WaveHeightCalculationService().Validate(calculationName, validFilePath, messageProviderStub);
+            Action call = () => valid = WaveHeightCalculationService.Validate(calculationName, validFilePath, messageProviderStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -85,7 +85,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            Action call = () => valid = new WaveHeightCalculationService().Validate(calculationName, notValidFilePath, messageProviderStub);
+            Action call = () => valid = WaveHeightCalculationService.Validate(calculationName, notValidFilePath, messageProviderStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r93d214db8ac0a90b6f1bf1712a414e4f31c3eed9 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 93d214db8ac0a90b6f1bf1712a414e4f31c3eed9)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -303,7 +303,7 @@
         {
             foreach (var calculation in grassCoverErosionInwardsCalculations)
             {
-                new GrassCoverErosionInwardsCalculationService().Validate(calculation, assessmentSection);
+                GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSection);
             }
         }
 
@@ -587,7 +587,7 @@
 
             return builder.AddValidateCalculationItem(
                 context,
-                c => new GrassCoverErosionInwardsCalculationService().Validate(c.WrappedData, c.AssessmentSection),
+                c => GrassCoverErosionInwardsCalculationService.Validate(c.WrappedData, c.AssessmentSection),
                 ValidateAllDataAvailableAndGetErrorMessageForCalculation)
                           .AddPerformCalculationItem(calculation, context, Calculate, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
                           .AddClearCalculationOutputItem(calculation)
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationActivity.cs
===================================================================
diff -u -r5d5d353c6b6bdda426324c591029b096621abaa4 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationActivity.cs	(.../GrassCoverErosionInwardsCalculationActivity.cs)	(revision 5d5d353c6b6bdda426324c591029b096621abaa4)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationActivity.cs	(.../GrassCoverErosionInwardsCalculationActivity.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -84,7 +84,7 @@
 
         protected override bool Validate()
         {
-            return calculationService.Validate(calculation, assessmentSection);
+            return GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSection);
         }
 
         protected override void PerformCalculation()
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -rc786273ba6460b0498c00ff70d1703eee74fadb8 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision c786273ba6460b0498c00ff70d1703eee74fadb8)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -60,7 +60,7 @@
         /// <param name="calculation">The <see cref="GrassCoverErosionInwardsCalculation"/> for which to validate the values.</param>
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> for which to validate the values.</param>
         /// <returns><c>True</c>c> if <paramref name="calculation"/> has no validation errors; <c>False</c>c> otherwise.</returns>
-        public bool Validate(GrassCoverErosionInwardsCalculation calculation, IAssessmentSection assessmentSection)
+        public static bool Validate(GrassCoverErosionInwardsCalculation calculation, IAssessmentSection assessmentSection)
         {
             CalculationServiceHelper.LogValidationBeginTime(calculation.Name);
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs
===================================================================
diff -u -r5d5d353c6b6bdda426324c591029b096621abaa4 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs	(.../GrassCoverErosionInwardsCalculationServiceTest.cs)	(revision 5d5d353c6b6bdda426324c591029b096621abaa4)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs	(.../GrassCoverErosionInwardsCalculationServiceTest.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -70,7 +70,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new GrassCoverErosionInwardsCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -110,7 +110,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new GrassCoverErosionInwardsCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -153,7 +153,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new GrassCoverErosionInwardsCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -193,7 +193,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new GrassCoverErosionInwardsCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -229,7 +229,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new GrassCoverErosionInwardsCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -273,7 +273,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new GrassCoverErosionInwardsCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -311,7 +311,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new GrassCoverErosionInwardsCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -351,7 +351,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new GrassCoverErosionInwardsCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r1a49563c568eaef8b84743fec1f04ee119bf5c9c -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -702,7 +702,7 @@
         {
             foreach (GrassCoverErosionOutwardsWaveConditionsCalculation calculation in calculations)
             {
-                new GrassCoverErosionOutwardsWaveConditionsCalculationService().Validate(calculation, database.FilePath);
+                GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, database.FilePath);
             }
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -81,7 +81,7 @@
 
         protected override bool Validate()
         {
-            return calculationService.Validate(calculation, hlcdFilePath);
+            return GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, hlcdFilePath);
         }
 
         protected override void PerformCalculation()
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs
===================================================================
diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs)	(revision e69acb9595f7bf1d202ddd1fb51934b66768b75d)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -41,7 +41,7 @@
         /// <param name="calculation">The <see cref="GrassCoverErosionOutwardsWaveConditionsCalculation"/> for which to validate the values.</param>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The file path of the hydraulic boundary database file which to validate.</param>
         /// <returns><c>True</c>c> if there were no validation errors; <c>False</c>c> otherwise.</returns>
-        public bool Validate(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath)
+        public static bool Validate(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath)
         {
             return ValidateWaveConditionsInput(
                 calculation.InputParameters,
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -80,7 +80,7 @@
                 // Call
                 Action call = () =>
                 {
-                    isValid = new GrassCoverErosionOutwardsWaveConditionsCalculationService().Validate(calculation, testFilePath);
+                    isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, testFilePath);
                 };
 
                 // Assert
@@ -110,7 +110,7 @@
                 // Call
                 Action call = () =>
                 {
-                    isValid = new GrassCoverErosionOutwardsWaveConditionsCalculationService().Validate(calculation, testFilePath);
+                    isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, testFilePath);
                 };
 
                 // Assert
@@ -140,7 +140,7 @@
                 // Call
                 Action call = () =>
                 {
-                    isValid = new GrassCoverErosionOutwardsWaveConditionsCalculationService().Validate(calculation, validFilePath);
+                    isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, validFilePath);
                 };
 
                 // Assert
@@ -170,7 +170,7 @@
                 // Call
                 Action call = () =>
                 {
-                    isValid = new GrassCoverErosionOutwardsWaveConditionsCalculationService().Validate(calculation, validFilePath);
+                    isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, validFilePath);
                 };
 
                 // Assert
@@ -203,7 +203,7 @@
                 // Call
                 Action call = () =>
                 {
-                    isValid = new GrassCoverErosionOutwardsWaveConditionsCalculationService().Validate(calculation, validFilePath);
+                    isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, validFilePath);
                 };
 
                 // Assert
@@ -238,7 +238,7 @@
                 // Call
                 Action call = () =>
                 {
-                    isValid = new GrassCoverErosionOutwardsWaveConditionsCalculationService().Validate(calculation, validFilePath);
+                    isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, validFilePath);
                 };
 
                 // Assert
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -198,7 +198,7 @@
         {
             foreach (var calculation in heightStructuresCalculations)
             {
-                new HeightStructuresCalculationService().Validate(calculation, assessmentSection);
+                HeightStructuresCalculationService.Validate(calculation, assessmentSection);
             }
         }
 
@@ -561,7 +561,7 @@
 
             return builder.AddValidateCalculationItem(
                 context,
-                c => new HeightStructuresCalculationService().Validate(c.WrappedData, c.AssessmentSection),
+                c => HeightStructuresCalculationService.Validate(c.WrappedData, c.AssessmentSection),
                 ValidateAllDataAvailableAndGetErrorMessageForCalculation)
                           .AddPerformCalculationItem(calculation, context, Calculate, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
                           .AddClearCalculationOutputItem(calculation)
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs	(.../HeightStructuresCalculationActivity.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs	(.../HeightStructuresCalculationActivity.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -81,7 +81,7 @@
 
         protected override bool Validate()
         {
-            return calculationService.Validate(calculation, assessmentSection);
+            return HeightStructuresCalculationService.Validate(calculation, assessmentSection);
         }
 
         protected override void PerformCalculation()
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -rc786273ba6460b0498c00ff70d1703eee74fadb8 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision c786273ba6460b0498c00ff70d1703eee74fadb8)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -59,7 +59,7 @@
         /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> for which to validate the values.</param>
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> for which to validate the values.</param>
         /// <returns><c>True</c>c> if <paramref name="calculation"/> has no validation errors; <c>False</c>c> otherwise.</returns>
-        public bool Validate(StructuresCalculation<HeightStructuresInput> calculation, IAssessmentSection assessmentSection)
+        public static bool Validate(StructuresCalculation<HeightStructuresInput> calculation, IAssessmentSection assessmentSection)
         {
             CalculationServiceHelper.LogValidationBeginTime(calculation.Name);
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -73,7 +73,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new HeightStructuresCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = HeightStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -112,7 +112,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new HeightStructuresCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = HeightStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -151,7 +151,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new HeightStructuresCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = HeightStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -195,7 +195,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new HeightStructuresCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = HeightStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -238,7 +238,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new HeightStructuresCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = HeightStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -284,7 +284,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new HeightStructuresCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = HeightStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -333,7 +333,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new HeightStructuresCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = HeightStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -381,7 +381,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new HeightStructuresCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = HeightStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -429,7 +429,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new HeightStructuresCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = HeightStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -469,7 +469,7 @@
 
             // Call
             bool isValid = false;
-            Action call = () => isValid = new HeightStructuresCalculationService().Validate(calculation, assessmentSectionStub);
+            Action call = () => isValid = HeightStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r1a49563c568eaef8b84743fec1f04ee119bf5c9c -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -421,7 +421,7 @@
         {
             foreach (StabilityStoneCoverWaveConditionsCalculation calculation in calculations)
             {
-                new StabilityStoneCoverWaveConditionsCalculationService().Validate(calculation, database.FilePath);
+                StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, database.FilePath);
             }
         }
 
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r03ec489f1a084da620f85271fdbd28e081ea0eb5 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivity.cs)	(revision 03ec489f1a084da620f85271fdbd28e081ea0eb5)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivity.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -80,7 +80,7 @@
 
         protected override bool Validate()
         {
-            return calculationService.Validate(calculation, hlcdFilePath);
+            return StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, hlcdFilePath);
         }
 
         protected override void PerformCalculation()
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs
===================================================================
diff -u -re4f43547afaab47559c5aa667b1aac661a0d1a8b -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs	(.../StabilityStoneCoverWaveConditionsCalculationService.cs)	(revision e4f43547afaab47559c5aa667b1aac661a0d1a8b)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs	(.../StabilityStoneCoverWaveConditionsCalculationService.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -46,7 +46,7 @@
         /// <param name="calculation">The <see cref="StabilityStoneCoverWaveConditionsCalculation"/> for which to validate the values.</param>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The file path of the hydraulic boundary database file which to validate.</param>
         /// <returns><c>True</c>c> if there were no validation errors; <c>False</c>c> otherwise.</returns>
-        public bool Validate(StabilityStoneCoverWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath)
+        public static bool Validate(StabilityStoneCoverWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath)
         {
             return ValidateWaveConditionsInput(
                 calculation.InputParameters,
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -68,7 +68,7 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                Action call = () => { isValid = new StabilityStoneCoverWaveConditionsCalculationService().Validate(calculation, testFilePath); };
+                Action call = () => { isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, testFilePath); };
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -95,7 +95,7 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                Action call = () => { isValid = new StabilityStoneCoverWaveConditionsCalculationService().Validate(calculation, testFilePath); };
+                Action call = () => { isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, testFilePath); };
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -122,7 +122,7 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                Action call = () => { isValid = new StabilityStoneCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); };
+                Action call = () => { isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, validFilePath); };
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -149,7 +149,7 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                Action call = () => { isValid = new StabilityStoneCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); };
+                Action call = () => { isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, validFilePath); };
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -179,7 +179,7 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                Action call = () => { isValid = new StabilityStoneCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); };
+                Action call = () => { isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, validFilePath); };
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -211,7 +211,7 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                Action call = () => { isValid = new StabilityStoneCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); };
+                Action call = () => { isValid = StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation, validFilePath); };
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r1a49563c568eaef8b84743fec1f04ee119bf5c9c -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -427,7 +427,7 @@
         {
             foreach (WaveImpactAsphaltCoverWaveConditionsCalculation calculation in calculations)
             {
-                new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, database.FilePath);
+                WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, database.FilePath);
             }
         }
 
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs)	(revision e69acb9595f7bf1d202ddd1fb51934b66768b75d)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -82,7 +82,7 @@
 
         protected override bool Validate()
         {
-            return calculationService.Validate(calculation, hlcdFilePath);
+            return WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, hlcdFilePath);
         }
 
         protected override void PerformCalculation()
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs
===================================================================
diff -u -ra8c48040ef69edbc103390432fbd921244e92afd -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationService.cs)	(revision a8c48040ef69edbc103390432fbd921244e92afd)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationService.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -41,7 +41,7 @@
         /// <param name="calculation">The <see cref="WaveImpactAsphaltCoverWaveConditionsCalculation"/> for which to validate the values.</param>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The file path of the hydraulic boundary database file which to validate.</param>
         /// <returns><c>True</c>c> if there were no validation errors; <c>False</c>c> otherwise.</returns>
-        public bool Validate(WaveImpactAsphaltCoverWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath)
+        public static bool Validate(WaveImpactAsphaltCoverWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath)
         {
             return ValidateWaveConditionsInput(
                 calculation.InputParameters,
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r16cb360eae0014270ebb6700054afdbbd565ae65
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs)	(revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
@@ -78,7 +78,7 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                Action call = () => { isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, testFilePath); };
+                Action call = () => { isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, testFilePath); };
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -105,7 +105,7 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                Action call = () => { isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, testFilePath); };
+                Action call = () => { isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, testFilePath); };
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -132,7 +132,7 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                Action call = () => { isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); };
+                Action call = () => { isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, validFilePath); };
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -159,7 +159,7 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                Action call = () => { isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); };
+                Action call = () => { isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, validFilePath); };
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -189,7 +189,7 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                Action call = () => { isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); };
+                Action call = () => { isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, validFilePath); };
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -221,7 +221,7 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                Action call = () => { isValid = new WaveImpactAsphaltCoverWaveConditionsCalculationService().Validate(calculation, validFilePath); };
+                Action call = () => { isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, validFilePath); };
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>