Index: Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/CalculatableFailureMechanismSectionResultsMapLayer.cs
===================================================================
diff -u -r8658d36cc32a7af5ea898721e85abe5985b52fb1 -r8a38b10934f10fa56481a95212dbc9a8132bb02a
--- Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/CalculatableFailureMechanismSectionResultsMapLayer.cs	(.../CalculatableFailureMechanismSectionResultsMapLayer.cs)	(revision 8658d36cc32a7af5ea898721e85abe5985b52fb1)
+++ Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/CalculatableFailureMechanismSectionResultsMapLayer.cs	(.../CalculatableFailureMechanismSectionResultsMapLayer.cs)	(revision 8a38b10934f10fa56481a95212dbc9a8132bb02a)
@@ -48,7 +48,7 @@
         /// </summary>
         /// <param name="failureMechanism">The failure path to get the data from.</param>
         /// <param name="performAssemblyFunc">The <see cref="Func{T,T2}"/> used to assemble the result of a section result.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public CalculatableFailureMechanismSectionResultsMapLayer(
             TFailureMechanism failureMechanism, Func<TSectionResult, FailureMechanismSectionAssemblyResult> performAssemblyFunc)
             : base(failureMechanism, performAssemblyFunc)
Index: Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayer.cs
===================================================================
diff -u -r0fd89ca862752d22af9e6543f05f891ef7c6380a -r8a38b10934f10fa56481a95212dbc9a8132bb02a
--- Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayer.cs	(.../NonCalculatableFailureMechanismSectionResultsMapLayer.cs)	(revision 0fd89ca862752d22af9e6543f05f891ef7c6380a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayer.cs	(.../NonCalculatableFailureMechanismSectionResultsMapLayer.cs)	(revision 8a38b10934f10fa56481a95212dbc9a8132bb02a)
@@ -47,7 +47,7 @@
         /// </summary>
         /// <param name="failureMechanism">The failure path to get the data from.</param>
         /// <param name="performAssemblyFunc">The <see cref="Func{T1,TResult}"/> used to assemble the result of a section result.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public NonCalculatableFailureMechanismSectionResultsMapLayer(
             IHasSectionResults<TSectionResult> failureMechanism,
             Func<TSectionResult, FailureMechanismSectionAssemblyResult> performAssemblyFunc)
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/CalculatableFailureMechanismSectionResultsMapLayerTest.cs
===================================================================
diff -u -r9616d6e1fe303f236014e8f5f668a3990373d16b -r8a38b10934f10fa56481a95212dbc9a8132bb02a
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/CalculatableFailureMechanismSectionResultsMapLayerTest.cs	(.../CalculatableFailureMechanismSectionResultsMapLayerTest.cs)	(revision 9616d6e1fe303f236014e8f5f668a3990373d16b)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/CalculatableFailureMechanismSectionResultsMapLayerTest.cs	(.../CalculatableFailureMechanismSectionResultsMapLayerTest.cs)	(revision 8a38b10934f10fa56481a95212dbc9a8132bb02a)
@@ -88,6 +88,10 @@
                 MapDataTestHelper.AssertAssemblyMapData(failureMechanism, assemblyResult, mapLayer.MapData);
 
                 // When
+                assemblyResult = new FailureMechanismSectionAssemblyResult(
+                    random.NextDouble(), random.NextDouble(), random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+
                 failureMechanism.CalculationsGroup.Children.Add(new TestCalculation());
                 failureMechanism.CalculationsGroup.NotifyObservers();
 
@@ -131,6 +135,10 @@
                 MapDataTestHelper.AssertAssemblyMapData(failureMechanism, assemblyResult, mapLayer.MapData);
 
                 // When
+                assemblyResult = new FailureMechanismSectionAssemblyResult(
+                    random.NextDouble(), random.NextDouble(), random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+
                 calculationScenario.IsRelevant = false;
                 calculationScenario.NotifyObservers();
 
@@ -174,6 +182,10 @@
                 MapDataTestHelper.AssertAssemblyMapData(failureMechanism, assemblyResult, mapLayer.MapData);
 
                 // When
+                assemblyResult = new FailureMechanismSectionAssemblyResult(
+                    random.NextDouble(), random.NextDouble(), random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+
                 calculationScenario.InputParameters.HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
                 calculationScenario.InputParameters.NotifyObservers();
 
@@ -222,6 +234,10 @@
                 MapDataTestHelper.AssertAssemblyMapData(failureMechanism, assemblyResult, mapLayer.MapData);
 
                 // When
+                assemblyResult = new FailureMechanismSectionAssemblyResult(
+                    random.NextDouble(), random.NextDouble(), random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+
                 nestedCalculationScenario.InputParameters.HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
                 nestedCalculationScenario.InputParameters.NotifyObservers();
 
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayerTest.cs
===================================================================
diff -u -r9616d6e1fe303f236014e8f5f668a3990373d16b -r8a38b10934f10fa56481a95212dbc9a8132bb02a
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayerTest.cs	(.../NonCalculatableFailureMechanismSectionResultsMapLayerTest.cs)	(revision 9616d6e1fe303f236014e8f5f668a3990373d16b)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayerTest.cs	(.../NonCalculatableFailureMechanismSectionResultsMapLayerTest.cs)	(revision 8a38b10934f10fa56481a95212dbc9a8132bb02a)
@@ -114,8 +114,11 @@
                 MapDataTestHelper.AssertAssemblyMapData(failureMechanism, assemblyResult, mapLayer.MapData);
 
                 // When
+                assemblyResult = new FailureMechanismSectionAssemblyResult(
+                    random.NextDouble(), random.NextDouble(), random.NextDouble(),
+                    random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+
                 TestFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.First();
-                sectionResult.IsRelevant = false;
                 sectionResult.NotifyObservers();
 
                 // Then
Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapDataTestHelper.cs
===================================================================
diff -u -rdcf0daecff8fe9d5f20f78226b88a8da9f8f2c96 -r8a38b10934f10fa56481a95212dbc9a8132bb02a
--- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapDataTestHelper.cs	(.../MapDataTestHelper.cs)	(revision dcf0daecff8fe9d5f20f78226b88a8da9f8f2c96)
+++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapDataTestHelper.cs	(.../MapDataTestHelper.cs)	(revision 8a38b10934f10fa56481a95212dbc9a8132bb02a)
@@ -23,7 +23,6 @@
 using System.Linq;
 using Core.Common.Base.Geometry;
 using Core.Common.Geometry;
-using Core.Common.Util;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Geometries;
@@ -35,6 +34,7 @@
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.FailurePath;
+using Riskeer.Common.Forms.Helpers;
 
 namespace Riskeer.Common.Forms.TestUtil
 {
@@ -319,8 +319,7 @@
                 CollectionAssert.AreEqual(failureMechanismSection.Points, feature.MapGeometries.Single().PointCollections.Single());
 
                 Assert.AreEqual(1, feature.MetaData.Count);
-                Assert.AreEqual(new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyGroup>(
-                                    DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(expectedAssemblyResult.AssemblyGroup)).DisplayName,
+                Assert.AreEqual(FailureMechanismSectionAssemblyGroupDisplayHelper.GetAssemblyGroupDisplayName(expectedAssemblyResult.AssemblyGroup),
                                 feature.MetaData["Duidingsklasse"]);
             }
         }