Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs
===================================================================
diff -u -rfe1b8746811c902febd1b9cbc0a76404a7eeb155 -r1c17e6670dfa05398d51183624023c0c7387b472
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision fe1b8746811c902febd1b9cbc0a76404a7eeb155)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 1c17e6670dfa05398d51183624023c0c7387b472)
@@ -197,7 +197,6 @@
         public static SemiProbabilisticPipingCalculationScenario GetSemiProbabilisticPipingCalculationScenarioWithNaNs()
         {
             SemiProbabilisticPipingCalculationScenario calculation = GetPipingCalculationScenarioWithAssessmentLevel();
-            calculation.Contribution = RoundedDouble.NaN;
             calculation.InputParameters.AssessmentLevel = RoundedDouble.NaN;
             calculation.InputParameters.EntryPointL = RoundedDouble.NaN;
             calculation.InputParameters.ExitPointL = RoundedDouble.NaN;
@@ -248,7 +247,6 @@
         public static SemiProbabilisticPipingCalculationScenario GetSemiProbabilisticPipingCalculationScenarioWithInfinities()
         {
             SemiProbabilisticPipingCalculationScenario calculation = GetPipingCalculationScenarioWithAssessmentLevel();
-            calculation.Contribution = (RoundedDouble) double.PositiveInfinity;
 
             calculation.InputParameters.SurfaceLine.SetGeometry(new[]
             {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StructuresCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -r49b2202cdc9ef297f85814d7917645e24bc008b9 -r1c17e6670dfa05398d51183624023c0c7387b472
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StructuresCalculationScenarioCreateExtensionsTest.cs	(.../StructuresCalculationScenarioCreateExtensionsTest.cs)	(revision 49b2202cdc9ef297f85814d7917645e24bc008b9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StructuresCalculationScenarioCreateExtensionsTest.cs	(.../StructuresCalculationScenarioCreateExtensionsTest.cs)	(revision 1c17e6670dfa05398d51183624023c0c7387b472)
@@ -191,7 +191,6 @@
             // Setup
             var calculation = new StructuresCalculationScenario<HeightStructuresInput>
             {
-                Contribution = RoundedDouble.NaN,
                 InputParameters =
                 {
                     StructureNormalOrientation = RoundedDouble.NaN,
@@ -247,7 +246,6 @@
             HeightStructuresCalculationEntity entity = calculation.CreateForHeightStructures(registry, 0);
 
             // Assert
-            Assert.IsNull(entity.ScenarioContribution);
             Assert.IsNull(entity.StructureNormalOrientation);
             Assert.IsNull(entity.ModelFactorSuperCriticalFlowMean);
             Assert.IsNull(entity.AllowedLevelIncreaseStorageMean);
@@ -533,7 +531,6 @@
             // Setup
             var calculation = new StructuresCalculationScenario<ClosingStructuresInput>
             {
-                Contribution = RoundedDouble.NaN,
                 InputParameters =
                 {
                     StormDuration =
@@ -612,7 +609,6 @@
             ClosingStructuresCalculationEntity entity = calculation.CreateForClosingStructures(registry, order);
 
             // Assert
-            Assert.IsNull(entity.ScenarioContribution);
             Assert.IsNull(entity.StormDurationMean);
             Assert.IsNull(entity.StructureNormalOrientation);
             Assert.IsNull(entity.BreakWaterHeight);
@@ -973,7 +969,6 @@
             // Setup
             var calculation = new StructuresCalculationScenario<StabilityPointStructuresInput>
             {
-                Contribution = RoundedDouble.NaN,
                 InputParameters =
                 {
                     StormDuration =
@@ -1101,7 +1096,6 @@
             StabilityPointStructuresCalculationEntity entity = calculation.CreateForStabilityPointStructures(registry, order);
 
             // Assert
-            Assert.IsNull(entity.ScenarioContribution);
             Assert.IsNull(entity.StormDurationMean);
             Assert.IsNull(entity.StructureNormalOrientation);
             Assert.IsNull(entity.BreakWaterHeight);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r49b2202cdc9ef297f85814d7917645e24bc008b9 -r1c17e6670dfa05398d51183624023c0c7387b472
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs	(.../ClosingStructuresCalculationEntityReadExtensionsTest.cs)	(revision 49b2202cdc9ef297f85814d7917645e24bc008b9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs	(.../ClosingStructuresCalculationEntityReadExtensionsTest.cs)	(revision 1c17e6670dfa05398d51183624023c0c7387b472)
@@ -156,7 +156,7 @@
             // Setup
             var entity = new ClosingStructuresCalculationEntity
             {
-                ScenarioContribution = null,
+                ScenarioContribution = 0.1,
                 StructureNormalOrientation = null,
                 ModelFactorSuperCriticalFlowMean = null,
                 AllowedLevelIncreaseStorageMean = null,
@@ -191,8 +191,6 @@
             StructuresCalculationScenario<ClosingStructuresInput> calculation = entity.Read(collector);
 
             // Assert
-            Assert.IsNaN(calculation.Contribution);
-
             ClosingStructuresInput inputParameters = calculation.InputParameters;
             Assert.IsNaN(inputParameters.StructureNormalOrientation);
             Assert.IsNaN(inputParameters.ModelFactorSuperCriticalFlow.Mean);
@@ -232,7 +230,8 @@
             var entity = new ClosingStructuresCalculationEntity
             {
                 ClosingStructureEntity = structureEntity,
-                IdenticalApertures = 1
+                IdenticalApertures = 1,
+                ScenarioContribution = 0.1
             };
             var collector = new ReadConversionCollector();
             collector.Read(structureEntity, structure);
@@ -253,7 +252,8 @@
             var entity = new ClosingStructuresCalculationEntity
             {
                 HydraulicLocationEntity = hydraulicLocationEntity,
-                IdenticalApertures = 1
+                IdenticalApertures = 1,
+                ScenarioContribution = 0.1
             };
 
             var collector = new ReadConversionCollector();
@@ -275,7 +275,8 @@
             var entity = new ClosingStructuresCalculationEntity
             {
                 ForeshoreProfileEntity = profileEntity,
-                IdenticalApertures = 1
+                IdenticalApertures = 1,
+                ScenarioContribution = 0.1
             };
 
             var collector = new ReadConversionCollector();
@@ -298,7 +299,8 @@
                 {
                     new ClosingStructuresOutputEntity()
                 },
-                IdenticalApertures = 1
+                IdenticalApertures = 1,
+                ScenarioContribution = 0.1
             };
 
             var collector = new ReadConversionCollector();
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r49b2202cdc9ef297f85814d7917645e24bc008b9 -r1c17e6670dfa05398d51183624023c0c7387b472
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs	(.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs)	(revision 49b2202cdc9ef297f85814d7917645e24bc008b9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs	(.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs)	(revision 1c17e6670dfa05398d51183624023c0c7387b472)
@@ -196,7 +196,7 @@
             // Setup
             var entity = new StabilityPointStructuresCalculationEntity
             {
-                ScenarioContribution = null,
+                ScenarioContribution = 0.1,
                 StructureNormalOrientation = null,
                 AllowedLevelIncreaseStorageMean = null,
                 AllowedLevelIncreaseStorageStandardDeviation = null,
@@ -250,8 +250,6 @@
             StructuresCalculationScenario<StabilityPointStructuresInput> calculation = entity.Read(collector);
 
             // Assert
-            Assert.IsNaN(calculation.Contribution);
-
             StabilityPointStructuresInput inputParameters = calculation.InputParameters;
             Assert.IsNaN(inputParameters.StructureNormalOrientation);
             Assert.IsNaN(inputParameters.AllowedLevelIncreaseStorage.Mean);
@@ -310,7 +308,8 @@
             var structureEntity = new StabilityPointStructureEntity();
             var entity = new StabilityPointStructuresCalculationEntity
             {
-                StabilityPointStructureEntity = structureEntity
+                StabilityPointStructureEntity = structureEntity,
+                ScenarioContribution = 0.1
             };
             var collector = new ReadConversionCollector();
             collector.Read(structureEntity, structure);
@@ -330,7 +329,8 @@
             var hydraulicLocationEntity = new HydraulicLocationEntity();
             var entity = new StabilityPointStructuresCalculationEntity
             {
-                HydraulicLocationEntity = hydraulicLocationEntity
+                HydraulicLocationEntity = hydraulicLocationEntity,
+                ScenarioContribution = 0.1
             };
 
             var collector = new ReadConversionCollector();
@@ -351,7 +351,8 @@
             var profileEntity = new ForeshoreProfileEntity();
             var entity = new StabilityPointStructuresCalculationEntity
             {
-                ForeshoreProfileEntity = profileEntity
+                ForeshoreProfileEntity = profileEntity,
+                ScenarioContribution = 0.1
             };
 
             var collector = new ReadConversionCollector();
@@ -373,7 +374,8 @@
                 StabilityPointStructuresOutputEntities =
                 {
                     new StabilityPointStructuresOutputEntity()
-                }
+                },
+                ScenarioContribution = 0.1
             };
 
             var collector = new ReadConversionCollector();