Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationTest.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r9d03e0c94adad4bcb57a0b7135f8891c255c5f52
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationTest.cs	(.../ClosingStructuresCalculationConfigurationTest.cs)	(revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationTest.cs	(.../ClosingStructuresCalculationConfigurationTest.cs)	(revision 9d03e0c94adad4bcb57a0b7135f8891c255c5f52)
@@ -108,5 +108,18 @@
             Assert.AreEqual(failureProbabilityReparation, configuration.FailureProbabilityReparation);
             Assert.AreEqual(probabilityOrFrequencyOpenStructureBeforeFlooding, configuration.ProbabilityOrFrequencyOpenStructureBeforeFlooding);
         }
+
+        [Test]
+        public void Name_Null_ThrowsArgumentNullException()
+        {
+            // Setup
+            var calculationConfiguration = new ClosingStructuresCalculationConfiguration("valid name");
+
+            // Call
+            TestDelegate test = () => calculationConfiguration.Name = null;
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationTest.cs
===================================================================
diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -r9d03e0c94adad4bcb57a0b7135f8891c255c5f52
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationTest.cs	(.../GrassCoverErosionInwardsCalculationConfigurationTest.cs)	(revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationTest.cs	(.../GrassCoverErosionInwardsCalculationConfigurationTest.cs)	(revision 9d03e0c94adad4bcb57a0b7135f8891c255c5f52)
@@ -30,7 +30,7 @@
     public class GrassCoverErosionInwardsCalculationConfigurationTest
     {
         [Test]
-        public void Constructor_WithoutConstructionProperties_ThrowsArgumentNullException()
+        public void Constructor_NameNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate test = () => new GrassCoverErosionInwardsCalculationConfiguration(null);
@@ -40,7 +40,7 @@
         }
 
         [Test]
-        public void Constructor_ConstructionPropertiesWithoutValues_PropertiesAreDefault()
+        public void Constructor_WithName_ExpectedValues()
         {
             // Setup
             const string name = "name";
@@ -62,7 +62,7 @@
         }
 
         [Test]
-        public void Constructor_ConstructionPropertiesWithValuesSet_PropertiesAsExpected()
+        public void SimpleProperties_SetNewValues_NewValuesSet()
         {
             // Setup
             const string calculationName = "Name of the calculation";
@@ -118,5 +118,18 @@
             Assert.AreEqual(criticalFlowMean, readCalculation.CriticalFlowRate.Mean);
             Assert.AreEqual(critifalFlowStandardDeviation, readCalculation.CriticalFlowRate.StandardDeviation);
         }
+
+        [Test]
+        public void Name_Null_ThrowsArgumentNullException()
+        {
+            // Setup
+            var calculationConfiguration = new GrassCoverErosionInwardsCalculationConfiguration("valid name");
+
+            // Call
+            TestDelegate test = () => calculationConfiguration.Name = null;
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Ringtoets.GrassCoverErosionOutwards.IO.csproj
===================================================================
diff -u -r4fa75e2c07753d69a156377821eec5caaff7fc11 -r9d03e0c94adad4bcb57a0b7135f8891c255c5f52
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Ringtoets.GrassCoverErosionOutwards.IO.csproj	(.../Ringtoets.GrassCoverErosionOutwards.IO.csproj)	(revision 4fa75e2c07753d69a156377821eec5caaff7fc11)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Ringtoets.GrassCoverErosionOutwards.IO.csproj	(.../Ringtoets.GrassCoverErosionOutwards.IO.csproj)	(revision 9d03e0c94adad4bcb57a0b7135f8891c255c5f52)
@@ -34,7 +34,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationTest.cs
===================================================================
diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -r9d03e0c94adad4bcb57a0b7135f8891c255c5f52
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationTest.cs	(.../HeightStructuresCalculationConfigurationTest.cs)	(revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationTest.cs	(.../HeightStructuresCalculationConfigurationTest.cs)	(revision 9d03e0c94adad4bcb57a0b7135f8891c255c5f52)
@@ -65,5 +65,18 @@
             // Assert
             Assert.AreSame(levelCrestStructure, configuration.LevelCrestStructure);
         }
+
+        [Test]
+        public void Name_Null_ThrowsArgumentNullException()
+        {
+            // Setup
+            var calculationConfiguration = new HeightStructuresCalculationConfiguration("valid name");
+
+            // Call
+            TestDelegate test = () => calculationConfiguration.Name = null;
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs
===================================================================
diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -r9d03e0c94adad4bcb57a0b7135f8891c255c5f52
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs	(.../MacroStabilityInwardsCalculationConfigurationTest.cs)	(revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs	(.../MacroStabilityInwardsCalculationConfigurationTest.cs)	(revision 9d03e0c94adad4bcb57a0b7135f8891c255c5f52)
@@ -30,7 +30,7 @@
     public class MacroStabilityInwardsCalculationConfigurationTest
     {
         [Test]
-        public void Constructor_WithoutConstructionProperties_ThrowsArgumentNullException()
+        public void Constructor_NameNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate test = () => new MacroStabilityInwardsCalculationConfiguration(null);
@@ -40,7 +40,7 @@
         }
 
         [Test]
-        public void Constructor_ConstructionPropertiesWithoutValues_PropertiesAreDefault()
+        public void Constructor_WithName_ExpectedValues()
         {
             // Setup
             const string name = "some name";
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void Constructor_ConstructionPropertiesWithValuesSet_PropertiesAsExpected()
+        public void SimpleProperties_SetNewValues_NewValuesSet()
         {
             // Setup
             const string calculationName = "Name of the calculation";
@@ -87,5 +87,18 @@
             Assert.AreEqual(stochasticSoilModel, readCalculation.StochasticSoilModelName);
             Assert.AreEqual(stochasticSoilProfile, readCalculation.StochasticSoilProfileName);
         }
+
+        [Test]
+        public void Name_Null_ThrowsArgumentNullException()
+        {
+            // Setup
+            var calculationConfiguration = new MacroStabilityInwardsCalculationConfiguration("valid name");
+
+            // Call
+            TestDelegate test = () => calculationConfiguration.Name = null;
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationTest.cs
===================================================================
diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -r9d03e0c94adad4bcb57a0b7135f8891c255c5f52
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationTest.cs	(.../PipingCalculationConfigurationTest.cs)	(revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationTest.cs	(.../PipingCalculationConfigurationTest.cs)	(revision 9d03e0c94adad4bcb57a0b7135f8891c255c5f52)
@@ -92,7 +92,7 @@
                 PhreaticLevelExit = new StochastConfiguration
                 {
                     Mean = phreaticLevelExitMean,
-                    StandardDeviation = phreaticLevelExitStandardDeviation,
+                    StandardDeviation = phreaticLevelExitStandardDeviation
                 },
                 DampingFactorExit = new StochastConfiguration
                 {
@@ -115,5 +115,18 @@
             Assert.AreEqual(dampingFactorExitMean, readPipingCalculation.DampingFactorExit.Mean);
             Assert.AreEqual(dampingFactorExitStandardDeviation, readPipingCalculation.DampingFactorExit.StandardDeviation);
         }
+
+        [Test]
+        public void Name_Null_ThrowsArgumentNullException()
+        {
+            // Setup
+            var calculationConfiguration = new PipingCalculationConfiguration("valid name");
+
+            // Call
+            TestDelegate test = () => calculationConfiguration.Name = null;
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/Helpers/WaveConditionsInputExtensions.cs
===================================================================
diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -r9d03e0c94adad4bcb57a0b7135f8891c255c5f52
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/Helpers/WaveConditionsInputExtensions.cs	(.../WaveConditionsInputExtensions.cs)	(revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/Helpers/WaveConditionsInputExtensions.cs	(.../WaveConditionsInputExtensions.cs)	(revision 9d03e0c94adad4bcb57a0b7135f8891c255c5f52)
@@ -68,7 +68,7 @@
         /// <param name="input">The wave conditions input to update from.</param>
         /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         private static void SetConfigurationForeshoreProfileDependendProperties(WaveConditionsCalculationConfiguration configuration,
-                                                                               WaveConditionsInput input)
+                                                                                WaveConditionsInput input)
         {
             if (configuration == null)
             {
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationTest.cs
===================================================================
diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -r9d03e0c94adad4bcb57a0b7135f8891c255c5f52
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationTest.cs	(.../WaveConditionsCalculationConfigurationTest.cs)	(revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationTest.cs	(.../WaveConditionsCalculationConfigurationTest.cs)	(revision 9d03e0c94adad4bcb57a0b7135f8891c255c5f52)
@@ -30,7 +30,7 @@
     public class WaveConditionsCalculationConfigurationTest
     {
         [Test]
-        public void Constructor_ConstructionPropertiesNull_ThrowArgumentNullException()
+        public void Constructor_NameNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate test = () => new WaveConditionsCalculationConfiguration(null);
@@ -40,7 +40,7 @@
         }
 
         [Test]
-        public void Constructor_ConstructionPropertiesWithoutValues_PropertiesAreDefault()
+        public void Constructor_WithName_ExpectedValues()
         {
             // Setup
             var name = "some name";
@@ -63,7 +63,7 @@
         }
 
         [Test]
-        public void Constructor_ConstructionPropertiesWithValuesSet_PropertiesAsExpected()
+        public void SimpleProperties_SetNewValues_NewValuesSet()
         {
             // Setup
             const string calculationName = "Name of the calculation";
@@ -115,5 +115,18 @@
             Assert.AreEqual(breakWaterHeight, readWaveConditionsCalculation.WaveReduction.BreakWaterHeight);
             Assert.AreEqual(useForeshore, readWaveConditionsCalculation.WaveReduction.UseForeshoreProfile);
         }
+
+        [Test]
+        public void Name_Null_ThrowsArgumentNullException()
+        {
+            // Setup
+            var calculationConfiguration = new WaveConditionsCalculationConfiguration("valid name");
+
+            // Call
+            TestDelegate test = () => calculationConfiguration.Name = null;
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationTest.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -r9d03e0c94adad4bcb57a0b7135f8891c255c5f52
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationTest.cs	(.../StabilityPointStructuresCalculationConfigurationTest.cs)	(revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationTest.cs	(.../StabilityPointStructuresCalculationConfigurationTest.cs)	(revision 9d03e0c94adad4bcb57a0b7135f8891c255c5f52)
@@ -166,5 +166,18 @@
             Assert.AreEqual(verticalDistance, configuration.VerticalDistance);
             Assert.AreEqual(volumicWeightWater, configuration.VolumicWeightWater);
         }
+
+        [Test]
+        public void Name_Null_ThrowsArgumentNullException()
+        {
+            // Setup
+            var calculationConfiguration = new StabilityPointStructuresCalculationConfiguration("valid name");
+
+            // Call
+            TestDelegate test = () => calculationConfiguration.Name = null;
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
     }
 }
\ No newline at end of file