Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs
===================================================================
diff -u -rea9770b83ed5e59f58b05ae908a0f033c1ad8313 -r149816274958897b5b72a5b90044b13696298897
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs	(.../MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs)	(revision ea9770b83ed5e59f58b05ae908a0f033c1ad8313)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs	(.../MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs)	(revision 149816274958897b5b72a5b90044b13696298897)
@@ -32,14 +32,14 @@
     public class MacroStabilityInwardsCalculationScenarioTestFactoryTest
     {
         [Test]
-        public void CreateMacroStabilityInwardsCalculationScenariot_SectionNull_ThrowsArgumentNullException()
+        public void CreateMacroStabilityInwardsCalculationScenario_SectionNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(null);
+            void Call() => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("section", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("section", exception.ParamName);
         }
 
         [Test]
@@ -64,14 +64,14 @@
         }
 
         [Test]
-        public void CreateMacroStabilityInwardsCalculationScenario_SectionNull_ThrowsArgumentNullException()
+        public void CreateMacroStabilityInwardsCalculationScenarioWithFactorOfStability_SectionNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(double.NaN, null);
+            void Call() => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(double.NaN, null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("section", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("section", exception.ParamName);
         }
 
         [Test]
@@ -97,11 +97,11 @@
         public void CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput_SectionNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(null);
+            void Call() => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("section", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("section", exception.ParamName);
         }
 
         [Test]
@@ -123,11 +123,11 @@
         public void CreateIrrelevantMacroStabilityInwardsCalculationScenario_SectionNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(null);
+            void Call() => MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("section", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("section", exception.ParamName);
         }
 
         [Test]
@@ -149,11 +149,11 @@
         public void CreateNotCalculatedMacroStabilityInwardsCalculationScenario_SectionNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(null);
+            void Call() => MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("section", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("section", exception.ParamName);
         }
 
         [Test]
@@ -181,14 +181,14 @@
         }
 
         [Test]
-        public void CreateMacroStabilityInwardsCalculationScenarioWithValidInput_HydraulicBoundaryLocationNull_ThrowsArgumentnullException()
+        public void CreateMacroStabilityInwardsCalculationScenarioWithValidInput_HydraulicBoundaryLocationNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(null);
+            void Call() => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("hydraulicBoundaryLocation", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("hydraulicBoundaryLocation", exception.ParamName);
         }
 
         [Test]
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioTestFactory.cs
===================================================================
diff -u -r27834049b3f935d7ae1da0d64b8386784c4d4d41 -r149816274958897b5b72a5b90044b13696298897
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioTestFactory.cs	(.../MacroStabilityInwardsCalculationScenarioTestFactory.cs)	(revision 27834049b3f935d7ae1da0d64b8386784c4d4d41)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioTestFactory.cs	(.../MacroStabilityInwardsCalculationScenarioTestFactory.cs)	(revision 149816274958897b5b72a5b90044b13696298897)
@@ -176,6 +176,21 @@
                             Mean = (RoundedDouble) 15,
                             CoefficientOfVariation = (RoundedDouble) 0.5,
                             Shift = (RoundedDouble) 0.2
+                        },
+                        ShearStrengthRatio =
+                        {
+                            Mean = (RoundedDouble) 0.1,
+                            CoefficientOfVariation = (RoundedDouble) 0.2
+                        },
+                        Pop =
+                        {
+                            Mean = (RoundedDouble) 0.3,
+                            CoefficientOfVariation = (RoundedDouble) 0.4
+                        },
+                        StrengthIncreaseExponent =
+                        {
+                            Mean = (RoundedDouble) 0.5,
+                            CoefficientOfVariation = (RoundedDouble) 0.6
                         }
                     }
                 },
@@ -198,6 +213,21 @@
                             Mean = (RoundedDouble) 15,
                             CoefficientOfVariation = (RoundedDouble) 0.5,
                             Shift = (RoundedDouble) 0.2
+                        },
+                        ShearStrengthRatio =
+                        {
+                            Mean = (RoundedDouble) 0.1,
+                            CoefficientOfVariation = (RoundedDouble) 0.2
+                        },
+                        Pop =
+                        {
+                            Mean = (RoundedDouble) 0.3,
+                            CoefficientOfVariation = (RoundedDouble) 0.4
+                        },
+                        StrengthIncreaseExponent =
+                        {
+                            Mean = (RoundedDouble) 0.5,
+                            CoefficientOfVariation = (RoundedDouble) 0.6
                         }
                     }
                 },
@@ -220,6 +250,21 @@
                             Mean = (RoundedDouble) 15,
                             CoefficientOfVariation = (RoundedDouble) 0.5,
                             Shift = (RoundedDouble) 0.2
+                        },
+                        ShearStrengthRatio =
+                        {
+                            Mean = (RoundedDouble) 0.1,
+                            CoefficientOfVariation = (RoundedDouble) 0.2
+                        },
+                        Pop =
+                        {
+                            Mean = (RoundedDouble) 0.3,
+                            CoefficientOfVariation = (RoundedDouble) 0.4
+                        },
+                        StrengthIncreaseExponent = 
+                        {
+                            Mean = (RoundedDouble) 0.5,
+                            CoefficientOfVariation = (RoundedDouble) 0.6
                         }
                     }
                 }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -rea9770b83ed5e59f58b05ae908a0f033c1ad8313 -r149816274958897b5b72a5b90044b13696298897
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision ea9770b83ed5e59f58b05ae908a0f033c1ad8313)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 149816274958897b5b72a5b90044b13696298897)
@@ -1753,15 +1753,6 @@
                                          Assert.AreEqual(expectedItem.TailorMadeAssessmentProbability, actualItem.TailorMadeAssessmentProbability, 1e-6);
                                          Assert.AreEqual(expectedItem.UseManualAssembly, actualItem.UseManualAssembly);
                                          Assert.AreEqual(expectedItem.ManualAssemblyProbability, actualItem.ManualAssemblyProbability, 1e-6);
-
-                                         if (expectedItem.Calculation == null)
-                                         {
-                                             Assert.IsNull(expectedItem.Calculation);
-                                         }
-                                         else
-                                         {
-                                             AssertGrassCoverErosionInwardsCalculation(expectedItem.Calculation, actualItem.Calculation);
-                                         }
                                      });
         }