Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r9abcf45f24ba0d6fbb53ca342242063c5de35c7c -rbec551a0573ee212e96d4c3b210edef17a883944
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 9abcf45f24ba0d6fbb53ca342242063c5de35c7c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision bec551a0573ee212e96d4c3b210edef17a883944)
@@ -740,8 +740,13 @@
                                      actualSectionResults,
                                      (expectedItem, actualItem) =>
                                      {
-                                         Assert.AreEqual(expectedItem.AssessmentLayerOne, actualItem.AssessmentLayerOne);
-                                         Assert.AreEqual(expectedItem.TailorMadeAssessmentProbability, actualItem.TailorMadeAssessmentProbability);
+                                         Assert.AreEqual(expectedItem.SimpleAssessmentResult, actualItem.SimpleAssessmentResult);
+                                         Assert.AreEqual(expectedItem.DetailedAssessmentResult, actualItem.DetailedAssessmentResult);
+                                         Assert.AreEqual(expectedItem.TailorMadeAssessmentResult, actualItem.TailorMadeAssessmentResult);
+                                         Assert.AreEqual(expectedItem.TailorMadeAssessmentProbability, actualItem.TailorMadeAssessmentProbability, 1e-6);
+                                         Assert.AreEqual(expectedItem.UseManualAssemblyProbability, actualItem.UseManualAssemblyProbability);
+                                         Assert.AreEqual(expectedItem.ManualAssemblyProbability, actualItem.ManualAssemblyProbability, 1e-6);
+
                                          if (expectedItem.Calculation == null)
                                          {
                                              Assert.IsNull(actualItem.Calculation);
@@ -878,8 +883,13 @@
                                      actualSectionResults,
                                      (expectedItem, actualItem) =>
                                      {
-                                         Assert.AreEqual(expectedItem.AssessmentLayerOne, actualItem.AssessmentLayerOne);
-                                         Assert.AreEqual(expectedItem.TailorMadeAssessmentProbability, actualItem.TailorMadeAssessmentProbability);
+                                         Assert.AreEqual(expectedItem.SimpleAssessmentResult, actualItem.SimpleAssessmentResult);
+                                         Assert.AreEqual(expectedItem.DetailedAssessmentResult, actualItem.DetailedAssessmentResult);
+                                         Assert.AreEqual(expectedItem.TailorMadeAssessmentResult, actualItem.TailorMadeAssessmentResult);
+                                         Assert.AreEqual(expectedItem.TailorMadeAssessmentProbability, actualItem.TailorMadeAssessmentProbability, 1e-6);
+                                         Assert.AreEqual(expectedItem.UseManualAssemblyProbability, actualItem.UseManualAssemblyProbability);
+                                         Assert.AreEqual(expectedItem.ManualAssemblyProbability, actualItem.ManualAssemblyProbability, 1e-6);
+
                                          if (expectedItem.Calculation == null)
                                          {
                                              Assert.IsNull(actualItem.Calculation);
@@ -1644,8 +1654,13 @@
                                      actualSectionResults,
                                      (expectedItem, actualItem) =>
                                      {
-                                         Assert.AreEqual(expectedItem.AssessmentLayerOne, actualItem.AssessmentLayerOne);
-                                         Assert.AreEqual(expectedItem.TailorMadeAssessmentProbability, actualItem.TailorMadeAssessmentProbability);
+                                         Assert.AreEqual(expectedItem.SimpleAssessmentResult, actualItem.SimpleAssessmentResult);
+                                         Assert.AreEqual(expectedItem.DetailedAssessmentResult, actualItem.DetailedAssessmentResult);
+                                         Assert.AreEqual(expectedItem.TailorMadeAssessmentResult, actualItem.TailorMadeAssessmentResult);
+                                         Assert.AreEqual(expectedItem.TailorMadeAssessmentProbability, actualItem.TailorMadeAssessmentProbability, 1e-6);
+                                         Assert.AreEqual(expectedItem.UseManualAssemblyProbability, actualItem.UseManualAssemblyProbability);
+                                         Assert.AreEqual(expectedItem.ManualAssemblyProbability, actualItem.ManualAssemblyProbability, 1e-6);
+
                                          if (expectedItem.Calculation == null)
                                          {
                                              Assert.IsNull(expectedItem.Calculation);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r9abcf45f24ba0d6fbb53ca342242063c5de35c7c -rbec551a0573ee212e96d4c3b210edef17a883944
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 9abcf45f24ba0d6fbb53ca342242063c5de35c7c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision bec551a0573ee212e96d4c3b210edef17a883944)
@@ -630,8 +630,13 @@
             var firstSectionResultHasCalculation = false;
             foreach (StabilityPointStructuresFailureMechanismSectionResult sectionResult in sectionResults)
             {
-                sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState();
+                sectionResult.SimpleAssessmentResult = random.NextEnumValue<SimpleAssessmentValidityOnlyResultType>();
+                sectionResult.DetailedAssessmentResult = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
+                sectionResult.TailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>();
                 sectionResult.TailorMadeAssessmentProbability = random.NextDouble();
+                sectionResult.UseManualAssemblyProbability = random.NextBoolean();
+                sectionResult.ManualAssemblyProbability = random.NextDouble();
+
                 if (!firstSectionResultHasCalculation)
                 {
                     sectionResult.Calculation = calculation;
@@ -745,8 +750,13 @@
             var firstSectionResultHasCalculation = false;
             foreach (ClosingStructuresFailureMechanismSectionResult sectionResult in sectionResults)
             {
-                sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState();
+                sectionResult.SimpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+                sectionResult.DetailedAssessmentResult = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
+                sectionResult.TailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>();
                 sectionResult.TailorMadeAssessmentProbability = random.NextDouble();
+                sectionResult.UseManualAssemblyProbability = random.NextBoolean();
+                sectionResult.ManualAssemblyProbability = random.NextDouble();
+
                 if (!firstSectionResultHasCalculation)
                 {
                     sectionResult.Calculation = calculation;
@@ -1792,8 +1802,13 @@
             var firstSectionResultHasCalculation = false;
             foreach (GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult in sectionResults)
             {
-                sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState();
+                sectionResult.SimpleAssessmentResult = random.NextEnumValue<SimpleAssessmentValidityOnlyResultType>();
+                sectionResult.DetailedAssessmentResult = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
+                sectionResult.TailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>();
                 sectionResult.TailorMadeAssessmentProbability = random.NextDouble();
+                sectionResult.UseManualAssemblyProbability = random.NextBoolean();
+                sectionResult.ManualAssemblyProbability = random.NextDouble();
+
                 if (!firstSectionResultHasCalculation)
                 {
                     sectionResult.Calculation = calculation;