Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r9b0af3f940ae57b373ab4edfd7da944090255fde -rb1acb656284ee0a7db2384e83d2b36f64fa57dc8
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 9b0af3f940ae57b373ab4edfd7da944090255fde)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -26,7 +26,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.ClosingStructures.Data;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
@@ -1271,21 +1270,12 @@
                 foreshoreProfile
             }, "path");
 
-            var calculationWithForeshoreProfileAndOutput = new TestCalculationWithForeshoreProfile(true)
-            {
-                InputParameters =
-                {
-                    ForeshoreProfile = foreshoreProfile
-                }
-            };
-            var calculationWithForeshoreProfile = new TestCalculationWithForeshoreProfile(false)
-            {
-                InputParameters =
-                {
-                    ForeshoreProfile = foreshoreProfile
-                }
-            };
-            var calculationWithoutForeshoreProfile = new TestCalculationWithForeshoreProfile(false);
+            TestCalculationWithForeshoreProfile calculationWithForeshoreProfileAndOutput =
+                 TestCalculationWithForeshoreProfile.CreateCalculationWithOutput(foreshoreProfile);
+            TestCalculationWithForeshoreProfile calculationWithForeshoreProfile =
+                TestCalculationWithForeshoreProfile.CreateCalculationWithoutOutput(foreshoreProfile);
+            TestCalculationWithForeshoreProfile calculationWithoutForeshoreProfile =
+                TestCalculationWithForeshoreProfile.CreateDefaultCalculation();
 
             var calculations = new List<ICalculation<ICalculationInput>>
             {
@@ -1307,8 +1297,6 @@
             // Note: To make sure the clear is performed regardless of what is done with
             // the return result, no ToArray() should be called before these assertions:
             CollectionAssert.IsEmpty(foreshoreProfiles);
-
-            CollectionAssert.IsEmpty(foreshoreProfiles);
             Assert.IsFalse(calculationWithForeshoreProfileAndOutput.HasOutput);
             Assert.IsTrue(calculationsWithForeshoreProfile.All(calc => calc.InputParameters.ForeshoreProfile == null));
 
@@ -1592,46 +1580,6 @@
             return hydraulicBoundaryLocation.DesignWaterLevelOutput != null || hydraulicBoundaryLocation.WaveHeightOutput != null;
         }
 
-        private class TestCalculationWithForeshoreProfile : Observable, ICalculation<TestCalculationInputWithForeshoreProfile>
-        {
-            public TestCalculationWithForeshoreProfile(bool hasOutput)
-            {
-                InputParameters = new TestCalculationInputWithForeshoreProfile();
-                HasOutput = hasOutput;
-            }
-
-            public string Name { get; set; }
-            public bool HasOutput { get; private set; }
-            public Comment Comments { get; }
-
-            public TestCalculationInputWithForeshoreProfile InputParameters { get; }
-
-            public void ClearOutput()
-            {
-                HasOutput = false;
-            }
-        }
-
-        private class TestCalculationInputWithForeshoreProfile : ICalculationInput, IHasForeshoreProfile
-        {
-            public ForeshoreProfile ForeshoreProfile { get; set; }
-
-            public void Attach(IObserver observer)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void Detach(IObserver observer)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void NotifyObservers()
-            {
-                throw new NotImplementedException();
-            }
-        }
-
         #region TestData
 
         private static IEnumerable<TestCaseData> GetGrassAndDuneLocations(string testName)