Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocation.cs
===================================================================
diff -u -r75897942629adb76bc369ddc3a2bbb30b2bb4f06 -r3401d9bb860058fd63172e26815bff00ee84f704
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocation.cs	(.../DuneLocation.cs)	(revision 75897942629adb76bc369ddc3a2bbb30b2bb4f06)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocation.cs	(.../DuneLocation.cs)	(revision 3401d9bb860058fd63172e26815bff00ee84f704)
@@ -62,9 +62,6 @@
             D50 = new RoundedDouble(6, properties.D50);
 
             Calculation = new DuneLocationCalculation();
-            Calculation2 = new DuneLocationCalculation();
-            Calculation3 = new DuneLocationCalculation();
-            Calculation4 = new DuneLocationCalculation();
         }
 
         /// <summary>
@@ -103,26 +100,11 @@
         public RoundedDouble D50 { get; }
 
         /// <summary>
-        /// Gets the first dune erosion calculation.
+        /// Gets the dune erosion calculation.
         /// </summary>
         public DuneLocationCalculation Calculation { get; }
 
         /// <summary>
-        /// Gets the second dune erosion calculation.
-        /// </summary>
-        public DuneLocationCalculation Calculation2 { get; }
-
-        /// <summary>
-        /// Gets the third dune erosion calculation.
-        /// </summary>
-        public DuneLocationCalculation Calculation3 { get; }
-
-        /// <summary>
-        /// Gets the fourth dune erosion calculation.
-        /// </summary>
-        public DuneLocationCalculation Calculation4 { get; }
-
-        /// <summary>
         /// Class holding the various construction parameters for <see cref="DuneLocation"/>.
         /// </summary>
         public class ConstructionProperties
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneLocationTest.cs
===================================================================
diff -u -r75897942629adb76bc369ddc3a2bbb30b2bb4f06 -r3401d9bb860058fd63172e26815bff00ee84f704
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneLocationTest.cs	(.../DuneLocationTest.cs)	(revision 75897942629adb76bc369ddc3a2bbb30b2bb4f06)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneLocationTest.cs	(.../DuneLocationTest.cs)	(revision 3401d9bb860058fd63172e26815bff00ee84f704)
@@ -83,10 +83,8 @@
             Assert.AreEqual(offset, duneLocation.Offset.Value);
             Assert.AreEqual(orientation, duneLocation.Orientation.Value);
             Assert.AreEqual(d50, duneLocation.D50.Value);
-            AssertDuneLocationCalculation(duneLocation.Calculation);
-            AssertDuneLocationCalculation(duneLocation.Calculation2);
-            AssertDuneLocationCalculation(duneLocation.Calculation3);
-            AssertDuneLocationCalculation(duneLocation.Calculation4);
+            Assert.IsNotNull(duneLocation.Calculation);
+            Assert.IsNull(duneLocation.Calculation.Output);
         }
 
         [Test]
@@ -133,11 +131,5 @@
             Assert.AreEqual(6, duneLocation.D50.NumberOfDecimalPlaces);
             Assert.AreEqual(0.123457, duneLocation.D50, duneLocation.D50.GetAccuracy());
         }
-
-        private static void AssertDuneLocationCalculation(DuneLocationCalculation duneLocationCalculation)
-        {
-            Assert.IsNotNull(duneLocationCalculation);
-            Assert.IsNull(duneLocationCalculation.Output);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r3401d9bb860058fd63172e26815bff00ee84f704
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 3401d9bb860058fd63172e26815bff00ee84f704)
@@ -1605,7 +1605,14 @@
 
         private static bool HasHydraulicBoundaryLocationOutput(HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            return hydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput || hydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput;
+            return hydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput
+                   || hydraulicBoundaryLocation.DesignWaterLevelCalculation2.HasOutput
+                   || hydraulicBoundaryLocation.DesignWaterLevelCalculation3.HasOutput
+                   || hydraulicBoundaryLocation.DesignWaterLevelCalculation4.HasOutput
+                   || hydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput
+                   || hydraulicBoundaryLocation.WaveHeightCalculation2.HasOutput
+                   || hydraulicBoundaryLocation.WaveHeightCalculation3.HasOutput
+                   || hydraulicBoundaryLocation.WaveHeightCalculation4.HasOutput;
         }
 
         #region TestData
@@ -1647,7 +1654,7 @@
             get
             {
                 yield return new TestCaseData(
-                    TestHydraulicBoundaryLocation.CreateFullyCalculated(),
+                    CreateFullyCalculatedHydraulicBoundaryLocation(),
                     new TestHydraulicBoundaryLocation(),
                     new TestDuneLocation
                     {
@@ -1658,13 +1665,13 @@
                     }
                 ).SetName("HydraulicBoundaryAndDuneLocationWithOutput");
                 yield return new TestCaseData(
-                    TestHydraulicBoundaryLocation.CreateFullyCalculated(),
+                    CreateFullyCalculatedHydraulicBoundaryLocation(),
                     new TestHydraulicBoundaryLocation(),
                     new TestDuneLocation()
                 ).SetName("HydraulicBoundaryLocationWithOutput");
                 yield return new TestCaseData(
+                    CreateFullyCalculatedHydraulicBoundaryLocation(),
                     TestHydraulicBoundaryLocation.CreateFullyCalculated(),
-                    TestHydraulicBoundaryLocation.CreateFullyCalculated(),
                     new TestDuneLocation
                     {
                         Calculation =
@@ -1674,8 +1681,8 @@
                     }
                 ).SetName("AllTypesWithOutput");
                 yield return new TestCaseData(
+                    CreateFullyCalculatedHydraulicBoundaryLocation(),
                     TestHydraulicBoundaryLocation.CreateFullyCalculated(),
-                    TestHydraulicBoundaryLocation.CreateFullyCalculated(),
                     new TestDuneLocation()
                 ).SetName("HydraulicBoundaryAndGrassLocationWithOutput");
                 yield return new TestCaseData(
@@ -1713,6 +1720,45 @@
             }
         }
 
+        private static HydraulicBoundaryLocation CreateFullyCalculatedHydraulicBoundaryLocation()
+        {
+            return new TestHydraulicBoundaryLocation
+            {
+                DesignWaterLevelCalculation1 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(1.1)
+                },
+                DesignWaterLevelCalculation2 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(2.2)
+                },
+                DesignWaterLevelCalculation3 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(3.3)
+                },
+                DesignWaterLevelCalculation4 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(4.4)
+                },
+                WaveHeightCalculation1 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(5.5)
+                },
+                WaveHeightCalculation2 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(6.6)
+                },
+                WaveHeightCalculation3 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(7.7)
+                },
+                WaveHeightCalculation4 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(8.8)
+                }
+            };
+        }
+
         #endregion
     }
 }
\ No newline at end of file