Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r91b6773de2fccf52417609b4ed9463f98d6451dd -re5d2b62a6626e9d34433859f6dccfcf5a1eff783
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs	(.../HeightStructuresFailureMechanismSectionResultRowTest.cs)	(revision 91b6773de2fccf52417609b4ed9463f98d6451dd)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs	(.../HeightStructuresFailureMechanismSectionResultRowTest.cs)	(revision e5d2b62a6626e9d34433859f6dccfcf5a1eff783)
@@ -31,6 +31,7 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.TypeConverters;
 using Ringtoets.Common.Forms.Views;
+using Ringtoets.Common.Primitives;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.Views;
 
@@ -57,8 +58,13 @@
 
             // Assert
             Assert.IsInstanceOf<FailureMechanismSectionResultRow<HeightStructuresFailureMechanismSectionResult>>(row);
+<<<<<<< HEAD
             Assert.AreEqual(result.AssessmentLayerOne, row.AssessmentLayerOne);
             Assert.AreEqual(result.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), row.DetailedAssessmentProbability);
+=======
+            Assert.AreEqual(result.SimpleAssessmentResult, row.SimpleAssessmentResult);
+            Assert.AreEqual(result.GetAssessmentLayerTwoA(failureMechanism, assessmentSection), row.AssessmentLayerTwoA);
+>>>>>>> Implemented SimpleAssessmentResult type for Closing and Height structures:
             Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree);
 
             TestHelper.AssertTypeConverter<HeightStructuresFailureMechanismSectionResultRow, NoProbabilityValueDoubleConverter>(
@@ -104,10 +110,7 @@
         }
 
         [Test]
-        [TestCase(AssessmentLayerOneState.NotAssessed)]
-        [TestCase(AssessmentLayerOneState.Sufficient)]
-        [TestCase(AssessmentLayerOneState.NoVerdict)]
-        public void AssessmentLayerOne_AlwaysOnChange_NotifyObserversOfResultAndResultPropertyChanged(AssessmentLayerOneState newValue)
+        public void SimpleAssessmentResult_AlwaysOnChange_NotifyObserversOfResultAndResultPropertyChanged()
         {
             // Setup
             var mocks = new MockRepository();
@@ -120,15 +123,16 @@
             var result = new HeightStructuresFailureMechanismSectionResult(section);
             result.Attach(observer);
 
+            var newValue = new Random(21).NextEnumValue<SimpleAssessmentResultType>();
             var row = new HeightStructuresFailureMechanismSectionResultRow(result,
                                                                            new HeightStructuresFailureMechanism(),
                                                                            assessmentSection);
 
             // Call
-            row.AssessmentLayerOne = newValue;
+            row.SimpleAssessmentResult = newValue;
 
             // Assert
-            Assert.AreEqual(newValue, result.AssessmentLayerOne);
+            Assert.AreEqual(newValue, result.SimpleAssessmentResult);
             mocks.VerifyAll();
         }