Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResult.cs
===================================================================
diff -u -r9e7d412c1e0f7161e5cd10385f203aed85a3424f -ra83e2a5c40411d013fed9b21c300096e098c1594
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResult.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResult.cs)	(revision 9e7d412c1e0f7161e5cd10385f203aed85a3424f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResult.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResult.cs)	(revision a83e2a5c40411d013fed9b21c300096e098c1594)
@@ -18,7 +18,7 @@
         /// <param name="tailorMadeAssembly">The tailor made assembly result of the failure mechanism section.</param>
         /// <param name="combinedAssembly">The combined assembly result of the failure mechanism section.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null.</c></exception>
-        public ExportableAggregatedFailureMechanismSectionAssemblyResult(FailureMechanismSection failureMechanismSection,
+        public ExportableAggregatedFailureMechanismSectionAssemblyResult(ExportableFailureMechanismSection failureMechanismSection,
                                                                          ExportableSectionAssemblyResult simpleAssembly,
                                                                          ExportableSectionAssemblyResult detailedAssembly,
                                                                          ExportableSectionAssemblyResult tailorMadeAssembly,
Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultBase.cs
===================================================================
diff -u -rb5b18fd9acc22783510d375631ef3dc61c240074 -ra83e2a5c40411d013fed9b21c300096e098c1594
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultBase.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultBase.cs)	(revision b5b18fd9acc22783510d375631ef3dc61c240074)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultBase.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultBase.cs)	(revision a83e2a5c40411d013fed9b21c300096e098c1594)
@@ -18,7 +18,7 @@
         /// <param name="tailorMadeAssembly">The tailor made assembly result of the failure mechanism section.</param>
         /// <param name="combinedAssembly">The combined assembly result of the failure mechanism section.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null.</c></exception>
-        protected ExportableAggregatedFailureMechanismSectionAssemblyResultBase(FailureMechanismSection failureMechanismSection,
+        protected ExportableAggregatedFailureMechanismSectionAssemblyResultBase(ExportableFailureMechanismSection failureMechanismSection,
                                                                                 TSectionAssemblyResult simpleAssembly,
                                                                                 TSectionAssemblyResult tailorMadeAssembly,
                                                                                 TSectionAssemblyResult combinedAssembly)
@@ -52,7 +52,7 @@
         /// <summary>
         /// Gets the failure mechanism section.
         /// </summary>
-        public FailureMechanismSection FailureMechanismSection { get; }
+        public ExportableFailureMechanismSection FailureMechanismSection { get; }
 
         /// <summary>
         /// Gets the simple assembly result.
Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability.cs
===================================================================
diff -u -r9e7d412c1e0f7161e5cd10385f203aed85a3424f -ra83e2a5c40411d013fed9b21c300096e098c1594
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability.cs)	(revision 9e7d412c1e0f7161e5cd10385f203aed85a3424f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability.cs)	(revision a83e2a5c40411d013fed9b21c300096e098c1594)
@@ -18,7 +18,7 @@
         /// <param name="tailorMadeAssembly">The tailor made assembly result of the failure mechanism section.</param>
         /// <param name="combinedAssembly">The combined assembly result of the failure mechanism section.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null.</c></exception>
-        public ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability(FailureMechanismSection failureMechanismSection,
+        public ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability(ExportableFailureMechanismSection failureMechanismSection,
                                                                                         ExportableSectionAssemblyResultWithProbability simpleAssembly,
                                                                                         ExportableSectionAssemblyResultWithProbability detailedAssembly,
                                                                                         ExportableSectionAssemblyResultWithProbability tailorMadeAssembly,
Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly.cs
===================================================================
diff -u -r083dc60305e72a225bb92b247fbc03d428ac05f3 -ra83e2a5c40411d013fed9b21c300096e098c1594
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly.cs)	(revision 083dc60305e72a225bb92b247fbc03d428ac05f3)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly.cs)	(revision a83e2a5c40411d013fed9b21c300096e098c1594)
@@ -17,7 +17,7 @@
         /// <param name="tailorMadeAssembly">The tailor made assembly result of the failure mechanism section.</param>
         /// <param name="combinedAssembly">The combined assembly result of the failure mechanism section.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null.</c></exception>
-        public ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly(FailureMechanismSection failureMechanismSection,
+        public ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly(ExportableFailureMechanismSection failureMechanismSection,
                                                                                                 ExportableSectionAssemblyResult simpleAssembly,
                                                                                                 ExportableSectionAssemblyResult tailorMadeAssembly,
                                                                                                 ExportableSectionAssemblyResult combinedAssembly)
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultBaseTest.cs
===================================================================
diff -u -r0e5b053d882dfc62c36c0a84678179a5a259279c -ra83e2a5c40411d013fed9b21c300096e098c1594
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultBaseTest.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultBaseTest.cs)	(revision 0e5b053d882dfc62c36c0a84678179a5a259279c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultBaseTest.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultBaseTest.cs)	(revision a83e2a5c40411d013fed9b21c300096e098c1594)
@@ -1,9 +1,9 @@
 using System;
+using System.Linq;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
-using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.IO.Assembly;
 
 namespace Ringtoets.Integration.IO.Test.Assembly
@@ -29,11 +29,10 @@
         public void Constructor_SimpleAssemblyNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new TestExportableAggregatedFailureMechanismSectionAssemblyResultBase(
-                FailureMechanismSectionTestFactory.CreateFailureMechanismSection(),
-                null,
-                CreateSectionResult(),
-                CreateSectionResult());
+            TestDelegate call = () => new TestExportableAggregatedFailureMechanismSectionAssemblyResultBase(CreateSection(),
+                                                                                                            null,
+                                                                                                            CreateSectionResult(),
+                                                                                                            CreateSectionResult());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -44,11 +43,10 @@
         public void Constructor_TailorMadeAssemblyNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new TestExportableAggregatedFailureMechanismSectionAssemblyResultBase(
-                FailureMechanismSectionTestFactory.CreateFailureMechanismSection(),
-                CreateSectionResult(),
-                null,
-                CreateSectionResult());
+            TestDelegate call = () => new TestExportableAggregatedFailureMechanismSectionAssemblyResultBase(CreateSection(),
+                                                                                                            CreateSectionResult(),
+                                                                                                            null,
+                                                                                                            CreateSectionResult());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -59,11 +57,10 @@
         public void Constructor_CombinedAssemblyNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new TestExportableAggregatedFailureMechanismSectionAssemblyResultBase(
-                FailureMechanismSectionTestFactory.CreateFailureMechanismSection(),
-                CreateSectionResult(),
-                CreateSectionResult(),
-                null);
+            TestDelegate call = () => new TestExportableAggregatedFailureMechanismSectionAssemblyResultBase(CreateSection(),
+                                                                                                            CreateSectionResult(),
+                                                                                                            CreateSectionResult(),
+                                                                                                            null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -74,7 +71,7 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+            ExportableFailureMechanismSection failureMechanismSection = CreateSection();
             ExportableSectionAssemblyResult simpleAssembly = CreateSectionResult();
             ExportableSectionAssemblyResult tailorMadeAssembly = CreateSectionResult();
             ExportableSectionAssemblyResult combinedAssembly = CreateSectionResult();
@@ -99,10 +96,16 @@
                                                        random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
         }
 
+        private static ExportableFailureMechanismSection CreateSection()
+        {
+            var random = new Random(21);
+            return new ExportableFailureMechanismSection(Enumerable.Empty<Point2D>(), random.NextDouble(), random.NextDouble());
+        }
+
         private class TestExportableAggregatedFailureMechanismSectionAssemblyResultBase
             : ExportableAggregatedFailureMechanismSectionAssemblyResultBase<ExportableSectionAssemblyResult>
         {
-            public TestExportableAggregatedFailureMechanismSectionAssemblyResultBase(FailureMechanismSection failureMechanismSection,
+            public TestExportableAggregatedFailureMechanismSectionAssemblyResultBase(ExportableFailureMechanismSection failureMechanismSection,
                                                                                      ExportableSectionAssemblyResult simpleAssembly,
                                                                                      ExportableSectionAssemblyResult tailorMadeAssembly,
                                                                                      ExportableSectionAssemblyResult combinedAssembly)
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultTest.cs
===================================================================
diff -u -r0e5b053d882dfc62c36c0a84678179a5a259279c -ra83e2a5c40411d013fed9b21c300096e098c1594
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultTest.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultTest.cs)	(revision 0e5b053d882dfc62c36c0a84678179a5a259279c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultTest.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultTest.cs)	(revision a83e2a5c40411d013fed9b21c300096e098c1594)
@@ -1,9 +1,9 @@
 using System;
+using System.Linq;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
-using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.IO.Assembly;
 
 namespace Ringtoets.Integration.IO.Test.Assembly
@@ -16,7 +16,7 @@
         {
             // Call
             TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResult(
-                FailureMechanismSectionTestFactory.CreateFailureMechanismSection(),
+                CreateSection(),
                 CreateSectionResult(),
                 null,
                 CreateSectionResult(),
@@ -31,7 +31,7 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+            ExportableFailureMechanismSection failureMechanismSection = CreateSection();
             ExportableSectionAssemblyResult simpleAssembly = CreateSectionResult();
             ExportableSectionAssemblyResult detailedAssembly = CreateSectionResult();
             ExportableSectionAssemblyResult tailorMadeAssembly = CreateSectionResult();
@@ -54,6 +54,12 @@
             Assert.AreSame(combinedAssembly, assemblyResult.CombinedAssembly);
         }
 
+        private static ExportableFailureMechanismSection CreateSection()
+        {
+            var random = new Random(21);
+            return new ExportableFailureMechanismSection(Enumerable.Empty<Point2D>(), random.NextDouble(), random.NextDouble());
+        }
+
         private static ExportableSectionAssemblyResult CreateSectionResult()
         {
             var random = new Random(21);
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbabilityTest.cs
===================================================================
diff -u -r0e5b053d882dfc62c36c0a84678179a5a259279c -ra83e2a5c40411d013fed9b21c300096e098c1594
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbabilityTest.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbabilityTest.cs)	(revision 0e5b053d882dfc62c36c0a84678179a5a259279c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbabilityTest.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbabilityTest.cs)	(revision a83e2a5c40411d013fed9b21c300096e098c1594)
@@ -1,9 +1,9 @@
 using System;
+using System.Linq;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
-using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.IO.Assembly;
 
 namespace Ringtoets.Integration.IO.Test.Assembly
@@ -16,7 +16,7 @@
         {
             // Call
             TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability(
-                FailureMechanismSectionTestFactory.CreateFailureMechanismSection(),
+                CreateSection(),
                 CreateSectionResult(),
                 null,
                 CreateSectionResult(),
@@ -31,7 +31,7 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+            ExportableFailureMechanismSection failureMechanismSection = CreateSection();
             ExportableSectionAssemblyResultWithProbability simpleAssembly = CreateSectionResult();
             ExportableSectionAssemblyResultWithProbability detailedAssembly = CreateSectionResult();
             ExportableSectionAssemblyResultWithProbability tailorMadeAssembly = CreateSectionResult();
@@ -61,5 +61,11 @@
                                                                       random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>(),
                                                                       random.NextDouble());
         }
+
+        private static ExportableFailureMechanismSection CreateSection()
+        {
+            var random = new Random(21);
+            return new ExportableFailureMechanismSection(Enumerable.Empty<Point2D>(), random.NextDouble(), random.NextDouble());
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssemblyTest.cs
===================================================================
diff -u -r0e5b053d882dfc62c36c0a84678179a5a259279c -ra83e2a5c40411d013fed9b21c300096e098c1594
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssemblyTest.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssemblyTest.cs)	(revision 0e5b053d882dfc62c36c0a84678179a5a259279c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssemblyTest.cs	(.../ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssemblyTest.cs)	(revision a83e2a5c40411d013fed9b21c300096e098c1594)
@@ -1,9 +1,9 @@
 using System;
+using System.Linq;
+using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
-using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.IO.Assembly;
 
 namespace Ringtoets.Integration.IO.Test.Assembly
@@ -15,7 +15,7 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+            ExportableFailureMechanismSection failureMechanismSection = CreateSection();
             ExportableSectionAssemblyResult simpleAssembly = CreateSectionResult();
             ExportableSectionAssemblyResult tailorMadeAssembly = CreateSectionResult();
             ExportableSectionAssemblyResult combinedAssembly = CreateSectionResult();
@@ -41,5 +41,11 @@
             return new ExportableSectionAssemblyResult(random.NextEnumValue<ExportableAssemblyMethod>(),
                                                        random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
         }
+
+        private static ExportableFailureMechanismSection CreateSection()
+        {
+            var random = new Random(21);
+            return new ExportableFailureMechanismSection(Enumerable.Empty<Point2D>(), random.NextDouble(), random.NextDouble());
+        }
     }
 }
\ No newline at end of file