Index: Riskeer/Common/test/Riskeer.Common.IO.Test/Structures/StructureLocationReaderTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -rfc99e807a96e24b8b22f4b20cbfa772c935f23db
--- Riskeer/Common/test/Riskeer.Common.IO.Test/Structures/StructureLocationReaderTest.cs	(.../StructureLocationReaderTest.cs)	(revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.IO.Test/Structures/StructureLocationReaderTest.cs	(.../StructureLocationReaderTest.cs)	(revision fc99e807a96e24b8b22f4b20cbfa772c935f23db)
@@ -144,7 +144,7 @@
             TestDelegate call = () => new StructureLocationReader(invalidFilePath);
 
             // Assert
-            string expectedMessage = $"Fout bij het lezen van bestand '{invalidFilePath}': het bestand heeft geen attribuut '{"KWKIDENT"}'. Dit attribuut is vereist.";
+            string expectedMessage = $"Fout bij het lezen van bestand '{invalidFilePath}': het bestand heeft geen attribuut 'KWKIDENT'. Dit attribuut is vereist.";
             string message = Assert.Throws<CriticalFileReadException>(call).Message;
             Assert.AreEqual(expectedMessage, message);
         }
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/ConfigurationGrassCoverErosionOutwardsCalculationTypeTest.cs
===================================================================
diff -u -r3c8ea6afcb34a441d923e9288a313ec617af90d6 -rfc99e807a96e24b8b22f4b20cbfa772c935f23db
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/ConfigurationGrassCoverErosionOutwardsCalculationTypeTest.cs	(.../ConfigurationGrassCoverErosionOutwardsCalculationTypeTest.cs)	(revision 3c8ea6afcb34a441d923e9288a313ec617af90d6)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/ConfigurationGrassCoverErosionOutwardsCalculationTypeTest.cs	(.../ConfigurationGrassCoverErosionOutwardsCalculationTypeTest.cs)	(revision fc99e807a96e24b8b22f4b20cbfa772c935f23db)
@@ -43,7 +43,7 @@
                     },
                     {
                         ConfigurationGrassCoverErosionOutwardsCalculationType.Both,3
-                    },
+                    }
                 };
             }
         }
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -r9a756a45a3eb62e77347a0ce18f7e1a2f63bfba0 -rfc99e807a96e24b8b22f4b20cbfa772c935f23db
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision 9a756a45a3eb62e77347a0ce18f7e1a2f63bfba0)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision fc99e807a96e24b8b22f4b20cbfa772c935f23db)
@@ -312,7 +312,6 @@
             // Call
             TestDelegate call = () => handler.Update(new HydraulicBoundaryDatabase(), ReadHydraulicBoundaryDatabaseTestFactory.Create(),
                                                      ReadHydraulicLocationConfigurationDatabaseTestFactory.Create(), null, "", "");
-            ;
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -333,7 +332,6 @@
             TestDelegate call = () => handler.Update(new HydraulicBoundaryDatabase(), ReadHydraulicBoundaryDatabaseTestFactory.Create(),
                                                      ReadHydraulicLocationConfigurationDatabaseTestFactory.Create(), Enumerable.Empty<long>(),
                                                      null, "");
-            ;
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -354,7 +352,6 @@
             TestDelegate call = () => handler.Update(new HydraulicBoundaryDatabase(), ReadHydraulicBoundaryDatabaseTestFactory.Create(),
                                                      ReadHydraulicLocationConfigurationDatabaseTestFactory.Create(), Enumerable.Empty<long>(),
                                                      "", null);
-            ;
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/SoilProfile/MacroStabilityInwardsSoilProfile1DTestFactory.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rfc99e807a96e24b8b22f4b20cbfa772c935f23db
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/SoilProfile/MacroStabilityInwardsSoilProfile1DTestFactory.cs	(.../MacroStabilityInwardsSoilProfile1DTestFactory.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/SoilProfile/MacroStabilityInwardsSoilProfile1DTestFactory.cs	(.../MacroStabilityInwardsSoilProfile1DTestFactory.cs)	(revision fc99e807a96e24b8b22f4b20cbfa772c935f23db)
@@ -32,21 +32,6 @@
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsSoilProfile1D"/> which has:
         /// <list type="bullet">
-        /// <item><see cref="MacroStabilityInwardsSoilProfile1D.Name"/> set to "Profile".</item>
-        /// <item><see cref="MacroStabilityInwardsSoilProfile1D.Bottom"/> set to <c>0.0</c>.</item>
-        /// <item><see cref="MacroStabilityInwardsSoilProfile1D.Layers"/> set to a collection with a single <see cref="MacroStabilityInwardsSoilLayer1D"/>.
-        /// with <see cref="MacroStabilityInwardsSoilLayer1D.Top"/> set to <c>0.0</c>.</item>
-        /// </list>
-        /// </summary>
-        /// <returns>A configured <see cref="MacroStabilityInwardsSoilProfile1D"/>.</returns>
-        public static MacroStabilityInwardsSoilProfile1D CreateMacroStabilityInwardsSoilProfile1D()
-        {
-            return CreateMacroStabilityInwardsSoilProfile1D("Profile");
-        }
-
-        /// <summary>
-        /// Creates a new instance of <see cref="MacroStabilityInwardsSoilProfile1D"/> which has:
-        /// <list type="bullet">
         /// <item><see cref="MacroStabilityInwardsSoilProfile1D.Name"/> set to <paramref name="name"/>.</item>
         /// <item><see cref="MacroStabilityInwardsSoilProfile1D.Bottom"/> set to <c>0.0</c>.</item>
         /// <item><see cref="MacroStabilityInwardsSoilProfile1D.Layers"/> set to a collection with a single <see cref="MacroStabilityInwardsSoilLayer1D"/>.
@@ -55,7 +40,7 @@
         /// </summary>
         /// <param name="name">The name for the profile.</param>
         /// <returns>A configured <see cref="MacroStabilityInwardsSoilProfile1D"/>.</returns>
-        public static MacroStabilityInwardsSoilProfile1D CreateMacroStabilityInwardsSoilProfile1D(string name)
+        public static MacroStabilityInwardsSoilProfile1D CreateMacroStabilityInwardsSoilProfile1D(string name = "Profile")
         {
             return new MacroStabilityInwardsSoilProfile1D(name, 0.0, new[]
             {
Index: Riskeer/Piping/test/Riskeer.Piping.Primitives.TestUtil/PipingSoilProfileTestFactory.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rfc99e807a96e24b8b22f4b20cbfa772c935f23db
--- Riskeer/Piping/test/Riskeer.Piping.Primitives.TestUtil/PipingSoilProfileTestFactory.cs	(.../PipingSoilProfileTestFactory.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Piping/test/Riskeer.Piping.Primitives.TestUtil/PipingSoilProfileTestFactory.cs	(.../PipingSoilProfileTestFactory.cs)	(revision fc99e807a96e24b8b22f4b20cbfa772c935f23db)
@@ -27,39 +27,6 @@
     public static class PipingSoilProfileTestFactory
     {
         /// <summary>
-        /// Creates a new instance of <see cref="PipingSoilProfile"/>, which has:
-        /// <list type="bullet">
-        /// <item><see cref="PipingSoilProfile.Name"/> set to <paramref name="name"/>;</item>
-        /// <item><see cref="PipingSoilProfile.Bottom"/> set to <c>0.0</c>;</item>
-        /// <item><see cref="PipingSoilProfile.Layers"/> set to a collection with a single <see cref="PipingSoilLayer"/>
-        /// with <see cref="PipingSoilLayer.Top"/> set to <c>0.0</c>;</item>
-        /// <item><see cref="PipingSoilProfile.SoilProfileSourceType"/> set to <see cref="SoilProfileType.SoilProfile1D"/>.</item>
-        /// </list>
-        /// </summary>
-        /// <param name="name">The name to set for the <see cref="PipingSoilProfile"/>.</param>
-        /// <returns>The created <see cref="PipingSoilProfile"/>.</returns>
-        public static PipingSoilProfile CreatePipingSoilProfile(string name)
-        {
-            return CreatePipingSoilProfile(name, SoilProfileType.SoilProfile1D);
-        }
-
-        /// <summary>
-        /// Creates a new instance of <see cref="PipingSoilProfile"/>, which has:
-        /// <list type="bullet">
-        /// <item><see cref="PipingSoilProfile.Name"/> set to "name";</item>
-        /// <item><see cref="PipingSoilProfile.Bottom"/> set to <c>0.0</c>;</item>
-        /// <item><see cref="PipingSoilProfile.Layers"/> set to a collection with a single <see cref="PipingSoilLayer"/>
-        /// with <see cref="PipingSoilLayer.Top"/> set to <c>0.0</c>;</item>
-        /// <item><see cref="PipingSoilProfile.SoilProfileSourceType"/> set to <see cref="SoilProfileType.SoilProfile1D"/>.</item>
-        /// </list>
-        /// </summary>
-        /// <returns>The created <see cref="PipingSoilProfile"/>.</returns>
-        public static PipingSoilProfile CreatePipingSoilProfile()
-        {
-            return CreatePipingSoilProfile("name");
-        }
-
-        /// <summary>
         /// Creates a new instance of <see cref="PipingSoilProfile"/> that has:
         /// <list type="bullet">
         /// <item><see cref="PipingSoilProfile.Name"/> set to <paramref name="name"/>;</item>
@@ -72,7 +39,7 @@
         /// <param name="name">The name for the profile.</param>
         /// <param name="soilProfileType">The type of the profile.</param>
         /// <returns>The created <see cref="PipingSoilProfile"/>.</returns>
-        public static PipingSoilProfile CreatePipingSoilProfile(string name, SoilProfileType soilProfileType)
+        public static PipingSoilProfile CreatePipingSoilProfile(string name = "name", SoilProfileType soilProfileType = SoilProfileType.SoilProfile1D)
         {
             return new PipingSoilProfile(name, 0.0, new[]
             {