Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingAssemblyMapDataFeaturesFactory.cs
===================================================================
diff -u -rb9d48f272caaffb9d0ee553ddf12d1d3af8966c2 -r4be49ab92023b8a73056078c2caa86bd5cfdf5e5
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingAssemblyMapDataFeaturesFactory.cs	(.../PipingAssemblyMapDataFeaturesFactory.cs)	(revision b9d48f272caaffb9d0ee553ddf12d1d3af8966c2)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingAssemblyMapDataFeaturesFactory.cs	(.../PipingAssemblyMapDataFeaturesFactory.cs)	(revision 4be49ab92023b8a73056078c2caa86bd5cfdf5e5)
@@ -22,20 +22,16 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Util;
 using Core.Components.Gis.Features;
-using Ringtoets.AssemblyTool.Data;
-using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Forms.Factories;
 using Ringtoets.Piping.Data;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Factories
 {
     /// <summary>
-    /// Factory for creating collections of <see cref="MapFeature"/> for assembly results.
+    /// Factory for creating collections of <see cref="MapFeature"/> for assembly results in a <see cref="PipingFailureMechanism"/>.
     /// </summary>
     public static class PipingAssemblyMapDataFeaturesFactory
     {
@@ -45,10 +41,18 @@
         /// <param name="failureMechanism">The <see cref="PipingFailureMechanism"/> to create the features for.</param>
         /// <returns>A collection of <see cref="MapFeature"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when a <see cref="MapFeature"/> could not be created.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
+        /// is <c>null</c></exception>
         public static IEnumerable<MapFeature> CreateSimpleAssemblyFeatures(PipingFailureMechanism failureMechanism)
         {
-            return CreateAssemblyFeatures(failureMechanism,
-                                          PipingFailureMechanismAssemblyFactory.AssembleSimpleAssessment).ToArray();
+            if (failureMechanism == null)
+            {
+                throw new ArgumentNullException(nameof(failureMechanism));
+            }
+
+            return AssemblyMapDataFeaturesFactory.CreateAssemblyFeatures<PipingFailureMechanism, PipingFailureMechanismSectionResult>(
+                failureMechanism,
+                PipingFailureMechanismAssemblyFactory.AssembleSimpleAssessment);
         }
 
         /// <summary>
@@ -58,13 +62,26 @@
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> the <paramref name="failureMechanism"/> belongs to.</param>
         /// <returns>A collection of <see cref="MapFeature"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when a <see cref="MapFeature"/> could not be created.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c></exception>
         public static IEnumerable<MapFeature> CreateDetailedAssemblyFeatures(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
-            return CreateAssemblyFeatures(failureMechanism,
-                                          sectionResult => PipingFailureMechanismAssemblyFactory.AssembleDetailedAssessment(sectionResult,
-                                                                                                                            failureMechanism.Calculations.Cast<PipingCalculationScenario>(),
-                                                                                                                            failureMechanism,
-                                                                                                                            assessmentSection)).ToArray();
+            if (failureMechanism == null)
+            {
+                throw new ArgumentNullException(nameof(failureMechanism));
+            }
+
+            if (assessmentSection == null)
+            {
+                throw new ArgumentNullException(nameof(assessmentSection));
+            }
+
+            return AssemblyMapDataFeaturesFactory.CreateAssemblyFeatures<PipingFailureMechanism, PipingFailureMechanismSectionResult>(
+                failureMechanism,
+                sectionResult => PipingFailureMechanismAssemblyFactory.AssembleDetailedAssessment(
+                    sectionResult,
+                    failureMechanism.Calculations.Cast<PipingCalculationScenario>(),
+                    failureMechanism,
+                    assessmentSection));
         }
 
         /// <summary>
@@ -74,31 +91,53 @@
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> the <paramref name="failureMechanism"/> belongs to.</param>
         /// <returns>A collection of <see cref="MapFeature"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when a <see cref="MapFeature"/> could not be created.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c></exception>
         public static IEnumerable<MapFeature> CreateTailorMadeAssemblyFeatures(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
-            return CreateAssemblyFeatures(failureMechanism,
-                                          sectionResult => PipingFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment(sectionResult,
-                                                                                                                              failureMechanism,
-                                                                                                                              assessmentSection)).ToArray();
+            if (failureMechanism == null)
+            {
+                throw new ArgumentNullException(nameof(failureMechanism));
+            }
+
+            if (assessmentSection == null)
+            {
+                throw new ArgumentNullException(nameof(assessmentSection));
+            }
+
+            return AssemblyMapDataFeaturesFactory.CreateAssemblyFeatures<PipingFailureMechanism, PipingFailureMechanismSectionResult>(
+                failureMechanism,
+                sectionResult => PipingFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment(sectionResult,
+                                                                                                    failureMechanism,
+                                                                                                    assessmentSection));
         }
 
-        private static IEnumerable<MapFeature> CreateAssemblyFeatures(PipingFailureMechanism failureMechanism,
-                                                                      Func<PipingFailureMechanismSectionResult, FailureMechanismSectionAssembly> getAssemblyFunc)
+        /// <summary>
+        /// Creates features for the combined assembly results in <paramref name="failureMechanism"/>.
+        /// </summary>
+        /// <param name="failureMechanism">The <see cref="PipingFailureMechanism"/> to create the features for.</param>
+        /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> the <paramref name="failureMechanism"/> belongs to.</param>
+        /// <returns>A collection of <see cref="MapFeature"/>.</returns>
+        /// <exception cref="AssemblyException">Thrown when a <see cref="MapFeature"/> could not be created.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c></exception>
+        public static IEnumerable<MapFeature> CreateCombinedAssemblyFeatures(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
-            for (var i = 0; i < failureMechanism.SectionResults.Count(); i++)
+            if (failureMechanism == null)
             {
-                PipingFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.ElementAt(i);
-                MapFeature feature = RingtoetsMapDataFeaturesFactory.CreateSingleLineMapFeature(sectionResult.Section.Points);
-                FailureMechanismSectionAssembly assemblyResult = getAssemblyFunc(sectionResult);
+                throw new ArgumentNullException(nameof(failureMechanism));
+            }
 
-                feature.MetaData[RingtoetsCommonFormsResources.AssemblyCategory_Group_DisplayName] = 
-                    new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyCategoryGroup>(
-                        DisplayFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(assemblyResult.Group)).DisplayName;
-
-                feature.MetaData[RingtoetsCommonFormsResources.MetaData_Probability] = assemblyResult.Probability;
-
-                yield return feature;
+            if (assessmentSection == null)
+            {
+                throw new ArgumentNullException(nameof(assessmentSection));
             }
+
+            return AssemblyMapDataFeaturesFactory.CreateAssemblyFeatures<PipingFailureMechanism, PipingFailureMechanismSectionResult>(
+                failureMechanism,
+                sectionResult => PipingFailureMechanismAssemblyFactory.AssembleCombinedAssessment(
+                    sectionResult,
+                    failureMechanism.Calculations.Cast<PipingCalculationScenario>(),
+                    failureMechanism,
+                    assessmentSection));
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj
===================================================================
diff -u -rd77f0eae87afa15b1a5484d5ef7c54f952a04166 -r4be49ab92023b8a73056078c2caa86bd5cfdf5e5
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision 4be49ab92023b8a73056078c2caa86bd5cfdf5e5)
@@ -17,6 +17,7 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Factories\PipingAssemblyMapDataFeaturesFactory.cs" />
     <Compile Include="PipingCalculationConfigurationHelper.cs" />
     <Compile Include="PipingSurfaceLineSelectionDialog.cs">
       <SubType>Form</SubType>
@@ -147,6 +148,11 @@
       <Name>Ringtoets.AssemblyTool.Data</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Ringtoets.AssemblyTool.Forms\Ringtoets.AssemblyTool.Forms.csproj">
+      <Project>{22C5DDB8-2491-4BC6-BDC6-2A7B7EBF40C1}</Project>
+      <Name>Ringtoets.AssemblyTool.Forms</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingAssemblyMapDataFeaturesFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingAssemblyMapDataFeaturesFactoryTest.cs	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingAssemblyMapDataFeaturesFactoryTest.cs	(revision 4be49ab92023b8a73056078c2caa86bd5cfdf5e5)
@@ -0,0 +1,298 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Core.Common.TestUtil;
+using Core.Common.Util;
+using Core.Components.Gis.Features;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.AssemblyTool.Forms;
+using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Forms.Factories;
+
+namespace Ringtoets.Piping.Forms.Test.Factories
+{
+    [TestFixture]
+    public class PipingAssemblyMapDataFeaturesFactoryTest
+    {
+        private const string categoryMetaData = "Categorie";
+        private const string probabilityMetaData = "Faalkans";
+
+        [Test]
+        public void CreateSimpleAssemblyFeatures_FailureMechanismNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("failureMechanism", paramName);
+        }
+
+        [Test]
+        public void CreateSimpleAssemblyFeatures_WithValidData_ReturnsFeaturesCollection()
+        {
+            // Setup
+            var random = new Random(39);
+            var failureMechanism = new PipingFailureMechanism();
+            FailureMechanismTestHelper.AddSections(failureMechanism, random.Next(0, 10));
+
+            using (new AssemblyToolCalculatorFactoryConfig())
+            {
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
+                FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
+
+                calculator.SimpleAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(random.NextDouble(),
+                                                                                                random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
+
+                // Call
+                IEnumerable<MapFeature> features = PipingAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(failureMechanism);
+
+                // Assert
+                Assert.AreEqual(failureMechanism.Sections.Count(), features.Count());
+
+                for (var i = 0; i < features.Count(); i++)
+                {
+                    FailureMechanismSection section = failureMechanism.Sections.ElementAt(i);
+                    Assert.AreEqual(1, features.ElementAt(i).MapGeometries.Count());
+                    CollectionAssert.AreEqual(section.Points, features.ElementAt(i).MapGeometries.Single().PointCollections.Single());
+                    Assert.AreEqual(2, features.ElementAt(i).MetaData.Keys.Count);
+                    Assert.AreEqual(new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyCategoryGroup>(
+                                        DisplayFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(calculator.SimpleAssessmentAssemblyOutput.Group)).DisplayName,
+                                    features.ElementAt(i).MetaData[categoryMetaData]);
+                    Assert.AreEqual(calculator.SimpleAssessmentAssemblyOutput.Probability,
+                                    features.ElementAt(i).MetaData[probabilityMetaData]);
+                }
+            }
+        }
+
+        [Test]
+        public void CreateDetailedAssemblyFeatures_FailureMechanismNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            // Call
+            TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(null, assessmentSection);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("failureMechanism", paramName);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CreateDetailedAssemblyFeatures_AssessmentSectionNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(new PipingFailureMechanism(), null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("assessmentSection", paramName);
+        }
+
+        [Test]
+        public void CreateDetailedAssemblyFeatures_WithValidData_ReturnsFeaturesCollection()
+        {
+            // Setup
+            var random = new Random(39);
+            var assessmentSection = new AssessmentSectionStub();
+            var failureMechanism = new PipingFailureMechanism();
+            FailureMechanismTestHelper.AddSections(failureMechanism, random.Next(0, 10));
+
+            using (new AssemblyToolCalculatorFactoryConfig())
+            {
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
+                FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
+
+                calculator.DetailedAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(random.NextDouble(),
+                                                                                                  random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
+
+                // Call
+                IEnumerable<MapFeature> features = PipingAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(failureMechanism,
+                                                                                                                       assessmentSection);
+
+                // Assert
+                Assert.AreEqual(failureMechanism.Sections.Count(), features.Count());
+
+                for (var i = 0; i < features.Count(); i++)
+                {
+                    FailureMechanismSection section = failureMechanism.Sections.ElementAt(i);
+                    Assert.AreEqual(1, features.ElementAt(i).MapGeometries.Count());
+                    CollectionAssert.AreEqual(section.Points, features.ElementAt(i).MapGeometries.Single().PointCollections.Single());
+                    Assert.AreEqual(2, features.ElementAt(i).MetaData.Keys.Count);
+                    Assert.AreEqual(new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyCategoryGroup>(
+                                        DisplayFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(calculator.DetailedAssessmentAssemblyOutput.Group)).DisplayName,
+                                    features.ElementAt(i).MetaData[categoryMetaData]);
+                    Assert.AreEqual(calculator.DetailedAssessmentAssemblyOutput.Probability,
+                                    features.ElementAt(i).MetaData[probabilityMetaData]);
+                }
+            }
+        }
+
+        [Test]
+        public void CreateTailorMadeAssemblyFeatures_FailureMechanismNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            // Call
+            TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(null, assessmentSection);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("failureMechanism", paramName);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CreateTailorMadeAssemblyFeatures_AssessmentSectionNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(new PipingFailureMechanism(), null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("assessmentSection", paramName);
+        }
+
+        [Test]
+        public void CreateTailorMadeAssemblyFeatures_WithValidData_ReturnsFeaturesCollection()
+        {
+            // Setup
+            var random = new Random(39);
+            var assessmentSection = new AssessmentSectionStub();
+            var failureMechanism = new PipingFailureMechanism();
+            FailureMechanismTestHelper.AddSections(failureMechanism, random.Next(0, 10));
+
+            using (new AssemblyToolCalculatorFactoryConfig())
+            {
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
+                FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
+
+                calculator.TailorMadeAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(random.NextDouble(),
+                                                                                                    random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
+
+                // Call
+                IEnumerable<MapFeature> features = PipingAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(failureMechanism,
+                                                                                                                         assessmentSection);
+
+                // Assert
+                Assert.AreEqual(failureMechanism.Sections.Count(), features.Count());
+
+                for (var i = 0; i < features.Count(); i++)
+                {
+                    FailureMechanismSection section = failureMechanism.Sections.ElementAt(i);
+                    Assert.AreEqual(1, features.ElementAt(i).MapGeometries.Count());
+                    CollectionAssert.AreEqual(section.Points, features.ElementAt(i).MapGeometries.Single().PointCollections.Single());
+                    Assert.AreEqual(2, features.ElementAt(i).MetaData.Keys.Count);
+                    Assert.AreEqual(new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyCategoryGroup>(
+                                        DisplayFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(calculator.TailorMadeAssessmentAssemblyOutput.Group)).DisplayName,
+                                    features.ElementAt(i).MetaData[categoryMetaData]);
+                    Assert.AreEqual(calculator.TailorMadeAssessmentAssemblyOutput.Probability,
+                                    features.ElementAt(i).MetaData[probabilityMetaData]);
+                }
+            }
+        }
+
+        [Test]
+        public void CreateCombinedAssemblyFeatures_FailureMechanismNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            // Call
+            TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(null, assessmentSection);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("failureMechanism", paramName);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CreateCombinedAssemblyFeatures_AssessmentSectionNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(new PipingFailureMechanism(), null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("assessmentSection", paramName);
+        }
+
+        [Test]
+        public void CreateCombinedAssemblyFeatures_WithValidData_ReturnsFeaturesCollection()
+        {
+            // Setup
+            var random = new Random(39);
+            var assessmentSection = new AssessmentSectionStub();
+            var failureMechanism = new PipingFailureMechanism();
+            FailureMechanismTestHelper.AddSections(failureMechanism, random.Next(0, 10));
+
+            using (new AssemblyToolCalculatorFactoryConfig())
+            {
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
+                FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
+
+                calculator.CombinedAssemblyOutput = new FailureMechanismSectionAssembly(random.NextDouble(),
+                                                                                        random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
+
+                // Call
+                IEnumerable<MapFeature> features = PipingAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(failureMechanism,
+                                                                                                                       assessmentSection);
+
+                // Assert
+                Assert.AreEqual(failureMechanism.Sections.Count(), features.Count());
+
+                for (var i = 0; i < features.Count(); i++)
+                {
+                    FailureMechanismSection section = failureMechanism.Sections.ElementAt(i);
+                    Assert.AreEqual(1, features.ElementAt(i).MapGeometries.Count());
+                    CollectionAssert.AreEqual(section.Points, features.ElementAt(i).MapGeometries.Single().PointCollections.Single());
+                    Assert.AreEqual(2, features.ElementAt(i).MetaData.Keys.Count);
+                    Assert.AreEqual(new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyCategoryGroup>(
+                                        DisplayFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(calculator.CombinedAssemblyOutput.Group)).DisplayName,
+                                    features.ElementAt(i).MetaData[categoryMetaData]);
+                    Assert.AreEqual(calculator.CombinedAssemblyOutput.Probability,
+                                    features.ElementAt(i).MetaData[probabilityMetaData]);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
===================================================================
diff -u -r00835f43bb793e1fda36becd6dfd0c5619417927 -r4be49ab92023b8a73056078c2caa86bd5cfdf5e5
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision 00835f43bb793e1fda36becd6dfd0c5619417927)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision 4be49ab92023b8a73056078c2caa86bd5cfdf5e5)
@@ -24,6 +24,7 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Factories\PipingAssemblyMapDataFeaturesFactoryTest.cs" />
     <Compile Include="PipingCalculationConfigurationHelperTest.cs" />
     <Compile Include="PipingSurfaceLineSelectionDialogTest.cs" />
     <Compile Include="PresentationObjects\PipingFailureMechanismSectionsContextTest.cs" />
@@ -106,6 +107,10 @@
       <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
       <Name>Ringtoets.AssemblyTool.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Ringtoets.AssemblyTool.Forms\Ringtoets.AssemblyTool.Forms.csproj">
+      <Project>{22C5DDB8-2491-4BC6-BDC6-2A7B7EBF40C1}</Project>
+      <Name>Ringtoets.AssemblyTool.Forms</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\AssemblyTool\src\Ringtoets.AssemblyTool.KernelWrapper\Ringtoets.AssemblyTool.KernelWrapper.csproj">
       <Project>{358B6DA2-A1DF-477F-B6AC-C30204265CB0}</Project>
       <Name>Ringtoets.AssemblyTool.KernelWrapper</Name>