Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u -r590e1aeba4a1e5a622c8e8d89270167907920b43 -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensions.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensions.cs)	(revision 590e1aeba4a1e5a622c8e8d89270167907920b43)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensions.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensions.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -32,15 +32,26 @@
     internal static class GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensions
     {
         /// <summary>
-        /// Creates a <see cref="GrassCoverSlipOffInwardsSectionResultEntity"/> based on the information of the <see cref="GrassCoverSlipOffInwardsFailureMechanismSectionResult"/>.
+        /// Creates a <see cref="GrassCoverSlipOffInwardsSectionResultEntity"/> based on the information
+        /// of the <see cref="GrassCoverSlipOffInwardsFailureMechanismSectionResult"/>.
         /// </summary>
         /// <param name="result">The result to create a database entity for.</param>
         /// <returns>A new <see cref="GrassCoverSlipOffInwardsSectionResultEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="result"/> is <c>null</c>.</exception>
         internal static GrassCoverSlipOffInwardsSectionResultEntity Create(this GrassCoverSlipOffInwardsFailureMechanismSectionResult result)
         {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
             var sectionResultEntity = new GrassCoverSlipOffInwardsSectionResultEntity
             {
-                LayerOne = Convert.ToByte(result.AssessmentLayerOne)
+                SimpleAssessmentResult = Convert.ToByte(result.SimpleAssessmentResult),
+                DetailedAssessmentResult = Convert.ToByte(result.DetailedAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(result.TailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(result.UseManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(result.ManualAssemblyCategoryGroup)
             };
 
             return sectionResultEntity;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u -r64fdab6f623c85ae3ad1b030ff4046c61773a38e -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs)	(revision 64fdab6f623c85ae3ad1b030ff4046c61773a38e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -36,11 +36,21 @@
         /// </summary>
         /// <param name="result">The result to create a database entity for.</param>
         /// <returns>A new <see cref="GrassCoverSlipOffOutwardsSectionResultEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="result"/> is <c>null</c>.</exception>
         internal static GrassCoverSlipOffOutwardsSectionResultEntity Create(this GrassCoverSlipOffOutwardsFailureMechanismSectionResult result)
         {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
             var sectionResultEntity = new GrassCoverSlipOffOutwardsSectionResultEntity
             {
-                LayerOne = Convert.ToByte(result.AssessmentLayerOne)
+                SimpleAssessmentResult = Convert.ToByte(result.SimpleAssessmentResult),
+                DetailedAssessmentResult = Convert.ToByte(result.DetailedAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(result.TailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(result.UseManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(result.ManualAssemblyCategoryGroup)
             };
 
             return sectionResultEntity;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u -r59512bde82de1297788119a8cacd067789389d41 -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs)	(revision 59512bde82de1297788119a8cacd067789389d41)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -36,13 +36,22 @@
         /// </summary>
         /// <param name="result">The result to create a database entity for.</param>
         /// <returns>A new <see cref="MacroStabilityOutwardsSectionResultEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="result"/> is <c>null</c>.</exception>
         internal static MacroStabilityOutwardsSectionResultEntity Create(this MacroStabilityOutwardsFailureMechanismSectionResult result)
         {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
             var sectionResultEntity = new MacroStabilityOutwardsSectionResultEntity
             {
-                LayerOne = Convert.ToByte(result.AssessmentLayerOne),
-                LayerTwoA = result.DetailedAssessmentProbability.ToNaNAsNull(),
-                LayerThree = result.TailorMadeAssessmentProbability.ToNaNAsNull()
+                SimpleAssessmentResult = Convert.ToByte(result.SimpleAssessmentResult),
+                DetailedAssessmentResult = Convert.ToByte(result.DetailedAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(result.TailorMadeAssessmentResult),
+                TailorMadeAssessmentProbability = result.TailorMadeAssessmentProbability.ToNaNAsNull(),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(result.UseManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup =  Convert.ToByte(result.ManualAssemblyCategoryGroup)
             };
 
             return sectionResultEntity;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u -r4503f687155622bb1b19155d27f8e3f9a5842fb0 -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensions.cs	(.../MicrostabilityFailureMechanismSectionResultCreateExtensions.cs)	(revision 4503f687155622bb1b19155d27f8e3f9a5842fb0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensions.cs	(.../MicrostabilityFailureMechanismSectionResultCreateExtensions.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -36,11 +36,21 @@
         /// </summary>
         /// <param name="result">The result to create a database entity for.</param>
         /// <returns>A new <see cref="MicrostabilitySectionResultEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="result"/> is <c>null</c>.</exception>
         internal static MicrostabilitySectionResultEntity Create(this MicrostabilityFailureMechanismSectionResult result)
         {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
             var sectionResultEntity = new MicrostabilitySectionResultEntity
             {
-                LayerOne = Convert.ToByte(result.AssessmentLayerOne)
+                SimpleAssessmentResult = Convert.ToByte(result.SimpleAssessmentResult),
+                DetailedAssessmentResult = Convert.ToByte(result.DetailedAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(result.TailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(result.UseManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(result.ManualAssemblyCategoryGroup)
             };
 
             return sectionResultEntity;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u -r80e09f002643af4dbacc7e99574ce0c784c7e873 -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensions.cs	(.../PipingStructureFailureMechanismSectionResultCreateExtensions.cs)	(revision 80e09f002643af4dbacc7e99574ce0c784c7e873)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensions.cs	(.../PipingStructureFailureMechanismSectionResultCreateExtensions.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -36,11 +36,21 @@
         /// </summary>
         /// <param name="result">The result to create a database entity for.</param>
         /// <returns>A new <see cref="PipingStructureSectionResultEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="result"/> is <c>null</c>.</exception>
         internal static PipingStructureSectionResultEntity Create(this PipingStructureFailureMechanismSectionResult result)
         {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
             var sectionResultEntity = new PipingStructureSectionResultEntity
             {
-                LayerOne = Convert.ToByte(result.AssessmentLayerOne)
+                SimpleAssessmentResult = Convert.ToByte(result.SimpleAssessmentResult),
+                DetailedAssessmentResult = Convert.ToByte(result.DetailedAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(result.TailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(result.UseManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(result.ManualAssemblyCategoryGroup)
             };
 
             return sectionResultEntity;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u -r802d3cd39b925ac9873ea277588ecd1933e374f6 -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensions.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensions.cs)	(revision 802d3cd39b925ac9873ea277588ecd1933e374f6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensions.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensions.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -36,11 +36,20 @@
         /// </summary>
         /// <param name="result">The result to create a database entity for.</param>
         /// <returns>A new <see cref="StrengthStabilityLengthwiseConstructionSectionResultEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="result"/> is <c>null</c>.</exception>
         internal static StrengthStabilityLengthwiseConstructionSectionResultEntity Create(this StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult result)
         {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
             var sectionResultEntity = new StrengthStabilityLengthwiseConstructionSectionResultEntity
             {
-                LayerOne = Convert.ToByte(result.AssessmentLayerOne)
+                SimpleAssessmentResult = Convert.ToByte(result.SimpleAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(result.TailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(result.UseManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(result.ManualAssemblyCategoryGroup)
             };
 
             return sectionResultEntity;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u -r341edbfd5905c218dcbaacdc77b68ca67e5424cf -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensions.cs	(.../TechnicalInnovationFailureMechanismSectionResultCreateExtensions.cs)	(revision 341edbfd5905c218dcbaacdc77b68ca67e5424cf)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensions.cs	(.../TechnicalInnovationFailureMechanismSectionResultCreateExtensions.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -36,11 +36,20 @@
         /// </summary>
         /// <param name="result">The result to create a database entity for.</param>
         /// <returns>A new <see cref="TechnicalInnovationSectionResultEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="result"/> is <c>null</c>.</exception>
         internal static TechnicalInnovationSectionResultEntity Create(this TechnicalInnovationFailureMechanismSectionResult result)
         {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
             var sectionResultEntity = new TechnicalInnovationSectionResultEntity
             {
-                LayerOne = Convert.ToByte(result.AssessmentLayerOne)
+                SimpleAssessmentResult = Convert.ToByte(result.SimpleAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(result.TailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(result.UseManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(result.ManualAssemblyCategoryGroup)
             };
 
             return sectionResultEntity;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u -r25f59fa52f81f0e5d8e1935f00abd21f2207bb7d -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs)	(revision 25f59fa52f81f0e5d8e1935f00abd21f2207bb7d)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -36,11 +36,20 @@
         /// </summary>
         /// <param name="result">The result to create a database entity for.</param>
         /// <returns>A new <see cref="WaterPressureAsphaltCoverSectionResultEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="result"/> is <c>null</c>.</exception>
         internal static WaterPressureAsphaltCoverSectionResultEntity Create(this WaterPressureAsphaltCoverFailureMechanismSectionResult result)
         {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
             var sectionResultEntity = new WaterPressureAsphaltCoverSectionResultEntity
             {
-                LayerOne = Convert.ToByte(result.AssessmentLayerOne)
+                SimpleAssessmentResult = Convert.ToByte(result.SimpleAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(result.TailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(result.UseManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(result.ManualAssemblyCategoryGroup)
             };
 
             return sectionResultEntity;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r590e1aeba4a1e5a622c8e8d89270167907920b43 -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 590e1aeba4a1e5a622c8e8d89270167907920b43)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Create.GrassCoverSlipOffInwards
@@ -34,21 +35,45 @@
     public class GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest
     {
         [Test]
-        public void Create_ValidData_ReturnsEntity()
+        public void Create_SectionResultNull_ThrowsArgumentNullException()
         {
+            // Call
+            TestDelegate call = () => ((GrassCoverSlipOffInwardsFailureMechanismSectionResult) null).Create();
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("result", exception.ParamName);
+        }
+
+        [Test]
+        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
+        {
             // Setup
-            var random = new Random(21);
+            var random = new Random(39);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
             var sectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
-                AssessmentLayerOne = random.NextEnumValue<AssessmentLayerOneState>()
+                SimpleAssessmentResult = simpleAssessmentResult,
+                DetailedAssessmentResult = detailedAssessmentResult,
+                TailorMadeAssessmentResult = tailorMadeAssessmentResult,
+                UseManualAssemblyCategoryGroup = useManualAssemblyCategoryGroup,
+                ManualAssemblyCategoryGroup = manualAssemblyCategoryGroup
             };
 
             // Call
-            GrassCoverSlipOffInwardsSectionResultEntity result = sectionResult.Create();
+            GrassCoverSlipOffInwardsSectionResultEntity entity = sectionResult.Create();
 
             // Assert
-            Assert.AreEqual(Convert.ToByte(sectionResult.AssessmentLayerOne), result.LayerOne);
+            Assert.AreEqual(Convert.ToByte(simpleAssessmentResult), entity.SimpleAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(detailedAssessmentResult), entity.DetailedAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(tailorMadeAssessmentResult), entity.TailorMadeAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(useManualAssemblyCategoryGroup), entity.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(Convert.ToByte(manualAssemblyCategoryGroup), entity.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r64fdab6f623c85ae3ad1b030ff4046c61773a38e -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 64fdab6f623c85ae3ad1b030ff4046c61773a38e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Create.GrassCoverSlipOffOutwards
@@ -34,21 +35,45 @@
     public class GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest
     {
         [Test]
-        public void Create_ValidData_ReturnsExpectedEntity()
+        public void Create_SectionResultNull_ThrowsArgumentNullException()
         {
+            // Call
+            TestDelegate call = () => ((GrassCoverSlipOffOutwardsFailureMechanismSectionResult) null).Create();
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("result", exception.ParamName);
+        }
+
+        [Test]
+        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
+        {
             // Setup
-            var random = new Random(21);
+            var random = new Random(39);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
             var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
-                AssessmentLayerOne = random.NextEnumValue<AssessmentLayerOneState>()
+                SimpleAssessmentResult = simpleAssessmentResult,
+                DetailedAssessmentResult = detailedAssessmentResult,
+                TailorMadeAssessmentResult = tailorMadeAssessmentResult,
+                UseManualAssemblyCategoryGroup = useManualAssemblyCategoryGroup,
+                ManualAssemblyCategoryGroup = manualAssemblyCategoryGroup
             };
 
             // Call
-            GrassCoverSlipOffOutwardsSectionResultEntity result = sectionResult.Create();
+            GrassCoverSlipOffOutwardsSectionResultEntity entity = sectionResult.Create();
 
             // Assert
-            Assert.AreEqual(Convert.ToByte(sectionResult.AssessmentLayerOne), result.LayerOne);
+            Assert.AreEqual(Convert.ToByte(simpleAssessmentResult), entity.SimpleAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(detailedAssessmentResult), entity.DetailedAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(tailorMadeAssessmentResult), entity.TailorMadeAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(useManualAssemblyCategoryGroup), entity.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(Convert.ToByte(manualAssemblyCategoryGroup), entity.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -rb33b9a8bcbeffa891d060c624b42e22fb07feed4 -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision b33b9a8bcbeffa891d060c624b42e22fb07feed4)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -48,7 +48,7 @@
         public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
         {
             // Setup
-            var random = new Random();
+            var random = new Random(39);
             var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
             var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
             var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -racf5179b0dfbd5e76a46b2014c6899c7c33b525d -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision acf5179b0dfbd5e76a46b2014c6899c7c33b525d)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -23,10 +23,10 @@
 using Application.Ringtoets.Storage.Create.MacroStabilityOutwards;
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.TestUtil;
-using Core.Common.Base.Data;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Create.MacroStabilityOutwards
@@ -35,60 +35,69 @@
     public class MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest
     {
         [Test]
-        public void Create_WithResults_ReturnsEntityWithExpectedResults()
+        public void Create_SectionResultNull_ThrowsArgumentNullException()
         {
-            // Setup
-            var random = new Random();
-            var assessmentLayerOneResult = random.NextEnumValue<AssessmentLayerOneState>();
-            const double assessmentLayerTwoAResult = 0.2;
-            const double assessmentLayerThreeResult = 0.4;
-
-            var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
-            {
-                AssessmentLayerOne = assessmentLayerOneResult,
-                DetailedAssessmentProbability = assessmentLayerTwoAResult,
-                TailorMadeAssessmentProbability = assessmentLayerThreeResult
-            };
-
             // Call
-            MacroStabilityOutwardsSectionResultEntity result = sectionResult.Create();
+            TestDelegate call = () => ((MacroStabilityOutwardsFailureMechanismSectionResult) null).Create();
 
             // Assert
-            Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne);
-            Assert.AreEqual(assessmentLayerTwoAResult, result.LayerTwoA);
-            Assert.AreEqual(assessmentLayerThreeResult, result.LayerThree);
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("result", exception.ParamName);
         }
 
         [Test]
-        public void Create_WithNaNLevel2aResult_ReturnsEntityWithExpectedResults()
+        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
         {
             // Setup
+            var random = new Random(39);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
+            double detailedAssessmentProbability = random.NextDouble();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>();
+            double tailorMadeAssessmentProbability = random.NextDouble();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+
             var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
-                DetailedAssessmentProbability = RoundedDouble.NaN
+                SimpleAssessmentResult = simpleAssessmentResult,
+                DetailedAssessmentResult = detailedAssessmentResult,
+                DetailedAssessmentProbability = detailedAssessmentProbability,
+                TailorMadeAssessmentResult = tailorMadeAssessmentResult,
+                TailorMadeAssessmentProbability = tailorMadeAssessmentProbability,
+                UseManualAssemblyCategoryGroup = useManualAssemblyCategoryGroup,
+                ManualAssemblyCategoryGroup = manualAssemblyCategoryGroup
             };
 
             // Call
-            MacroStabilityOutwardsSectionResultEntity result = sectionResult.Create();
+            MacroStabilityOutwardsSectionResultEntity entity = sectionResult.Create();
 
             // Assert
-            Assert.IsNull(result.LayerTwoA);
+            Assert.AreEqual(Convert.ToByte(simpleAssessmentResult), entity.SimpleAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(detailedAssessmentResult), entity.DetailedAssessmentResult);
+            Assert.AreEqual(detailedAssessmentProbability, entity.DetailedAssessmentProbability);
+            Assert.AreEqual(Convert.ToByte(tailorMadeAssessmentResult), entity.TailorMadeAssessmentResult);
+            Assert.AreEqual(tailorMadeAssessmentProbability, entity.TailorMadeAssessmentProbability);
+            Assert.AreEqual(Convert.ToByte(useManualAssemblyCategoryGroup), entity.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(Convert.ToByte(manualAssemblyCategoryGroup), entity.ManualAssemblyCategoryGroup);
         }
 
         [Test]
-        public void Create_WithNaNLevel3Result_ReturnsEntityWithExpectedResults()
+        public void Create_WithNaNProbabilities_ReturnsEntityWithExpectedResults()
         {
             // Setup
             var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
-                TailorMadeAssessmentProbability = RoundedDouble.NaN
+                DetailedAssessmentProbability = double.NaN,
+                TailorMadeAssessmentProbability = double.NaN
             };
 
             // Call
             MacroStabilityOutwardsSectionResultEntity result = sectionResult.Create();
 
             // Assert
-            Assert.IsNull(result.LayerThree);
+            Assert.IsNull(result.DetailedAssessmentProbability);
+            Assert.IsNull(result.TailorMadeAssessmentProbability);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r4503f687155622bb1b19155d27f8e3f9a5842fb0 -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs	(.../MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 4503f687155622bb1b19155d27f8e3f9a5842fb0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs	(.../MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Create.Microstability
@@ -34,21 +35,45 @@
     public class MicrostabilityFailureMechanismSectionResultCreateExtensionsTest
     {
         [Test]
-        public void Create_ValidData_ReturnsEntityWithExpectedResults()
+        public void Create_SectionResultNull_ThrowsArgumentNullException()
         {
+            // Call
+            TestDelegate call = () => ((MicrostabilityFailureMechanismSectionResult) null).Create();
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("result", exception.ParamName);
+        }
+
+        [Test]
+        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
+        {
             // Setup
-            var random = new Random(21);
+            var random = new Random(39);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
             var sectionResult = new MicrostabilityFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
-                AssessmentLayerOne = random.NextEnumValue<AssessmentLayerOneState>()
+                SimpleAssessmentResult = simpleAssessmentResult,
+                DetailedAssessmentResult = detailedAssessmentResult,
+                TailorMadeAssessmentResult = tailorMadeAssessmentResult,
+                UseManualAssemblyCategoryGroup = useManualAssemblyCategoryGroup,
+                ManualAssemblyCategoryGroup = manualAssemblyCategoryGroup
             };
 
             // Call
-            MicrostabilitySectionResultEntity result = sectionResult.Create();
+            MicrostabilitySectionResultEntity entity = sectionResult.Create();
 
             // Assert
-            Assert.AreEqual(Convert.ToByte(sectionResult.AssessmentLayerOne), result.LayerOne);
+            Assert.AreEqual(Convert.ToByte(simpleAssessmentResult), entity.SimpleAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(detailedAssessmentResult), entity.DetailedAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(tailorMadeAssessmentResult), entity.TailorMadeAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(useManualAssemblyCategoryGroup), entity.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(Convert.ToByte(manualAssemblyCategoryGroup), entity.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r80e09f002643af4dbacc7e99574ce0c784c7e873 -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs	(.../PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 80e09f002643af4dbacc7e99574ce0c784c7e873)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs	(.../PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Create.PipingStructure
@@ -34,21 +35,45 @@
     public class PipingStructureFailureMechanismSectionResultCreateExtensionsTest
     {
         [Test]
-        public void Create_ValidData_ReturnsEntityWithExpectedResults()
+        public void Create_SectionResultNull_ThrowsArgumentNullException()
         {
+            // Call
+            TestDelegate call = () => ((PipingStructureFailureMechanismSectionResult) null).Create();
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("result", exception.ParamName);
+        }
+
+        [Test]
+        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
+        {
             // Setup
-            var random = new Random(21);
+            var random = new Random(39);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
             var sectionResult = new PipingStructureFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
-                AssessmentLayerOne = random.NextEnumValue<AssessmentLayerOneState>()
+                SimpleAssessmentResult = simpleAssessmentResult,
+                DetailedAssessmentResult = detailedAssessmentResult,
+                TailorMadeAssessmentResult = tailorMadeAssessmentResult,
+                UseManualAssemblyCategoryGroup = useManualAssemblyCategoryGroup,
+                ManualAssemblyCategoryGroup = manualAssemblyCategoryGroup
             };
 
             // Call
-            PipingStructureSectionResultEntity result = sectionResult.Create();
+            PipingStructureSectionResultEntity entity = sectionResult.Create();
 
             // Assert
-            Assert.AreEqual(Convert.ToByte(sectionResult.AssessmentLayerOne), result.LayerOne);
+            Assert.AreEqual(Convert.ToByte(simpleAssessmentResult), entity.SimpleAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(detailedAssessmentResult), entity.DetailedAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(tailorMadeAssessmentResult), entity.TailorMadeAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(useManualAssemblyCategoryGroup), entity.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(Convert.ToByte(manualAssemblyCategoryGroup), entity.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r802d3cd39b925ac9873ea277588ecd1933e374f6 -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 802d3cd39b925ac9873ea277588ecd1933e374f6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Create.StrengthStabilityLengthwise
@@ -34,21 +35,42 @@
     public class StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest
     {
         [Test]
-        public void Create_ValidData_ReturnsEntity()
+        public void Create_SectionResultNull_ThrowsArgumentNullException()
         {
+            // Call
+            TestDelegate call = () => ((StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult) null).Create();
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("result", exception.ParamName);
+        }
+
+        [Test]
+        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
+        {
             // Setup
-            var random = new Random(21);
+            var random = new Random(39);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
             var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
-                AssessmentLayerOne = random.NextEnumValue<AssessmentLayerOneState>()
+                SimpleAssessmentResult = simpleAssessmentResult,
+                TailorMadeAssessmentResult = tailorMadeAssessmentResult,
+                UseManualAssemblyCategoryGroup = useManualAssemblyCategoryGroup,
+                ManualAssemblyCategoryGroup = manualAssemblyCategoryGroup
             };
 
             // Call
-            StrengthStabilityLengthwiseConstructionSectionResultEntity result = sectionResult.Create();
+            StrengthStabilityLengthwiseConstructionSectionResultEntity entity = sectionResult.Create();
 
             // Assert
-            Assert.AreEqual(Convert.ToByte(sectionResult.AssessmentLayerOne), result.LayerOne);
+            Assert.AreEqual(Convert.ToByte(simpleAssessmentResult), entity.SimpleAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(tailorMadeAssessmentResult), entity.TailorMadeAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(useManualAssemblyCategoryGroup), entity.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(Convert.ToByte(manualAssemblyCategoryGroup), entity.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r341edbfd5905c218dcbaacdc77b68ca67e5424cf -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 341edbfd5905c218dcbaacdc77b68ca67e5424cf)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Create.TechnicalInnovation
@@ -34,21 +35,42 @@
     public class TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest
     {
         [Test]
-        public void Create_ValidData_ReturnsEntityWithExpectedResults()
+        public void Create_SectionResultNull_ThrowsArgumentNullException()
         {
+            // Call
+            TestDelegate call = () => ((TechnicalInnovationFailureMechanismSectionResult) null).Create();
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("result", exception.ParamName);
+        }
+
+        [Test]
+        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
+        {
             // Setup
-            var random = new Random(21);
+            var random = new Random(39);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
             var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
-                AssessmentLayerOne = random.NextEnumValue<AssessmentLayerOneState>()
+                SimpleAssessmentResult = simpleAssessmentResult,
+                TailorMadeAssessmentResult = tailorMadeAssessmentResult,
+                UseManualAssemblyCategoryGroup = useManualAssemblyCategoryGroup,
+                ManualAssemblyCategoryGroup = manualAssemblyCategoryGroup
             };
 
             // Call
-            TechnicalInnovationSectionResultEntity result = sectionResult.Create();
+            TechnicalInnovationSectionResultEntity entity = sectionResult.Create();
 
             // Assert
-            Assert.AreEqual(Convert.ToByte(sectionResult.AssessmentLayerOne), result.LayerOne);
+            Assert.AreEqual(Convert.ToByte(simpleAssessmentResult), entity.SimpleAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(tailorMadeAssessmentResult), entity.TailorMadeAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(useManualAssemblyCategoryGroup), entity.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(Convert.ToByte(manualAssemblyCategoryGroup), entity.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r25f59fa52f81f0e5d8e1935f00abd21f2207bb7d -r7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 25f59fa52f81f0e5d8e1935f00abd21f2207bb7d)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 7f4dd3be7eb03e33a2fa5ff6917a5ba0af4e2686)
@@ -25,7 +25,8 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Test.Create.WaterPressureAsphaltCover
@@ -34,22 +35,42 @@
     public class WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest
     {
         [Test]
-        public void Create_WithResults_ReturnsEntityWithExpectedResults()
+        public void Create_SectionResultNull_ThrowsArgumentNullException()
         {
+            // Call
+            TestDelegate call = () => ((WaterPressureAsphaltCoverFailureMechanismSectionResult) null).Create();
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("result", exception.ParamName);
+        }
+
+        [Test]
+        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
+        {
             // Setup
-            var random = new Random();
-            var assessmentLayerOneResult = random.NextEnumValue<AssessmentLayerOneState>();
+            var random = new Random(39);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
 
             var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
-                AssessmentLayerOne = assessmentLayerOneResult
+                SimpleAssessmentResult = simpleAssessmentResult,
+                TailorMadeAssessmentResult = tailorMadeAssessmentResult,
+                UseManualAssemblyCategoryGroup = useManualAssemblyCategoryGroup,
+                ManualAssemblyCategoryGroup = manualAssemblyCategoryGroup
             };
 
             // Call
-            WaterPressureAsphaltCoverSectionResultEntity result = sectionResult.Create();
+            WaterPressureAsphaltCoverSectionResultEntity entity = sectionResult.Create();
 
             // Assert
-            Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne);
+            Assert.AreEqual(Convert.ToByte(simpleAssessmentResult), entity.SimpleAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(tailorMadeAssessmentResult), entity.TailorMadeAssessmentResult);
+            Assert.AreEqual(Convert.ToByte(useManualAssemblyCategoryGroup), entity.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(Convert.ToByte(manualAssemblyCategoryGroup), entity.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file