Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -r9793bc3048c48b4c25bcde1d0c07d6d02b53b2ff -re94ca2b1649e98b1a0a08bbb245e75436795cadc
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs	(.../GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs)	(revision 9793bc3048c48b4c25bcde1d0c07d6d02b53b2ff)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs	(.../GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs)	(revision e94ca2b1649e98b1a0a08bbb245e75436795cadc)
@@ -54,7 +54,7 @@
                 Name = calculation.Name.DeepClone(),
                 Comments = calculation.Comments.Body.DeepClone(),
                 RelevantForScenario = Convert.ToByte(calculation.IsRelevant),
-                ScenarioContribution = calculation.Contribution.ToNaNAsNull(),
+                ScenarioContribution = calculation.Contribution,
                 Order = order
             };
             SetInputValues(entity, calculation.InputParameters, registry);
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re94ca2b1649e98b1a0a08bbb245e75436795cadc
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs)	(revision e94ca2b1649e98b1a0a08bbb245e75436795cadc)
@@ -54,7 +54,7 @@
             {
                 Name = calculation.Name.DeepClone(),
                 Comment = calculation.Comments.Body.DeepClone(),
-                ScenarioContribution = calculation.Contribution.ToNaNAsNull(),
+                ScenarioContribution = calculation.Contribution,
                 RelevantForScenario = Convert.ToByte(calculation.IsRelevant),
                 Order = order
             };
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -rca6a51a3a62bfe3bfdceeabfc803f195a1e32a36 -re94ca2b1649e98b1a0a08bbb245e75436795cadc
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioCreateExtensions.cs	(.../SemiProbabilisticPipingCalculationScenarioCreateExtensions.cs)	(revision ca6a51a3a62bfe3bfdceeabfc803f195a1e32a36)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioCreateExtensions.cs	(.../SemiProbabilisticPipingCalculationScenarioCreateExtensions.cs)	(revision e94ca2b1649e98b1a0a08bbb245e75436795cadc)
@@ -52,7 +52,7 @@
             var entity = new SemiProbabilisticPipingCalculationEntity
             {
                 RelevantForScenario = Convert.ToByte(calculation.IsRelevant),
-                ScenarioContribution = calculation.Contribution.ToNaNAsNull(),
+                ScenarioContribution = calculation.Contribution,
                 Name = calculation.Name.DeepClone(),
                 Comments = calculation.Comments.Body.DeepClone(),
                 Order = order
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/StructuresCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -r3ec4914aaaf4219b33f6ff3ce04759bf2acd597c -re94ca2b1649e98b1a0a08bbb245e75436795cadc
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/StructuresCalculationScenarioCreateExtensions.cs	(.../StructuresCalculationScenarioCreateExtensions.cs)	(revision 3ec4914aaaf4219b33f6ff3ce04759bf2acd597c)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/StructuresCalculationScenarioCreateExtensions.cs	(.../StructuresCalculationScenarioCreateExtensions.cs)	(revision e94ca2b1649e98b1a0a08bbb245e75436795cadc)
@@ -112,7 +112,7 @@
             {
                 Name = calculation.Name.DeepClone(),
                 RelevantForScenario = Convert.ToByte(calculation.IsRelevant),
-                ScenarioContribution = calculation.Contribution.ToNaNAsNull(),
+                ScenarioContribution = calculation.Contribution,
                 Comments = calculation.Comments.Body.DeepClone(),
                 Order = order
             };
@@ -201,7 +201,7 @@
             {
                 Name = calculation.Name.DeepClone(),
                 RelevantForScenario = Convert.ToByte(calculation.IsRelevant),
-                ScenarioContribution = calculation.Contribution.ToNaNAsNull(),
+                ScenarioContribution = calculation.Contribution,
                 Comments = calculation.Comments.Body.DeepClone(),
                 Order = order
             };
@@ -266,7 +266,7 @@
             {
                 Name = calculation.Name.DeepClone(),
                 RelevantForScenario = Convert.ToByte(calculation.IsRelevant),
-                ScenarioContribution = calculation.Contribution.ToNaNAsNull(),
+                ScenarioContribution = calculation.Contribution,
                 Comments = calculation.Comments.Body.DeepClone(),
                 Order = order
             };
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -r6161d1ec9a3bf06a86520aa6c4b9f98f50130999 -re94ca2b1649e98b1a0a08bbb245e75436795cadc
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs)	(revision 6161d1ec9a3bf06a86520aa6c4b9f98f50130999)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs)	(revision e94ca2b1649e98b1a0a08bbb245e75436795cadc)
@@ -47,10 +47,10 @@
             var scenario = new MacroStabilityInwardsCalculationScenario();
 
             // Call
-            TestDelegate call = () => scenario.Create(null, 0);
+            void Call() => scenario.Create(null, 0);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("registry", exception.ParamName);
         }
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re94ca2b1649e98b1a0a08bbb245e75436795cadc
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs	(.../MacroStabilityInwardsCalculationEntityTestHelper.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs	(.../MacroStabilityInwardsCalculationEntityTestHelper.cs)	(revision e94ca2b1649e98b1a0a08bbb245e75436795cadc)
@@ -66,7 +66,7 @@
             }
 
             Assert.AreEqual(Convert.ToByte(scenario.IsRelevant), entity.RelevantForScenario);
-            AssertAreEqual(scenario.Contribution, entity.ScenarioContribution);
+            Assert.AreEqual(scenario.Contribution, entity.ScenarioContribution);
 
             AssertInputParameters(scenario.InputParameters, entity);
         }