Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyGroupCreatorTest.cs
===================================================================
diff -u -r57da5ea59cea2ac53c249bea9fe1dea9a9dfa5a0 -r132e63ecfbb509b83e15f0f466b0d6e16f283c6d
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyGroupCreatorTest.cs	(.../AssessmentSectionAssemblyGroupCreatorTest.cs)	(revision 57da5ea59cea2ac53c249bea9fe1dea9a9dfa5a0)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyGroupCreatorTest.cs	(.../AssessmentSectionAssemblyGroupCreatorTest.cs)	(revision 132e63ecfbb509b83e15f0f466b0d6e16f283c6d)
@@ -33,7 +33,7 @@
     public class AssessmentSectionAssemblyGroupCreatorTest
     {
         [Test]
-        public void CreateAssessmentSectionAssemblyCategoryGroup_WithInvalidAssessmentGrade_ThrowsInvalidEnumArgumentException()
+        public void CreateAssessmentSectionAssemblyGroup_WithInvalidAssessmentGrade_ThrowsInvalidEnumArgumentException()
         {
             // Call
             void Call() => AssessmentSectionAssemblyGroupCreator.CreateAssessmentSectionAssemblyGroup((EAssessmentGrade) 99);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionCategoryGroupCreatorTest.cs
===================================================================
diff -u -r921a4a5b07e757058cfdf6a9be5d256cd08c8c12 -r132e63ecfbb509b83e15f0f466b0d6e16f283c6d
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionCategoryGroupCreatorTest.cs	(.../SerializableAssessmentSectionCategoryGroupCreatorTest.cs)	(revision 921a4a5b07e757058cfdf6a9be5d256cd08c8c12)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionCategoryGroupCreatorTest.cs	(.../SerializableAssessmentSectionCategoryGroupCreatorTest.cs)	(revision 132e63ecfbb509b83e15f0f466b0d6e16f283c6d)
@@ -33,29 +33,29 @@
     public class SerializableAssessmentSectionCategoryGroupCreatorTest
     {
         [Test]
-        public void Create_InvalidAssessmentSectionAssemblyCategoryGroup_ThrowInvalidEnumArgumentException()
+        public void Create_InvalidAssessmentSectionAssemblyGroup_ThrowInvalidEnumArgumentException()
         {
             // Setup
-            const AssessmentSectionAssemblyGroup groupInput = (AssessmentSectionAssemblyGroup) 999;
+            const AssessmentSectionAssemblyGroup group = (AssessmentSectionAssemblyGroup) 999;
 
             // Call
-            TestDelegate call = () => SerializableAssessmentSectionCategoryGroupCreator.Create(groupInput);
+            void Call() => SerializableAssessmentSectionCategoryGroupCreator.Create(group);
 
             // Assert
-            string message = $"The value of argument 'categoryGroup' ({groupInput}) is invalid for Enum type '{nameof(AssessmentSectionAssemblyGroup)}'.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(call, message);
+            var message = $"The value of argument 'group' ({group}) is invalid for Enum type '{nameof(AssessmentSectionAssemblyGroup)}'.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(Call, message);
         }
 
         [Test]
         [TestCase(AssessmentSectionAssemblyGroup.None)]
         [TestCase(AssessmentSectionAssemblyGroup.NotApplicable)]
-        public void Create_WithNotSupportedInvalidCategoryGroup_ThrowsNotSupportedException(AssessmentSectionAssemblyGroup notSupportedCategoryGroup)
+        public void Create_WithNotSupportedAssessmentSectionAssemblyGroup_ThrowsNotSupportedException(AssessmentSectionAssemblyGroup notSupportedGroup)
         {
             // Call
-            TestDelegate call = () => SerializableAssessmentSectionCategoryGroupCreator.Create(notSupportedCategoryGroup);
+            void Call() => SerializableAssessmentSectionCategoryGroupCreator.Create(notSupportedGroup);
 
             // Assert
-            Assert.Throws<NotSupportedException>(call);
+            Assert.Throws<NotSupportedException>(Call);
         }
 
         [Test]
@@ -65,11 +65,11 @@
         [TestCase(AssessmentSectionAssemblyGroup.C, SerializableAssessmentSectionCategoryGroup.C)]
         [TestCase(AssessmentSectionAssemblyGroup.D, SerializableAssessmentSectionCategoryGroup.D)]
         [TestCase(AssessmentSectionAssemblyGroup.NotAssessed, SerializableAssessmentSectionCategoryGroup.NotAssessed)]
-        public void Create_WithValidAssessmentSectionAssemblyCategoryGroup_ReturnExpectedValues(AssessmentSectionAssemblyGroup categoryGroup,
-                                                                                                SerializableAssessmentSectionCategoryGroup expectedGroup)
+        public void Create_WithValidAssessmentSectionAssemblyGroup_ReturnExpectedValues(AssessmentSectionAssemblyGroup group,
+                                                                                        SerializableAssessmentSectionCategoryGroup expectedGroup)
         {
             // Call
-            SerializableAssessmentSectionCategoryGroup serializableGroup = SerializableAssessmentSectionCategoryGroupCreator.Create(categoryGroup);
+            SerializableAssessmentSectionCategoryGroup serializableGroup = SerializableAssessmentSectionCategoryGroupCreator.Create(group);
 
             // Assert
             Assert.AreEqual(expectedGroup, serializableGroup);