Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/DerivedPipingInputTest.cs
===================================================================
diff -u -r6d8e9207553c40861d44ef3f3fc44b4345ef0d4d -rec0de57593da61bb52d70da94454ae4ce6f5b156
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/DerivedPipingInputTest.cs	(.../DerivedPipingInputTest.cs)	(revision 6d8e9207553c40861d44ef3f3fc44b4345ef0d4d)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/DerivedPipingInputTest.cs	(.../DerivedPipingInputTest.cs)	(revision ec0de57593da61bb52d70da94454ae4ce6f5b156)
@@ -37,22 +37,22 @@
         public void GetEffectiveThicknessCoverageLayer_InputNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => DerivedPipingInput.GetEffectiveThicknessCoverageLayer(null, new GeneralPipingInput());
+            void Call() => DerivedPipingInput.GetEffectiveThicknessCoverageLayer(null, new GeneralPipingInput());
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("input", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("input", exception.ParamName);
         }
 
         [Test]
         public void GetEffectiveThicknessCoverageLayer_GeneralInputNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => DerivedPipingInput.GetEffectiveThicknessCoverageLayer(new TestPipingInput(), null);
+            void Call() => DerivedPipingInput.GetEffectiveThicknessCoverageLayer(new TestPipingInput(), null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("generalInput", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("generalInput", exception.ParamName);
         }
 
         [Test]
@@ -167,11 +167,11 @@
         public void GetThicknessCoverageLayer_InputNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => DerivedPipingInput.GetThicknessCoverageLayer(null);
+            void Call() => DerivedPipingInput.GetThicknessCoverageLayer(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("input", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("input", exception.ParamName);
         }
 
         [Test]
@@ -286,11 +286,11 @@
         public void GetThicknessAquiferLayer_InputNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => DerivedPipingInput.GetThicknessAquiferLayer(null);
+            void Call() => DerivedPipingInput.GetThicknessAquiferLayer(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("input", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("input", exception.ParamName);
         }
 
         [Test]
@@ -355,8 +355,7 @@
         public void GetThicknessAquiferLayer_SoilProfileMultipleAquiferUnderSurfaceLine_ReturnsDistributionWithMeanSetToTopmostConsecutiveAquiferLayerThickness()
         {
             // Setup
-            double expectedThickness;
-            PipingInput input = PipingInputFactory.CreateInputWithMultipleAquiferLayersUnderSurfaceLine(out expectedThickness);
+            PipingInput input = PipingInputFactory.CreateInputWithMultipleAquiferLayersUnderSurfaceLine(out double expectedThickness);
 
             // Call
             LogNormalDistribution thicknessAquiferLayer = DerivedPipingInput.GetThicknessAquiferLayer(input);
@@ -420,8 +419,7 @@
         public void GetThicknessAquiferLayer_SoilProfileMultipleAquiferUnderSurfaceLine_ReturnsDistributionWithMeanSetToConsecutiveAquiferLayerThickness()
         {
             // Setup
-            double expectedThickness;
-            PipingInput input = PipingInputFactory.CreateInputWithMultipleAquiferLayersUnderSurfaceLine(out expectedThickness);
+            PipingInput input = PipingInputFactory.CreateInputWithMultipleAquiferLayersUnderSurfaceLine(out double expectedThickness);
 
             // Call
             LogNormalDistribution thicknessAquiferLayer = DerivedPipingInput.GetThicknessAquiferLayer(input);
@@ -488,11 +486,11 @@
         public void GetSeepageLength_InputNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => DerivedPipingInput.GetSeepageLength(null);
+            void Call() => DerivedPipingInput.GetSeepageLength(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("input", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("input", exception.ParamName);
         }
 
         [Test]
@@ -542,11 +540,11 @@
         public void GetSaturatedVolumicWeightOfCoverageLayer_InputNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => DerivedPipingInput.GetSaturatedVolumicWeightOfCoverageLayer(null);
+            void Call() => DerivedPipingInput.GetSaturatedVolumicWeightOfCoverageLayer(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("input", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("input", exception.ParamName);
         }
 
         [Test]
@@ -843,11 +841,11 @@
         public void GetDarcyPermeability_InputNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => DerivedPipingInput.GetDarcyPermeability(null);
+            void Call() => DerivedPipingInput.GetDarcyPermeability(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("input", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("input", exception.ParamName);
         }
 
         [Test]
@@ -1027,11 +1025,11 @@
         public void GetDiameterD70_InputNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => DerivedPipingInput.GetDiameterD70(null);
+            void Call() => DerivedPipingInput.GetDiameterD70(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("input", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("input", exception.ParamName);
         }
 
         [Test]
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactoryTest.cs
===================================================================
diff -u -rca82e0dfd0fcd86bc7fd6a0b1bb02e9193b74a16 -rec0de57593da61bb52d70da94454ae4ce6f5b156
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactoryTest.cs	(.../SemiProbabilisticPipingDesignVariableFactoryTest.cs)	(revision ca82e0dfd0fcd86bc7fd6a0b1bb02e9193b74a16)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactoryTest.cs	(.../SemiProbabilisticPipingDesignVariableFactoryTest.cs)	(revision ec0de57593da61bb52d70da94454ae4ce6f5b156)
@@ -56,8 +56,8 @@
             void Call() => SemiProbabilisticPipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
-            Assert.AreEqual("generalPipingInput", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("generalPipingInput", exception.ParamName);
         }
 
         [Test]
@@ -81,8 +81,8 @@
             void Call() => SemiProbabilisticPipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
-            Assert.AreEqual("generalPipingInput", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("generalPipingInput", exception.ParamName);
         }
 
         [Test]
@@ -106,8 +106,8 @@
             void Call() => SemiProbabilisticPipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
-            Assert.AreEqual("generalPipingInput", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("generalPipingInput", exception.ParamName);
         }
 
         [Test]
@@ -195,8 +195,8 @@
             void Call() => SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
-            Assert.AreEqual("pipingInput", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("pipingInput", exception.ParamName);
         }
 
         [Test]
@@ -221,8 +221,8 @@
             void Call() => SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
-            Assert.AreEqual("pipingInput", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("pipingInput", exception.ParamName);
         }
 
         [Test]