Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/SerializableFailureMechanismSectionAssemblyResultCreator.cs
===================================================================
diff -u -r1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c -r19043242cabb3c29ab5956da83245f300427767c
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/SerializableFailureMechanismSectionAssemblyResultCreator.cs	(.../SerializableFailureMechanismSectionAssemblyResultCreator.cs)	(revision 1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/SerializableFailureMechanismSectionAssemblyResultCreator.cs	(.../SerializableFailureMechanismSectionAssemblyResultCreator.cs)	(revision 19043242cabb3c29ab5956da83245f300427767c)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Ringtoets.AssemblyTool.Data;
 using Ringtoets.AssemblyTool.IO.Model.DataTypes;
 using Ringtoets.AssemblyTool.IO.Model.Enums;
 using Ringtoets.Integration.IO.Assembly;
@@ -49,12 +48,6 @@
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
-            if (sectionResult.AssemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
-            {
-                return new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethodCreator.Create(sectionResult.AssemblyMethod),
-                                                                             assessmentType);
-            }
-
             return new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethodCreator.Create(sectionResult.AssemblyMethod),
                                                                          assessmentType,
                                                                          SerializableFailureMechanismSectionCategoryGroupCreator.Create(sectionResult.AssemblyCategory));
@@ -77,12 +70,6 @@
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
-            if (sectionResult.AssemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
-            {
-                return new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethodCreator.Create(sectionResult.AssemblyMethod),
-                                                                             assessmentType);
-            }
-
             return new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethodCreator.Create(sectionResult.AssemblyMethod),
                                                                          assessmentType,
                                                                          SerializableFailureMechanismSectionCategoryGroupCreator.Create(sectionResult.AssemblyCategory),
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs
===================================================================
diff -u -r95cc9e09a2390a216a0e933dc07841bcc67d5751 -r19043242cabb3c29ab5956da83245f300427767c
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs	(.../AggregatedSerializableFailureMechanismCreatorTest.cs)	(revision 95cc9e09a2390a216a0e933dc07841bcc67d5751)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs	(.../AggregatedSerializableFailureMechanismCreatorTest.cs)	(revision 19043242cabb3c29ab5956da83245f300427767c)
@@ -479,15 +479,27 @@
         private static ExportableSectionAssemblyResult CreateSectionAssemblyResult(int seed)
         {
             var random = new Random(seed);
+            var assemblyCategory = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            if (assemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
+            {
+                assemblyCategory = FailureMechanismSectionAssemblyCategoryGroup.IIIv;
+            }
+
             return new ExportableSectionAssemblyResult(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                       random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
+                                                       assemblyCategory);
         }
 
         private static ExportableSectionAssemblyResultWithProbability CreateSectionAssemblyResultWithProbability(int seed)
         {
             var random = new Random(seed);
+            var assemblyCategory = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            if (assemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
+            {
+                assemblyCategory = FailureMechanismSectionAssemblyCategoryGroup.IIIv;
+            }
+
             return new ExportableSectionAssemblyResultWithProbability(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                                      random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>(),
+                                                                      assemblyCategory,
                                                                       random.NextDouble());
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs
===================================================================
diff -u -r1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c -r19043242cabb3c29ab5956da83245f300427767c
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs	(.../AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs)	(revision 1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs	(.../AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs)	(revision 19043242cabb3c29ab5956da83245f300427767c)
@@ -405,15 +405,27 @@
         private static ExportableSectionAssemblyResult CreateSectionAssemblyResult(int seed)
         {
             var random = new Random(seed);
+            var assemblyCategory = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            if (assemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
+            {
+                assemblyCategory = FailureMechanismSectionAssemblyCategoryGroup.IIIv;
+            }
+
             return new ExportableSectionAssemblyResult(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                       random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
+                                                       assemblyCategory);
         }
 
         private static ExportableSectionAssemblyResultWithProbability CreateSectionAssemblyResultWithProbability(int seed)
         {
             var random = new Random(seed);
+            var assemblyCategory = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            if (assemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
+            {
+                assemblyCategory = FailureMechanismSectionAssemblyCategoryGroup.IIIv;
+            }
+
             return new ExportableSectionAssemblyResultWithProbability(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                                      random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>(),
+                                                                      assemblyCategory,
                                                                       random.NextDouble());
         }
     }
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs
===================================================================
diff -u -r7d9a50c849077865822160e024ee7b5ed66905a0 -r19043242cabb3c29ab5956da83245f300427767c
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs	(.../SerializableAssemblyCreatorTest.cs)	(revision 7d9a50c849077865822160e024ee7b5ed66905a0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs	(.../SerializableAssemblyCreatorTest.cs)	(revision 19043242cabb3c29ab5956da83245f300427767c)
@@ -206,8 +206,14 @@
         private static ExportableSectionAssemblyResult CreateSectionAssemblyResult()
         {
             var random = new Random(30);
+            var assemblyCategory = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            if (assemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
+            {
+                assemblyCategory = FailureMechanismSectionAssemblyCategoryGroup.IIIv;
+            }
+
             return new ExportableSectionAssemblyResult(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                       random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
+                                                       assemblyCategory);
         }
 
         #endregion
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs
===================================================================
diff -u -r1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c -r19043242cabb3c29ab5956da83245f300427767c
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs	(.../SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs)	(revision 1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs	(.../SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs)	(revision 19043242cabb3c29ab5956da83245f300427767c)
@@ -22,11 +22,11 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.AssemblyTool.Data;
 using Ringtoets.AssemblyTool.IO.Model.DataTypes;
 using Ringtoets.AssemblyTool.IO.Model.Enums;
 using Ringtoets.Integration.IO.Assembly;
 using Ringtoets.Integration.IO.Creators;
+using Ringtoets.Integration.IO.TestUtil;
 
 namespace Ringtoets.Integration.IO.Test.Creators
 {
@@ -48,13 +48,11 @@
         }
 
         [Test]
-        public void Create_WithExportableSectionAssemblyResultAndCategory_ReturnsSerializableFailureMechanismAssemblyResult()
+        public void Create_WithExportableSectionAssemblyResult_ReturnsSerializableFailureMechanismAssemblyResult()
         {
             // Setup
-            var random = new Random(21);
-            var assessmentType = random.NextEnumValue<SerializableAssessmentType>();
-            var sectionResult = new ExportableSectionAssemblyResult(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                                    FailureMechanismSectionAssemblyCategoryGroup.IIIv);
+            var assessmentType = new Random(21).NextEnumValue<SerializableAssessmentType>();
+            ExportableSectionAssemblyResult sectionResult = ExportableSectionAssemblyResultTestFactory.CreateSectionAssemblyResult();
 
             // Call
             SerializableFailureMechanismSectionAssemblyResult serializableResult =
@@ -69,27 +67,6 @@
         }
 
         [Test]
-        public void Create_WithExportableSectionAssemblyResultAndCategoryNone_ReturnsSerializableFailureMechanismAssemblyResult()
-        {
-            // Setup
-            var random = new Random(21);
-            var assessmentType = random.NextEnumValue<SerializableAssessmentType>();
-            var sectionResult = new ExportableSectionAssemblyResult(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                                    FailureMechanismSectionAssemblyCategoryGroup.None);
-
-            // Call
-            SerializableFailureMechanismSectionAssemblyResult serializableResult =
-                SerializableFailureMechanismSectionAssemblyResultCreator.Create(assessmentType, sectionResult);
-
-            // Assert
-            Assert.AreEqual(assessmentType, serializableResult.AssessmentType);
-
-            Assert.AreEqual(SerializableAssemblyMethodCreator.Create(sectionResult.AssemblyMethod), serializableResult.AssemblyMethod);
-            Assert.IsNull(serializableResult.CategoryGroup);
-            Assert.IsNull(serializableResult.Probability);
-        }
-
-        [Test]
         public void CreateWithExportableSectionAssemblyResultWithProbability_SectionResultNull_ThrowsArgumentNullException()
         {
             // Setup
@@ -105,14 +82,11 @@
         }
 
         [Test]
-        public void Create_WithExportableSectionAssemblyResultWithProbabilityAndCategory_ReturnsSerializableFailureMechanismAssemblyResult()
+        public void Create_WithExportableSectionAssemblyResultWithProbability_ReturnsSerializableFailureMechanismAssemblyResult()
         {
             // Setup
-            var random = new Random(21);
-            var assessmentType = random.NextEnumValue<SerializableAssessmentType>();
-            var sectionResult = new ExportableSectionAssemblyResultWithProbability(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                                                   FailureMechanismSectionAssemblyCategoryGroup.IIIv,
-                                                                                   random.NextDouble());
+            var assessmentType = new Random(21).NextEnumValue<SerializableAssessmentType>();
+            ExportableSectionAssemblyResultWithProbability sectionResult = ExportableSectionAssemblyResultTestFactory.CreateSectionAssemblyResultWithProbability();
 
             // Call
             SerializableFailureMechanismSectionAssemblyResult serializableResult =
@@ -125,27 +99,5 @@
             Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(sectionResult.AssemblyCategory), serializableResult.CategoryGroup);
             Assert.AreEqual(sectionResult.Probability, serializableResult.Probability);
         }
-
-        [Test]
-        public void Create_WithExportableSectionAssemblyResultWithProbabilityAndCategoryNone_ReturnsSerializableFailureMechanismAssemblyResult()
-        {
-            // Setup
-            var random = new Random(21);
-            var assessmentType = random.NextEnumValue<SerializableAssessmentType>();
-            var sectionResult = new ExportableSectionAssemblyResultWithProbability(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                                                   FailureMechanismSectionAssemblyCategoryGroup.None,
-                                                                                   random.NextDouble());
-
-            // Call
-            SerializableFailureMechanismSectionAssemblyResult serializableResult =
-                SerializableFailureMechanismSectionAssemblyResultCreator.Create(assessmentType, sectionResult);
-
-            // Assert
-            Assert.AreEqual(assessmentType, serializableResult.AssessmentType);
-
-            Assert.AreEqual(SerializableAssemblyMethodCreator.Create(sectionResult.AssemblyMethod), serializableResult.AssemblyMethod);
-            Assert.IsNull(serializableResult.CategoryGroup);
-            Assert.IsNull(serializableResult.Probability);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/SerializableFailureMechanismSectionAssemblyResultTestHelper.cs
===================================================================
diff -u -r1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c -r19043242cabb3c29ab5956da83245f300427767c
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/SerializableFailureMechanismSectionAssemblyResultTestHelper.cs	(.../SerializableFailureMechanismSectionAssemblyResultTestHelper.cs)	(revision 1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/SerializableFailureMechanismSectionAssemblyResultTestHelper.cs	(.../SerializableFailureMechanismSectionAssemblyResultTestHelper.cs)	(revision 19043242cabb3c29ab5956da83245f300427767c)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using NUnit.Framework;
-using Ringtoets.AssemblyTool.Data;
 using Ringtoets.AssemblyTool.IO.Model.DataTypes;
 using Ringtoets.AssemblyTool.IO.Model.Enums;
 using Ringtoets.Integration.IO.Assembly;
@@ -52,20 +51,12 @@
                                                 SerializableAssessmentType expectedAssessmentType,
                                                 SerializableFailureMechanismSectionAssemblyResult actualResult)
         {
+            Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
+                            actualResult.CategoryGroup);
             Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedResult.AssemblyMethod),
                             actualResult.AssemblyMethod);
             Assert.AreEqual(expectedAssessmentType, actualResult.AssessmentType);
             Assert.IsNull(actualResult.Probability);
-
-            if (expectedResult.AssemblyCategory != FailureMechanismSectionAssemblyCategoryGroup.None)
-            {
-                Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
-                                actualResult.CategoryGroup);
-            }
-            else
-            {
-                Assert.IsNull(actualResult.CategoryGroup);
-            }
         }
 
         /// <summary>
@@ -87,21 +78,12 @@
                                                 SerializableAssessmentType expectedAssessmentType,
                                                 SerializableFailureMechanismSectionAssemblyResult actualResult)
         {
+            Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
+                            actualResult.CategoryGroup);
             Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedResult.AssemblyMethod),
                             actualResult.AssemblyMethod);
             Assert.AreEqual(expectedAssessmentType, actualResult.AssessmentType);
-
-            if (expectedResult.AssemblyCategory != FailureMechanismSectionAssemblyCategoryGroup.None)
-            {
-                Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
-                                actualResult.CategoryGroup);
-                Assert.AreEqual(expectedResult.Probability, actualResult.Probability);
-            }
-            else
-            {
-                Assert.IsNull(actualResult.CategoryGroup);
-                Assert.IsNull(actualResult.Probability);
-            }
+            Assert.AreEqual(expectedResult.Probability, actualResult.Probability);
         }
     }
 }
\ No newline at end of file