Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs
===================================================================
diff -u -rb3687b70a3ff1795a2b1867bbc273f0b06fc3cac -rc00754e69dff2c23630579b625ee2e4368ab25ae
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs	(.../AssessmentSectionMergeHandlerTest.cs)	(revision b3687b70a3ff1795a2b1867bbc273f0b06fc3cac)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs	(.../AssessmentSectionMergeHandlerTest.cs)	(revision c00754e69dff2c23630579b625ee2e4368ab25ae)
@@ -35,7 +35,6 @@
 using Riskeer.Common.Data.TestUtil.IllustrationPoints;
 using Riskeer.GrassCoverErosionInwards.Data;
 using Riskeer.GrassCoverErosionOutwards.Data;
-using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.HeightStructures.Data;
 using Riskeer.Integration.Data;
 using Riskeer.Integration.Data.Merge;
@@ -314,7 +313,6 @@
                     HydraulicBoundaryLocation = sourceLocations[1]
                 }
             });
-            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(sourceAssessmentSection.GrassCoverErosionOutwards, sourceLocations, true);
             sourceAssessmentSection.GrassCoverErosionOutwards.WaveConditionsCalculationGroup.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 InputParameters =
@@ -408,16 +406,16 @@
             // Then
             foreach (HydraulicBoundaryLocationCalculationsForTargetProbability tp in sourceAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities)
             {
-                HydraulicBoundaryLocationCalculationsForTargetProbability targetProbability = targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First(c => c.TargetProbability.Equals(tp.TargetProbability));
-
-                AssertHydraulicBoundaryCalculations(tp.HydraulicBoundaryLocationCalculations, targetProbability.HydraulicBoundaryLocationCalculations, targetLocations);
+                AssertHydraulicBoundaryCalculations(tp.HydraulicBoundaryLocationCalculations, targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities
+                                                                                                                     .First(c => c.TargetProbability.Equals(tp.TargetProbability))
+                                                                                                                     .HydraulicBoundaryLocationCalculations, targetLocations);
             }
 
             foreach (HydraulicBoundaryLocationCalculationsForTargetProbability tp in sourceAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities)
             {
-                HydraulicBoundaryLocationCalculationsForTargetProbability targetProbability = targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.First(c => c.TargetProbability.Equals(tp.TargetProbability));
-
-                AssertHydraulicBoundaryCalculations(tp.HydraulicBoundaryLocationCalculations, targetProbability.HydraulicBoundaryLocationCalculations, targetLocations);
+                AssertHydraulicBoundaryCalculations(tp.HydraulicBoundaryLocationCalculations, targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities
+                                                                                                                     .First(c => c.TargetProbability.Equals(tp.TargetProbability))
+                                                                                                                     .HydraulicBoundaryLocationCalculations, targetLocations);
             }
         }
 
@@ -445,6 +443,10 @@
             sourceAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[0].TargetProbability = 0.01;
             sourceAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities[0].TargetProbability = 0.01;
 
+            // Precondition
+            Assert.AreEqual(0, targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01)));
+            Assert.AreEqual(0, targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01)));
+
             // When
             handler.PerformMerge(targetAssessmentSection, new AssessmentSectionMergeData(
                                      sourceAssessmentSection,
@@ -462,8 +464,8 @@
                                      }));
 
             // Then
-            Assert.AreEqual(targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01)), 1);
-            Assert.AreEqual(targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01)), 1);
+            Assert.AreEqual(1, targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01)));
+            Assert.AreEqual(1, targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Count(c => c.TargetProbability.Equals(0.01)));
         }
 
         private static void AssertHydraulicBoundaryCalculations(IEnumerable<HydraulicBoundaryLocationCalculation> sourceCalculations,
@@ -858,6 +860,12 @@
                                               section => section.WaterLevelCalculationsForSignalingNorm));
             yield return new TestCaseData(new Func<AssessmentSection, IEnumerable<HydraulicBoundaryLocationCalculation>>(
                                               section => section.WaterLevelCalculationsForLowerLimitNorm));
+            yield return new TestCaseData(new Func<AssessmentSection, IEnumerable<HydraulicBoundaryLocationCalculation>>(
+                                              section => section.WaterLevelCalculationsForUserDefinedTargetProbabilities
+                                                                .SelectMany(c => c.HydraulicBoundaryLocationCalculations)));
+            yield return new TestCaseData(new Func<AssessmentSection, IEnumerable<HydraulicBoundaryLocationCalculation>>(
+                                              section => section.WaveHeightCalculationsForUserDefinedTargetProbabilities
+                                                                .SelectMany(c => c.HydraulicBoundaryLocationCalculations)));
         }
 
         #endregion