Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r4503f687155622bb1b19155d27f8e3f9a5842fb0 -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs	(.../MicrostabilitySectionResultEntityReadExtensionsTest.cs)	(revision 4503f687155622bb1b19155d27f8e3f9a5842fb0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs	(.../MicrostabilitySectionResultEntityReadExtensionsTest.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -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.Read
@@ -34,74 +35,63 @@
     public class MicrostabilitySectionResultEntityReadExtensionsTest
     {
         [Test]
-        public void Read_SectionResultIsNull_ThrowArgumentNullException()
+        public void Read_EntityNull_ThrowsArgumentNullException()
         {
             // Setup
-            var entity = new MicrostabilitySectionResultEntity();
+            var sectionResult = new MicrostabilityFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
-            TestDelegate call = () => entity.Read(null);
+            TestDelegate test = () => ((MicrostabilitySectionResultEntity) null).Read(sectionResult);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("sectionResult", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("entity", exception.ParamName);
         }
 
         [Test]
-        public void Read_ParameterValues_SectionResultWithParameterValues()
+        public void Read_SectionResultNull_ThrowsArgumentNullException()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-            var layerTwoA = random.NextEnumValue<AssessmentLayerTwoAResult>();
-            double layerThree = random.NextDouble();
+            var entity = new MicrostabilitySectionResultEntity();
 
-            var collector = new ReadConversionCollector();
-
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
-            var entity = new MicrostabilitySectionResultEntity
-            {
-                LayerThree = layerThree,
-                LayerTwoA = Convert.ToByte(layerTwoA),
-                LayerOne = Convert.ToByte(layerOne),
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
-            };
-            var sectionResult = new MicrostabilityFailureMechanismSectionResult(new TestFailureMechanismSection());
-
             // Call
-            entity.Read(sectionResult);
+            TestDelegate call = () => entity.Read(null);
 
             // Assert
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("sectionResult", paramName);
         }
 
         [Test]
-        public void Read_EntityWithNullValues_SectionResultWitNaNValues()
+        public void Read_ParameterValues_SetsSectionResultWithParameterValues()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-            var layerTwoA = random.NextEnumValue<AssessmentLayerTwoAResult>();
+            var random = new Random(31);
+            var simpleAssessmentResult = random.NextEnumValue<SimpleAssessmentResultType>();
+            var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentResultType>();
+            var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentResultType>();
+            var manualAssemblyCategoryGroup = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            bool useManualAssemblyCategoryGroup = random.NextBoolean();
 
-            var collector = new ReadConversionCollector();
-
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
             var entity = new MicrostabilitySectionResultEntity
             {
-                LayerThree = null,
-                LayerTwoA = Convert.ToByte(layerTwoA),
-                LayerOne = Convert.ToByte(layerOne),
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
+                SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult),
+                DetailedAssessmentResult = Convert.ToByte(detailedAssessmentResult),
+                TailorMadeAssessmentResult = Convert.ToByte(tailorMadeAssessmentResult),
+                UseManualAssemblyCategoryGroup = Convert.ToByte(useManualAssemblyCategoryGroup),
+                ManualAssemblyCategoryGroup = Convert.ToByte(manualAssemblyCategoryGroup)
             };
             var sectionResult = new MicrostabilityFailureMechanismSectionResult(new TestFailureMechanismSection());
 
             // Call
             entity.Read(sectionResult);
 
             // Assert
-            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+            Assert.AreEqual(simpleAssessmentResult, sectionResult.SimpleAssessmentResult);
+            Assert.AreEqual(detailedAssessmentResult, sectionResult.DetailedAssessmentResult);
+            Assert.AreEqual(tailorMadeAssessmentResult, sectionResult.TailorMadeAssessmentResult);
+            Assert.AreEqual(useManualAssemblyCategoryGroup, sectionResult.UseManualAssemblyCategoryGroup);
+            Assert.AreEqual(manualAssemblyCategoryGroup, sectionResult.ManualAssemblyCategoryGroup);
         }
     }
 }
\ No newline at end of file