Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/ExceedanceProbabilityCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r43c8708f1748b69d1c79746febc03d5a3bc5c53a
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/ExceedanceProbabilityCalculationInputTest.cs	(.../ExceedanceProbabilityCalculationInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/ExceedanceProbabilityCalculationInputTest.cs	(.../ExceedanceProbabilityCalculationInputTest.cs)	(revision 43c8708f1748b69d1c79746febc03d5a3bc5c53a)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using NUnit.Framework;
 using Riskeer.HydraRing.Calculation.Data;
 using Riskeer.HydraRing.Calculation.Data.Input;
@@ -32,7 +33,6 @@
         public void Constructor_Always_ExpectedValues()
         {
             // Setup
-            const int expectedCalculationTypeId = 1;
             const int hydraulicBoundaryLocationId = 1000;
 
             // Call
@@ -41,11 +41,8 @@
 
             // Assert
             Assert.IsInstanceOf<HydraRingCalculationInput>(exceedanceProbabilityCalculationInputImplementation);
-            Assert.AreEqual(expectedCalculationTypeId, exceedanceProbabilityCalculationInputImplementation.CalculationTypeId);
+            Assert.AreEqual(1, exceedanceProbabilityCalculationInputImplementation.CalculationTypeId);
             Assert.AreEqual(hydraulicBoundaryLocationId, exceedanceProbabilityCalculationInputImplementation.HydraulicBoundaryLocationId);
-            Assert.AreEqual(HydraRingFailureMechanismType.DikesOvertopping, exceedanceProbabilityCalculationInputImplementation.FailureMechanismType);
-            Assert.AreEqual(5, exceedanceProbabilityCalculationInputImplementation.VariableId);
-            Assert.AreEqual(1, exceedanceProbabilityCalculationInputImplementation.Section.SectionId);
             CollectionAssert.IsEmpty(exceedanceProbabilityCalculationInputImplementation.Variables);
             CollectionAssert.IsEmpty(exceedanceProbabilityCalculationInputImplementation.ProfilePoints);
             CollectionAssert.IsEmpty(exceedanceProbabilityCalculationInputImplementation.ForelandsPoints);
@@ -57,29 +54,13 @@
         {
             public ExceedanceProbabilityCalculationInputImplementation(int hydraulicBoundaryLocationId) : base(hydraulicBoundaryLocationId) {}
 
-            public override HydraRingFailureMechanismType FailureMechanismType
-            {
-                get
-                {
-                    return HydraRingFailureMechanismType.DikesOvertopping;
-                }
-            }
+            public override HydraRingFailureMechanismType FailureMechanismType => throw new NotImplementedException();
 
-            public override int VariableId
-            {
-                get
-                {
-                    return 5;
-                }
-            }
+            public override int VariableId => throw new NotImplementedException();
 
-            public override HydraRingSection Section
-            {
-                get
-                {
-                    return new HydraRingSection(1, 2.2, 3.3);
-                }
-            }
+            public override int FaultTreeModelId => throw new NotImplementedException();
+
+            public override HydraRingSection Section => throw new NotImplementedException();
         }
     }
 }
\ No newline at end of file
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/HydraRingCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r43c8708f1748b69d1c79746febc03d5a3bc5c53a
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/HydraRingCalculationInputTest.cs	(.../HydraRingCalculationInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/HydraRingCalculationInputTest.cs	(.../HydraRingCalculationInputTest.cs)	(revision 43c8708f1748b69d1c79746febc03d5a3bc5c53a)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using NUnit.Framework;
 using Riskeer.HydraRing.Calculation.Data;
 using Riskeer.HydraRing.Calculation.Data.Input;
@@ -35,11 +36,7 @@
             var hydraRingCalculationInput = new HydraRingCalculationInputImplementation(1);
 
             // Assert
-            Assert.AreEqual(HydraRingFailureMechanismType.QVariant, hydraRingCalculationInput.FailureMechanismType);
-            Assert.AreEqual(4, hydraRingCalculationInput.CalculationTypeId);
-            Assert.AreEqual(5, hydraRingCalculationInput.VariableId);
             Assert.AreEqual(1, hydraRingCalculationInput.HydraulicBoundaryLocationId);
-            Assert.AreEqual(1, hydraRingCalculationInput.Section.SectionId);
             CollectionAssert.IsEmpty(hydraRingCalculationInput.Variables);
             CollectionAssert.IsEmpty(hydraRingCalculationInput.ProfilePoints);
             CollectionAssert.IsEmpty(hydraRingCalculationInput.ForelandsPoints);
@@ -48,66 +45,19 @@
             Assert.AreEqual(3, hydraRingCalculationInput.IterationMethodId);
         }
 
-        [Test]
-        public void GetSubMechanismModelId_ReturnsExpectedValues()
-        {
-            // Call
-            var hydraRingCalculationInput = new HydraRingCalculationInputImplementation(1);
-
-            // Assert
-            Assert.AreEqual(10, hydraRingCalculationInput.GetSubMechanismModelId(1));
-            Assert.AreEqual(20, hydraRingCalculationInput.GetSubMechanismModelId(2));
-            Assert.IsNull(hydraRingCalculationInput.GetSubMechanismModelId(3));
-        }
-
         private class HydraRingCalculationInputImplementation : HydraRingCalculationInput
         {
             public HydraRingCalculationInputImplementation(int hydraulicBoundaryLocationId) : base(hydraulicBoundaryLocationId) {}
 
-            public override HydraRingFailureMechanismType FailureMechanismType
-            {
-                get
-                {
-                    return HydraRingFailureMechanismType.QVariant;
-                }
-            }
+            public override HydraRingFailureMechanismType FailureMechanismType => throw new NotImplementedException();
 
-            public override int CalculationTypeId
-            {
-                get
-                {
-                    return 4;
-                }
-            }
+            public override int CalculationTypeId => throw new NotImplementedException();
 
-            public override int VariableId
-            {
-                get
-                {
-                    return 5;
-                }
-            }
+            public override int VariableId => throw new NotImplementedException();
 
-            public override HydraRingSection Section
-            {
-                get
-                {
-                    return new HydraRingSection(1, 2.2, 3.3);
-                }
-            }
+            public override int FaultTreeModelId => throw new NotImplementedException();
 
-            public override int? GetSubMechanismModelId(int subMechanismId)
-            {
-                switch (subMechanismId)
-                {
-                    case 1:
-                        return 10;
-                    case 2:
-                        return 20;
-                    default:
-                        return null;
-                }
-            }
+            public override HydraRingSection Section => throw new NotImplementedException();
         }
     }
 }
\ No newline at end of file
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r43c8708f1748b69d1c79746febc03d5a3bc5c53a
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs	(.../ReliabilityIndexCalculationInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs	(.../ReliabilityIndexCalculationInputTest.cs)	(revision 43c8708f1748b69d1c79746febc03d5a3bc5c53a)
@@ -38,7 +38,7 @@
         public void Constructed_UsingDifferentReturnPeriodAndLocationId_ReturnDifferentBetaAndDefaultValues(int locationId, double norm)
         {
             // Call
-            var reliabilityIndexCalculationInput = new SimpleReliabilityIndexCalculationInput(locationId, norm);
+            var reliabilityIndexCalculationInput = new ReliabilityIndexCalculationInputImplementation(locationId, norm);
 
             // Assert
             Assert.IsInstanceOf<HydraRingCalculationInput>(reliabilityIndexCalculationInput);
@@ -52,34 +52,18 @@
             Assert.AreEqual(expectedBeta, reliabilityIndexCalculationInput.Beta);
         }
 
-        private class SimpleReliabilityIndexCalculationInput : ReliabilityIndexCalculationInput
+        private class ReliabilityIndexCalculationInputImplementation : ReliabilityIndexCalculationInput
         {
-            public SimpleReliabilityIndexCalculationInput(int i, double norm)
+            public ReliabilityIndexCalculationInputImplementation(int i, double norm)
                 : base(i, norm) {}
 
-            public override HydraRingFailureMechanismType FailureMechanismType
-            {
-                get
-                {
-                    throw new NotImplementedException();
-                }
-            }
+            public override HydraRingFailureMechanismType FailureMechanismType => throw new NotImplementedException();
 
-            public override int VariableId
-            {
-                get
-                {
-                    throw new NotImplementedException();
-                }
-            }
+            public override int VariableId => throw new NotImplementedException();
 
-            public override HydraRingSection Section
-            {
-                get
-                {
-                    throw new NotImplementedException();
-                }
-            }
+            public override int FaultTreeModelId => throw new NotImplementedException();
+
+            public override HydraRingSection Section => throw new NotImplementedException();
         }
     }
 }
\ No newline at end of file