Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationActivityFactoryTest.cs
===================================================================
diff -u -rf1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f -r3d2efe6a449689dc99848ac70f3ac5dd15fbc8b9
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationActivityFactoryTest.cs	(.../GrassCoverErosionInwardsCalculationActivityFactoryTest.cs)	(revision f1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationActivityFactoryTest.cs	(.../GrassCoverErosionInwardsCalculationActivityFactoryTest.cs)	(revision 3d2efe6a449689dc99848ac70f3ac5dd15fbc8b9)
@@ -114,16 +114,19 @@
 
             mocks.ReplayAll();
 
-            GrassCoverErosionInwardsCalculation calculation = CreateValidCalculation();
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            assessmentSection.HydraulicBoundaryDatabases.First().Locations.Add(hydraulicBoundaryLocation);
 
+            GrassCoverErosionInwardsCalculation calculation = CreateValidCalculation(hydraulicBoundaryLocation);
+
             // Call
             CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
                                                                                                                          failureMechanism,
                                                                                                                          assessmentSection);
 
             // Assert
             Assert.IsInstanceOf<GrassCoverErosionInwardsCalculationActivity>(activity);
-            AssertGrassCoverErosionInwardsCalculationActivity(activity, calculation, assessmentSection.HydraulicBoundaryDatabase);
+            AssertGrassCoverErosionInwardsCalculationActivity(activity, calculation, assessmentSection);
             mocks.VerifyAll();
         }
 
@@ -191,9 +194,12 @@
 
             mocks.ReplayAll();
 
-            GrassCoverErosionInwardsCalculation calculation1 = CreateValidCalculation();
-            GrassCoverErosionInwardsCalculation calculation2 = CreateValidCalculation();
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            assessmentSection.HydraulicBoundaryDatabases.First().Locations.Add(hydraulicBoundaryLocation);
 
+            GrassCoverErosionInwardsCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation);
+            GrassCoverErosionInwardsCalculation calculation2 = CreateValidCalculation(hydraulicBoundaryLocation);
+
             var calculations = new CalculationGroup
             {
                 Children =
@@ -212,8 +218,8 @@
             Assert.AreEqual(2, activities.Count());
 
             HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
-            AssertGrassCoverErosionInwardsCalculationActivity(activities.First(), calculation1, hydraulicBoundaryDatabase);
-            AssertGrassCoverErosionInwardsCalculationActivity(activities.ElementAt(1), calculation2, hydraulicBoundaryDatabase);
+            AssertGrassCoverErosionInwardsCalculationActivity(activities.First(), calculation1, assessmentSection);
+            AssertGrassCoverErosionInwardsCalculationActivity(activities.ElementAt(1), calculation2, assessmentSection);
             mocks.VerifyAll();
         }
 
@@ -258,9 +264,12 @@
 
             mocks.ReplayAll();
 
-            GrassCoverErosionInwardsCalculation calculation1 = CreateValidCalculation();
-            GrassCoverErosionInwardsCalculation calculation2 = CreateValidCalculation();
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            assessmentSection.HydraulicBoundaryDatabases.First().Locations.Add(hydraulicBoundaryLocation);
 
+            GrassCoverErosionInwardsCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation);
+            GrassCoverErosionInwardsCalculation calculation2 = CreateValidCalculation(hydraulicBoundaryLocation);
+
             failureMechanism.CalculationsGroup.Children.AddRange(new[]
             {
                 calculation1,
@@ -276,18 +285,18 @@
             Assert.AreEqual(2, activities.Count());
 
             HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
-            AssertGrassCoverErosionInwardsCalculationActivity(activities.First(), calculation1, hydraulicBoundaryDatabase);
-            AssertGrassCoverErosionInwardsCalculationActivity(activities.ElementAt(1), calculation2, hydraulicBoundaryDatabase);
+            AssertGrassCoverErosionInwardsCalculationActivity(activities.First(), calculation1, assessmentSection);
+            AssertGrassCoverErosionInwardsCalculationActivity(activities.ElementAt(1), calculation2, assessmentSection);
             mocks.VerifyAll();
         }
 
-        private static GrassCoverErosionInwardsCalculation CreateValidCalculation()
+        private static GrassCoverErosionInwardsCalculation CreateValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             return new GrassCoverErosionInwardsCalculation
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2),
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                     DikeProfile = new DikeProfile(new Point2D(0, 0),
                                                   new RoughnessPoint[0],
                                                   new Point2D[0],
@@ -302,7 +311,7 @@
 
         private static void AssertGrassCoverErosionInwardsCalculationActivity(Activity activity,
                                                                               GrassCoverErosionInwardsCalculation calculation,
-                                                                              HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
+                                                                              IAssessmentSection assessmentSection)
         {
             var mocks = new MockRepository();
             var testCalculator = new TestOvertoppingCalculator();
@@ -311,7 +320,7 @@
                              .WhenCalled(invocation =>
                              {
                                  HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase),
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection, calculation.InputParameters.HydraulicBoundaryLocation),
                                      (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(testCalculator);