Index: Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculationOutput.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculationOutput.cs	(.../ICalculationOutput.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculationOutput.cs	(.../ICalculationOutput.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -19,12 +19,13 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Core.Common.Base;
 
 namespace Ringtoets.Common.Data.Calculation
 {
     /// <summary>
     /// Interface describing an object that is the output to a <see cref="ICalculation"/>.
     /// </summary>
-    public interface ICalculationOutput : IObservable {}
+    public interface ICalculationOutput : IObservable, ICloneable {}
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentOutput.cs
===================================================================
diff -u -r5a0faf50983c0b2b407604d01d34312f12282b19 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentOutput.cs	(.../ProbabilityAssessmentOutput.cs)	(revision 5a0faf50983c0b2b407604d01d34312f12282b19)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentOutput.cs	(.../ProbabilityAssessmentOutput.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -29,7 +29,7 @@
     /// <summary>
     /// This class contains the results of a probabilistic assessment calculation.
     /// </summary>
-    public class ProbabilityAssessmentOutput : Observable, ICalculationOutput, ICloneable
+    public class ProbabilityAssessmentOutput : Observable, ICalculationOutput
     {
         private double requiredProbability;
         private double probability;
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs
===================================================================
diff -u -r4c394b22a72798514dbbba8935f8683147da0ef3 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs	(.../GrassCoverErosionInwardsOutput.cs)	(revision 4c394b22a72798514dbbba8935f8683147da0ef3)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs	(.../GrassCoverErosionInwardsOutput.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -28,7 +28,7 @@
     /// <summary>
     /// The overall result of a grass cover erosion inwards assessment.
     /// </summary>
-    public class GrassCoverErosionInwardsOutput : Observable, ICalculationOutput, ICloneable
+    public class GrassCoverErosionInwardsOutput : Observable, ICalculationOutput
     {
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionInwardsOutput"/>.
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutput.cs
===================================================================
diff -u -rdb79f2474954cf7342857521970048613aefcb18 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutput.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutput.cs)	(revision db79f2474954cf7342857521970048613aefcb18)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutput.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutput.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -31,7 +31,7 @@
     /// <summary>
     /// Container for the results of a grass cover erosion outwards wave conditions calculation.
     /// </summary>
-    public class GrassCoverErosionOutwardsWaveConditionsOutput : Observable, ICalculationOutput, ICloneable
+    public class GrassCoverErosionOutwardsWaveConditionsOutput : Observable, ICalculationOutput
     {
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionOutwardsWaveConditionsOutput"/>.
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.TestUtil/Ringtoets.GrassCoverErosionOutwards.Data.TestUtil.csproj
===================================================================
diff -u -rdb79f2474954cf7342857521970048613aefcb18 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.TestUtil/Ringtoets.GrassCoverErosionOutwards.Data.TestUtil.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Data.TestUtil.csproj)	(revision db79f2474954cf7342857521970048613aefcb18)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.TestUtil/Ringtoets.GrassCoverErosionOutwards.Data.TestUtil.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Data.TestUtil.csproj)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -35,11 +35,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationContextTest.cs
===================================================================
diff -u -r41f61f39ae4e78d9aa78cd5b57b716e2ff5a9fa9 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationContextTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTest.cs)	(revision 41f61f39ae4e78d9aa78cd5b57b716e2ff5a9fa9)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationContextTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTest.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -126,7 +126,6 @@
         public void Equals_ToOtherWithDifferentType_ReturnFalse()
         {
             // Setup
-            // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
@@ -161,9 +160,6 @@
             var context1 = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation1, parent, failureMechanism, assessmentSection);
             var context2 = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation2, parent, failureMechanism, assessmentSection);
 
-            // Precondition
-            Assert.IsFalse(context1.Equals(context2));
-
             // Call
             bool isEqual1 = context1.Equals(context2);
             bool isEqual2 = context2.Equals(context1);
@@ -234,6 +230,7 @@
         [Test]
         public void GetHashCode_EqualObjects_ReturnSameHashCode()
         {
+            // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsOutput.cs
===================================================================
diff -u -r0e809897e28ca8673b98ec8abb68b42939a3a647 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsOutput.cs	(.../MacroStabilityInwardsOutput.cs)	(revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsOutput.cs	(.../MacroStabilityInwardsOutput.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -65,41 +65,12 @@
             ForbiddenZonesXEntryMax = properties.ForbiddenZonesXEntryMax;
         }
 
-        #region Properties
+        public object Clone()
+        {
+            throw new NotImplementedException();
+        }
 
         /// <summary>
-        /// Gets the sliding curve.
-        /// </summary>
-        public MacroStabilityInwardsSlidingCurve SlidingCurve { get; }
-
-        /// <summary>
-        /// Gets the slip plane.
-        /// </summary>
-        public MacroStabilityInwardsSlipPlaneUpliftVan SlipPlane { get; }
-
-        /// <summary>
-        /// Gets the factor of stability of the Uplift Van calculation.
-        /// </summary>
-        public double FactorOfStability { get; }
-
-        /// <summary>
-        /// Gets the z value.
-        /// </summary>
-        public double ZValue { get; }
-
-        /// <summary>
-        /// Gets the forbidden zones x entry min.
-        /// </summary>
-        public double ForbiddenZonesXEntryMin { get; }
-
-        /// <summary>
-        /// Gets the forbidden zones x entry max.
-        /// </summary>
-        public double ForbiddenZonesXEntryMax { get; }
-
-        #endregion
-
-        /// <summary>
         /// Container for properties for constructing a <see cref="MacroStabilityInwardsOutput"/>.
         /// </summary>s
         public class ConstructionProperties
@@ -135,5 +106,39 @@
             /// </summary>
             public double ForbiddenZonesXEntryMax { internal get; set; }
         }
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the sliding curve.
+        /// </summary>
+        public MacroStabilityInwardsSlidingCurve SlidingCurve { get; }
+
+        /// <summary>
+        /// Gets the slip plane.
+        /// </summary>
+        public MacroStabilityInwardsSlipPlaneUpliftVan SlipPlane { get; }
+
+        /// <summary>
+        /// Gets the factor of stability of the Uplift Van calculation.
+        /// </summary>
+        public double FactorOfStability { get; }
+
+        /// <summary>
+        /// Gets the z value.
+        /// </summary>
+        public double ZValue { get; }
+
+        /// <summary>
+        /// Gets the forbidden zones x entry min.
+        /// </summary>
+        public double ForbiddenZonesXEntryMin { get; }
+
+        /// <summary>
+        /// Gets the forbidden zones x entry max.
+        /// </summary>
+        public double ForbiddenZonesXEntryMax { get; }
+
+        #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingOutput.cs
===================================================================
diff -u -r3cf4d4c65cf2ce285bdeb71162cf3b0a79cb3742 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingOutput.cs	(.../PipingOutput.cs)	(revision 3cf4d4c65cf2ce285bdeb71162cf3b0a79cb3742)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingOutput.cs	(.../PipingOutput.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -29,7 +29,7 @@
     /// <summary>
     /// Simple class containing the results of a Piping calculation.
     /// </summary>
-    public class PipingOutput : Observable, ICalculationOutput, ICloneable
+    public class PipingOutput : Observable, ICalculationOutput
     {
         /// <summary>
         /// Creates a new instance of <see cref="PipingOutput"/>. 
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsOutput.cs
===================================================================
diff -u -rb7e9a2c0ff0bb20209a80f5d96ffda1921ec724c -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsOutput.cs	(.../WaveConditionsOutput.cs)	(revision b7e9a2c0ff0bb20209a80f5d96ffda1921ec724c)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsOutput.cs	(.../WaveConditionsOutput.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -32,7 +32,7 @@
     /// <summary>
     /// The result of a wave conditions calculation.
     /// </summary>
-    public class WaveConditionsOutput : Observable, ICalculationOutput, ICloneable
+    public class WaveConditionsOutput : Observable, ICalculationOutput
     {
         private CalculationConvergence calculationConvergence;
         private double targetProbability;
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/WaveConditionsCloneAssert.cs
===================================================================
diff -u -rb7e9a2c0ff0bb20209a80f5d96ffda1921ec724c -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/WaveConditionsCloneAssert.cs	(.../WaveConditionsCloneAssert.cs)	(revision b7e9a2c0ff0bb20209a80f5d96ffda1921ec724c)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/WaveConditionsCloneAssert.cs	(.../WaveConditionsCloneAssert.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -67,7 +67,6 @@
             Assert.AreSame(original.HydraulicBoundaryLocation, clone.HydraulicBoundaryLocation);
             Assert.AreEqual(original.Orientation, clone.Orientation);
             Assert.AreEqual(original.StepSize, clone.StepSize);
-            Assert.AreEqual(original.UpperBoundaryDesignWaterLevel, clone.UpperBoundaryDesignWaterLevel);
             Assert.AreEqual(original.UpperBoundaryRevetment, clone.UpperBoundaryRevetment);
             Assert.AreEqual(original.LowerBoundaryWaterLevels, clone.LowerBoundaryWaterLevels);
             Assert.AreEqual(original.LowerBoundaryRevetment, clone.LowerBoundaryRevetment);
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsOutput.cs
===================================================================
diff -u -rb7e9a2c0ff0bb20209a80f5d96ffda1921ec724c -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsOutput.cs	(.../StabilityStoneCoverWaveConditionsOutput.cs)	(revision b7e9a2c0ff0bb20209a80f5d96ffda1921ec724c)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsOutput.cs	(.../StabilityStoneCoverWaveConditionsOutput.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -31,7 +31,7 @@
     /// <summary>
     /// Container for the results of a stability stone cover wave conditions calculation.
     /// </summary>
-    public class StabilityStoneCoverWaveConditionsOutput : Observable, ICalculationOutput, ICloneable
+    public class StabilityStoneCoverWaveConditionsOutput : Observable, ICalculationOutput
     {
         /// <summary>
         /// Creates a new instance of <see cref="StabilityStoneCoverWaveConditionsOutput"/>.
@@ -70,8 +70,8 @@
         {
             var clone = (StabilityStoneCoverWaveConditionsOutput) MemberwiseClone();
 
-            clone.ColumnsOutput = ColumnsOutput.Select(s => (WaveConditionsOutput) s.Clone()).ToArray();
-            clone.BlocksOutput = BlocksOutput.Select(s => (WaveConditionsOutput) s.Clone()).ToArray();
+            clone.ColumnsOutput = ColumnsOutput.Select(column => (WaveConditionsOutput) column.Clone()).ToArray();
+            clone.BlocksOutput = BlocksOutput.Select(block => (WaveConditionsOutput) block.Clone()).ToArray();
 
             return clone;
         }
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs
===================================================================
diff -u -rdb79f2474954cf7342857521970048613aefcb18 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationTest.cs)	(revision db79f2474954cf7342857521970048613aefcb18)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationTest.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -107,7 +107,7 @@
             // Setup
             StabilityStoneCoverWaveConditionsCalculation original = StabilityStoneCoverTestDataGenerator.GetRandomStabilityStoneCoverWaveConditionsCalculation();
 
-            original.Output = StabilityStoneCoverTestDataGenerator.GetRandomStabilityStoneCoverWaveConditoinsOutput();
+            original.Output = StabilityStoneCoverTestDataGenerator.GetRandomStabilityStoneCoverWaveConditionsOutput();
 
             // Call
             object clone = original.Clone();
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsOutputTest.cs
===================================================================
diff -u -rdb79f2474954cf7342857521970048613aefcb18 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsOutputTest.cs	(.../StabilityStoneCoverWaveConditionsOutputTest.cs)	(revision db79f2474954cf7342857521970048613aefcb18)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsOutputTest.cs	(.../StabilityStoneCoverWaveConditionsOutputTest.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -80,7 +80,7 @@
         public void Clone_Always_ReturnNewInstanceWithCopiedValues()
         {
             // Setup
-            StabilityStoneCoverWaveConditionsOutput original = StabilityStoneCoverTestDataGenerator.GetRandomStabilityStoneCoverWaveConditoinsOutput();
+            StabilityStoneCoverWaveConditionsOutput original = StabilityStoneCoverTestDataGenerator.GetRandomStabilityStoneCoverWaveConditionsOutput();
 
             // Call
             object clone = original.Clone();
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.TestUtil/Ringtoets.StabilityStoneCover.Data.TestUtil.csproj
===================================================================
diff -u -r30af1e4ee34906e1d48fbf65cccf5b341538590c -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.TestUtil/Ringtoets.StabilityStoneCover.Data.TestUtil.csproj	(.../Ringtoets.StabilityStoneCover.Data.TestUtil.csproj)	(revision 30af1e4ee34906e1d48fbf65cccf5b341538590c)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.TestUtil/Ringtoets.StabilityStoneCover.Data.TestUtil.csproj	(.../Ringtoets.StabilityStoneCover.Data.TestUtil.csproj)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -35,7 +35,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.TestUtil/StabilityStoneCoverTestDataGenerator.cs
===================================================================
diff -u -rdb79f2474954cf7342857521970048613aefcb18 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.TestUtil/StabilityStoneCoverTestDataGenerator.cs	(.../StabilityStoneCoverTestDataGenerator.cs)	(revision db79f2474954cf7342857521970048613aefcb18)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.TestUtil/StabilityStoneCoverTestDataGenerator.cs	(.../StabilityStoneCoverTestDataGenerator.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -52,7 +52,7 @@
         /// Creates a random instance of <see cref="StabilityStoneCoverWaveConditionsOutput"/>.
         /// </summary>
         /// <returns>A random instance of <see cref="StabilityStoneCoverWaveConditionsOutput"/>.</returns>
-        public static StabilityStoneCoverWaveConditionsOutput GetRandomStabilityStoneCoverWaveConditoinsOutput()
+        public static StabilityStoneCoverWaveConditionsOutput GetRandomStabilityStoneCoverWaveConditionsOutput()
         {
             return new StabilityStoneCoverWaveConditionsOutput(new[]
                                                                {
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationContextTest.cs
===================================================================
diff -u -rb7e9a2c0ff0bb20209a80f5d96ffda1921ec724c -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationContextTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTest.cs)	(revision b7e9a2c0ff0bb20209a80f5d96ffda1921ec724c)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationContextTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTest.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -126,7 +126,6 @@
         public void Equals_ToOtherWithDifferentType_ReturnFalse()
         {
             // Setup
-            // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
@@ -161,9 +160,6 @@
             var context1 = new StabilityStoneCoverWaveConditionsCalculationContext(calculation1, parent, failureMechanism, assessmentSection);
             var context2 = new StabilityStoneCoverWaveConditionsCalculationContext(calculation2, parent, failureMechanism, assessmentSection);
 
-            // Precondition
-            Assert.IsFalse(context1.Equals(context2));
-
             // Call
             bool isEqual1 = context1.Equals(context2);
             bool isEqual2 = context2.Equals(context1);
@@ -234,6 +230,7 @@
         [Test]
         public void GetHashCode_EqualObjects_ReturnSameHashCode()
         {
+            // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsOutput.cs
===================================================================
diff -u -rdb79f2474954cf7342857521970048613aefcb18 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsOutput.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutput.cs)	(revision db79f2474954cf7342857521970048613aefcb18)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsOutput.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutput.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -31,7 +31,7 @@
     /// <summary>
     /// Container for the results of a wave impact asphalt cover wave conditions calculation.
     /// </summary>
-    public class WaveImpactAsphaltCoverWaveConditionsOutput : Observable, ICalculationOutput, ICloneable
+    public class WaveImpactAsphaltCoverWaveConditionsOutput : Observable, ICalculationOutput
     {
         /// <summary>
         /// Creates a new instance of <see cref="WaveImpactAsphaltCoverWaveConditionsOutput"/>.
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.TestUtil/Ringtoets.WaveImpactAsphaltCover.Data.TestUtil.csproj
===================================================================
diff -u -rdb79f2474954cf7342857521970048613aefcb18 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.TestUtil/Ringtoets.WaveImpactAsphaltCover.Data.TestUtil.csproj	(.../Ringtoets.WaveImpactAsphaltCover.Data.TestUtil.csproj)	(revision db79f2474954cf7342857521970048613aefcb18)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.TestUtil/Ringtoets.WaveImpactAsphaltCover.Data.TestUtil.csproj	(.../Ringtoets.WaveImpactAsphaltCover.Data.TestUtil.csproj)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -35,11 +35,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverCalculationContextTest.cs
===================================================================
diff -u -r41f61f39ae4e78d9aa78cd5b57b716e2ff5a9fa9 -rdecccf5efb0ae872940d8d51b6de9978d13ecb37
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverCalculationContextTest.cs	(.../WaveImpactAsphaltCoverCalculationContextTest.cs)	(revision 41f61f39ae4e78d9aa78cd5b57b716e2ff5a9fa9)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverCalculationContextTest.cs	(.../WaveImpactAsphaltCoverCalculationContextTest.cs)	(revision decccf5efb0ae872940d8d51b6de9978d13ecb37)
@@ -126,7 +126,6 @@
         public void Equals_ToOtherWithDifferentType_ReturnFalse()
         {
             // Setup
-            // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
@@ -161,9 +160,6 @@
             var context1 = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(calculation1, parent, failureMechanism, assessmentSection);
             var context2 = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(calculation2, parent, failureMechanism, assessmentSection);
 
-            // Precondition
-            Assert.IsFalse(context1.Equals(context2));
-
             // Call
             bool isEqual1 = context1.Equals(context2);
             bool isEqual2 = context2.Equals(context1);
@@ -234,6 +230,7 @@
         [Test]
         public void GetHashCode_EqualObjects_ReturnSameHashCode()
         {
+            // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();