Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs
===================================================================
diff -u -r09486786d73dcf29f225c4aad4a3ac89ca44d21a -r9357b0881bee62fa8a953061811499c9bbd30581
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs	(.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs)	(revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs	(.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs)	(revision 9357b0881bee62fa8a953061811499c9bbd30581)
@@ -200,8 +200,8 @@
             }
         }
 
-        private static void AssertSections<T>(IEnumerable<T> originalSectionResults, IEnumerable<CombinedAssemblyFailureMechanismSection> inputSections)
-            where T : FailureMechanismSectionResult
+        private static void AssertSections(IEnumerable<FailureMechanismSectionResult> originalSectionResults,
+                                           IEnumerable<CombinedAssemblyFailureMechanismSection> inputSections)
         {
             Assert.AreEqual(originalSectionResults.Count(), inputSections.Count());
 
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -rafed9963ae0fa0e6a70caa0af9b8d3ea98f26d04 -r9357b0881bee62fa8a953061811499c9bbd30581
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs	(.../AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs)	(revision afed9963ae0fa0e6a70caa0af9b8d3ea98f26d04)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs	(.../AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs)	(revision 9357b0881bee62fa8a953061811499c9bbd30581)
@@ -24,16 +24,15 @@
 using System.Linq;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
-using Core.Common.Util;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Geometries;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.Forms;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Forms.Helpers;
 using Riskeer.Integration.Data;
 using Riskeer.Integration.Data.Assembly;
 using Riskeer.Integration.Data.TestUtil;
@@ -101,8 +100,7 @@
 
                     Assert.AreEqual(2, actualFeature.MetaData.Keys.Count);
                     Assert.AreEqual(expectedAssemblyResult.SectionNumber, actualFeature.MetaData["Vaknummer"]);
-                    Assert.AreEqual(new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyGroup>(
-                                        DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(expectedAssemblyResult.TotalResult)).DisplayName,
+                    Assert.AreEqual(FailureMechanismSectionAssemblyGroupDisplayHelper.GetAssemblyGroupDisplayName(expectedAssemblyResult.TotalResult),
                                     features.ElementAt(i).MetaData["Duidingsklasse"]);
                 }
             }
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs
===================================================================
diff -u -rafed9963ae0fa0e6a70caa0af9b8d3ea98f26d04 -r9357b0881bee62fa8a953061811499c9bbd30581
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs	(.../AssemblyResultPerSectionMapViewTest.cs)	(revision afed9963ae0fa0e6a70caa0af9b8d3ea98f26d04)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs	(.../AssemblyResultPerSectionMapViewTest.cs)	(revision 9357b0881bee62fa8a953061811499c9bbd30581)
@@ -26,21 +26,20 @@
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
-using Core.Common.Util;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Forms;
 using Core.Components.Gis.Geometries;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.Forms;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Hydraulics;
+using Riskeer.Common.Forms.Helpers;
 using Riskeer.Common.Forms.TestUtil;
 using Riskeer.Common.Forms.Views;
 using Riskeer.Integration.Data;
@@ -392,8 +391,7 @@
 
                 Assert.AreEqual(2, actualFeature.MetaData.Keys.Count);
                 Assert.AreEqual(expectedAssemblyResult.SectionNumber, actualFeature.MetaData["Vaknummer"]);
-                Assert.AreEqual(new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyGroup>(
-                                    DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(expectedAssemblyResult.TotalResult)).DisplayName,
+                Assert.AreEqual(FailureMechanismSectionAssemblyGroupDisplayHelper.GetAssemblyGroupDisplayName(expectedAssemblyResult.TotalResult),
                                 mapFeatures.ElementAt(i).MetaData["Duidingsklasse"]);
             }
         }