Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingVariable.cs
===================================================================
diff -u -r2e826fe82412e8333f9d4cb2e2eece2f3b3c6509 -r315378ecfaa9a06a553863ca91b8f4d6252e7bae
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingVariable.cs	(.../HydraRingVariable.cs)	(revision 2e826fe82412e8333f9d4cb2e2eece2f3b3c6509)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingVariable.cs	(.../HydraRingVariable.cs)	(revision 315378ecfaa9a06a553863ca91b8f4d6252e7bae)
@@ -22,9 +22,9 @@
 namespace Ringtoets.HydraRing.Calculation.Data
 {
     /// <summary>
-    /// Container for Hydra-Ring variable related data.
+    /// Class for Hydra-Ring variable related data.
     /// </summary>
-    public abstract class HydraRingVariable
+    public class HydraRingVariable
     {
         private readonly int variableId;
         private readonly HydraRingDistributionType distributionType;
@@ -44,7 +44,7 @@
         /// <param name="mean">The mean value in case the variable is random.</param>
         /// <param name="variability">The variability in case the variable is random.</param>
         /// <param name="shift">The shift in case the variable is random.</param>
-        protected HydraRingVariable(int variableId, HydraRingDistributionType distributionType, double value, HydraRingDeviationType deviationType, double mean, double variability, double shift)
+        public HydraRingVariable(int variableId, HydraRingDistributionType distributionType, double value, HydraRingDeviationType deviationType, double mean, double variability, double shift)
         {
             this.variableId = variableId;
             this.distributionType = distributionType;
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs
===================================================================
diff -u -rdec46d5efaad5332ffb2a96e67ec11209ddc5515 -r315378ecfaa9a06a553863ca91b8f4d6252e7bae
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs	(.../AssessmentLevelCalculationInput.cs)	(revision dec46d5efaad5332ffb2a96e67ec11209ddc5515)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs	(.../AssessmentLevelCalculationInput.cs)	(revision 315378ecfaa9a06a553863ca91b8f4d6252e7bae)
@@ -68,13 +68,10 @@
         {
             get
             {
-                yield return new AssessmentLevelVariable();
+                // Assessment level
+                yield return new HydraRingVariable(26, HydraRingDistributionType.Deterministic, 0,
+                                                   HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
             }
         }
-
-        private class AssessmentLevelVariable : HydraRingVariable
-        {
-            public AssessmentLevelVariable() : base(26, HydraRingDistributionType.Deterministic, 0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN) {}
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs
===================================================================
diff -u -re3912b8e6d94f1d0e9c765ba8ec18ed29e8484db -r315378ecfaa9a06a553863ca91b8f4d6252e7bae
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs	(.../OvertoppingCalculationInput.cs)	(revision e3912b8e6d94f1d0e9c765ba8ec18ed29e8484db)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs	(.../OvertoppingCalculationInput.cs)	(revision 315378ecfaa9a06a553863ca91b8f4d6252e7bae)
@@ -153,14 +153,7 @@
         {
             get
             {
-                yield return new OvertoppingVariableDikeHeight(dikeHeight);
-                yield return new OvertoppingVariableModelFactorCriticalOvertopping(modelFactorCriticalOvertopping);
-                yield return new OvertoppingVariableFactorFb(factorFbMean, factorFbStandardDeviation);
-                yield return new OvertoppingVariableFactorFn(factorFnMean, factorFnStandardDeviation);
-                yield return new OvertoppingVariableModelFactorOvertopping(modelFactorOvertopping);
-                yield return new OvertoppingVariableCriticalOvertopping(criticalOvertoppingMean, criticalOvertoppingStandardDeviation);
-                yield return new OvertoppingVariableModelFactorFrunup(modelFactorFrunupMean, modelFactorFrunupStandardDeviation);
-                yield return new OvertoppingVariableExponentModelFactorShallow(exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation);
+                return GetHydraRingVariables();
             }
         }
 
@@ -177,43 +170,44 @@
             }
         }
 
-        #region Overtopping Variables
-
-        private class OvertoppingVariableDikeHeight : HydraRingVariable
+        private IEnumerable<HydraRingVariable> GetHydraRingVariables()
         {
-            public OvertoppingVariableDikeHeight(double dikeHeight) : base(1, HydraRingDistributionType.Deterministic, dikeHeight, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN) {}
-        }
+            // DikeHeight
+            yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, dikeHeight,
+                                               HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
 
-        private class OvertoppingVariableModelFactorCriticalOvertopping : HydraRingVariable
-        {
-            public OvertoppingVariableModelFactorCriticalOvertopping(double modelFactorCriticalOvertoppingValue) : base(8, HydraRingDistributionType.Deterministic, modelFactorCriticalOvertoppingValue, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN) {}
-        }
+            // Model factor critical overtopping
+            yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, modelFactorCriticalOvertopping,
+                                               HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
 
-        private class OvertoppingVariableFactorFb : HydraRingVariable
-        {
-            public OvertoppingVariableFactorFb(double mean, double standardDeviation) : base(10, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, mean, standardDeviation, double.NaN) {}
-        }
+            // Factor Fb
+            yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN,
+                                               HydraRingDeviationType.Standard, factorFbMean, factorFbStandardDeviation,
+                                               double.NaN);
 
-        private class OvertoppingVariableFactorFn : HydraRingVariable
-        {
-            public OvertoppingVariableFactorFn(double mean, double standardDeviation) : base(11, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, mean, standardDeviation, double.NaN) {}
-        }
+            // Factor Fn
+            yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN,
+                                               HydraRingDeviationType.Standard, factorFnMean, factorFnStandardDeviation,
+                                               double.NaN);
 
-        private class OvertoppingVariableModelFactorOvertopping : HydraRingVariable
-        {
-            public OvertoppingVariableModelFactorOvertopping(double modelFactorOvertoppingValue) : base(12, HydraRingDistributionType.Deterministic, modelFactorOvertoppingValue, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN) {}
-        }
+            // Model factor overtopping
+            yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, modelFactorOvertopping,
+                                               HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
 
-        private class OvertoppingVariableModelFactorFrunup : HydraRingVariable
-        {
-            public OvertoppingVariableModelFactorFrunup(double mean, double standardDeviation) : base(120, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, mean, standardDeviation, double.NaN) {}
-        }
+            // Critical overtopping
+            yield return new HydraRingVariable(17, HydraRingDistributionType.LogNormal, double.NaN,
+                                               HydraRingDeviationType.Standard, criticalOvertoppingMean,
+                                               criticalOvertoppingStandardDeviation, double.NaN);
 
-        private class OvertoppingVariableExponentModelFactorShallow : HydraRingVariable
-        {
-            public OvertoppingVariableExponentModelFactorShallow(double mean, double standardDeviation) : base(123, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, mean, standardDeviation, double.NaN) {}
-        }
+            // Model factor Frunup
+            yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN,
+                                               HydraRingDeviationType.Variation, modelFactorFrunupMean,
+                                               modelFactorFrunupStandardDeviation, double.NaN);
 
-        #endregion
+            // Exponent model factor shallow
+            yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN,
+                                               HydraRingDeviationType.Standard, exponentModelFactorShallowMean,
+                                               exponentModelFactorShallowStandardDeviation, double.NaN);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs
===================================================================
diff -u -rf4c5904adf196826278061be33fe3adbc9ad4bc8 -r315378ecfaa9a06a553863ca91b8f4d6252e7bae
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs	(.../StructuresOvertoppingCalculationInput.cs)	(revision f4c5904adf196826278061be33fe3adbc9ad4bc8)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs	(.../StructuresOvertoppingCalculationInput.cs)	(revision 315378ecfaa9a06a553863ca91b8f4d6252e7bae)
@@ -160,116 +160,81 @@
         {
             get
             {
-                yield return new OvertoppingGravitationalAcceleration(gravitationalAcceleration);
-                yield return new OvertoppingModelFactorOvertopping(modelFactorOvertoppingMean, modelFactorOvertoppingStandardDeviation);
-                yield return new OvertoppingLevelOfCrestOfStructure(levelOfCrestOfStructureMean, levelOfCrestOfStructureStandardDeviation);
-                yield return new OvertoppingOrientationOfTheNormalOfTheStructure(structureNormalOrientation);
-                yield return new OvertoppingModelFactorOvertoppingSupercriticalFlow(modelFactorOvertoppingSupercriticalFlowMean, modelFactorOvertoppingSupercriticalFlowStandardDeviation);
-                yield return new OvertoppingAllowableIncreaseOfLevelForStorage(allowableIncreaseOfLevelForStorageMean, allowableIncreaseOfLevelForStorageStandardDeviation);
-                yield return new OvertoppingModelFactorForStorageVolume(modelFactorForStorageVolumeMean, modelFactorForStorageVolumeStandardDeviation);
-                yield return new OvertoppingStorageStructureArea(storageStructureAreaMean, storageStructureAreaVariation);
-                yield return new OvertoppingModelFactorForIncomingFlowVolume(modelFactorForIncomingFlowVolume);
-                yield return new OvertoppingFlowWidthAtBottomProtection(flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation);
-                yield return new OvertoppingCriticalOvertoppingDischarge(criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation);
-                yield return new OvertoppingFailureProbabilityOfStructureGivenErosion(failureProbabilityOfStructureGivenErosion);
-                yield return new OvertoppingWidthOfFlowApertures(widthOfFlowAperturesMean, widthOfFlowAperturesVariation);
-                yield return new OvertoppingDeviationOfTheWaveDirection(deviationOfTheWaveDirection);
-                yield return new OvertoppingStormDuration(stormDurationMean, stormDurationVariation);
+                return GetHydraRingVariables();
             }
         }
 
-        #region Overtopping Variables
-
-        private class OvertoppingGravitationalAcceleration : HydraRingVariable
+        private IEnumerable<HydraRingVariable> GetHydraRingVariables()
         {
-            public OvertoppingGravitationalAcceleration(double acceleration) :
-                base(58, HydraRingDistributionType.Deterministic, acceleration, HydraRingDeviationType.Variation, double.NaN, double.NaN, double.NaN) {}
-        }
+            // Gravitational acceleration
+            yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, gravitationalAcceleration,
+                                               HydraRingDeviationType.Variation, double.NaN, double.NaN, double.NaN);
 
-        private class OvertoppingModelFactorOvertopping : HydraRingVariable
-        {
-            public OvertoppingModelFactorOvertopping(double mean, double standardDeviation) :
-                base(59, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, mean, standardDeviation, double.NaN) {}
-        }
+            // Model factor overtopping
+            yield return new HydraRingVariable(59, HydraRingDistributionType.LogNormal, double.NaN,
+                                               HydraRingDeviationType.Standard, modelFactorOvertoppingMean,
+                                               modelFactorOvertoppingStandardDeviation, double.NaN);
 
-        private class OvertoppingLevelOfCrestOfStructure : HydraRingVariable
-        {
-            public OvertoppingLevelOfCrestOfStructure(double mean, double standardDeviation) :
-                base(60, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, mean, standardDeviation, double.NaN) {}
-        }
+            // Level of crest of structure
+            yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN,
+                                               HydraRingDeviationType.Standard, levelOfCrestOfStructureMean,
+                                               levelOfCrestOfStructureStandardDeviation, double.NaN);
 
-        private class OvertoppingOrientationOfTheNormalOfTheStructure : HydraRingVariable
-        {
-            public OvertoppingOrientationOfTheNormalOfTheStructure(double orientation) :
-                base(61, HydraRingDistributionType.Deterministic, orientation, HydraRingDeviationType.Variation, double.NaN, double.NaN, double.NaN) {}
-        }
+            // Orientation of the normal of the structure
+            yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, structureNormalOrientation,
+                                               HydraRingDeviationType.Variation, double.NaN, double.NaN, double.NaN);
 
-        private class OvertoppingModelFactorOvertoppingSupercriticalFlow : HydraRingVariable
-        {
-            public OvertoppingModelFactorOvertoppingSupercriticalFlow(double mean, double standardDeviation) :
-                base(62, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, mean, standardDeviation, double.NaN) {}
-        }
+            // Model factor overtopping supercritical flow
+            yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN,
+                                               HydraRingDeviationType.Standard, modelFactorOvertoppingSupercriticalFlowMean,
+                                               modelFactorOvertoppingSupercriticalFlowStandardDeviation, double.NaN);
 
-        private class OvertoppingAllowableIncreaseOfLevelForStorage : HydraRingVariable
-        {
-            public OvertoppingAllowableIncreaseOfLevelForStorage(double mean, double standardDeviation) :
-                base(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, mean, standardDeviation, double.NaN) {}
-        }
+            // Allowable increase of level for storage
+            yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN,
+                                               HydraRingDeviationType.Standard, allowableIncreaseOfLevelForStorageMean,
+                                               allowableIncreaseOfLevelForStorageStandardDeviation, double.NaN);
 
-        private class OvertoppingModelFactorForStorageVolume : HydraRingVariable
-        {
-            public OvertoppingModelFactorForStorageVolume(double mean, double standardDeviation) :
-                base(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, mean, standardDeviation, double.NaN) {}
-        }
+            // Model factor for storage volume
+            yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN,
+                                               HydraRingDeviationType.Standard, modelFactorForStorageVolumeMean,
+                                               modelFactorForStorageVolumeStandardDeviation, double.NaN);
 
-        private class OvertoppingStorageStructureArea : HydraRingVariable
-        {
-            public OvertoppingStorageStructureArea(double mean, double variation) :
-                base(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, mean, variation, double.NaN) {}
-        }
+            // Storage structure area
+            yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN,
+                                               HydraRingDeviationType.Variation, storageStructureAreaMean,
+                                               storageStructureAreaVariation, double.NaN);
 
-        private class OvertoppingModelFactorForIncomingFlowVolume : HydraRingVariable
-        {
-            public OvertoppingModelFactorForIncomingFlowVolume(double modelFactor) :
-                base(97, HydraRingDistributionType.Deterministic, modelFactor, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN) {}
-        }
+            // Model factor for incoming flow volume
+            yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, modelFactorForIncomingFlowVolume,
+                                               HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
 
-        private class OvertoppingFlowWidthAtBottomProtection : HydraRingVariable
-        {
-            public OvertoppingFlowWidthAtBottomProtection(double mean, double standardDeviation) :
-                base(103, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, mean, standardDeviation, double.NaN) {}
-        }
+            // Flow width at bottom protection
+            yield return new HydraRingVariable(103, HydraRingDistributionType.Normal, double.NaN,
+                                               HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean,
+                                               flowWidthAtBottomProtectionStandardDeviation, double.NaN);
 
-        private class OvertoppingCriticalOvertoppingDischarge : HydraRingVariable
-        {
-            public OvertoppingCriticalOvertoppingDischarge(double mean, double variation) :
-                base(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, mean, variation, double.NaN) {}
-        }
+            // Critical overtopping discharge
+            yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN,
+                                               HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean,
+                                               criticalOvertoppingDischargeVariation, double.NaN);
 
-        private class OvertoppingFailureProbabilityOfStructureGivenErosion : HydraRingVariable
-        {
-            public OvertoppingFailureProbabilityOfStructureGivenErosion(double failureProbability) :
-                base(105, HydraRingDistributionType.Deterministic, failureProbability, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN) {}
-        }
+            // Failure probability of structure given erosion
+            yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, failureProbabilityOfStructureGivenErosion,
+                                               HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
 
-        private class OvertoppingWidthOfFlowApertures : HydraRingVariable
-        {
-            public OvertoppingWidthOfFlowApertures(double mean, double standardDeviation) :
-                base(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, mean, standardDeviation, double.NaN) {}
-        }
+            // Width of flow apertures
+            yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN,
+                                               HydraRingDeviationType.Variation, widthOfFlowAperturesMean,
+                                               widthOfFlowAperturesVariation, double.NaN);
 
-        private class OvertoppingDeviationOfTheWaveDirection : HydraRingVariable
-        {
-            public OvertoppingDeviationOfTheWaveDirection(double deviation) :
-                base(107, HydraRingDistributionType.Deterministic, deviation, HydraRingDeviationType.Variation, double.NaN, double.NaN, double.NaN) {}
-        }
+            // Deviation of the wave direction
+            yield return new HydraRingVariable(107, HydraRingDistributionType.Deterministic, deviationOfTheWaveDirection,
+                                               HydraRingDeviationType.Variation, double.NaN, double.NaN, double.NaN);
 
-        private class OvertoppingStormDuration : HydraRingVariable
-        {
-            public OvertoppingStormDuration(double mean, double variation) :
-                base(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, mean, variation, double.NaN) {}
+            // Storm duration
+            yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN,
+                                               HydraRingDeviationType.Variation, stormDurationMean,
+                                               stormDurationVariation, double.NaN);
         }
-
-        #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingVariableTest.cs
===================================================================
diff -u -r759de5bbd411b0140aa72d2887a026f3e4b3eb97 -r315378ecfaa9a06a553863ca91b8f4d6252e7bae
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingVariableTest.cs	(.../HydraRingVariableTest.cs)	(revision 759de5bbd411b0140aa72d2887a026f3e4b3eb97)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingVariableTest.cs	(.../HydraRingVariableTest.cs)	(revision 315378ecfaa9a06a553863ca91b8f4d6252e7bae)
@@ -31,7 +31,7 @@
         public void Constructor_ExpectedValues()
         {
             // Call
-            var hydraRingVariable = new HydraRingVariableImplementation(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5);
+            var hydraRingVariable = new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5);
 
             // Assert
             Assert.AreEqual(1, hydraRingVariable.VariableId);
@@ -42,11 +42,5 @@
             Assert.AreEqual(4.4, hydraRingVariable.Variability);
             Assert.AreEqual(5.5, hydraRingVariable.Shift);
         }
-
-        private class HydraRingVariableImplementation : HydraRingVariable
-        {
-            public HydraRingVariableImplementation(int variableId, HydraRingDistributionType distributionType, double value, HydraRingDeviationType deviationType, double mean, double variability, double shift)
-                : base(variableId, distributionType, value, deviationType, mean, variability, shift) {}
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs
===================================================================
diff -u -rf4c5904adf196826278061be33fe3adbc9ad4bc8 -r315378ecfaa9a06a553863ca91b8f4d6252e7bae
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs	(.../OvertoppingCalculationInputTest.cs)	(revision f4c5904adf196826278061be33fe3adbc9ad4bc8)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs	(.../OvertoppingCalculationInputTest.cs)	(revision 315378ecfaa9a06a553863ca91b8f4d6252e7bae)
@@ -123,20 +123,14 @@
 
         private IEnumerable<HydraRingVariable> GetDefaultOvertoppingVariables()
         {
-            yield return new HydraRingVariableImplementation(1, HydraRingDistributionType.Deterministic, 11.11, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-            yield return new HydraRingVariableImplementation(8, HydraRingDistributionType.Deterministic, 1.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-            yield return new HydraRingVariableImplementation(10, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 4.75, 0.5, double.NaN);
-            yield return new HydraRingVariableImplementation(11, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 2.6, 0.35, double.NaN);
-            yield return new HydraRingVariableImplementation(12, HydraRingDistributionType.Deterministic, 1.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-            yield return new HydraRingVariableImplementation(17, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 22.22, 33.33, double.NaN);
-            yield return new HydraRingVariableImplementation(120, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 1, 0.07, double.NaN);
-            yield return new HydraRingVariableImplementation(123, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 0.92, 0.24, double.NaN);
+            yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, 11.11, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, 1.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 4.75, 0.5, double.NaN);
+            yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 2.6, 0.35, double.NaN);
+            yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, 1.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(17, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 22.22, 33.33, double.NaN);
+            yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 1, 0.07, double.NaN);
+            yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 0.92, 0.24, double.NaN);
         }
-
-        private class HydraRingVariableImplementation : HydraRingVariable
-        {
-            public HydraRingVariableImplementation(int variableId, HydraRingDistributionType distributionType, double value, HydraRingDeviationType deviationType, double mean, double variability, double shift) :
-                base(variableId, distributionType, value, deviationType, mean, variability, shift) {}
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs
===================================================================
diff -u -rf4c5904adf196826278061be33fe3adbc9ad4bc8 -r315378ecfaa9a06a553863ca91b8f4d6252e7bae
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs	(.../StructuresOvertoppingCalculationInputTest.cs)	(revision f4c5904adf196826278061be33fe3adbc9ad4bc8)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs	(.../StructuresOvertoppingCalculationInputTest.cs)	(revision 315378ecfaa9a06a553863ca91b8f4d6252e7bae)
@@ -110,27 +110,21 @@
 
         private static IEnumerable<HydraRingVariable> GetDefaultOvertoppingVariables()
         {
-            yield return new HydraRingVariableImplementation(58, HydraRingDistributionType.Deterministic, 9.81, HydraRingDeviationType.Variation, double.NaN, double.NaN, double.NaN);
-            yield return new HydraRingVariableImplementation(59, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 0.09, 0.06, double.NaN);
-            yield return new HydraRingVariableImplementation(60, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 1.1, 0.05, double.NaN);
-            yield return new HydraRingVariableImplementation(61, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Variation, double.NaN, double.NaN, double.NaN);
-            yield return new HydraRingVariableImplementation(62, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 1.1, 0.03, double.NaN);
-            yield return new HydraRingVariableImplementation(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 3.3, 0.1, double.NaN);
-            yield return new HydraRingVariableImplementation(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 1, 0.2, double.NaN);
-            yield return new HydraRingVariableImplementation(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 4.4, 0.1, double.NaN);
-            yield return new HydraRingVariableImplementation(97, HydraRingDistributionType.Deterministic, 1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-            yield return new HydraRingVariableImplementation(103, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 5.5, 0.05, double.NaN);
-            yield return new HydraRingVariableImplementation(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 6.6, 0.15, double.NaN);
-            yield return new HydraRingVariableImplementation(105, HydraRingDistributionType.Deterministic, 7.7, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
-            yield return new HydraRingVariableImplementation(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 8.8, 0.05, double.NaN);
-            yield return new HydraRingVariableImplementation(107, HydraRingDistributionType.Deterministic, 9.9, HydraRingDeviationType.Variation, double.NaN, double.NaN, double.NaN);
-            yield return new HydraRingVariableImplementation(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 7.5, 0.25, double.NaN);
+            yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 9.81, HydraRingDeviationType.Variation, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(59, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 0.09, 0.06, double.NaN);
+            yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 1.1, 0.05, double.NaN);
+            yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Variation, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 1.1, 0.03, double.NaN);
+            yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 3.3, 0.1, double.NaN);
+            yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 1, 0.2, double.NaN);
+            yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 4.4, 0.1, double.NaN);
+            yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(103, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 5.5, 0.05, double.NaN);
+            yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 6.6, 0.15, double.NaN);
+            yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 7.7, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 8.8, 0.05, double.NaN);
+            yield return new HydraRingVariable(107, HydraRingDistributionType.Deterministic, 9.9, HydraRingDeviationType.Variation, double.NaN, double.NaN, double.NaN);
+            yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 7.5, 0.25, double.NaN);
         }
-
-        private class HydraRingVariableImplementation : HydraRingVariable
-        {
-            public HydraRingVariableImplementation(int variableId, HydraRingDistributionType distributionType, double value, HydraRingDeviationType deviationType, double mean, double variability, double shift) :
-                base(variableId, distributionType, value, deviationType, mean, variability, shift) {}
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs
===================================================================
diff -u -r0280e7ce5a21162e00e3c092aff5a121777fd3ec -r315378ecfaa9a06a553863ca91b8f4d6252e7bae
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs	(.../HydraRingConfigurationServiceTest.cs)	(revision 0280e7ce5a21162e00e3c092aff5a121777fd3ec)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs	(.../HydraRingConfigurationServiceTest.cs)	(revision 315378ecfaa9a06a553863ca91b8f4d6252e7bae)
@@ -304,12 +304,12 @@
             {
                 get
                 {
-                    yield return new HydraRingVariableImplementation(26, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, 3.3, 4.4, 5.5);
-                    yield return new HydraRingVariableImplementation(26, HydraRingDistributionType.Deterministic, 22.2, HydraRingDeviationType.Variation, 33.3, 44.4, 55.5);
-                    yield return new HydraRingVariableImplementation(26, HydraRingDistributionType.Normal, 222.2, HydraRingDeviationType.Standard, 333.3, 444.4, 555.5);
-                    yield return new HydraRingVariableImplementation(26, HydraRingDistributionType.Normal, 2222.2, HydraRingDeviationType.Variation, 3333.3, 4444.4, 5555.5);
-                    yield return new HydraRingVariableImplementation(26, HydraRingDistributionType.LogNormal, 22222.2, HydraRingDeviationType.Standard, 33333.3, 44444.4, 55555.5);
-                    yield return new HydraRingVariableImplementation(26, HydraRingDistributionType.LogNormal, 222222.2, HydraRingDeviationType.Variation, 333333.3, 444444.4, 555555.5);
+                    yield return new HydraRingVariable(26, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, 3.3, 4.4, 5.5);
+                    yield return new HydraRingVariable(26, HydraRingDistributionType.Deterministic, 22.2, HydraRingDeviationType.Variation, 33.3, 44.4, 55.5);
+                    yield return new HydraRingVariable(26, HydraRingDistributionType.Normal, 222.2, HydraRingDeviationType.Standard, 333.3, 444.4, 555.5);
+                    yield return new HydraRingVariable(26, HydraRingDistributionType.Normal, 2222.2, HydraRingDeviationType.Variation, 3333.3, 4444.4, 5555.5);
+                    yield return new HydraRingVariable(26, HydraRingDistributionType.LogNormal, 22222.2, HydraRingDeviationType.Standard, 33333.3, 44444.4, 55555.5);
+                    yield return new HydraRingVariable(26, HydraRingDistributionType.LogNormal, 222222.2, HydraRingDeviationType.Variation, 333333.3, 444444.4, 555555.5);
                 }
             }
 
@@ -353,12 +353,6 @@
             }
         }
 
-        private class HydraRingVariableImplementation : HydraRingVariable
-        {
-            public HydraRingVariableImplementation(int variableId, HydraRingDistributionType distributionType, double value, HydraRingDeviationType deviationType, double mean, double variability, double shift)
-                : base(variableId, distributionType, value, deviationType, mean, variability, shift) {}
-        }
-
         private class HydraRingProfilePointDerivative : HydraRingProfilePoint
         {
             private readonly double roughness;