Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3 -rdd84b844a388b0dc3f721bd40674c4ed513b3231
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision dd84b844a388b0dc3f721bd40674c4ed513b3231)
@@ -36,6 +36,8 @@
 using Ringtoets.HydraRing.Calculation.TestUtil;
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Plugin.FileImporters;
+using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.Service;
 using Ringtoets.Revetment.Service.TestUtil;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Integration.Test
@@ -73,7 +75,6 @@
                                                                                           assessmentSection.GrassCoverErosionOutwards,
                                                                                           assessmentSection);
 
-            using (new HydraRingCalculationServiceConfig())
             using (new WaveConditionsCalculationServiceConfig())
             {
                 // Call
@@ -98,14 +99,13 @@
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             ImportHydraulicBoundaryDatabase(assessmentSection);
 
-            var calculation = GetValidCalculation(assessmentSection);
+            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection);
 
             var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation,
                                                                                           testDataPath,
                                                                                           assessmentSection.GrassCoverErosionOutwards,
                                                                                           assessmentSection);
 
-            using (new HydraRingCalculationServiceConfig())
             using (new WaveConditionsCalculationServiceConfig())
             {
                 // Call
@@ -139,7 +139,7 @@
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             ImportHydraulicBoundaryDatabase(assessmentSection);
 
-            var calculation = GetValidCalculation(assessmentSection);
+            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection);
 
             var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation,
                                                                                           testDataPath,
@@ -181,7 +181,7 @@
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             ImportHydraulicBoundaryDatabase(assessmentSection);
 
-            var calculation = GetValidCalculation(assessmentSection);
+            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection);
 
             var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation,
                                                                                           testDataPath,
@@ -206,20 +206,61 @@
         }
 
         [Test]
+        public void OnRun_Always_InputPropertiesCorrectlySendToService()
+        {
+            // Setup
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
+            ImportHydraulicBoundaryDatabase(assessmentSection);
+
+            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection);
+
+            var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation,
+                                                                                          testDataPath,
+                                                                                          assessmentSection.GrassCoverErosionOutwards,
+                                                                                          assessmentSection);
+
+            using (new WaveConditionsCalculationServiceConfig())
+            {
+                var testService = (TestWaveConditionsCalculationService)WaveConditionsCalculationService.Instance;
+
+                // Call
+                activity.Run();
+
+                // Assert
+                TestWaveConditionsCalculationServiceInput[] testWaveConditionsInputs = testService.Inputs.ToArray();
+                Assert.AreEqual(3, testWaveConditionsInputs.Length);
+
+                for (int i = 0; i < testWaveConditionsInputs.Length; i++)
+                {
+                    GeneralGrassCoverErosionOutwardsInput generalWaveConditionsInput = assessmentSection.GrassCoverErosionOutwards.GeneralInput;
+
+                    Assert.AreEqual(calculation.InputParameters.WaterLevels.ToArray()[i], testWaveConditionsInputs[i].WaterLevel);
+                    Assert.AreEqual(generalWaveConditionsInput.GeneralWaveConditionsInput.A, testWaveConditionsInputs[i].A);
+                    Assert.AreEqual(generalWaveConditionsInput.GeneralWaveConditionsInput.B, testWaveConditionsInputs[i].B);
+                    Assert.AreEqual(generalWaveConditionsInput.GeneralWaveConditionsInput.C, testWaveConditionsInputs[i].C);
+                    Assert.AreEqual(assessmentSection.FailureMechanismContribution.Norm, testWaveConditionsInputs[i].Norm);
+                    Assert.AreSame(calculation.InputParameters, testWaveConditionsInputs[i].WaveConditionsInput);
+                    Assert.AreEqual(testDataPath, testWaveConditionsInputs[i].HlcdDirectory);
+                    Assert.AreEqual(assessmentSection.Id, testWaveConditionsInputs[i].RingId);
+                    Assert.AreEqual(calculation.Name, testWaveConditionsInputs[i].Name);
+                }
+            }
+        }
+
+        [Test]
         public void OnFinish_CalculationPerformed_SetsOutput()
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             ImportHydraulicBoundaryDatabase(assessmentSection);
 
-            var calculation = GetValidCalculation(assessmentSection);
+            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection);
 
             var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation,
                                                                                           testDataPath,
                                                                                           assessmentSection.GrassCoverErosionOutwards,
                                                                                           assessmentSection);
 
-            using (new HydraRingCalculationServiceConfig())
             using (new WaveConditionsCalculationServiceConfig())
             {
                 activity.Run();
@@ -240,7 +281,7 @@
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             ImportHydraulicBoundaryDatabase(assessmentSection);
 
-            var calculation = GetValidCalculation(assessmentSection);
+            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection);
 
             var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation,
                                                                                           testDataPath,