Index: Riskeer/Integration/src/Riskeer.Integration.Service/AssessmentSectionCalculationActivityFactory.cs
===================================================================
diff -u -r88a1b9aaf1515610c13bd6cba90d87943bb47cff -r8b271a22db7dc94f6e0855288321618c7adae36a
--- Riskeer/Integration/src/Riskeer.Integration.Service/AssessmentSectionCalculationActivityFactory.cs	(.../AssessmentSectionCalculationActivityFactory.cs)	(revision 88a1b9aaf1515610c13bd6cba90d87943bb47cff)
+++ Riskeer/Integration/src/Riskeer.Integration.Service/AssessmentSectionCalculationActivityFactory.cs	(.../AssessmentSectionCalculationActivityFactory.cs)	(revision 8b271a22db7dc94f6e0855288321618c7adae36a)
@@ -60,7 +60,7 @@
             activities.AddRange(AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.CreateHydraulicBoundaryLocationCalculationActivities(assessmentSection));
             activities.AddRange(StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(assessmentSection.StabilityStoneCover, assessmentSection));
             activities.AddRange(WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(assessmentSection.WaveImpactAsphaltCover, assessmentSection));
-            activities.AddRange(GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivitiesWithoutAssessmentSectionCalculations(assessmentSection.GrassCoverErosionOutwards, assessmentSection));
+            activities.AddRange(GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivities(assessmentSection.GrassCoverErosionOutwards, assessmentSection));
             activities.AddRange(DuneLocationCalculationActivityFactory.CreateCalculationActivities(assessmentSection.DuneErosion, assessmentSection));
 
             return activities;
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs
===================================================================
diff -u -r14e8d8ce46e7546fe5d143c006576914a30b4c28 -r8b271a22db7dc94f6e0855288321618c7adae36a
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 14e8d8ce46e7546fe5d143c006576914a30b4c28)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 8b271a22db7dc94f6e0855288321618c7adae36a)
@@ -199,7 +199,7 @@
             {
                 hydraulicBoundaryLocation
             };
-            
+
             assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.AddRange(
                 new[]
                 {
@@ -255,21 +255,6 @@
                                  })
                                  .Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(9);
 
-                calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                                 .WhenCalled(invocation =>
-                                 {
-                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                         expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]);
-                                 })
-                                 .Return(new TestDesignWaterLevelCalculator()).Repeat.Times(3);
-                calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
-                                 .WhenCalled(invocation =>
-                                 {
-                                     HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                         expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]);
-                                 })
-                                 .Return(new TestWaveHeightCalculator()).Repeat.Times(3);
-
                 calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                                  .WhenCalled(invocation =>
                                  {
@@ -294,7 +279,7 @@
                 AssessmentSectionCalculationActivityFactory.CreateHydraulicLoadCalculationActivities(assessmentSection);
 
             // Assert
-            Assert.AreEqual(20, activities.Count());
+            Assert.AreEqual(14, activities.Count());
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {