Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r11faaf2149d31eb83bcb32b8be0e989b477d3c83 -rc94701528c392fbac4fbf2bb2e2c0641735318fa
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 11faaf2149d31eb83bcb32b8be0e989b477d3c83)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c94701528c392fbac4fbf2bb2e2c0641735318fa)
@@ -469,6 +469,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to De categoriegrenzen voor de gecombineerde toetssporen in groep 1 en 2..
+        /// </summary>
+        public static string CategoryBoundariesGroupOneAndTwo_Description {
+            get {
+                return ResourceManager.GetString("CategoryBoundariesGroupOneAndTwo_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Categoriegrenzen groep 1 en 2.
+        /// </summary>
+        public static string CategoryBoundariesGroupOneAndTwo_DisplayName {
+            get {
+                return ResourceManager.GetString("CategoryBoundariesGroupOneAndTwo_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to U heeft een ander hydraulische belastingendatabase bestand geselecteerd. Als gevolg hiervan moet de uitvoer van alle ervan afhankelijke berekeningen verwijderd worden.
         ///    
         ///Weet u zeker dat u wilt doorgaan?.
@@ -619,6 +637,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to De gecombineerde faalkansruimte voor de toetssporen in groep 1 en 2..
+        /// </summary>
+        public static string FailureProbabilityMarginFactor_Description {
+            get {
+                return ResourceManager.GetString("FailureProbabilityMarginFactor_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Gecombineerde faalkansruimte.
+        /// </summary>
+        public static string FailureProbabilityMarginFactor_DisplayName {
+            get {
+                return ResourceManager.GetString("FailureProbabilityMarginFactor_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to &amp;Koppel aan database....
         /// </summary>
         public static string HydraulicBoundaryDatabase_Connect {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r11faaf2149d31eb83bcb32b8be0e989b477d3c83 -rc94701528c392fbac4fbf2bb2e2c0641735318fa
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 11faaf2149d31eb83bcb32b8be0e989b477d3c83)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision c94701528c392fbac4fbf2bb2e2c0641735318fa)
@@ -376,4 +376,16 @@
   <data name="AssemblyResultPerSection_DisplayName" xml:space="preserve">
     <value>Gecombineerd vakoordeel</value>
   </data>
+  <data name="CategoryBoundariesGroupOneAndTwo_Description" xml:space="preserve">
+    <value>De categoriegrenzen voor de gecombineerde toetssporen in groep 1 en 2.</value>
+  </data>
+  <data name="CategoryBoundariesGroupOneAndTwo_DisplayName" xml:space="preserve">
+    <value>Categoriegrenzen groep 1 en 2</value>
+  </data>
+  <data name="FailureProbabilityMarginFactor_Description" xml:space="preserve">
+    <value>De gecombineerde faalkansruimte voor de toetssporen in groep 1 en 2.</value>
+  </data>
+  <data name="FailureProbabilityMarginFactor_DisplayName" xml:space="preserve">
+    <value>Gecombineerde faalkansruimte</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/AssemblyResultCategoriesProperties.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/AssemblyResultCategoriesProperties.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/AssemblyResultCategoriesProperties.cs	(revision c94701528c392fbac4fbf2bb2e2c0641735318fa)
@@ -0,0 +1,93 @@
+// Copyright (C) Stichting Deltares 2017. 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.ComponentModel;
+using System.Linq;
+using Core.Common.Base.Data;
+using Core.Common.Gui.Attributes;
+using Core.Common.Gui.Converters;
+using Core.Common.Gui.PropertyBag;
+using Core.Common.Util.Attributes;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.Integration.Forms.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of a collection of <see cref="FailureMechanismAssemblyCategory"/> for properties panel.
+    /// </summary>
+    public class AssemblyResultCategoriesProperties : ObjectProperties<IEnumerable<FailureMechanismAssemblyCategory>>
+    {
+        private readonly AssessmentSection assessmentSection;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="AssemblyResultCategoriesProperties"/>.
+        /// </summary>
+        /// <param name="categories">The collection of categories.</param>
+        /// <param name="assessmentSection">The assessment section.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public AssemblyResultCategoriesProperties(IEnumerable<FailureMechanismAssemblyCategory> categories,
+                                                  AssessmentSection assessmentSection)
+        {
+            if (assessmentSection == null)
+            {
+                throw new ArgumentNullException(nameof(assessmentSection));
+            }
+
+            if (categories == null)
+            {
+                throw new ArgumentNullException(nameof(categories));
+            }
+
+            Data = categories;
+            this.assessmentSection = assessmentSection;
+        }
+
+        [PropertyOrder(1)]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.CategoryBoundariesGroupOneAndTwo_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.CategoryBoundariesGroupOneAndTwo_Description))]
+        [TypeConverter(typeof(ExpandableArrayConverter))]
+        public FailureMechanismAssemblyCategoryProperties[] AssemblyCategories
+        {
+            get
+            {
+                return data.Select(category => new FailureMechanismAssemblyCategoryProperties(category)).ToArray();
+            }
+        }
+
+        [PropertyOrder(2)]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureProbabilityMarginFactor_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.FailureProbabilityMarginFactor_Description))]
+        public RoundedDouble FailureProbabilityMarginFactor
+        {
+            get
+            {
+                return assessmentSection.FailureProbabilityMarginFactor;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r9b6a3927ea0f32fa59ee5648cd4abede807cb65a -rc94701528c392fbac4fbf2bb2e2c0641735318fa
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 9b6a3927ea0f32fa59ee5648cd4abede807cb65a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision c94701528c392fbac4fbf2bb2e2c0641735318fa)
@@ -63,6 +63,7 @@
     <Compile Include="PresentationObjects\StandAlone\GrassCoverSlipOffInwardsFailureMechanismContext.cs" />
     <Compile Include="PresentationObjects\StandAlone\MacroStabilityOutwardsFailureMechanismContext.cs" />
     <Compile Include="PresentationObjects\StandAlone\PipingStructureFailureMechanismContext.cs" />
+    <Compile Include="PropertyClasses\AssemblyResultCategoriesProperties.cs" />
     <Compile Include="PropertyClasses\BackgroundDataProperties.cs" />
     <Compile Include="PropertyClasses\CalculationContextProperties.cs" />
     <Compile Include="PropertyClasses\CalculationGroupContextProperties.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssemblyResultCategoriesPropertiesTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssemblyResultCategoriesPropertiesTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssemblyResultCategoriesPropertiesTest.cs	(revision c94701528c392fbac4fbf2bb2e2c0641735318fa)
@@ -0,0 +1,126 @@
+// Copyright (C) Stichting Deltares 2017. 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.ComponentModel;
+using System.Linq;
+using Core.Common.Gui.Converters;
+using Core.Common.Gui.PropertyBag;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Forms.PropertyClasses;
+using Ringtoets.Integration.Forms.TestUtil;
+
+namespace Ringtoets.Integration.Forms.Test.PropertyClasses
+{
+    [TestFixture]
+    public class AssemblyResultCategoriesPropertiesTest
+    {
+        [Test]
+        public void Constructor_CategoriesNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new AssemblyResultCategoriesProperties(null, new AssessmentSection(AssessmentSectionComposition.Dike));
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("categories", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new AssemblyResultCategoriesProperties(Enumerable.Empty<FailureMechanismAssemblyCategory>(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("assessmentSection", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_ValidParameters_ExpectedValues()
+        {
+            // Setup
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
+            IEnumerable<FailureMechanismAssemblyCategory> expectedFailureMechanismCategories = GetFailureMechanismAssemblyCategories();
+
+            // Call
+            var properties = new AssemblyResultCategoriesProperties(expectedFailureMechanismCategories, assessmentSection);
+
+            // Assert
+            Assert.IsInstanceOf<ObjectProperties<IEnumerable<FailureMechanismAssemblyCategory>>>(properties);
+
+            TestHelper.AssertTypeConverter<AssemblyResultCategoriesProperties, ExpandableArrayConverter>(
+                nameof(AssemblyResultCategoriesProperties.AssemblyCategories));
+
+            Assert.AreSame(expectedFailureMechanismCategories, properties.Data);
+            Assert.AreEqual(assessmentSection.FailureProbabilityMarginFactor, properties.FailureProbabilityMarginFactor);
+            AssemblyCategoryPropertiesTestHelper.AssertFailureMechanismAssemblyCategoryProperties(
+                expectedFailureMechanismCategories,
+                properties);
+        }
+
+        [Test]
+        public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
+        {
+            // Call
+            var properties = new AssemblyResultCategoriesProperties(GetFailureMechanismAssemblyCategories(),
+                                                                    new AssessmentSection(AssessmentSectionComposition.Dike));
+
+            // Assert
+            PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
+            Assert.AreEqual(2, dynamicProperties.Count);
+
+            const string generalCategoryName = "Algemeen";
+
+            PropertyDescriptor categoriesProperty = dynamicProperties[0];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(categoriesProperty,
+                                                                            generalCategoryName,
+                                                                            "Categoriegrenzen groep 1 en 2",
+                                                                            "De categoriegrenzen voor de gecombineerde toetssporen in groep 1 en 2.",
+                                                                            true);
+
+            PropertyDescriptor failureMechanismSectionCategoriesProperty = dynamicProperties[1];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(failureMechanismSectionCategoriesProperty,
+                                                                            generalCategoryName,
+                                                                            "Gecombineerde faalkansruimte",
+                                                                            "De gecombineerde faalkansruimte voor de toetssporen in groep 1 en 2.",
+                                                                            true);
+        }
+
+        private static IEnumerable<FailureMechanismAssemblyCategory> GetFailureMechanismAssemblyCategories()
+        {
+            var random = new Random(21);
+
+            return new[]
+            {
+                new FailureMechanismAssemblyCategory(random.NextDouble(),
+                                                     random.NextDouble(),
+                                                     random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>())
+            };
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesPropertiesTest.cs
===================================================================
diff -u -r997fbe209a64d3b50a11c0902aafdb7f48762aff -rc94701528c392fbac4fbf2bb2e2c0641735318fa
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesPropertiesTest.cs	(.../FailureMechanismAssemblyCategoriesPropertiesTest.cs)	(revision 997fbe209a64d3b50a11c0902aafdb7f48762aff)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesPropertiesTest.cs	(.../FailureMechanismAssemblyCategoriesPropertiesTest.cs)	(revision c94701528c392fbac4fbf2bb2e2c0641735318fa)
@@ -65,7 +65,7 @@
             TestHelper.AssertTypeConverter<FailureMechanismAssemblyCategoriesProperties, ExpandableArrayConverter>(
                 nameof(FailureMechanismAssemblyCategoriesProperties.FailureMechanismSectionAssemblyCategories));
 
-            AssemblyCategoryPropertiesTestHelper.AssertFailureMechanismAssemblyCategoryProperties(
+            AssemblyCategoryPropertiesTestHelper.AssertFailureMechanismAndFailureMechanismSectionAssemblyCategoryProperties(
                 expectedFailureMechanismCategories,
                 expectedFailureMechanismSectionCategories,
                 properties);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r9b6a3927ea0f32fa59ee5648cd4abede807cb65a -rc94701528c392fbac4fbf2bb2e2c0641735318fa
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 9b6a3927ea0f32fa59ee5648cd4abede807cb65a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision c94701528c392fbac4fbf2bb2e2c0641735318fa)
@@ -62,6 +62,7 @@
     <Compile Include="PresentationObjects\StandAlone\WaterPressureAsphaltCoverFailureMechanismContextTest.cs" />
     <Compile Include="PresentationObjects\StandAlone\PipingStructureFailureMechanismContextTest.cs" />
     <Compile Include="PresentationObjects\StandAlone\MacroStabilityOutwardsFailureMechanismContextTest.cs" />
+    <Compile Include="PropertyClasses\AssemblyResultCategoriesPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoriesPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoryPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionAssemblyCategoriesPropertiesTest.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.TestUtil/AssemblyCategoryPropertiesTestHelper.cs
===================================================================
diff -u -r997fbe209a64d3b50a11c0902aafdb7f48762aff -rc94701528c392fbac4fbf2bb2e2c0641735318fa
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.TestUtil/AssemblyCategoryPropertiesTestHelper.cs	(.../AssemblyCategoryPropertiesTestHelper.cs)	(revision 997fbe209a64d3b50a11c0902aafdb7f48762aff)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.TestUtil/AssemblyCategoryPropertiesTestHelper.cs	(.../AssemblyCategoryPropertiesTestHelper.cs)	(revision c94701528c392fbac4fbf2bb2e2c0641735318fa)
@@ -41,7 +41,7 @@
         /// <param name="properties">The actual <see cref="FailureMechanismAssemblyCategoriesProperties"/> to assert.</param>
         /// <exception cref="AssertionException">Thrown when the content of <paramref name="properties"/> does not equal
         /// <paramref name="expectedFailureMechanismCategories"/> and <paramref name="expectedFailureMechanismSectionCategories"/>.</exception>
-        public static void AssertFailureMechanismAssemblyCategoryProperties(
+        public static void AssertFailureMechanismAndFailureMechanismSectionAssemblyCategoryProperties(
             IEnumerable<FailureMechanismAssemblyCategory> expectedFailureMechanismCategories,
             IEnumerable<FailureMechanismSectionAssemblyCategory> expectedFailureMechanismSectionCategories,
             FailureMechanismAssemblyCategoriesProperties properties)
@@ -61,6 +61,29 @@
 
         /// <summary>
         /// Asserts whether the content of <paramref name="properties"/> equals the given
+        /// <paramref name="expectedFailureMechanismCategories"/> and <paramref name="expectedFailureMechanismSectionCategories"/>.
+        /// </summary>
+        /// <param name="expectedFailureMechanismCategories">The collection of expected <see cref="FailureMechanismAssemblyCategory"/>.</param>
+        /// <param name="properties">The actual <see cref="AssemblyResultCategoriesProperties"/> to assert.</param>
+        /// <exception cref="AssertionException">Thrown when the content of <paramref name="properties"/> does not equal
+        /// <paramref name="expectedFailureMechanismCategories"/>.</exception>
+        public static void AssertFailureMechanismAssemblyCategoryProperties(
+            IEnumerable<FailureMechanismAssemblyCategory> expectedFailureMechanismCategories,
+            AssemblyResultCategoriesProperties properties)
+        {
+            Assert.AreEqual(expectedFailureMechanismCategories.Count(), properties.AssemblyCategories.Length);
+            for (var i = 0; i < expectedFailureMechanismCategories.Count(); i++)
+            {
+                FailureMechanismAssemblyCategory category = expectedFailureMechanismCategories.ElementAt(i);
+                FailureMechanismAssemblyCategoryProperties property = properties.AssemblyCategories[i];
+                Assert.AreEqual(category.Group, property.Group);
+                Assert.AreEqual(category.UpperBoundary, property.UpperBoundary);
+                Assert.AreEqual(category.LowerBoundary, property.LowerBoundary);
+            }
+        }
+
+        /// <summary>
+        /// Asserts whether the content of <paramref name="properties"/> equals the given
         /// <paramref name="expectedFailureMechanismSectionCategories"/>.
         /// </summary>
         /// <param name="expectedFailureMechanismSectionCategories">The collection of expected <see cref="FailureMechanismSectionAssemblyCategory"/>.</param>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismAssemblyCategoriesContextPropertyInfoTest.cs
===================================================================
diff -u -rab9e6a1f47225304b418f5fce8a3c321e7439886 -rc94701528c392fbac4fbf2bb2e2c0641735318fa
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismAssemblyCategoriesContextPropertyInfoTest.cs	(.../FailureMechanismAssemblyCategoriesContextPropertyInfoTest.cs)	(revision ab9e6a1f47225304b418f5fce8a3c321e7439886)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismAssemblyCategoriesContextPropertyInfoTest.cs	(.../FailureMechanismAssemblyCategoriesContextPropertyInfoTest.cs)	(revision c94701528c392fbac4fbf2bb2e2c0641735318fa)
@@ -19,15 +19,11 @@
 // 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.Gui.Plugin;
 using Core.Common.Gui.PropertyBag;
-using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.AssemblyTool.Data;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
@@ -90,7 +86,7 @@
                 Assert.IsInstanceOf<FailureMechanismAssemblyCategoriesProperties>(objectProperties);
 
                 var properties = (FailureMechanismAssemblyCategoriesProperties) objectProperties;
-                AssemblyCategoryPropertiesTestHelper.AssertFailureMechanismAssemblyCategoryProperties(
+                AssemblyCategoryPropertiesTestHelper.AssertFailureMechanismAndFailureMechanismSectionAssemblyCategoryProperties(
                     calculator.FailureMechanismCategoriesOutput,
                     context.GetFailureMechanismSectionAssemblyCategoriesFunc(),
                     properties);