Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -rb29487c198d87b176783f2396c2b59cd76b9f246 -rd941c131f9c9ef14eaf09b9865b6c072e1a7c3c3
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision b29487c198d87b176783f2396c2b59cd76b9f246)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision d941c131f9c9ef14eaf09b9865b6c072e1a7c3c3)
@@ -346,6 +346,7 @@
     <ProjectReference Include="..\..\..\AssemblyTool\src\Ringtoets.AssemblyTool.Data\Ringtoets.AssemblyTool.Data.csproj">
       <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
       <Name>Ringtoets.AssemblyTool.Data</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
       <Project>{888d4097-8bc2-4703-9fb1-8744c94d525e}</Project>
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/FailureMechanismSectionResultTestFactory.cs
===================================================================
diff -u -rc4d1fab26e8a8a24845606047d51628f6bf4fe5e -rd941c131f9c9ef14eaf09b9865b6c072e1a7c3c3
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/FailureMechanismSectionResultTestFactory.cs	(.../FailureMechanismSectionResultTestFactory.cs)	(revision c4d1fab26e8a8a24845606047d51628f6bf4fe5e)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/FailureMechanismSectionResultTestFactory.cs	(.../FailureMechanismSectionResultTestFactory.cs)	(revision d941c131f9c9ef14eaf09b9865b6c072e1a7c3c3)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Ringtoets.Common.Data.FailureMechanism;
 
 namespace Ringtoets.Common.Data.TestUtil
@@ -34,6 +35,8 @@
         /// </summary>
         /// <param name="name">The name of the section.</param>
         /// <returns>A valid <see cref="TestFailureMechanismSectionResult"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <param name="name"></param>
+        /// is <c>null</c>.</exception>
         public static TestFailureMechanismSectionResult CreateFailureMechanismSectionResult(string name = "test")
         {
             return new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(name));
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/FailureMechanismSectionTestFactory.cs
===================================================================
diff -u -rc4d1fab26e8a8a24845606047d51628f6bf4fe5e -rd941c131f9c9ef14eaf09b9865b6c072e1a7c3c3
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/FailureMechanismSectionTestFactory.cs	(.../FailureMechanismSectionTestFactory.cs)	(revision c4d1fab26e8a8a24845606047d51628f6bf4fe5e)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/FailureMechanismSectionTestFactory.cs	(.../FailureMechanismSectionTestFactory.cs)	(revision d941c131f9c9ef14eaf09b9865b6c072e1a7c3c3)
@@ -37,6 +37,8 @@
         /// </summary>
         /// <param name="name">The name of the section.</param>
         /// <returns>A valid <see cref="FailureMechanismSection"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <param name="name"></param>
+        /// is <c>null</c>.</exception>
         public static FailureMechanismSection CreateFailureMechanismSection(string name = "test")
         {
             return CreateFailureMechanismSection(name, new[]
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r675f7c90056894a60a20233cd9f146a0f84ceb01 -rd941c131f9c9ef14eaf09b9865b6c072e1a7c3c3
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision 675f7c90056894a60a20233cd9f146a0f84ceb01)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision d941c131f9c9ef14eaf09b9865b6c072e1a7c3c3)
@@ -46,7 +46,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssemblyCategoryGroup AssembleSimpleAssessment(
             MacroStabilityOutwardsFailureMechanismSectionResult failureMechanismSectionResult)
@@ -79,7 +79,7 @@
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> belonging to this section.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssemblyCategoryGroup AssembleDetailedAssembly(
             MacroStabilityOutwardsFailureMechanismSectionResult failureMechanismSectionResult,
@@ -135,7 +135,7 @@
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> belonging to this section.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssemblyCategoryGroup AssembleTailorMadeAssembly(
             MacroStabilityOutwardsFailureMechanismSectionResult failureMechanismSectionResult,
@@ -191,7 +191,7 @@
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> belonging to this section.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssemblyCategoryGroup AssembleCombinedAssembly(
             MacroStabilityOutwardsFailureMechanismSectionResult failureMechanismSectionResult,
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResult.cs
===================================================================
diff -u -r712c1aad8e5486980f259491130e4ae07ea48149 -rd941c131f9c9ef14eaf09b9865b6c072e1a7c3c3
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResult.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResult.cs)	(revision 712c1aad8e5486980f259491130e4ae07ea48149)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResult.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResult.cs)	(revision d941c131f9c9ef14eaf09b9865b6c072e1a7c3c3)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Base.Data;
 using Ringtoets.AssemblyTool.Data;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs
===================================================================
diff -u -r405b3462fe3bd495b4820bf225a68a4188c9c112 -rd941c131f9c9ef14eaf09b9865b6c072e1a7c3c3
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs	(.../MacroStabilityOutwardsSectionResultRow.cs)	(revision 405b3462fe3bd495b4820bf225a68a4188c9c112)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs	(.../MacroStabilityOutwardsSectionResultRow.cs)	(revision d941c131f9c9ef14eaf09b9865b6c072e1a7c3c3)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using Core.Common.Controls.DataGrid;
@@ -66,10 +65,12 @@
         /// <param name="constructionProperties">The property values required to create an instance of
         /// <see cref="MacroStabilityOutwardsSectionResultRow"/>.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public MacroStabilityOutwardsSectionResultRow(MacroStabilityOutwardsFailureMechanismSectionResult sectionResult,
-                                                      MacroStabilityOutwardsFailureMechanism failureMechanism,
-                                                      IAssessmentSection assessmentSection,
-                                                      ConstructionProperties constructionProperties)
+        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
+        /// is a valid value, but unsupported.</exception>
+        internal MacroStabilityOutwardsSectionResultRow(MacroStabilityOutwardsFailureMechanismSectionResult sectionResult,
+                                                        MacroStabilityOutwardsFailureMechanism failureMechanism,
+                                                        IAssessmentSection assessmentSection,
+                                                        ConstructionProperties constructionProperties)
             : base(sectionResult)
         {
             if (failureMechanism == null)
@@ -109,6 +110,8 @@
         /// <summary>
         /// Gets or sets the value representing the simple assessment result.
         /// </summary>
+        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
+        /// is a valid value, but unsupported.</exception>
         public SimpleAssessmentResultType SimpleAssessmentResult
         {
             get
@@ -126,6 +129,8 @@
         /// <summary>
         /// Gets or sets the value representing the detailed assessment result.
         /// </summary>
+        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
+        /// is a valid value, but unsupported.</exception>
         public DetailedAssessmentResultType DetailedAssessmentResult
         {
             get
@@ -145,6 +150,8 @@
         /// </summary>
         /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="value"/> is 
         /// not in the range [0,1].</exception>
+        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
+        /// is a valid value, but unsupported.</exception>
         [TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
         public double DetailedAssessmentProbability
         {
@@ -163,6 +170,8 @@
         /// <summary>
         /// Gets or sets the value representing the tailor made assessment result.
         /// </summary>
+        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
+        /// is a valid value, but unsupported.</exception>
         public TailorMadeAssessmentProbabilityAndDetailedCalculationResultType TailorMadeAssessmentResult
         {
             get
@@ -182,6 +191,8 @@
         /// </summary>
         /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="value"/> is 
         /// not in the range [0,1].</exception>
+        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
+        /// is a valid value, but unsupported.</exception>
         [TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
         public double TailorMadeAssessmentProbability
         {
@@ -220,6 +231,8 @@
         /// <summary>
         /// Gets or sets the indicator whether the combined assembly should be overwritten by <see cref="ManualAssemblyCategoryGroup"/>.
         /// </summary>
+        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
+        /// is a valid value, but unsupported.</exception>
         public bool UseManualAssemblyCategoryGroup
         {
             get
@@ -251,6 +264,15 @@
             }
         }
 
+        /// <inheritdoc />
+        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
+        /// is a valid value, but unsupported.</exception>
+        public override void Update()
+        {
+            UpdateDerivedData();
+            UpdateColumnStateDefinitionStates();
+        }
+
         private void CreateColumnStateDefinitions()
         {
             ColumnStateDefinitions.Add(simpleAssessmentResultIndex, new DataGridViewColumnStateDefinition());
@@ -265,12 +287,6 @@
             ColumnStateDefinitions.Add(manualAssemblyCategoryGroupIndex, new DataGridViewColumnStateDefinition());
         }
 
-        private void Update()
-        {
-            UpdateDerivedData();
-            UpdateColumnDefinitionStates();
-        }
-
         private void UpdateDerivedData()
         {
             ResetErrorTexts();
@@ -349,7 +365,12 @@
             }
         }
 
-        private void UpdateColumnDefinitionStates()
+        /// <summary>
+        /// Updates the column state definitions.
+        /// </summary>
+        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
+        /// is a valid value, but unsupported.</exception>
+        private void UpdateColumnStateDefinitionStates()
         {
             bool simpleAssessmentSufficient = GetSimpleAssessmentSufficient();
 
@@ -377,13 +398,28 @@
             SetColumnState(manualAssemblyCategoryGroupIndex, !UseManualAssemblyCategoryGroup);
         }
 
+        /// <summary>
+        /// Sets the style of the column state definition on the given <paramref name="index"/>.
+        /// </summary>
+        /// <param name="index">The index of the column state definition.</param>
+        /// <param name="assemblyCategoryGroup">The category group to get the color for.</param>
+        /// <returns>A <see cref="Color"/>.</returns>
+        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
+        /// is a valid value, but unsupported.</exception>
         private void SetAssemblyCategoryGroupStyle(int index, FailureMechanismSectionAssemblyCategoryGroup assemblyCategoryGroup)
         {
             ColumnStateDefinitions[index].Style = new CellStyle(
                 Color.FromKnownColor(KnownColor.ControlText),
                 GetCategoryGroupColor(assemblyCategoryGroup));
         }
 
+        /// <summary>
+        /// Gets the color based on the <paramref name="categoryGroup"/>.
+        /// </summary>
+        /// <param name="categoryGroup">The category group to get the color for.</param>
+        /// <returns>A <see cref="Color"/>.</returns>
+        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
+        /// is a valid value, but unsupported.</exception>
         private static Color GetCategoryGroupColor(FailureMechanismSectionAssemblyCategoryGroup categoryGroup)
         {
             switch (categoryGroup)
@@ -454,52 +490,52 @@
         public class ConstructionProperties
         {
             /// <summary>
-            /// Gets or sets the simple assessment result index.
+            /// Sets the simple assessment result index.
             /// </summary>
             public int SimpleAssessmentResultIndex { internal get; set; }
 
             /// <summary>
-            /// Gets or sets the detailed assessment result index.
+            /// Sets the detailed assessment result index.
             /// </summary>
             public int DetailedAssessmentResultIndex { internal get; set; }
 
             /// <summary>
-            /// Gets or sets the detailed assessment probability index.
+            /// Sets the detailed assessment probability index.
             /// </summary>
             public int DetailedAssessmentProbabilityIndex { internal get; set; }
 
             /// <summary>
-            /// Gets or sets the tailor made assessment result index.
+            /// Sets the tailor made assessment result index.
             /// </summary>
             public int TailorMadeAssessmentResultIndex { internal get; set; }
 
             /// <summary>
-            /// Gets or sets the tailor made assessment probability index.
+            /// Sets the tailor made assessment probability index.
             /// </summary>
             public int TailorMadeAssessmentProbabilityIndex { internal get; set; }
 
             /// <summary>
-            /// Gets or sets the simple assembly category group index.
+            /// Sets the simple assembly category group index.
             /// </summary>
             public int SimpleAssemblyCategoryGroupIndex { internal get; set; }
 
             /// <summary>
-            /// Gets or sets the detailed assembly category group index.
+            /// Sets the detailed assembly category group index.
             /// </summary>
             public int DetailedAssemblyCategoryGroupIndex { internal get; set; }
 
             /// <summary>
-            /// Gets or sets the tailor made assembly category group index.
+            /// Sets the tailor made assembly category group index.
             /// </summary>
             public int TailorMadeAssemblyCategoryGroupIndex { internal get; set; }
 
             /// <summary>
-            /// Gets or sets the combined assembly category group index.
+            /// Sets the combined assembly category group index.
             /// </summary>
             public int CombinedAssemblyCategoryGroupIndex { internal get; set; }
 
             /// <summary>
-            /// Gets or sets the manual assembly category group index.
+            /// Sets the manual assembly category group index.
             /// </summary>
             public int ManualAssemblyCategoryGroupIndex { internal get; set; }
         }