Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableAssessmentSectionTest.cs
===================================================================
diff -u -r7c5c4da68eaa7539d635b50361dbf224c5268107 -r77634bba07b0c62ed8a44bfe97e8e529ef4afa64
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableAssessmentSectionTest.cs	(.../ExportableAssessmentSectionTest.cs)	(revision 7c5c4da68eaa7539d635b50361dbf224c5268107)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableAssessmentSectionTest.cs	(.../ExportableAssessmentSectionTest.cs)	(revision 77634bba07b0c62ed8a44bfe97e8e529ef4afa64)
@@ -38,8 +38,8 @@
         public void Constructor_InvalidId_ThrowsArgumentException(string invalidId)
         {
             // Call
-            void Call() => new ExportableAssessmentSection(invalidId, string.Empty, Enumerable.Empty<Point2D>(), 
-                                                           Enumerable.Empty<ExportableFailureMechanismSectionCollection>(), 
+            void Call() => new ExportableAssessmentSection(invalidId, string.Empty, Enumerable.Empty<Point2D>(),
+                                                           Enumerable.Empty<ExportableFailureMechanismSectionCollection>(),
                                                            ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(),
                                                            Enumerable.Empty<ExportableFailureMechanism>(),
                                                            Enumerable.Empty<ExportableCombinedSectionAssembly>());
@@ -69,7 +69,7 @@
         {
             // Call
             void Call() => new ExportableAssessmentSection("id", string.Empty,
-                                                           null,Enumerable.Empty<ExportableFailureMechanismSectionCollection>(), 
+                                                           null, Enumerable.Empty<ExportableFailureMechanismSectionCollection>(),
                                                            ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(),
                                                            Enumerable.Empty<ExportableFailureMechanism>(),
                                                            Enumerable.Empty<ExportableCombinedSectionAssembly>());
@@ -84,7 +84,7 @@
         {
             // Call
             void Call() => new ExportableAssessmentSection("id", string.Empty,
-                                                           Enumerable.Empty<Point2D>(), null, 
+                                                           Enumerable.Empty<Point2D>(), null,
                                                            ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(),
                                                            Enumerable.Empty<ExportableFailureMechanism>(),
                                                            Enumerable.Empty<ExportableCombinedSectionAssembly>());
@@ -93,14 +93,14 @@
             var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("failureMechanismSectionCollections", exception.ParamName);
         }
-        
+
         [Test]
         public void Constructor_AssessmentSectionAssemblyNull_ThrowsArgumentNullException()
         {
             // Call
             void Call() => new ExportableAssessmentSection("id", string.Empty, Enumerable.Empty<Point2D>(),
                                                            Enumerable.Empty<ExportableFailureMechanismSectionCollection>(),
-                                                           null, Enumerable.Empty<ExportableFailureMechanism>(), 
+                                                           null, Enumerable.Empty<ExportableFailureMechanism>(),
                                                            Enumerable.Empty<ExportableCombinedSectionAssembly>());
 
             // Assert
@@ -128,7 +128,7 @@
             // Call
             void Call() => new ExportableAssessmentSection("id", string.Empty, Enumerable.Empty<Point2D>(),
                                                            Enumerable.Empty<ExportableFailureMechanismSectionCollection>(),
-                                                           ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(), 
+                                                           ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(),
                                                            Enumerable.Empty<ExportableFailureMechanism>(), null);
 
             // Assert
@@ -137,10 +137,10 @@
         }
 
         [Test]
-        [TestCase("id","")]
-        [TestCase("id", "   ")]
+        [TestCase("id", "")]
+        [TestCase("id1", "   ")]
         [TestCase("Valid_id", "Valid name")]
-        public void Constructor_WithValidArguments_ExpectedValues(string id, string name)
+        public void Constructor_ExpectedValues(string id, string name)
         {
             // Setup
             IEnumerable<Point2D> geometry = Enumerable.Empty<Point2D>();
@@ -151,8 +151,9 @@
             IEnumerable<ExportableCombinedSectionAssembly> combinedSectionAssemblyResults = Enumerable.Empty<ExportableCombinedSectionAssembly>();
 
             // Call
-            var assessmentSection = new ExportableAssessmentSection(id, name, geometry, failureMechanismSectionCollections, 
-                                                                    assessmentSectionAssembly, failureMechanisms, combinedSectionAssemblyResults);
+            var assessmentSection = new ExportableAssessmentSection(
+                id, name, geometry, failureMechanismSectionCollections, assessmentSectionAssembly,
+                failureMechanisms, combinedSectionAssemblyResults);
 
             // Assert
             Assert.AreEqual(name, assessmentSection.Name);
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableCombinedFailureMechanismSectionTest.cs
===================================================================
diff -u -r54be8d72ca7e4cea39fe62f9ed711cc4ab53b4c9 -r77634bba07b0c62ed8a44bfe97e8e529ef4afa64
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableCombinedFailureMechanismSectionTest.cs	(.../ExportableCombinedFailureMechanismSectionTest.cs)	(revision 54be8d72ca7e4cea39fe62f9ed711cc4ab53b4c9)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableCombinedFailureMechanismSectionTest.cs	(.../ExportableCombinedFailureMechanismSectionTest.cs)	(revision 77634bba07b0c62ed8a44bfe97e8e529ef4afa64)
@@ -34,11 +34,11 @@
     public class ExportableCombinedFailureMechanismSectionTest
     {
         [Test]
-        public void Constructor_WithArguments_ExpectedValues()
+        public void Constructor_ExpectedValues()
         {
             // Setup
             const string id = "id";
-            
+
             var random = new Random(21);
             IEnumerable<Point2D> geometry = Enumerable.Empty<Point2D>();
             var assemblyMethod = random.NextEnumValue<ExportableAssemblyMethod>();
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismSectionTest.cs
===================================================================
diff -u -r234c67f206c92dde881cc2c15e2cb4299be50741 -r77634bba07b0c62ed8a44bfe97e8e529ef4afa64
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismSectionTest.cs	(.../ExportableFailureMechanismSectionTest.cs)	(revision 234c67f206c92dde881cc2c15e2cb4299be50741)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismSectionTest.cs	(.../ExportableFailureMechanismSectionTest.cs)	(revision 77634bba07b0c62ed8a44bfe97e8e529ef4afa64)
@@ -41,9 +41,7 @@
             var random = new Random(21);
 
             // Call
-            void Call() => new ExportableFailureMechanismSection(invalidId, null,
-                                                                 random.NextDouble(),
-                                                                 random.NextDouble());
+            void Call() => new ExportableFailureMechanismSection(invalidId, null, random.NextDouble(), random.NextDouble());
 
             // Assert
             const string expectedMessage = "'id' must have a value and consist only of alphanumerical characters, '-', '_' or '.'.";
@@ -57,12 +55,10 @@
             var random = new Random(21);
 
             // Call
-            TestDelegate call = () => new ExportableFailureMechanismSection("id", null,
-                                                                            random.NextDouble(),
-                                                                            random.NextDouble());
+            void Call() => new ExportableFailureMechanismSection("id", null, random.NextDouble(), random.NextDouble());
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("geometry", exception.ParamName);
         }