Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -re1da963f397797ce6d47241e13c112ce24a6104c -rfd842a67cc3e9b60707c4dcf782aa97d5291b6c6
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision e1da963f397797ce6d47241e13c112ce24a6104c)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision fd842a67cc3e9b60707c4dcf782aa97d5291b6c6)
@@ -1911,10 +1911,11 @@
             Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name);
             AssertComments(expectedCalculation.Comments, actualCalculation.Comments);
 
-            AssertWaveConditionsInput(expectedCalculation.InputParameters, actualCalculation.InputParameters);
+            AssertGrassCoverErosionOutwardsCalculationInput(expectedCalculation.InputParameters, actualCalculation.InputParameters);
 
             if (expectedCalculation.HasOutput)
             {
+                AssertWaveConditionsOutputs(expectedCalculation.Output.WaveRunUpOutput.ToArray(), actualCalculation.Output.WaveRunUpOutput.ToArray());
                 AssertWaveConditionsOutputs(expectedCalculation.Output.WaveImpactOutput.ToArray(), actualCalculation.Output.WaveImpactOutput.ToArray());
             }
             else
@@ -1923,6 +1924,13 @@
             }
         }
 
+        private static void AssertGrassCoverErosionOutwardsCalculationInput(GrassCoverErosionOutwardsWaveConditionsInput expectedInput, 
+                                                                            GrassCoverErosionOutwardsWaveConditionsInput actualInput)
+        {
+            AssertWaveConditionsInput(expectedInput, actualInput);
+            Assert.AreEqual(expectedInput.CalculationType, actualInput.CalculationType);
+        }
+
         #endregion
 
         #region StabilityStoneCover FailureMechanism
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r877f0d6830122b89d78bc3e27aa3c61736617276 -rfd842a67cc3e9b60707c4dcf782aa97d5291b6c6
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision fd842a67cc3e9b60707c4dcf782aa97d5291b6c6)
@@ -1894,7 +1894,8 @@
                             UpperBoundaryWaterLevels = (RoundedDouble) 15.3,
                             LowerBoundaryWaterLevels = (RoundedDouble) (-2.4),
                             StepSize = WaveConditionsInputStepSize.Two,
-                            CategoryType = FailureMechanismCategoryType.FactorizedLowerLimitNorm
+                            CategoryType = FailureMechanismCategoryType.FactorizedLowerLimitNorm,
+                            CalculationType = GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveImpact
                         }
                     }
                 }
@@ -1928,7 +1929,8 @@
                         UpperBoundaryWaterLevels = (RoundedDouble) 13.3,
                         LowerBoundaryWaterLevels = (RoundedDouble) (-1.9),
                         StepSize = WaveConditionsInputStepSize.One,
-                        CategoryType = FailureMechanismCategoryType.LowerLimitNorm
+                        CategoryType = FailureMechanismCategoryType.LowerLimitNorm,
+                        CalculationType = GrassCoverErosionOutwardsWaveConditionsCalculationType.Both
                     },
                     Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create(
                         new[]