Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs
===================================================================
diff -u -r4236512c9bc66f92177cd89d3269f7415c3b70eb -rc16772f88ccd57d80eb875838757cbbb49f92f85
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs	(.../SerializableAssemblyCreatorTest.cs)	(revision 4236512c9bc66f92177cd89d3269f7415c3b70eb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs	(.../SerializableAssemblyCreatorTest.cs)	(revision c16772f88ccd57d80eb875838757cbbb49f92f85)
@@ -119,23 +119,8 @@
             AssertSerializableFailureMechanismSectionCollection("Vi.19",
                                                                 serializableTotalAssemblyResult,
                                                                 combinedFailureMechanismSectionCollection);
-            var combinedFailureMechanismSection1 = (SerializableFailureMechanismSection) serializableAssemblyFeatureMembers[22];
-            AssertSerializableFailureMechanismSection("Wks.20",
-                                                      combinedFailureMechanismSectionCollection,
-                                                      combinedFailureMechanismSection1);
-            AssertSerializableCombinedFailureMechanismSectionAssembly("Gto.21",
-                                                                      serializableTotalAssemblyResult,
-                                                                      combinedFailureMechanismSection1,
-                                                                      (SerializableCombinedFailureMechanismSectionAssembly) serializableAssemblyFeatureMembers[11]);
-
-            var combinedFailureMechanismSection2 = (SerializableFailureMechanismSection) serializableAssemblyFeatureMembers[23];
-            AssertSerializableFailureMechanismSection("Wks.22",
-                                                      combinedFailureMechanismSectionCollection,
-                                                      combinedFailureMechanismSection2);
-            AssertSerializableCombinedFailureMechanismSectionAssembly("Gto.23",
-                                                                      serializableTotalAssemblyResult,
-                                                                      combinedFailureMechanismSection2,
-                                                                      (SerializableCombinedFailureMechanismSectionAssembly) serializableAssemblyFeatureMembers[12]);
+            AssertCombinedFailureMechanismSectionAssemblyConnections(11, 20, combinedFailureMechanismSectionCollection, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers);
+            AssertCombinedFailureMechanismSectionAssemblyConnections(12, 22, combinedFailureMechanismSectionCollection, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers);
         }
 
         #region Test Helpers: Factory Methods
@@ -386,6 +371,22 @@
 
         #region Combined failure mechanism sections
 
+        private static void AssertCombinedFailureMechanismSectionAssemblyConnections(int indexSerializableCombinedSectionAssembly,
+                                                                                     int startId,
+                                                                                     SerializableFailureMechanismSectionCollection expectedCombinedFailureMechanismSectionCollection,
+                                                                                     SerializableTotalAssemblyResult expectedSerializableTotalAssemblyResult,
+                                                                                     SerializableFeatureMember[] serializableAssemblyFeatureMembers)
+        {
+            var combinedFailureMechanismSection1 = (SerializableFailureMechanismSection) serializableAssemblyFeatureMembers[indexSerializableCombinedSectionAssembly + 11];
+            AssertSerializableFailureMechanismSection($"Wks.{startId++}",
+                                                      expectedCombinedFailureMechanismSectionCollection,
+                                                      combinedFailureMechanismSection1);
+            AssertSerializableCombinedFailureMechanismSectionAssembly($"Gto.{startId}",
+                                                                      expectedSerializableTotalAssemblyResult,
+                                                                      combinedFailureMechanismSection1,
+                                                                      (SerializableCombinedFailureMechanismSectionAssembly) serializableAssemblyFeatureMembers[indexSerializableCombinedSectionAssembly]);
+        }
+
         private static void AssertSerializableFailureMechanismSectionCollection(string expectedId,
                                                                                 SerializableTotalAssemblyResult expectedSerializableTotalAssemblyResult,
                                                                                 SerializableFailureMechanismSectionCollection serializableFailureMechanismSectionCollection)