Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs	(.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs	(.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -166,7 +166,7 @@
         {
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -24,11 +24,11 @@
 using NUnit.Framework;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.Structures;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.ClosingStructures;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.ClosingStructures
 {
@@ -50,7 +50,7 @@
         public void Create_PersistencyRegistryNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate test = () => sectionResult.Create(null);
@@ -72,7 +72,7 @@
             bool useManualAssemblyProbability = random.NextBoolean();
             double manualAssemblyProbability = random.NextDouble();
 
-            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
@@ -99,7 +99,7 @@
         public void Create_SectionResultWithNaNValues_ReturnsEntityWithExpectedResults()
         {
             // Setup
-            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 TailorMadeAssessmentProbability = double.NaN,
                 ManualAssemblyProbability = double.NaN
@@ -118,7 +118,7 @@
         {
             // Setup
             var calculation = new StructuresCalculation<ClosingStructuresInput>();
-            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 Calculation = calculation
             };
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensionsTest.cs	(.../DuneErosionFailureMechanismCreateExtensionsTest.cs)	(revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensionsTest.cs	(.../DuneErosionFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -151,7 +151,7 @@
         {
             // Setup
             var failureMechanism = new DuneErosionFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs	(.../DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs	(.../DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.Storage.Core.Create.DuneErosion;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.DuneErosion
 {
@@ -60,7 +60,7 @@
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
             var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
-            var sectionResult = new DuneErosionFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new DuneErosionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResultForFactorizedSignalingNorm = detailedAssessmentResultForFactorizedSignalingNorm,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/FailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/FailureMechanismCreateExtensionsTest.cs	(.../FailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/FailureMechanismCreateExtensionsTest.cs	(.../FailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -79,7 +79,7 @@
         {
             // Setup
             var failureMechanism = new TestFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             var failureMechanismEntity = new FailureMechanismEntity();
 
             // Call
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/FailureMechanismSectionCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/FailureMechanismSectionCreateExtensionsTest.cs	(.../FailureMechanismSectionCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/FailureMechanismSectionCreateExtensionsTest.cs	(.../FailureMechanismSectionCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,10 +23,10 @@
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Serializers;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create
 {
@@ -37,7 +37,7 @@
         public void Create_WithoutCollector_ThrowsArgumentNullException()
         {
             // Setup
-            var failureMechanismSection = new TestFailureMechanismSection();
+            var failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
 
             // Call
             TestDelegate test = () => failureMechanismSection.Create(null);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -152,7 +152,7 @@
         {
             // Setup
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,12 +22,12 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.GrassCoverErosionInwards;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.GrassCoverErosionInwards
 {
@@ -49,7 +49,7 @@
         public void Create_PersistencyRegistryNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate test = () => sectionResult.Create(null);
@@ -71,7 +71,7 @@
             bool useManualAssemblyProbability = random.NextBoolean();
             double manualAssemblyProbability = random.NextDouble();
 
-            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
@@ -99,7 +99,7 @@
         public void Create_SectionResultWithNaNValues_ReturnsEntityWithExpectedResults()
         {
             // Setup
-            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 TailorMadeAssessmentProbability = double.NaN,
                 ManualAssemblyProbability = double.NaN
@@ -118,7 +118,7 @@
         {
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation();
-            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 Calculation = calculation
             };
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -153,7 +153,7 @@
         {
             // Setup
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.Storage.Core.Create.GrassCoverErosionOutwards;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.GrassCoverErosionOutwards
 {
@@ -60,7 +60,7 @@
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
             var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
-            var sectionResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResultForFactorizedSignalingNorm = detailedAssessmentResultForFactorizedSignalingNorm,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismCreateExtensionsTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismCreateExtensionsTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,11 +22,11 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.GrassCoverSlipOffInwards;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.GrassCoverSlipOffInwards
 {
@@ -140,7 +140,7 @@
         {
             // Setup
             var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.Create.GrassCoverSlipOffInwards;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.GrassCoverSlipOffInwards
 {
@@ -56,7 +56,7 @@
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
             var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
-            var sectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismCreateExtensionsTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismCreateExtensionsTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,11 +22,11 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.GrassCoverSlipOffOutwards;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.GrassCoverSlipOffOutwards
 {
@@ -140,7 +140,7 @@
         {
             // Setup
             var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.Create.GrassCoverSlipOffOutwards;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.GrassCoverSlipOffOutwards
 {
@@ -56,7 +56,7 @@
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
             var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
-            var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs	(.../HeightStructuresFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs	(.../HeightStructuresFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -159,7 +159,7 @@
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/HeightStructures/HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/HeightStructures/HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/HeightStructures/HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,12 +23,12 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Structures;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.HeightStructures;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.HeightStructures
 {
@@ -50,7 +50,7 @@
         public void Create_PersistenceRegistryNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate test = () => sectionResult.Create(null);
@@ -72,7 +72,7 @@
             bool useManualAssemblyProbability = random.NextBoolean();
             double manualAssemblyProbability = random.NextDouble();
 
-            var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
@@ -99,7 +99,7 @@
         public void Create_SectionResultWithNaNValues_ReturnsEntityWithExpectedResults()
         {
             // Setup
-            var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 TailorMadeAssessmentProbability = double.NaN,
                 ManualAssemblyProbability = double.NaN
@@ -118,7 +118,7 @@
         {
             // Setup
             var calculation = new StructuresCalculation<HeightStructuresInput>();
-            var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 Calculation = calculation
             };
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs	(.../MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs)	(revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs	(.../MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -25,14 +25,14 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Primitives;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.MacroStabilityInwards;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.MacroStabilityInwards
 {
@@ -239,7 +239,7 @@
         {
             // Setup
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            var testFailureMechanismSection = new TestFailureMechanismSection();
+            var testFailureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             failureMechanism.AddSection(testFailureMechanismSection);
 
             // Call
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,11 +22,11 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.Storage.Core.Create.MacroStabilityInwards;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.MacroStabilityInwards
 {
@@ -56,7 +56,7 @@
             bool useManualAssemblyProbability = random.NextBoolean();
             double manualAssemblyProbability = random.NextDouble();
 
-            var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
@@ -82,7 +82,7 @@
         public void Create_SectionResultWithNaNValues_ReturnsEntityWithExpectedResults()
         {
             // Setup
-            var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 TailorMadeAssessmentProbability = double.NaN,
                 ManualAssemblyProbability = double.NaN
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs	(.../MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs	(.../MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,11 +22,11 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.MacroStabilityOutwards;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.MacroStabilityOutwards
 {
@@ -170,7 +170,7 @@
         {
             // Setup
             var failureMechanism = new MacroStabilityOutwardsFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.Create.MacroStabilityOutwards;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.MacroStabilityOutwards
 {
@@ -58,7 +58,7 @@
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
             var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
-            var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
@@ -86,7 +86,7 @@
         public void Create_WithNaNProbabilities_ReturnsEntityWithExpectedResults()
         {
             // Setup
-            var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 DetailedAssessmentProbability = double.NaN,
                 TailorMadeAssessmentProbability = double.NaN
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Microstability/MicrostabilityFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Microstability/MicrostabilityFailureMechanismCreateExtensionsTest.cs	(.../MicrostabilityFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Microstability/MicrostabilityFailureMechanismCreateExtensionsTest.cs	(.../MicrostabilityFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,11 +22,11 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.Microstability;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.Microstability
 {
@@ -140,7 +140,7 @@
         {
             // Setup
             var failureMechanism = new MicrostabilityFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs	(.../MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs	(.../MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.Create.Microstability;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.Microstability
 {
@@ -56,7 +56,7 @@
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
             var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
-            var sectionResult = new MicrostabilityFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new MicrostabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PersistenceRegistryTest.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -286,7 +286,7 @@
 
             protected override FailureMechanismSection CreateDataModel()
             {
-                return new TestFailureMechanismSection();
+                return FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             }
         }
 
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs	(.../PipingFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs	(.../PipingFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -25,14 +25,14 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Primitives;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.Piping;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.Piping
 {
@@ -172,8 +172,8 @@
         {
             // Setup
             var failureMechanism = new PipingFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             var registry = new PersistenceRegistry();
 
             // Call
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Piping/PipingFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Piping/PipingFailureMechanismSectionResultCreateExtensionsTest.cs	(.../PipingFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Piping/PipingFailureMechanismSectionResultCreateExtensionsTest.cs	(.../PipingFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,11 +22,11 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Piping.Data;
 using Ringtoets.Storage.Core.Create.Piping;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.Piping
 {
@@ -56,7 +56,7 @@
             bool useManualAssemblyProbability = random.NextBoolean();
             double manualAssemblyProbability = random.NextDouble();
 
-            var sectionResult = new PipingFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
@@ -82,7 +82,7 @@
         public void Create_SectionResultWithNaNValues_ReturnsEntityWithExpectedResults()
         {
             // Setup
-            var sectionResult = new PipingFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 TailorMadeAssessmentProbability = double.NaN,
                 ManualAssemblyProbability = double.NaN
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensionsTest.cs	(.../PipingStructureFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensionsTest.cs	(.../PipingStructureFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using System.Linq;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.PipingStructure;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.PipingStructure
 {
@@ -143,7 +143,7 @@
         {
             // Setup
             var failureMechanism = new PipingStructureFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs	(.../PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs	(.../PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.Create.PipingStructure;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.PipingStructure
 {
@@ -56,7 +56,7 @@
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
             var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
-            var sectionResult = new PipingStructureFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new PipingStructureFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -169,7 +169,7 @@
         {
             // Setup
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,12 +23,12 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Structures;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.StabilityPointStructures;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.StabilityPointStructures
 {
@@ -50,7 +50,7 @@
         public void Create_PersistencyRegistryNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate test = () => sectionResult.Create(null);
@@ -72,7 +72,7 @@
             bool useManualAssemblyProbability = random.NextBoolean();
             double manualAssemblyProbability = random.NextDouble();
 
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
@@ -100,7 +100,7 @@
         public void Create_SectionResultWithNaNValues_ReturnsEntityWithExpectedResults()
         {
             // Setup
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 TailorMadeAssessmentProbability = double.NaN,
                 ManualAssemblyProbability = double.NaN
@@ -119,7 +119,7 @@
         {
             // Setup
             var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 Calculation = calculation
             };
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs	(.../StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs	(.../StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -148,7 +148,7 @@
         {
             // Setup
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.Storage.Core.Create.StabilityStoneCover;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.StabilityStoneCover
 {
@@ -60,7 +60,7 @@
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
             var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
-            var sectionResult = new StabilityStoneCoverFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResultForFactorizedSignalingNorm = detailedAssessmentResultForFactorizedSignalingNorm,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensionsTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensionsTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,11 +22,11 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.StrengthStabilityLengthwise;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.StrengthStabilityLengthwise
 {
@@ -140,7 +140,7 @@
         {
             // Setup
             var failureMechanism = new StrengthStabilityLengthwiseConstructionFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.Create.StrengthStabilityLengthwise;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.StrengthStabilityLengthwise
 {
@@ -55,7 +55,7 @@
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
             var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
-            var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 TailorMadeAssessmentResult = tailorMadeAssessmentResult,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensionsTest.cs	(.../TechnicalInnovationFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensionsTest.cs	(.../TechnicalInnovationFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,11 +22,11 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.TechnicalInnovation;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.TechnicalInnovation
 {
@@ -140,7 +140,7 @@
         {
             // Setup
             var failureMechanism = new TechnicalInnovationFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.Create.TechnicalInnovation;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.TechnicalInnovation
 {
@@ -55,7 +55,7 @@
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
             var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
-            var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 TailorMadeAssessmentResult = tailorMadeAssessmentResult,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismCreateExtensionsTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismCreateExtensionsTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,11 +22,11 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Storage.Core.Create;
 using Ringtoets.Storage.Core.Create.WaterPressureAsphaltCover;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.WaterPressureAsphaltCover
 {
@@ -140,7 +140,7 @@
         {
             // Setup
             var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.Create.WaterPressureAsphaltCover;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Create.WaterPressureAsphaltCover
 {
@@ -55,7 +55,7 @@
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
             var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
-            var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 TailorMadeAssessmentResult = tailorMadeAssessmentResult,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -149,7 +149,7 @@
         {
             // Setup
             var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
-            failureMechanism.AddSection(new TestFailureMechanismSection());
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 6c8de1309c92e793410baf799ac85db84bed9463)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,10 +23,10 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Storage.Core.Create.WaveImpactAsphaltCover;
 using Ringtoets.Storage.Core.DbContext;
-using Ringtoets.Storage.Core.TestUtil;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 
 namespace Ringtoets.Storage.Core.Test.Create.WaveImpactAsphaltCover
@@ -60,7 +60,7 @@
             bool useManualAssemblyCategoryGroup = random.NextBoolean();
             var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
-            var sectionResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection())
+            var sectionResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResultForFactorizedSignalingNorm = detailedAssessmentResultForFactorizedSignalingNorm,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensionsTest.cs	(.../ClosingStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensionsTest.cs	(.../ClosingStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -24,11 +24,11 @@
 using NUnit.Framework;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.Structures;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read;
 using Ringtoets.Storage.Core.Read.ClosingStructures;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read.ClosingStructures
 {
@@ -40,7 +40,7 @@
         {
             // Call
             TestDelegate call = () => ((ClosingStructuresSectionResultEntity) null).Read(
-                new ClosingStructuresFailureMechanismSectionResult(new TestFailureMechanismSection()),
+                new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()),
                 new ReadConversionCollector());
 
             // Assert
@@ -70,7 +70,7 @@
 
             // Call
             TestDelegate call = () => entity.Read(new ClosingStructuresFailureMechanismSectionResult(
-                                                      new TestFailureMechanismSection()), null);
+                                                      FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -92,7 +92,7 @@
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
+            collector.Read(failureMechanismSectionEntity, FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             var entity = new ClosingStructuresSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity,
@@ -103,7 +103,7 @@
                 UseManualAssemblyProbability = Convert.ToByte(useManualAssemblyProbability),
                 ManualAssemblyProbability = manualAssemblyProbability
             };
-            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
@@ -125,12 +125,12 @@
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
+            collector.Read(failureMechanismSectionEntity, FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             var entity = new ClosingStructuresSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
@@ -156,7 +156,7 @@
             {
                 ClosingStructuresCalculationEntity = calculationEntity
             };
-            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/DuneErosion/DuneErosionSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/DuneErosion/DuneErosionSectionResultEntityReadExtensionsTest.cs	(.../DuneErosionSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/DuneErosion/DuneErosionSectionResultEntityReadExtensionsTest.cs	(.../DuneErosionSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read.DuneErosion;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read.DuneErosion
 {
@@ -39,7 +39,7 @@
         {
             // Call
             TestDelegate call = () => ((DuneErosionSectionResultEntity) null).Read(
-                new DuneErosionFailureMechanismSectionResult(new TestFailureMechanismSection()));
+                new DuneErosionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()));
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -88,7 +88,7 @@
                 UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
                 ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
-            var sectionResult = new DuneErosionFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new DuneErosionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,12 +22,12 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read;
 using Ringtoets.Storage.Core.Read.GrassCoverErosionInwards;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read.GrassCoverErosionInwards
 {
@@ -39,7 +39,7 @@
         {
             // Call
             TestDelegate call = () => ((GrassCoverErosionInwardsSectionResultEntity) null).Read(
-                new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection()),
+                new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()),
                 new ReadConversionCollector());
 
             // Assert
@@ -68,7 +68,7 @@
             var entity = new GrassCoverErosionInwardsSectionResultEntity();
 
             // Call
-            TestDelegate call = () => entity.Read(new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection()), null);
+            TestDelegate call = () => entity.Read(new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -90,7 +90,7 @@
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
+            collector.Read(failureMechanismSectionEntity, FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             var entity = new GrassCoverErosionInwardsSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity,
@@ -101,7 +101,7 @@
                 UseManualAssemblyProbability = Convert.ToByte(useManualAssemblyProbability),
                 ManualAssemblyProbability = manualAssemblyProbability
             };
-            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
@@ -123,13 +123,13 @@
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
+            collector.Read(failureMechanismSectionEntity, FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             var entity = new GrassCoverErosionInwardsSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
@@ -150,15 +150,15 @@
             var calculationEntity = new GrassCoverErosionInwardsCalculationEntity();
 
             var collector = new ReadConversionCollector();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
+            collector.Read(failureMechanismSectionEntity, FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             collector.Read(calculationEntity, calculation);
 
             var entity = new GrassCoverErosionInwardsSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity,
                 GrassCoverErosionInwardsCalculationEntity = calculationEntity
             };
-            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read.GrassCoverErosionOutwards;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read.GrassCoverErosionOutwards
 {
@@ -39,7 +39,7 @@
         {
             // Call
             TestDelegate call = () => ((GrassCoverErosionOutwardsSectionResultEntity) null).Read(
-                new GrassCoverErosionOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection()));
+                new GrassCoverErosionOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()));
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -88,7 +88,7 @@
                 UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
                 ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
-            var sectionResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read
 {
@@ -38,7 +38,7 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate call = () => ((GrassCoverSlipOffInwardsSectionResultEntity) null).Read(sectionResult);
@@ -81,7 +81,7 @@
                 UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
                 ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
-            var sectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs)	(revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read
 {
@@ -38,7 +38,7 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate call = () => ((GrassCoverSlipOffOutwardsSectionResultEntity) null).Read(sectionResult);
@@ -81,7 +81,7 @@
                 UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
                 ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
-            var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs	(.../HeightStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs	(.../HeightStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,12 +23,12 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Structures;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read;
 using Ringtoets.Storage.Core.Read.HeightStructures;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read.HeightStructures
 {
@@ -40,7 +40,7 @@
         {
             // Call
             TestDelegate call = () => ((HeightStructuresSectionResultEntity) null).Read(
-                new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection()),
+                new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()),
                 new ReadConversionCollector());
 
             // Assert
@@ -70,7 +70,7 @@
 
             // Call
             TestDelegate call = () => entity.Read(new HeightStructuresFailureMechanismSectionResult(
-                                                      new TestFailureMechanismSection()), null);
+                                                      FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -92,7 +92,7 @@
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
+            collector.Read(failureMechanismSectionEntity, FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             var entity = new HeightStructuresSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity,
@@ -103,7 +103,7 @@
                 UseManualAssemblyProbability = Convert.ToByte(useManualAssemblyProbability),
                 ManualAssemblyProbability = manualAssemblyProbability
             };
-            var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
@@ -126,12 +126,12 @@
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
+            collector.Read(failureMechanismSectionEntity, FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             var entity = new HeightStructuresSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
@@ -157,7 +157,7 @@
             {
                 HeightStructuresCalculationEntity = calculationEntity
             };
-            var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs	(.../MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs	(.../MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,11 +22,11 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read.MacroStabilityInwards;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read.MacroStabilityInwards
 {
@@ -37,7 +37,7 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate test = () => ((MacroStabilityInwardsSectionResultEntity) null).Read(sectionResult);
@@ -82,7 +82,7 @@
                 UseManualAssemblyProbability = Convert.ToByte(useManualAssemblyProbability),
                 ManualAssemblyProbability = manualAssemblyProbability
             };
-            var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
@@ -101,7 +101,7 @@
         {
             // Setup
             var entity = new MacroStabilityInwardsSectionResultEntity();
-            var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs	(.../MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs)	(revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs	(.../MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read.MacroStabilityOutwards;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read.MacroStabilityOutwards
 {
@@ -38,7 +38,7 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate call = () => ((MacroStabilityOutwardsSectionResultEntity) null).Read(sectionResult);
@@ -85,7 +85,7 @@
                 UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
                 ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
-            var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
@@ -103,7 +103,7 @@
         {
             // Setup
             var entity = new MacroStabilityOutwardsSectionResultEntity();
-            var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs	(.../MicrostabilitySectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs	(.../MicrostabilitySectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read
 {
@@ -38,7 +38,7 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new MicrostabilityFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new MicrostabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate call = () => ((MicrostabilitySectionResultEntity) null).Read(sectionResult);
@@ -81,7 +81,7 @@
                 UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
                 ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
-            var sectionResult = new MicrostabilityFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new MicrostabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/Piping/PipingSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/Piping/PipingSectionResultEntityReadExtensionsTest.cs	(.../PipingSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/Piping/PipingSectionResultEntityReadExtensionsTest.cs	(.../PipingSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -22,11 +22,11 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Piping.Data;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read.Piping;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read.Piping
 {
@@ -38,7 +38,7 @@
         {
             // Call
             TestDelegate call = () => ((PipingSectionResultEntity) null).Read(
-                new PipingFailureMechanismSectionResult(new TestFailureMechanismSection()));
+                new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()));
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -81,7 +81,7 @@
                 ManualAssemblyProbability = manualAssemblyProbability
             };
 
-            var sectionResult = new PipingFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
@@ -100,7 +100,7 @@
         {
             // Setup
             var entity = new PipingSectionResultEntity();
-            var sectionResult = new PipingFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensionsTest.cs	(.../PipingStructureSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensionsTest.cs	(.../PipingStructureSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read.PipingStructure;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read.PipingStructure
 {
@@ -38,7 +38,7 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new PipingStructureFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new PipingStructureFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate test = () => ((PipingStructureSectionResultEntity) null).Read(sectionResult);
@@ -81,7 +81,7 @@
                 UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
                 ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
-            var sectionResult = new PipingStructureFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new PipingStructureFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ReadConversionCollectorTest.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -304,7 +304,7 @@
 
             protected override FailureMechanismSection CreateDataModel()
             {
-                return new TestFailureMechanismSection();
+                return FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             }
         }
 
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs	(.../StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs	(.../StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,12 +23,12 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Structures;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read;
 using Ringtoets.Storage.Core.Read.StabilityPointStructures;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read.StabilityPointStructures
 {
@@ -40,7 +40,7 @@
         {
             // Call
             TestDelegate call = () => ((StabilityPointStructuresSectionResultEntity) null).Read(
-                new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection()),
+                new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()),
                 new ReadConversionCollector());
 
             // Assert
@@ -70,7 +70,7 @@
 
             // Call
             TestDelegate call = () => entity.Read(new StabilityPointStructuresFailureMechanismSectionResult(
-                                                      new TestFailureMechanismSection()), null);
+                                                      FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -92,7 +92,7 @@
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
+            collector.Read(failureMechanismSectionEntity, FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             var entity = new StabilityPointStructuresSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity,
@@ -103,7 +103,7 @@
                 UseManualAssemblyProbability = Convert.ToByte(useManualAssemblyProbability),
                 ManualAssemblyProbability = manualAssemblyProbability
             };
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
@@ -125,12 +125,12 @@
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
+            collector.Read(failureMechanismSectionEntity, FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
             var entity = new StabilityPointStructuresSectionResultEntity
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity
             };
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
@@ -155,7 +155,7 @@
             {
                 StabilityPointStructuresCalculationEntity = calculationEntity
             };
-            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult, collector);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs	(.../StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs	(.../StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read.StabilityStoneCover;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read.StabilityStoneCover
 {
@@ -39,7 +39,7 @@
         {
             // Call
             TestDelegate call = () => ((StabilityStoneCoverSectionResultEntity) null).Read(
-                new StabilityStoneCoverFailureMechanismSectionResult(new TestFailureMechanismSection()));
+                new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()));
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -89,7 +89,7 @@
                 ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
 
-            var sectionResult = new StabilityStoneCoverFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs	(.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs	(.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read
 {
@@ -38,7 +38,7 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate call = () => ((StrengthStabilityLengthwiseConstructionSectionResultEntity) null).Read(sectionResult);
@@ -79,7 +79,7 @@
                 UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
                 ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
-            var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs	(.../TechnicalInnovationSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs	(.../TechnicalInnovationSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read
 {
@@ -38,7 +38,7 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate call = () => ((TechnicalInnovationSectionResultEntity) null).Read(sectionResult);
@@ -79,7 +79,7 @@
                 UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
                 ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
-            var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs	(.../WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs	(.../WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,11 +23,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read;
-using Ringtoets.Storage.Core.TestUtil;
 
 namespace Ringtoets.Storage.Core.Test.Read
 {
@@ -38,7 +38,7 @@
         public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
-            var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             TestDelegate call = () => ((WaterPressureAsphaltCoverSectionResultEntity) null).Read(sectionResult);
@@ -79,7 +79,7 @@
                 UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
                 ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
-            var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs)	(revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -23,10 +23,10 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Primitives;
 using Ringtoets.Storage.Core.DbContext;
 using Ringtoets.Storage.Core.Read.WaveImpactAsphaltCover;
-using Ringtoets.Storage.Core.TestUtil;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 
 namespace Ringtoets.Storage.Core.Test.Read.WaveImpactAsphaltCover
@@ -39,7 +39,7 @@
         {
             // Call
             TestDelegate call = () => ((WaveImpactAsphaltCoverSectionResultEntity) null).Read(
-                new WaveImpactAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection()));
+                new WaveImpactAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()));
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -89,7 +89,7 @@
                 ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
 
-            var sectionResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection());
+            var sectionResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/Ringtoets.Storage.Core.TestUtil.Test.csproj
===================================================================
diff -u -rdab1b18604b9fe0d41ead0dfe418908fa2102fa2 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/Ringtoets.Storage.Core.TestUtil.Test.csproj	(.../Ringtoets.Storage.Core.TestUtil.Test.csproj)	(revision dab1b18604b9fe0d41ead0dfe418908fa2102fa2)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/Ringtoets.Storage.Core.TestUtil.Test.csproj	(.../Ringtoets.Storage.Core.TestUtil.Test.csproj)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -32,7 +32,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RingtoetsProjectTestHelperTest.cs" />
     <Compile Include="SqLiteDatabaseHelperTest.cs" />
-    <Compile Include="TestFailureMechanismSectionTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Fisheye: Tag 96e0a1fd29dc37c5abe6c020ec64f8188acdab60 refers to a dead (removed) revision in file `Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/TestFailureMechanismSectionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/Ringtoets.Storage.Core.TestUtil.csproj
===================================================================
diff -u -ra8ceb06ddf8e350872d2e81251760bd6fcf96056 -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/Ringtoets.Storage.Core.TestUtil.csproj	(.../Ringtoets.Storage.Core.TestUtil.csproj)	(revision a8ceb06ddf8e350872d2e81251760bd6fcf96056)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/Ringtoets.Storage.Core.TestUtil.csproj	(.../Ringtoets.Storage.Core.TestUtil.csproj)	(revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
@@ -31,7 +31,6 @@
     <Compile Include="RingtoetsProjectTestHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SqLiteDatabaseHelper.cs" />
-    <Compile Include="TestFailureMechanismSection.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Fisheye: Tag 96e0a1fd29dc37c5abe6c020ec64f8188acdab60 refers to a dead (removed) revision in file `Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/TestFailureMechanismSection.cs'.
Fisheye: No comparison available.  Pass `N' to diff?