Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ExceedanceProbabilityCalculationInputTest.cs
===================================================================
diff -u -r150366ef474f9522b3af857c29e3eac484910700 -rbdb1cb6468a9ce503797eedf563ba53b84e1a46c
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ExceedanceProbabilityCalculationInputTest.cs	(.../ExceedanceProbabilityCalculationInputTest.cs)	(revision 150366ef474f9522b3af857c29e3eac484910700)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ExceedanceProbabilityCalculationInputTest.cs	(.../ExceedanceProbabilityCalculationInputTest.cs)	(revision bdb1cb6468a9ce503797eedf563ba53b84e1a46c)
@@ -40,6 +40,7 @@
                 new ExceedanceProbabilityCalculationInputImplementation(hydraulicBoundaryLocationId);
 
             // Assert
+            Assert.IsInstanceOf<HydraRingCalculationInput>(exceedanceProbabilityCalculationInputImplementation);
             Assert.AreEqual(expectedCalculationTypeId, exceedanceProbabilityCalculationInputImplementation.CalculationTypeId);
             Assert.AreEqual(hydraulicBoundaryLocationId, exceedanceProbabilityCalculationInputImplementation.HydraulicBoundaryLocationId);
             Assert.AreEqual(HydraRingFailureMechanismType.DikesOvertopping, exceedanceProbabilityCalculationInputImplementation.FailureMechanismType);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs
===================================================================
diff -u -r7f519b5cf938d07241f9cbb481a76718e11e56c1 -rbdb1cb6468a9ce503797eedf563ba53b84e1a46c
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs	(.../AssessmentLevelCalculationInputTest.cs)	(revision 7f519b5cf938d07241f9cbb481a76718e11e56c1)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs	(.../AssessmentLevelCalculationInputTest.cs)	(revision bdb1cb6468a9ce503797eedf563ba53b84e1a46c)
@@ -23,6 +23,7 @@
 using Core.Common.Utils;
 using NUnit.Framework;
 using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Data.Input;
 using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Data.Input.Hydraulics
@@ -43,6 +44,7 @@
 
             // Assert
             double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            Assert.IsInstanceOf<ReliabilityIndexCalculationInput>(assessmentLevelCalculationInput);
             Assert.AreEqual(HydraRingFailureMechanismType.AssessmentLevel, assessmentLevelCalculationInput.FailureMechanismType);
             Assert.AreEqual(9, assessmentLevelCalculationInput.CalculationTypeId);
             Assert.AreEqual(26, assessmentLevelCalculationInput.VariableId);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs
===================================================================
diff -u -r7f519b5cf938d07241f9cbb481a76718e11e56c1 -rbdb1cb6468a9ce503797eedf563ba53b84e1a46c
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs	(.../DunesBoundaryConditionsCalculationInputTest.cs)	(revision 7f519b5cf938d07241f9cbb481a76718e11e56c1)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs	(.../DunesBoundaryConditionsCalculationInputTest.cs)	(revision bdb1cb6468a9ce503797eedf563ba53b84e1a46c)
@@ -23,6 +23,7 @@
 using Core.Common.Utils;
 using NUnit.Framework;
 using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Data.Input;
 using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Data.Input.Hydraulics
@@ -43,6 +44,7 @@
 
             // Assert
             double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            Assert.IsInstanceOf<AssessmentLevelCalculationInput>(dunesBoundaryConditionsCalculationInput);
             Assert.AreEqual(HydraRingFailureMechanismType.DunesBoundaryConditions, dunesBoundaryConditionsCalculationInput.FailureMechanismType);
             Assert.AreEqual(9, dunesBoundaryConditionsCalculationInput.CalculationTypeId);
             Assert.AreEqual(26, dunesBoundaryConditionsCalculationInput.VariableId);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs
===================================================================
diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -rbdb1cb6468a9ce503797eedf563ba53b84e1a46c
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs	(.../WaveHeightCalculationInputTest.cs)	(revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs	(.../WaveHeightCalculationInputTest.cs)	(revision bdb1cb6468a9ce503797eedf563ba53b84e1a46c)
@@ -23,6 +23,7 @@
 using Core.Common.Utils;
 using NUnit.Framework;
 using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Data.Input;
 using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Data.Input.Hydraulics
@@ -43,6 +44,7 @@
 
             // Assert
             double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            Assert.IsInstanceOf<ReliabilityIndexCalculationInput>(waveHeightCalculationInput);
             Assert.AreEqual(HydraRingFailureMechanismType.WaveHeight, waveHeightCalculationInput.FailureMechanismType);
             Assert.AreEqual(9, waveHeightCalculationInput.CalculationTypeId);
             Assert.AreEqual(28, waveHeightCalculationInput.VariableId);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -rbdb1cb6468a9ce503797eedf563ba53b84e1a46c
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs	(.../OvertoppingCalculationInputTest.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs	(.../OvertoppingCalculationInputTest.cs)	(revision bdb1cb6468a9ce503797eedf563ba53b84e1a46c)
@@ -23,6 +23,7 @@
 using System.Linq;
 using NUnit.Framework;
 using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Data.Input;
 using Ringtoets.HydraRing.Calculation.Data.Input.Overtopping;
 using Ringtoets.HydraRing.Calculation.TestUtil;
 
@@ -77,6 +78,7 @@
             // Assert
             const int expectedCalculationTypeId = 1;
             const int expectedVariableId = 1;
+            Assert.IsInstanceOf<ExceedanceProbabilityCalculationInput>(overtoppingCalculationInput);
             Assert.AreEqual(expectedCalculationTypeId, overtoppingCalculationInput.CalculationTypeId);
             Assert.AreEqual(hydraulicBoundaryLocationId, overtoppingCalculationInput.HydraulicBoundaryLocationId);
             Assert.AreEqual(HydraRingFailureMechanismType.DikesOvertopping, overtoppingCalculationInput.FailureMechanismType);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs
===================================================================
diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -rbdb1cb6468a9ce503797eedf563ba53b84e1a46c
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs	(.../ReliabilityIndexCalculationInputTest.cs)	(revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs	(.../ReliabilityIndexCalculationInputTest.cs)	(revision bdb1cb6468a9ce503797eedf563ba53b84e1a46c)
@@ -41,6 +41,7 @@
             var reliabilityIndexCalculationInput = new SimpleReliabilityIndexCalculationInput(locationId, norm);
 
             // Assert
+            Assert.IsInstanceOf<HydraRingCalculationInput>(reliabilityIndexCalculationInput);
             double expectedBeta = StatisticsConverter.NormToBeta(norm);
             Assert.AreEqual(locationId, reliabilityIndexCalculationInput.HydraulicBoundaryLocationId);
             Assert.AreEqual(9, reliabilityIndexCalculationInput.CalculationTypeId);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs
===================================================================
diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -rbdb1cb6468a9ce503797eedf563ba53b84e1a46c
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs	(.../StructuresOvertoppingCalculationInputTest.cs)	(revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs	(.../StructuresOvertoppingCalculationInputTest.cs)	(revision bdb1cb6468a9ce503797eedf563ba53b84e1a46c)
@@ -23,6 +23,7 @@
 using System.Linq;
 using NUnit.Framework;
 using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Data.Input;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
 using Ringtoets.HydraRing.Calculation.TestUtil;
 
@@ -89,6 +90,7 @@
             // Assert
             const int expectedCalculationTypeId = 1;
             const int variableId = 60;
+            Assert.IsInstanceOf<ExceedanceProbabilityCalculationInput>(input);
             Assert.AreEqual(expectedCalculationTypeId, input.CalculationTypeId);
             Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId);
             Assert.AreEqual(HydraRingFailureMechanismType.StructuresOvertopping, input.FailureMechanismType);