Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -rabff4c96abe92244fa1cea606223edb85f59e1fd -r88a54829a0338f02115f9c6a6728c101c3244624
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs	(.../ClosingStructuresFailureMechanismResultViewTest.cs)	(revision abff4c96abe92244fa1cea606223edb85f59e1fd)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs	(.../ClosingStructuresFailureMechanismResultViewTest.cs)	(revision 88a54829a0338f02115f9c6a6728c101c3244624)
@@ -209,8 +209,7 @@
             ClosingStructuresFailureMechanism,
             ClosingStructuresFailureMechanismSectionResult,
             ClosingStructuresFailureMechanismSectionResultRow,
-            StructuresCalculation<ClosingStructuresInput>,
-            ClosingStructuresInput>
+            StructuresCalculation<ClosingStructuresInput>>
         {
             protected override ClosingStructuresFailureMechanismResultView CreateResultView(ClosingStructuresFailureMechanism failureMechanism)
             {
@@ -223,11 +222,6 @@
             {
                 return new StructuresCalculation<ClosingStructuresInput>();
             }
-
-            protected override ClosingStructuresInput GetInput(StructuresCalculation<ClosingStructuresInput> calculation)
-            {
-                return calculation.InputParameters;
-            }
         }
 
         private ClosingStructuresFailureMechanismResultView ShowFailureMechanismResultsView(
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs
===================================================================
diff -u -r0078247e1ebbfa5d7c4a89795778ecd995611dd5 -r88a54829a0338f02115f9c6a6728c101c3244624
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs	(.../FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs)	(revision 0078247e1ebbfa5d7c4a89795778ecd995611dd5)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs	(.../FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs)	(revision 88a54829a0338f02115f9c6a6728c101c3244624)
@@ -45,15 +45,13 @@
     /// <typeparam name="TSectionResult">The type of the section results shown in the view.</typeparam>
     /// <typeparam name="TResultRow">The type of the presentation objects used in the view.</typeparam>
     /// <typeparam name="TCalculation">The type of calculations to get the input from.</typeparam>
-    /// <typeparam name="TCalculationInput">The type of the  input of a calculation.</typeparam>
     [TestFixture]
-    public abstract class FailureMechanismAssemblyResultWithProbabilityControlTestFixture<TView, TFailureMechanism, TSectionResult, TResultRow, TCalculation, TCalculationInput>
+    public abstract class FailureMechanismAssemblyResultWithProbabilityControlTestFixture<TView, TFailureMechanism, TSectionResult, TResultRow, TCalculation>
         where TView : FailureMechanismResultView<TSectionResult, TResultRow, TFailureMechanism, FailureMechanismAssemblyControl>
         where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResult>, ICalculatableFailureMechanism, new()
         where TSectionResult : FailureMechanismSectionResult
         where TResultRow : FailureMechanismSectionResultRow<TSectionResult>
-        where TCalculation : ICalculation
-        where TCalculationInput : ICalculationInput
+        where TCalculation : ICalculation<ICalculationInput>
     {
         private Form testForm;
 
@@ -248,7 +246,7 @@
                 var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 FailureMechanismAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismAssemblyCalculator;
                 calculator.FailureMechanismAssemblyOutput = new FailureMechanismAssembly(0.5, FailureMechanismAssemblyCategoryGroup.VIt);
-                GetInput(calculation).NotifyObservers();
+                calculation.InputParameters.NotifyObservers();
 
                 // Then
                 Assert.AreEqual("1/2", assemblyProbabilityLabel.Text);
@@ -269,14 +267,6 @@
         /// <returns>A new <typeparamref name="TCalculation"/>.</returns>
         protected abstract TCalculation CreateCalculation();
 
-        /// <summary>
-        /// Method to get the <typeparamref name="TCalculationInput"/> from a
-        /// <typeparamref name="TCalculation"/>.
-        /// </summary>
-        /// <param name="calculation">The calculation to get the input from.</param>
-        /// <returns>A new <typeparamref name="TCalculationInput"/>.</returns>
-        protected abstract TCalculationInput GetInput(TCalculation calculation);
-
         private static BorderedLabel GetGroupLabel()
         {
             return (BorderedLabel) new ControlTester("GroupLabel").TheObject;
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -rabff4c96abe92244fa1cea606223edb85f59e1fd -r88a54829a0338f02115f9c6a6728c101c3244624
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs)	(revision abff4c96abe92244fa1cea606223edb85f59e1fd)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs)	(revision 88a54829a0338f02115f9c6a6728c101c3244624)
@@ -208,8 +208,7 @@
             GrassCoverErosionInwardsFailureMechanism,
             GrassCoverErosionInwardsFailureMechanismSectionResult,
             GrassCoverErosionInwardsFailureMechanismSectionResultRow,
-            GrassCoverErosionInwardsCalculation,
-            GrassCoverErosionInwardsInput>
+            GrassCoverErosionInwardsCalculation>
         {
             protected override GrassCoverErosionInwardsFailureMechanismResultView CreateResultView(GrassCoverErosionInwardsFailureMechanism failureMechanism)
             {
@@ -222,11 +221,6 @@
             {
                 return new GrassCoverErosionInwardsCalculation();
             }
-
-            protected override GrassCoverErosionInwardsInput GetInput(GrassCoverErosionInwardsCalculation calculation)
-            {
-                return calculation.InputParameters;
-            }
         }
 
         private GrassCoverErosionInwardsFailureMechanismResultView ShowFailureMechanismResultsView(
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -rabff4c96abe92244fa1cea606223edb85f59e1fd -r88a54829a0338f02115f9c6a6728c101c3244624
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision abff4c96abe92244fa1cea606223edb85f59e1fd)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision 88a54829a0338f02115f9c6a6728c101c3244624)
@@ -210,8 +210,7 @@
             HeightStructuresFailureMechanism,
             HeightStructuresFailureMechanismSectionResult,
             HeightStructuresFailureMechanismSectionResultRow,
-            StructuresCalculation<HeightStructuresInput>,
-            HeightStructuresInput>
+            StructuresCalculation<HeightStructuresInput>>
         {
             protected override HeightStructuresFailureMechanismResultView CreateResultView(HeightStructuresFailureMechanism failureMechanism)
             {
@@ -224,11 +223,6 @@
             {
                 return new StructuresCalculation<HeightStructuresInput>();
             }
-
-            protected override HeightStructuresInput GetInput(StructuresCalculation<HeightStructuresInput> calculation)
-            {
-                return calculation.InputParameters;
-            }
         }
 
         private HeightStructuresFailureMechanismResultView ShowFailureMechanismResultsView(
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -rabff4c96abe92244fa1cea606223edb85f59e1fd -r88a54829a0338f02115f9c6a6728c101c3244624
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewTest.cs)	(revision abff4c96abe92244fa1cea606223edb85f59e1fd)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewTest.cs)	(revision 88a54829a0338f02115f9c6a6728c101c3244624)
@@ -211,8 +211,7 @@
             MacroStabilityInwardsFailureMechanism,
             MacroStabilityInwardsFailureMechanismSectionResult,
             MacroStabilityInwardsFailureMechanismSectionResultRow,
-            MacroStabilityInwardsCalculationScenario,
-            MacroStabilityInwardsInput>
+            MacroStabilityInwardsCalculationScenario>
         {
             protected override MacroStabilityInwardsFailureMechanismResultView CreateResultView(MacroStabilityInwardsFailureMechanism failureMechanism)
             {
@@ -225,11 +224,6 @@
             {
                 return MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput();
             }
-
-            protected override MacroStabilityInwardsInput GetInput(MacroStabilityInwardsCalculationScenario calculation)
-            {
-                return calculation.InputParameters;
-            }
         }
 
         private MacroStabilityInwardsFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable<MacroStabilityInwardsFailureMechanismSectionResult> sectionResults)
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs
===================================================================
diff -u -rabff4c96abe92244fa1cea606223edb85f59e1fd -r88a54829a0338f02115f9c6a6728c101c3244624
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision abff4c96abe92244fa1cea606223edb85f59e1fd)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision 88a54829a0338f02115f9c6a6728c101c3244624)
@@ -211,8 +211,7 @@
             PipingFailureMechanism,
             PipingFailureMechanismSectionResult,
             PipingFailureMechanismSectionResultRow,
-            PipingCalculationScenario,
-            PipingInput>
+            PipingCalculationScenario>
         {
             protected override PipingFailureMechanismResultView CreateResultView(PipingFailureMechanism failureMechanism)
             {
@@ -225,11 +224,6 @@
             {
                 return PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
             }
-
-            protected override PipingInput GetInput(PipingCalculationScenario calculation)
-            {
-                return calculation.InputParameters;
-            }
         }
 
         private PipingFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable<PipingFailureMechanismSectionResult> sectionResults)
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -rabff4c96abe92244fa1cea606223edb85f59e1fd -r88a54829a0338f02115f9c6a6728c101c3244624
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision abff4c96abe92244fa1cea606223edb85f59e1fd)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision 88a54829a0338f02115f9c6a6728c101c3244624)
@@ -212,8 +212,7 @@
             StabilityPointStructuresFailureMechanism,
             StabilityPointStructuresFailureMechanismSectionResult,
             StabilityPointStructuresFailureMechanismSectionResultRow,
-            StructuresCalculation<StabilityPointStructuresInput>,
-            StabilityPointStructuresInput>
+            StructuresCalculation<StabilityPointStructuresInput>>
         {
             protected override StabilityPointStructuresFailureMechanismResultView CreateResultView(StabilityPointStructuresFailureMechanism failureMechanism)
             {
@@ -226,11 +225,6 @@
             {
                 return new StructuresCalculation<StabilityPointStructuresInput>();
             }
-
-            protected override StabilityPointStructuresInput GetInput(StructuresCalculation<StabilityPointStructuresInput> calculation)
-            {
-                return calculation.InputParameters;
-            }
         }
 
         private StabilityPointStructuresFailureMechanismResultView ShowFailureMechanismResultsView(