Index: Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/CalculationGroup.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/CalculationGroup.cs	(.../CalculationGroup.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/CalculationGroup.cs	(.../CalculationGroup.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -59,7 +59,7 @@
         /// <summary>
         /// Gets the children that define this group.
         /// </summary>
-        public IList<ICalculationBase> Children { get; private set; }
+        public IList<ICalculationBase> Children { get; }
 
         public string Name
         {
@@ -76,5 +76,10 @@
                 name = value;
             }
         }
+
+        public object Clone()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculationBase.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculationBase.cs	(.../ICalculationBase.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculationBase.cs	(.../ICalculationBase.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -19,14 +19,15 @@
 // 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>
     /// A calculation related item.
     /// </summary>
-    public interface ICalculationBase : IObservable
+    public interface ICalculationBase : IObservable, ICloneable
     {
         /// <summary>
         /// Gets or sets the name of this calculation item.
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/IStructuresCalculation.cs
===================================================================
diff -u -rc59d5c2acab71a0a5f1a179e1a1d394d935ef14b -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/IStructuresCalculation.cs	(.../IStructuresCalculation.cs)	(revision c59d5c2acab71a0a5f1a179e1a1d394d935ef14b)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/IStructuresCalculation.cs	(.../IStructuresCalculation.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -19,15 +19,14 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Ringtoets.Common.Data.Calculation;
 
 namespace Ringtoets.Common.Data.Structures
 {
     /// <summary>
     /// Interface for structures calculations.
     /// </summary>
-    public interface IStructuresCalculation : ICalculation, ICloneable
+    public interface IStructuresCalculation : ICalculation
     {
         /// <summary>
         /// Gets the output of the structures calculation.
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuBuilder.cs
===================================================================
diff -u -r22c5092409b8d4cf1be4d3ebfdd41169c0e64c14 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuBuilder.cs	(.../RingtoetsContextMenuBuilder.cs)	(revision 22c5092409b8d4cf1be4d3ebfdd41169c0e64c14)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuBuilder.cs	(.../RingtoetsContextMenuBuilder.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -138,7 +138,7 @@
             TCalculation calculation,
             TCalculationContext calculationContext)
             where TCalculationContext : ICalculationContext<TCalculation, IFailureMechanism>
-            where TCalculation : ICalculation, ICloneable
+            where TCalculation : ICalculation
         {
             contextMenuBuilder.AddCustomItem(RingtoetsContextMenuItemFactory.CreateDuplicateCalculationItem(calculation, calculationContext));
             return this;
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs
===================================================================
diff -u -r22c5092409b8d4cf1be4d3ebfdd41169c0e64c14 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs	(.../RingtoetsContextMenuItemFactory.cs)	(revision 22c5092409b8d4cf1be4d3ebfdd41169c0e64c14)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs	(.../RingtoetsContextMenuItemFactory.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -185,7 +185,7 @@
             TCalculation calculation,
             TCalculationContext calculationContext)
             where TCalculationContext : ICalculationContext<TCalculation, IFailureMechanism>
-            where TCalculation : ICalculation, ICloneable
+            where TCalculation : ICalculation
         {
             return new StrictContextMenuItem(
                 Resources.Duplicate,
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestCalculationTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestCalculationTest.cs	(.../TestCalculationTest.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestCalculationTest.cs	(.../TestCalculationTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -19,23 +19,92 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using Core.Common.Base;
 using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
 
 namespace Ringtoets.Common.Data.TestUtil.Test
 {
     [TestFixture]
     public class TestCalculationTest
     {
         [Test]
-        public void Constructor_WithName_NameSet()
+        public void DefaultConstructor_DefaultValues()
         {
             // Call
-            var calculation = new TestCalculation("Name");
+            var calculation = new TestCalculation();
 
             // Assert
-            Assert.AreEqual("Name", calculation.Name);
-            Assert.IsFalse(calculation.HasOutput);
+            Assert.IsInstanceOf<ICalculation>(calculation);
+            Assert.IsInstanceOf<Observable>(calculation);
+            Assert.AreEqual("Nieuwe berekening", calculation.Name);
+            Assert.IsNull(calculation.Output);
             Assert.IsNull(calculation.Comments);
         }
+
+        [Test]
+        public void ParameteredConstructor_ExpectedValues()
+        {
+            // Setup
+            const string name = "Name";
+
+            // Call
+            var calculation = new TestCalculation(name);
+
+            // Assert
+            Assert.IsInstanceOf<ICalculation>(calculation);
+            Assert.IsInstanceOf<Observable>(calculation);
+            Assert.AreEqual(name, calculation.Name);
+            Assert.IsNull(calculation.Output);
+            Assert.IsNull(calculation.Comments);
+        }
+
+        [Test]
+        public void HasOutput_OutputSet_ReturnsTrue()
+        {
+            // Setup
+            var calculation = new TestCalculation
+            {
+                Output = new object()
+            };
+
+            // Call
+            bool calculationHasOutput = calculation.HasOutput;
+
+            // Assert
+            Assert.IsTrue(calculationHasOutput);
+        }
+
+        [Test]
+        public void HasOutput_OutputNull_ReturnsFalse()
+        {
+            // Setup
+            var calculation = new TestCalculation
+            {
+                Output = null
+            };
+
+            // Call
+            bool calculationHasOutput = calculation.HasOutput;
+
+            // Assert
+            Assert.IsFalse(calculationHasOutput);
+        }
+
+        [Test]
+        public void ClearOutput_OutputSet_OutputSetToNull()
+        {
+            // Setup
+            var calculation = new TestCalculation
+            {
+                Output = new object()
+            };
+
+            // Call
+            calculation.ClearOutput();
+
+            // Assert
+            Assert.IsNull(calculation.Output);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestCalculation.cs
===================================================================
diff -u -r2702ecf9aaf678cf869dc330f8ff560b3de4672a -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestCalculation.cs	(.../TestCalculation.cs)	(revision 2702ecf9aaf678cf869dc330f8ff560b3de4672a)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestCalculation.cs	(.../TestCalculation.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -33,14 +33,36 @@
         /// Creates a new <see cref="TestCalculation"/>.
         /// </summary>
         /// <param name="name">The name of the calculation.</param>
-        public TestCalculation(string name)
+        public TestCalculation(string name = "Nieuwe berekening")
         {
             Name = name;
         }
 
+        /// <summary>
+        /// Gets or sets an object that represents some output of this calculation.
+        /// </summary>
+        public object Output { get; set; }
+
         public string Name { get; set; }
-        public bool HasOutput { get; set; }
+
         public Comment Comments { get; }
-        public void ClearOutput() {}
+
+        public bool HasOutput
+        {
+            get
+            {
+                return Output != null;
+            }
+        }
+
+        public void ClearOutput()
+        {
+            Output = null;
+        }
+
+        public object Clone()
+        {
+            return MemberwiseClone();
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestCalculationWithForeshoreProfile.cs
===================================================================
diff -u -r3ff98dbb4db7f1269de33c3e972a633ec74169a5 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestCalculationWithForeshoreProfile.cs	(.../TestCalculationWithForeshoreProfile.cs)	(revision 3ff98dbb4db7f1269de33c3e972a633ec74169a5)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestCalculationWithForeshoreProfile.cs	(.../TestCalculationWithForeshoreProfile.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -141,5 +141,10 @@
                 throw new NotImplementedException();
             }
         }
+
+        public object Clone()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/CalculationChangeHandlerTest.cs
===================================================================
diff -u -r2702ecf9aaf678cf869dc330f8ff560b3de4672a -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/CalculationChangeHandlerTest.cs	(.../CalculationChangeHandlerTest.cs)	(revision 2702ecf9aaf678cf869dc330f8ff560b3de4672a)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/CalculationChangeHandlerTest.cs	(.../CalculationChangeHandlerTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -27,6 +27,7 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.ChangeHandlers;
+using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.IO;
 
 namespace Ringtoets.Common.Forms.Test.ChangeHandlers
@@ -135,11 +136,8 @@
 
             var calculations = new[]
             {
-                new TestCalculation("Test 1")
-                {
-                    HasOutput = true
-                },
-                new TestCalculation("Test 2")
+                CalculationTestDataFactory.CreateCalculationWithOutput(),
+                CalculationTestDataFactory.CreateCalculationWithoutOutput()
             };
 
             var handler = new CalculationChangeHandler(calculations,
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/FailureMechanismPropertyChangeHandlerTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/FailureMechanismPropertyChangeHandlerTest.cs	(.../FailureMechanismPropertyChangeHandlerTest.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/FailureMechanismPropertyChangeHandlerTest.cs	(.../FailureMechanismPropertyChangeHandlerTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -26,12 +26,12 @@
 using Core.Common.Base;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.ChangeHandlers;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TestUtil;
-using TestCalculation = Ringtoets.Common.Forms.TestUtil.TestCalculation;
 
 namespace Ringtoets.Common.Forms.Test.ChangeHandlers
 {
@@ -58,7 +58,7 @@
             TestDelegate test = () => changeHandler.SetPropertyValueAfterConfirmation(
                 null,
                 3,
-                (f, v) => { });
+                (f, v) => {});
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -75,7 +75,7 @@
             TestDelegate test = () => changeHandler.SetPropertyValueAfterConfirmation<int?>(
                 new TestFailureMechanism(),
                 null,
-                (f, v) => { });
+                (f, v) => {});
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -160,8 +160,8 @@
                 tester.ClickCancel();
             };
 
-            TestCalculation calculationWithOutput = CalculationTestHelper.CreateCalculationWithOutput();
-            TestCalculation calculationWithoutOutput = CalculationTestHelper.CreateCalculationWithoutOutput();
+            ICalculation calculationWithOutput = CalculationTestDataFactory.CreateCalculationWithOutput();
+            ICalculation calculationWithoutOutput = CalculationTestDataFactory.CreateCalculationWithoutOutput();
 
             var testFailureMechanism = new TestFailureMechanism(
                 new[]
@@ -198,7 +198,7 @@
             var testFailureMechanism = new TestFailureMechanism(
                 new[]
                 {
-                    CalculationTestHelper.CreateCalculationWithOutput()
+                    CalculationTestDataFactory.CreateCalculationWithOutput()
                 });
 
             var changeHandler = new FailureMechanismPropertyChangeHandler<IFailureMechanism>();
@@ -236,14 +236,14 @@
 
         public class ChangePropertyTestCase
         {
-            public ChangePropertyTestCase(ICollection<TestCalculation> calculations)
+            public ChangePropertyTestCase(ICollection<ICalculation> calculations)
             {
                 Calculations = calculations;
                 ExpectedAffectedCalculations = calculations.Where(c => c.HasOutput).ToArray();
             }
 
-            public ICollection<TestCalculation> Calculations { get; }
-            public ICollection<TestCalculation> ExpectedAffectedCalculations { get; }
+            public ICollection<ICalculation> Calculations { get; }
+            public ICollection<ICalculation> ExpectedAffectedCalculations { get; }
         }
 
         private static IEnumerable ChangePropertyTestCases()
@@ -255,47 +255,47 @@
             yield return new TestCaseData(
                 new ChangePropertyTestCase(new[]
                 {
-                    CalculationTestHelper.CreateCalculationWithOutput()
+                    CalculationTestDataFactory.CreateCalculationWithOutput()
                 })
             ).SetName("SetPropertyValueAfterConfirmation Single calculation with output");
 
             yield return new TestCaseData(
                 new ChangePropertyTestCase(new[]
                 {
-                    CalculationTestHelper.CreateCalculationWithoutOutput()
+                    CalculationTestDataFactory.CreateCalculationWithoutOutput()
                 })
             ).SetName("SetPropertyValueAfterConfirmation Single calculation without output");
 
             yield return new TestCaseData(
                 new ChangePropertyTestCase(new[]
                 {
-                    CalculationTestHelper.CreateCalculationWithoutOutput(),
-                    CalculationTestHelper.CreateCalculationWithoutOutput()
+                    CalculationTestDataFactory.CreateCalculationWithoutOutput(),
+                    CalculationTestDataFactory.CreateCalculationWithoutOutput()
                 })
             ).SetName("SetPropertyValueAfterConfirmation Two calculations without output");
 
             yield return new TestCaseData(
                 new ChangePropertyTestCase(new[]
                 {
-                    CalculationTestHelper.CreateCalculationWithOutput(),
-                    CalculationTestHelper.CreateCalculationWithoutOutput()
+                    CalculationTestDataFactory.CreateCalculationWithOutput(),
+                    CalculationTestDataFactory.CreateCalculationWithoutOutput()
                 })
             ).SetName("SetPropertyValueAfterConfirmation Calculation without and calculation with output");
 
             yield return new TestCaseData(
                 new ChangePropertyTestCase(new[]
                 {
-                    CalculationTestHelper.CreateCalculationWithOutput(),
-                    CalculationTestHelper.CreateCalculationWithOutput()
+                    CalculationTestDataFactory.CreateCalculationWithOutput(),
+                    CalculationTestDataFactory.CreateCalculationWithOutput()
                 })
             ).SetName("SetPropertyValueAfterConfirmation Two calculations with output");
 
             yield return new TestCaseData(
                 new ChangePropertyTestCase(new[]
                 {
-                    CalculationTestHelper.CreateCalculationWithOutput(),
-                    CalculationTestHelper.CreateCalculationWithOutput(),
-                    CalculationTestHelper.CreateCalculationWithoutOutput()
+                    CalculationTestDataFactory.CreateCalculationWithOutput(),
+                    CalculationTestDataFactory.CreateCalculationWithOutput(),
+                    CalculationTestDataFactory.CreateCalculationWithoutOutput()
                 })
             ).SetName("SetPropertyValueAfterConfirmation Two calculations with and one calculation without output");
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/ObservablePropertyChangeHandlerTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/ObservablePropertyChangeHandlerTest.cs	(.../ObservablePropertyChangeHandlerTest.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/ObservablePropertyChangeHandlerTest.cs	(.../ObservablePropertyChangeHandlerTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -25,6 +25,8 @@
 using Core.Common.Base;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.ChangeHandlers;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TestUtil;
@@ -141,7 +143,7 @@
                 tester.ClickCancel();
             };
 
-            TestCalculation calculation = CalculationTestHelper.CreateCalculationWithOutput();
+            ICalculation calculation = CalculationTestDataFactory.CreateCalculationWithOutput();
 
             var propertySet = 0;
 
@@ -169,7 +171,7 @@
                 tester.ClickOk();
             };
 
-            TestCalculation calculation = CalculationTestHelper.CreateCalculationWithOutput();
+            ICalculation calculation = CalculationTestDataFactory.CreateCalculationWithOutput();
 
             var changeHandler = new ObservablePropertyChangeHandler(calculation, new TestCalculationInput());
             var expectedException = new Exception();
@@ -186,7 +188,7 @@
         public void SetPropertyValueAfterConfirmation_ConfirmationNotRequiredExceptionInSetValue_ExceptionBubbled()
         {
             // Setup
-            TestCalculation calculation = CalculationTestHelper.CreateCalculationWithoutOutput();
+            ICalculation calculation = CalculationTestDataFactory.CreateCalculationWithoutOutput();
 
             var changeHandler = new ObservablePropertyChangeHandler(calculation, new TestCalculationInput());
             var expectedException = new Exception();
@@ -201,22 +203,22 @@
 
         public class ChangePropertyTestCase
         {
-            public ChangePropertyTestCase(TestCalculation calculation)
+            public ChangePropertyTestCase(ICalculation calculation)
             {
                 Calculation = calculation;
             }
 
-            public TestCalculation Calculation { get; }
+            public ICalculation Calculation { get; }
         }
 
         private static IEnumerable ChangePropertyTestCases()
         {
             yield return new TestCaseData(
-                new ChangePropertyTestCase(CalculationTestHelper.CreateCalculationWithOutput())
+                new ChangePropertyTestCase(CalculationTestDataFactory.CreateCalculationWithOutput())
             ).SetName("SetPropertyValueAfterConfirmation calculation with output");
 
             yield return new TestCaseData(
-                new ChangePropertyTestCase(CalculationTestHelper.CreateCalculationWithoutOutput())
+                new ChangePropertyTestCase(CalculationTestDataFactory.CreateCalculationWithoutOutput())
             ).SetName("SetPropertyValueAfterConfirmation calculation without output");
         }
     }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs
===================================================================
diff -u -r38414ee18cb869ba91e6b70abc4019a39ea2e08c -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs	(.../FailureMechanismSectionResultRowHelperTest.cs)	(revision 38414ee18cb869ba91e6b70abc4019a39ea2e08c)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs	(.../FailureMechanismSectionResultRowHelperTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -22,13 +22,12 @@
 using System;
 using System.Collections;
 using System.Windows.Forms;
-using Core.Common.Base;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.Helpers;
+using Ringtoets.Common.Forms.TestUtil;
 
 namespace Ringtoets.Common.Forms.Test.Helpers
 {
@@ -78,44 +77,6 @@
 
         private class TestDataGridViewCell : DataGridViewCell {}
 
-        private class CalculationWithOutput : ICalculation
-        {
-            public string Name { get; set; }
-            public Comment Comments { get; private set; }
-
-            public bool HasOutput
-            {
-                get
-                {
-                    return true;
-                }
-            }
-
-            public void Attach(IObserver observer) {}
-            public void Detach(IObserver observer) {}
-            public void NotifyObservers() {}
-            public void ClearOutput() {}
-        }
-
-        private class CalculationWithoutOutput : ICalculation
-        {
-            public string Name { get; set; }
-            public Comment Comments { get; private set; }
-
-            public bool HasOutput
-            {
-                get
-                {
-                    return false;
-                }
-            }
-
-            public void Attach(IObserver observer) {}
-            public void Detach(IObserver observer) {}
-            public void NotifyObservers() {}
-            public void ClearOutput() {}
-        }
-
         #region Testcases
 
         private static IEnumerable AssessmentLayerOneStateIsSufficient()
@@ -131,17 +92,21 @@
                 .SetName("SufficientWithValidLayerTwoAAndNoCalculation");
 
             yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.Sufficient, double.NaN,
-                                          new CalculationWithOutput(), string.Empty)
+                                          CalculationTestDataFactory.CreateCalculationWithOutput(),
+                                          string.Empty)
                 .SetName("SufficientWithInvalidLayerTwoAAndCalculationWithOutput");
             yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.Sufficient, 0.0,
-                                          new CalculationWithOutput(), string.Empty)
+                                          CalculationTestDataFactory.CreateCalculationWithOutput(),
+                                          string.Empty)
                 .SetName("SufficientWithValidLayerTwoAAndCalculationWithOutput");
 
             yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.Sufficient, double.NaN,
-                                          new CalculationWithoutOutput(), string.Empty)
+                                          CalculationTestDataFactory.CreateCalculationWithoutOutput(),
+                                          string.Empty)
                 .SetName("SufficientWithInvalidLayerTwoAAndCalculationWithoutOutput");
             yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.Sufficient, 0.0,
-                                          new CalculationWithoutOutput(), string.Empty)
+                                          CalculationTestDataFactory.CreateCalculationWithoutOutput(),
+                                          string.Empty)
                 .SetName("SufficientWithValidLayerTwoAAndCalculationWithoutOutput");
         }
 
@@ -175,19 +140,20 @@
             };
 
             yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.NotAssessed, double.NaN,
-                                          new CalculationWithoutOutput(),
+                                          CalculationTestDataFactory.CreateCalculationWithoutOutput(),
                                           "De maatgevende berekening voor dit vak moet nog worden uitgevoerd.")
                 .SetName("NotAssessedWithInvalidLayerTwoAAndCalculationWithoutOutput");
-            yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.NotAssessed, 0.0, new CalculationWithoutOutput(),
+            yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.NotAssessed, 0.0,
+                                          CalculationTestDataFactory.CreateCalculationWithoutOutput(),
                                           "De maatgevende berekening voor dit vak moet nog worden uitgevoerd.")
                 .SetName("NotAssessedWithValidLayerTwoAAndCalculationWithoutOutput");
 
             yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.NoVerdict, double.NaN,
-                                          new CalculationWithoutOutput(),
+                                          CalculationTestDataFactory.CreateCalculationWithoutOutput(),
                                           "De maatgevende berekening voor dit vak moet nog worden uitgevoerd.")
                 .SetName("NeedsDetailedAssessmentWithInvalidLayerTwoAAndCalculationWithoutOutput");
             yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.NoVerdict, 0.0,
-                                          new CalculationWithoutOutput(),
+                                          CalculationTestDataFactory.CreateCalculationWithoutOutput(),
                                           "De maatgevende berekening voor dit vak moet nog worden uitgevoerd.")
                 .SetName("NeedsDetailedAssessmentValidLayerTwoAAndCalculationWithoutOutput");
         }
@@ -200,19 +166,21 @@
             };
 
             yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.NotAssessed, double.NaN,
-                                          new CalculationWithOutput(),
+                                          CalculationTestDataFactory.CreateCalculationWithOutput(),
                                           "De maatgevende berekening voor dit vak moet een geldige uitkomst hebben.")
                 .SetName("NotAssessedWithInvalidLayerTwoAAndCalculationWithOutput");
-            yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.NotAssessed, 0.0, new CalculationWithOutput(),
+            yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.NotAssessed, 0.0,
+                                          CalculationTestDataFactory.CreateCalculationWithOutput(),
                                           string.Empty)
                 .SetName("NotAssessedWithValidLayerTwoAAndCalculationWithOutput");
 
             yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.NoVerdict, double.NaN,
-                                          new CalculationWithOutput(),
+                                          CalculationTestDataFactory.CreateCalculationWithOutput(),
                                           "De maatgevende berekening voor dit vak moet een geldige uitkomst hebben.")
                 .SetName("NeedsDetailedAssessmentWithInvalidLayerTwoAAndCalculationWithOutput");
             yield return new TestCaseData(dataGridViewCell, AssessmentLayerOneState.NoVerdict, 0.0,
-                                          new CalculationWithOutput(), string.Empty)
+                                          CalculationTestDataFactory.CreateCalculationWithOutput(),
+                                          string.Empty)
                 .SetName("NeedsDetailedAssessmentWithValidLayerTwoAAndCalculationWithOutput");
         }
 
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs
===================================================================
diff -u -rb9dd4faf4090750278254ff3fcfa162754a9e454 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs	(.../RingtoetsContextMenuBuilderTest.cs)	(revision b9dd4faf4090750278254ff3fcfa162754a9e454)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs	(.../RingtoetsContextMenuBuilderTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -32,7 +31,6 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
@@ -810,8 +808,8 @@
             var exportCommandHandler = mocks.StrictMock<IExportCommandHandler>();
             var updateCommandHandler = mocks.StrictMock<IUpdateCommandHandler>();
             var viewCommands = mocks.StrictMock<IViewCommands>();
-            var calculation = mocks.Stub<ICloneableCalculation>();
-            var calculationContext = mocks.Stub<ICalculationContext<ICloneableCalculation, IFailureMechanism>>();
+            var calculation = mocks.Stub<ICalculation>();
+            var calculationContext = mocks.Stub<ICalculationContext<ICalculation, IFailureMechanism>>();
 
             mocks.ReplayAll();
 
@@ -1867,32 +1865,8 @@
             public IFailureMechanism FailureMechanism { get; }
         }
 
-        private class TestCalculation : Observable, ICalculation
-        {
-            public TestCalculation()
-            {
-                Name = "Nieuwe berekening";
-            }
-
-            public string Name { get; set; }
-
-            public Comment Comments { get; private set; }
-
-            public bool HasOutput
-            {
-                get
-                {
-                    return false;
-                }
-            }
-
-            public void ClearOutput() {}
-        }
-
         public interface ICalculationInputWithForeshoreProfile : ICalculationInput, IHasForeshoreProfile {}
 
-        public interface ICloneableCalculation : ICalculation, ICloneable { }
-
         #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs
===================================================================
diff -u -rb9dd4faf4090750278254ff3fcfa162754a9e454 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs	(.../RingtoetsContextMenuItemFactoryTest.cs)	(revision b9dd4faf4090750278254ff3fcfa162754a9e454)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs	(.../RingtoetsContextMenuItemFactoryTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -30,7 +30,6 @@
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
@@ -605,7 +604,7 @@
         {
             get
             {
-                var calculation = new TestCloneableCalculation
+                var calculation = new TestCalculation
                 {
                     Name = "Nieuwe berekening"
                 };
@@ -656,8 +655,8 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var calculation = mocks.Stub<ICloneableCalculation>();
-            var calculationContext = mocks.Stub<ICalculationContext<ICloneableCalculation, IFailureMechanism>>();
+            var calculation = mocks.Stub<ICalculation>();
+            var calculationContext = mocks.Stub<ICalculationContext<ICalculation, IFailureMechanism>>();
             mocks.ReplayAll();
 
             // Call
@@ -674,13 +673,13 @@
 
         [Test]
         [TestCaseSource(nameof(CalculationGroupConfigurations))]
-        public void CreateDuplicateCalculationItem_PerformClickOnCreatedItem_DuplicatesCalculationWithExpectedNameAndPosition(TestCloneableCalculation calculation,
+        public void CreateDuplicateCalculationItem_PerformClickOnCreatedItem_DuplicatesCalculationWithExpectedNameAndPosition(TestCalculation calculation,
                                                                                                                               CalculationGroup calculationGroup,
                                                                                                                               string expectedCalculationName)
         {
             // Setup
             var mocks = new MockRepository();
-            var calculationContext = mocks.Stub<ICalculationContext<TestCloneableCalculation, IFailureMechanism>>();
+            var calculationContext = mocks.Stub<ICalculationContext<TestCalculation, IFailureMechanism>>();
 
             calculationContext.Stub(c => c.Parent).Return(calculationGroup);
 
@@ -702,36 +701,6 @@
             mocks.VerifyAll();
         }
 
-        public interface ICloneableCalculation : ICalculation, ICloneable {}
-
-        public class TestCloneableCalculation : Observable, ICloneableCalculation
-        {
-            public string Name { get; set; }
-
-            public bool HasOutput
-            {
-                get
-                {
-                    return false;
-                }
-            }
-
-            public Comment Comments
-            {
-                get
-                {
-                    return null;
-                }
-            }
-
-            public void ClearOutput() {}
-
-            public object Clone()
-            {
-                return MemberwiseClone();
-            }
-        }
-
         #endregion
 
         #region CreateUpdateForeshoreProfileOfCalculationItem
@@ -1749,28 +1718,6 @@
             public IFailureMechanism FailureMechanism { get; }
         }
 
-        private class TestCalculation : Observable, ICalculation
-        {
-            public TestCalculation()
-            {
-                Name = "Nieuwe berekening";
-            }
-
-            public string Name { get; set; }
-
-            public Comment Comments { get; private set; }
-
-            public bool HasOutput
-            {
-                get
-                {
-                    return false;
-                }
-            }
-
-            public void ClearOutput() {}
-        }
-
         public interface ICalculationInputWithForeshoreProfile : ICalculationInput, IHasForeshoreProfile {}
 
         #endregion
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs
===================================================================
diff -u -re74c57e402614c4fb76622b00011d111a92b6696 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs	(.../RingtoetsTreeNodeInfoFactoryTest.cs)	(revision e74c57e402614c4fb76622b00011d111a92b6696)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs	(.../RingtoetsTreeNodeInfoFactoryTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -28,10 +28,10 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
 using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -1086,28 +1086,6 @@
             public IFailureMechanism FailureMechanism { get; }
         }
 
-        private class TestCalculation : Observable, ICalculation
-        {
-            public TestCalculation()
-            {
-                Name = "Nieuwe berekening";
-            }
-
-            public string Name { get; set; }
-
-            public Comment Comments { get; private set; }
-
-            public bool HasOutput
-            {
-                get
-                {
-                    return false;
-                }
-            }
-
-            public void ClearOutput() {}
-        }
-
         private class TestFailureMechanismContext : FailureMechanismContext<IFailureMechanism>
         {
             public TestFailureMechanismContext(IFailureMechanism wrappedFailureMechanism, IAssessmentSection parent) : base(wrappedFailureMechanism, parent) {}
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/GeneralResultFaultTreeIllustrationPointViewTest.cs
===================================================================
diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/GeneralResultFaultTreeIllustrationPointViewTest.cs	(.../GeneralResultFaultTreeIllustrationPointViewTest.cs)	(revision fe90a6d174a01975381e6cda55ed1f7f4e831a51)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/GeneralResultFaultTreeIllustrationPointViewTest.cs	(.../GeneralResultFaultTreeIllustrationPointViewTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -29,6 +29,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.IllustrationPoints;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Data.TestUtil.IllustrationPoints;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TestUtil;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/CalculationTestDataFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/CalculationTestDataFactoryTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/CalculationTestDataFactoryTest.cs	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -0,0 +1,50 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
+
+namespace Ringtoets.Common.Forms.TestUtil.Test
+{
+    [TestFixture]
+    public class CalculationTestDataFactoryTest
+    {
+        [Test]
+        public void CreateCalculationWithoutOutput_Always_ReturnCalculationWithoutOutput()
+        {
+            // Call
+            ICalculation calculation = CalculationTestDataFactory.CreateCalculationWithoutOutput();
+
+            // Assert
+            Assert.IsFalse(calculation.HasOutput);
+        }
+
+        [Test]
+        public void CreateCalculationWithOutput_Always_ReturnCalculationWithOutput()
+        {
+            // Call
+            ICalculation calculation = CalculationTestDataFactory.CreateCalculationWithOutput();
+
+            // Assert
+            Assert.IsTrue(calculation.HasOutput);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 17b11c850b35c3ea99150ba25098b5b769b58f4f refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/CalculationTestHelperTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj
===================================================================
diff -u -r7b7bd75dc1c1327386c9be96b5d480565bb8ecd6 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj	(.../Ringtoets.Common.Forms.TestUtil.Test.csproj)	(revision 7b7bd75dc1c1327386c9be96b5d480565bb8ecd6)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj	(.../Ringtoets.Common.Forms.TestUtil.Test.csproj)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -51,15 +51,14 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="SetPropertyValueAfterConfirmationParameterTesterTest.cs" />
-    <Compile Include="CalculationTestHelperTest.cs" />
+    <Compile Include="CalculationTestDataFactoryTest.cs" />
     <Compile Include="ControlTestHelperTest.cs" />
     <Compile Include="DistributionPropertiesTestHelperTest.cs" />
     <Compile Include="FailureMechanismSetPropertyValueAfterConfirmationParameterTesterTest.cs" />
     <Compile Include="IllustrationPointControlItemComparerTest.cs" />
     <Compile Include="MapDataTestHelperTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestCalculationInputTest.cs" />
-    <Compile Include="TestCalculationTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Fisheye: Tag 17b11c850b35c3ea99150ba25098b5b769b58f4f refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/TestCalculationTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/CalculationTestDataFactory.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/CalculationTestDataFactory.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/CalculationTestDataFactory.cs	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -0,0 +1,53 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.TestUtil;
+
+namespace Ringtoets.Common.Forms.TestUtil
+{
+    /// <summary>
+    /// Factory for creating test calculation objects.
+    /// </summary>
+    public static class CalculationTestDataFactory
+    {
+        /// <summary>
+        /// Creates a test calculation without output.
+        /// </summary>
+        /// <returns>The created calculation.</returns>
+        public static ICalculation CreateCalculationWithoutOutput()
+        {
+            return new TestCalculation();
+        }
+
+        /// <summary>
+        /// Creates a test calculation with output.
+        /// </summary>
+        /// <returns>The created calculation.</returns>
+        public static ICalculation CreateCalculationWithOutput()
+        {
+            return new TestCalculation
+            {
+                Output = new object()
+            };
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 17b11c850b35c3ea99150ba25098b5b769b58f4f refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/CalculationTestHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj
===================================================================
diff -u -r7b7bd75dc1c1327386c9be96b5d480565bb8ecd6 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj	(.../Ringtoets.Common.Forms.TestUtil.csproj)	(revision 7b7bd75dc1c1327386c9be96b5d480565bb8ecd6)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj	(.../Ringtoets.Common.Forms.TestUtil.csproj)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -51,14 +51,13 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="SetPropertyValueAfterConfirmationParameterTester.cs" />
-    <Compile Include="CalculationTestHelper.cs" />
+    <Compile Include="CalculationTestDataFactory.cs" />
     <Compile Include="ControlTestHelper.cs" />
     <Compile Include="DistributionPropertiesTestHelper.cs" />
     <Compile Include="FailureMechanismSetPropertyValueAfterConfirmationParameterTester.cs" />
     <Compile Include="IllustrationPointControlItemComparer.cs" />
     <Compile Include="MapDataTestHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestCalculation.cs" />
     <Compile Include="TestCalculationInput.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -96,6 +95,10 @@
       <Project>{4D840673-3812-4338-A352-84854E32B8A0}</Project>
       <Name>Ringtoets.Common.Forms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Common.Data.TestUtil\Ringtoets.Common.Data.TestUtil.csproj">
+      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
+      <Name>Ringtoets.Common.Data.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Fisheye: Tag 17b11c850b35c3ea99150ba25098b5b769b58f4f refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/TestCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/CalculationConfigurationExporterTest.cs
===================================================================
diff -u -r393ce53735571a8f2d947aa9842b868391b1b397 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/CalculationConfigurationExporterTest.cs	(.../CalculationConfigurationExporterTest.cs)	(revision 393ce53735571a8f2d947aa9842b868391b1b397)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/CalculationConfigurationExporterTest.cs	(.../CalculationConfigurationExporterTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -80,6 +80,11 @@
             {
                 throw new NotImplementedException();
             }
+
+            public object Clone()
+            {
+                throw new NotImplementedException();
+            }
         }
     }
 
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs
===================================================================
diff -u -rc231e2ac0709fa09b47af14f12b8f617c3c6d101 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs	(.../CalculationConfigurationImporterTest.cs)	(revision c231e2ac0709fa09b47af14f12b8f617c3c6d101)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs	(.../CalculationConfigurationImporterTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -882,18 +882,6 @@
             public string Name { get; }
         }
 
-        private class TestCalculation : Observable, ICalculation
-        {
-            public string Name { get; set; }
-            public bool HasOutput { get; }
-            public Comment Comments { get; }
-
-            public void ClearOutput()
-            {
-                throw new NotImplementedException();
-            }
-        }
-
         private class ExpectedProgressNotification
         {
             public string Text { get; set; }
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs
===================================================================
diff -u -r4c394b22a72798514dbbba8935f8683147da0ef3 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs	(.../GrassCoverErosionInwardsCalculation.cs)	(revision 4c394b22a72798514dbbba8935f8683147da0ef3)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs	(.../GrassCoverErosionInwardsCalculation.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.Base;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Calculation;
@@ -30,7 +29,7 @@
     /// <summary>
     /// This class holds information about a calculation for the <see cref="GrassCoverErosionInwardsFailureMechanism"/>.
     /// </summary>
-    public class GrassCoverErosionInwardsCalculation : Observable, ICalculation, ICloneable
+    public class GrassCoverErosionInwardsCalculation : Observable, ICalculation
     {
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionInwardsCalculation"/>.
@@ -64,20 +63,6 @@
             }
         }
 
-        /// <summary>
-        /// Returns a string that represents the current object.
-        /// </summary>
-        /// <returns>The name of this calculation.</returns>
-        public override string ToString()
-        {
-            return Name;
-        }
-
-        public void ClearOutput()
-        {
-            Output = null;
-        }
-
         public object Clone()
         {
             var clone = (GrassCoverErosionInwardsCalculation) MemberwiseClone();
@@ -92,5 +77,19 @@
 
             return clone;
         }
+
+        /// <summary>
+        /// Returns a string that represents the current object.
+        /// </summary>
+        /// <returns>The name of this calculation.</returns>
+        public override string ToString()
+        {
+            return Name;
+        }
+
+        public void ClearOutput()
+        {
+            Output = null;
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs
===================================================================
diff -u -ra7250eadfcaa33555a923aac13f3ac00c0a12e1f -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs	(.../GrassCoverErosionInwardsCalculationTest.cs)	(revision a7250eadfcaa33555a923aac13f3ac00c0a12e1f)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs	(.../GrassCoverErosionInwardsCalculationTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.Base;
 using Core.Common.Data.TestUtil;
 using NUnit.Framework;
@@ -40,7 +39,6 @@
             // Assert
             Assert.IsInstanceOf<ICalculation>(calculation);
             Assert.IsInstanceOf<Observable>(calculation);
-            Assert.IsInstanceOf<ICloneable>(calculation);
 
             Assert.AreEqual("Nieuwe berekening", calculation.Name);
             Assert.IsNotNull(calculation.InputParameters);
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs
===================================================================
diff -u -r43701b21ae485678c471bcf76ca9c374fd16b9f9 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculation.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculation.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Core.Common.Base;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Calculation;
@@ -65,5 +66,10 @@
         {
             Output = null;
         }
+
+        public object Clone()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationContextPropertiesTest.cs
===================================================================
diff -u -re74c57e402614c4fb76622b00011d111a92b6696 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationContextPropertiesTest.cs	(.../CalculationContextPropertiesTest.cs)	(revision e74c57e402614c4fb76622b00011d111a92b6696)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationContextPropertiesTest.cs	(.../CalculationContextPropertiesTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -23,9 +23,9 @@
 using Core.Common.Gui.PropertyBag;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
 
@@ -50,10 +50,7 @@
         {
             // Setup
             const string name = "<very cool name>";
-            var calculation = new TestCalculation
-            {
-                Name = name
-            };
+            var calculation = new TestCalculation(name);
 
             var mocks = new MockRepository();
             var failureMechanism = mocks.StrictMock<IFailureMechanism>();
@@ -115,22 +112,5 @@
 
             public IFailureMechanism FailureMechanism { get; }
         }
-
-        private class TestCalculation : Observable, ICalculation
-        {
-            public string Name { get; set; }
-
-            public Comment Comments { get; private set; }
-
-            public bool HasOutput
-            {
-                get
-                {
-                    return false;
-                }
-            }
-
-            public void ClearOutput() {}
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsCalculation.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsCalculation.cs	(.../MacroStabilityInwardsCalculation.cs)	(revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsCalculation.cs	(.../MacroStabilityInwardsCalculation.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -48,7 +48,7 @@
         /// <summary>
         /// Gets the input parameters to perform a macro stability inwards calculation with.
         /// </summary>
-        public MacroStabilityInwardsInput InputParameters { get; private set; }
+        public MacroStabilityInwardsInput InputParameters { get; }
 
         /// <summary>
         /// Gets or sets <see cref="MacroStabilityInwardsOutput"/>, which contains the results of a macro stability inwards calculation.
@@ -77,5 +77,10 @@
             Output = null;
             SemiProbabilisticOutput = null;
         }
+
+        public object Clone()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs
===================================================================
diff -u -r3cf4d4c65cf2ce285bdeb71162cf3b0a79cb3742 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs	(.../PipingCalculation.cs)	(revision 3cf4d4c65cf2ce285bdeb71162cf3b0a79cb3742)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs	(.../PipingCalculation.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.Base;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Calculation;
@@ -30,7 +29,7 @@
     /// <summary>
     /// This class holds information about a calculation for the <see cref="PipingFailureMechanism"/>.
     /// </summary>
-    public class PipingCalculation : Observable, ICalculation, ICloneable
+    public class PipingCalculation : Observable, ICalculation
     {
         /// <summary>
         /// Creates a new instance of <see cref="PipingCalculation"/> with default values set for some of the parameters.
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs
===================================================================
diff -u -ra7250eadfcaa33555a923aac13f3ac00c0a12e1f -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision a7250eadfcaa33555a923aac13f3ac00c0a12e1f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -52,7 +52,6 @@
 
             // Assert
             Assert.IsInstanceOf<ICalculation>(calculation);
-            Assert.IsInstanceOf<ICloneable>(calculation);
 
             Assert.AreEqual("Nieuwe berekening", calculation.Name);
 
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs
===================================================================
diff -u -rac5d52dfa559def14c89499c0f819754ed3b446c -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs	(.../TestWaveConditionsCalculation.cs)	(revision ac5d52dfa559def14c89499c0f819754ed3b446c)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs	(.../TestWaveConditionsCalculation.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -64,8 +64,14 @@
         #region Irrelevant for test
 
         public string Name { get; set; }
+
         public Comment Comments { get; }
 
+        public object Clone()
+        {
+            throw new System.NotImplementedException();
+        }
+
         #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -rf288f9ccb9ac465f017170a59279909d8431fdc7 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs	(.../WaveConditionsCalculationConfigurationImporterTest.cs)	(revision f288f9ccb9ac465f017170a59279909d8431fdc7)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs	(.../WaveConditionsCalculationConfigurationImporterTest.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -22,18 +22,17 @@
 using System;
 using System.IO;
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.IO.Configurations.Import;
 using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.Data.TestUtil;
 using Ringtoets.Revetment.IO.Configurations;
 
 namespace Ringtoets.Revetment.IO.Test.Configurations
@@ -47,7 +46,7 @@
         public void Constructor_ExpectedValues()
         {
             // Call
-            var importer = new WaveConditionsCalculationConfigurationImporter<SimpleWaveConditionsCalculation>(
+            var importer = new WaveConditionsCalculationConfigurationImporter<TestWaveConditionsCalculation>(
                 "",
                 new CalculationGroup(),
                 Enumerable.Empty<HydraulicBoundaryLocation>(),
@@ -61,7 +60,7 @@
         public void Constructor_HydraulicBoundaryLocationsNull_ThrowArgumentNullException()
         {
             // Call
-            TestDelegate test = () => new WaveConditionsCalculationConfigurationImporter<SimpleWaveConditionsCalculation>(
+            TestDelegate test = () => new WaveConditionsCalculationConfigurationImporter<TestWaveConditionsCalculation>(
                 "",
                 new CalculationGroup(),
                 null,
@@ -76,7 +75,7 @@
         public void Constructor_ForeshoreProfilesNull_ThrowArgumentNullException()
         {
             // Call
-            TestDelegate test = () => new WaveConditionsCalculationConfigurationImporter<SimpleWaveConditionsCalculation>(
+            TestDelegate test = () => new WaveConditionsCalculationConfigurationImporter<TestWaveConditionsCalculation>(
                 "",
                 new CalculationGroup(),
                 Enumerable.Empty<HydraulicBoundaryLocation>(),
@@ -101,7 +100,7 @@
             string filePath = Path.Combine(path, file);
 
             var calculationGroup = new CalculationGroup();
-            var importer = new WaveConditionsCalculationConfigurationImporter<SimpleWaveConditionsCalculation>(
+            var importer = new WaveConditionsCalculationConfigurationImporter<TestWaveConditionsCalculation>(
                 filePath,
                 calculationGroup,
                 Enumerable.Empty<HydraulicBoundaryLocation>(),
@@ -125,7 +124,7 @@
             string filePath = Path.Combine(path, "validConfigurationCalculationContainingUnknownHydraulicBoundaryLocation.xml");
 
             var calculationGroup = new CalculationGroup();
-            var importer = new WaveConditionsCalculationConfigurationImporter<SimpleWaveConditionsCalculation>(
+            var importer = new WaveConditionsCalculationConfigurationImporter<TestWaveConditionsCalculation>(
                 filePath,
                 calculationGroup,
                 Enumerable.Empty<HydraulicBoundaryLocation>(),
@@ -149,7 +148,7 @@
             string filePath = Path.Combine(path, "validConfigurationCalculationContainingUnknownForeshoreProfile.xml");
 
             var calculationGroup = new CalculationGroup();
-            var importer = new WaveConditionsCalculationConfigurationImporter<SimpleWaveConditionsCalculation>(
+            var importer = new WaveConditionsCalculationConfigurationImporter<TestWaveConditionsCalculation>(
                 filePath,
                 calculationGroup,
                 Enumerable.Empty<HydraulicBoundaryLocation>(),
@@ -173,7 +172,7 @@
             string filePath = Path.Combine(path, "validConfigurationCalculationContainingWaveReductionWithoutForeshoreProfile.xml");
 
             var calculationGroup = new CalculationGroup();
-            var importer = new WaveConditionsCalculationConfigurationImporter<SimpleWaveConditionsCalculation>(
+            var importer = new WaveConditionsCalculationConfigurationImporter<TestWaveConditionsCalculation>(
                 filePath,
                 calculationGroup,
                 Enumerable.Empty<HydraulicBoundaryLocation>(),
@@ -198,7 +197,7 @@
 
             var calculationGroup = new CalculationGroup();
             var foreshoreProfile = new TestForeshoreProfile("Voorlandprofiel");
-            var importer = new WaveConditionsCalculationConfigurationImporter<SimpleWaveConditionsCalculation>(
+            var importer = new WaveConditionsCalculationConfigurationImporter<TestWaveConditionsCalculation>(
                 filePath,
                 calculationGroup,
                 Enumerable.Empty<HydraulicBoundaryLocation>(),
@@ -226,7 +225,7 @@
 
             var calculationGroup = new CalculationGroup();
             var foreshoreProfile = new TestForeshoreProfile("Voorlandprofiel");
-            var importer = new WaveConditionsCalculationConfigurationImporter<SimpleWaveConditionsCalculation>(
+            var importer = new WaveConditionsCalculationConfigurationImporter<TestWaveConditionsCalculation>(
                 filePath,
                 calculationGroup,
                 Enumerable.Empty<HydraulicBoundaryLocation>(),
@@ -241,7 +240,7 @@
             // Assert
             Assert.IsTrue(successful);
 
-            var expectedCalculation = new SimpleWaveConditionsCalculation
+            var expectedCalculation = new TestWaveConditionsCalculation
             {
                 Name = "Berekening 1",
                 InputParameters =
@@ -275,7 +274,7 @@
                 Name = "VoorlandProfielName"
             });
 
-            var importer = new WaveConditionsCalculationConfigurationImporter<SimpleWaveConditionsCalculation>(
+            var importer = new WaveConditionsCalculationConfigurationImporter<TestWaveConditionsCalculation>(
                 filePath,
                 calculationGroup,
                 new[]
@@ -293,7 +292,7 @@
             // Assert
             Assert.IsTrue(successful);
 
-            var expectedCalculation = new SimpleWaveConditionsCalculation
+            var expectedCalculation = new TestWaveConditionsCalculation
             {
                 Name = "Berekening 1",
                 InputParameters =
@@ -320,7 +319,7 @@
             AssertWaveConditionsCalculation(expectedCalculation, (ICalculation<WaveConditionsInput>) calculationGroup.Children[0]);
         }
 
-        private void AssertWaveConditionsCalculation(ICalculation<WaveConditionsInput> expectedCalculation, ICalculation<WaveConditionsInput> actualCalculation)
+        private static void AssertWaveConditionsCalculation(ICalculation<WaveConditionsInput> expectedCalculation, ICalculation<WaveConditionsInput> actualCalculation)
         {
             Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name);
             Assert.AreSame(expectedCalculation.InputParameters.HydraulicBoundaryLocation, actualCalculation.InputParameters.HydraulicBoundaryLocation);
@@ -336,24 +335,5 @@
             Assert.AreEqual(expectedCalculation.InputParameters.BreakWater.Height, actualCalculation.InputParameters.BreakWater.Height);
             Assert.AreEqual(expectedCalculation.InputParameters.BreakWater.Type, actualCalculation.InputParameters.BreakWater.Type);
         }
-
-        private class SimpleWaveConditionsCalculation : Observable, ICalculation<WaveConditionsInput>
-        {
-            public SimpleWaveConditionsCalculation()
-            {
-                InputParameters = new WaveConditionsInput();
-            }
-
-            public string Name { get; set; }
-            public bool HasOutput { get; }
-            public Comment Comments { get; }
-
-            public WaveConditionsInput InputParameters { get; }
-
-            public void ClearOutput()
-            {
-                throw new NotImplementedException();
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs
===================================================================
diff -u -r43701b21ae485678c471bcf76ca9c374fd16b9f9 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs	(.../StabilityStoneCoverWaveConditionsCalculation.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs	(.../StabilityStoneCoverWaveConditionsCalculation.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -65,5 +65,10 @@
         {
             Output = null;
         }
+
+        public object Clone()
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs
===================================================================
diff -u -r43701b21ae485678c471bcf76ca9c374fd16b9f9 -r17b11c850b35c3ea99150ba25098b5b769b58f4f
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs)	(revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
@@ -65,5 +65,10 @@
         {
             Output = null;
         }
+
+        public object Clone()
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
\ No newline at end of file