Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismAssemblyCategoriesProperties.cs
===================================================================
diff -u -rd520a1dd8a435c8de3ae5aab1c02b4be9627b67d -r09972250b5028e3fc06f492be60be48234b6e0e8
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismAssemblyCategoriesProperties.cs	(.../FailureMechanismAssemblyCategoriesProperties.cs)	(revision d520a1dd8a435c8de3ae5aab1c02b4be9627b67d)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismAssemblyCategoriesProperties.cs	(.../FailureMechanismAssemblyCategoriesProperties.cs)	(revision 09972250b5028e3fc06f492be60be48234b6e0e8)
@@ -28,51 +28,41 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
 using Ringtoets.AssemblyTool.Data;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.Properties;
 
 namespace Ringtoets.Common.Forms.PropertyClasses
 {
     /// <summary>
-    /// Base ViewModel of the assembly categories in a <see cref="IFailureMechanism"/> for properties panel.
+    /// ViewModel of a collection of <see cref="FailureMechanismAssemblyCategory"/> for properties panel.
     /// </summary>
-    public class FailureMechanismAssemblyCategoriesProperties : ObjectProperties<IFailureMechanism>
+    public class FailureMechanismAssemblyCategoriesProperties : ObjectProperties<IEnumerable<FailureMechanismAssemblyCategory>>
     {
         private const int failureMechanismAssemblyCategoryPropertyIndex = 1;
         private const int failureMechanismSectionAssemblyCategoryPropertyIndex = 2;
-        private readonly Func<IEnumerable<FailureMechanismAssemblyCategory>> getFailureMechanismAssemblyCategoryFunc;
-        private readonly Func<IEnumerable<FailureMechanismSectionAssemblyCategory>> getFailureMechanismSectionAssemblyCategoryFunc;
+        private readonly IEnumerable<FailureMechanismSectionAssemblyCategory> failureMechanismSectionAssemblyCategories;
 
         /// <summary>
         /// Creates a new instance of <see cref="FailureMechanismAssemblyCategoriesProperties"/>.
         /// </summary>
-        /// <param name="failureMechanism">The failure mechanism to show the properties for.</param>
-        /// <param name="getFailureMechanismAssemblyCategoryFunc">The function to get a collection of <see cref="FailureMechanismAssemblyCategory"/>.</param>
-        /// <param name="getFailureMechanismSectionAssemblyCategoryFunc">The function to get a collection of <see cref="FailureMechanismSectionAssemblyCategory"/>.</param>
+        /// <param name="failureMechanismAssemblyCategories">The collection of <see cref="FailureMechanismAssemblyCategory"/>.</param>
+        /// <param name="failureMechanismSectionAssemblyCategories">The collection of <see cref="FailureMechanismSectionAssemblyCategory"/>.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public FailureMechanismAssemblyCategoriesProperties(IFailureMechanism failureMechanism,
-                                                            Func<IEnumerable<FailureMechanismAssemblyCategory>> getFailureMechanismAssemblyCategoryFunc,
-                                                            Func<IEnumerable<FailureMechanismSectionAssemblyCategory>> getFailureMechanismSectionAssemblyCategoryFunc)
+        public FailureMechanismAssemblyCategoriesProperties(IEnumerable<FailureMechanismAssemblyCategory> failureMechanismAssemblyCategories,
+                                                            IEnumerable<FailureMechanismSectionAssemblyCategory> failureMechanismSectionAssemblyCategories)
         {
-            if (failureMechanism == null)
+            if (failureMechanismAssemblyCategories == null)
             {
-                throw new ArgumentNullException(nameof(failureMechanism));
+                throw new ArgumentNullException(nameof(failureMechanismAssemblyCategories));
             }
 
-            if (getFailureMechanismAssemblyCategoryFunc == null)
+            if (failureMechanismSectionAssemblyCategories == null)
             {
-                throw new ArgumentNullException(nameof(getFailureMechanismAssemblyCategoryFunc));
+                throw new ArgumentNullException(nameof(failureMechanismSectionAssemblyCategories));
             }
 
-            if (getFailureMechanismSectionAssemblyCategoryFunc == null)
-            {
-                throw new ArgumentNullException(nameof(getFailureMechanismSectionAssemblyCategoryFunc));
-            }
+            this.failureMechanismSectionAssemblyCategories = failureMechanismSectionAssemblyCategories;
 
-            this.getFailureMechanismAssemblyCategoryFunc = getFailureMechanismAssemblyCategoryFunc;
-            this.getFailureMechanismSectionAssemblyCategoryFunc = getFailureMechanismSectionAssemblyCategoryFunc;
-
-            Data = failureMechanism;
+            Data = failureMechanismAssemblyCategories;
         }
 
         [PropertyOrder(failureMechanismAssemblyCategoryPropertyIndex)]
@@ -84,7 +74,7 @@
         {
             get
             {
-                return getFailureMechanismAssemblyCategoryFunc().Select(category => new FailureMechanismAssemblyCategoryProperties(category)).ToArray();
+                return data.Select(category => new FailureMechanismAssemblyCategoryProperties(category)).ToArray();
             }
         }
 
@@ -97,7 +87,7 @@
         {
             get
             {
-                return getFailureMechanismSectionAssemblyCategoryFunc().Select(category => new FailureMechanismSectionAssemblyCategoryProperties(category)).ToArray();
+                return failureMechanismSectionAssemblyCategories.Select(category => new FailureMechanismSectionAssemblyCategoryProperties(category)).ToArray();
             }
         }
     }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesPropertiesTest.cs
===================================================================
diff -u -r8211929afdf8bbc97b32554493572972fc552c23 -r09972250b5028e3fc06f492be60be48234b6e0e8
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesPropertiesTest.cs	(.../FailureMechanismAssemblyCategoriesPropertiesTest.cs)	(revision 8211929afdf8bbc97b32554493572972fc552c23)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesPropertiesTest.cs	(.../FailureMechanismAssemblyCategoriesPropertiesTest.cs)	(revision 09972250b5028e3fc06f492be60be48234b6e0e8)
@@ -27,9 +27,7 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Ringtoets.AssemblyTool.Data;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.PropertyClasses;
 
 namespace Ringtoets.Common.Forms.Test.PropertyClasses
@@ -38,75 +36,43 @@
     public class FailureMechanismAssemblyCategoriesPropertiesTest
     {
         [Test]
-        public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
+        public void Constructor_GetFailureMechanismAssemblyCategoryFuncNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () => new FailureMechanismAssemblyCategoriesProperties(null,
-                                                                                       GetFailureMechanismAssemblyCategory,
-                                                                                       GetFailureMechanismSectionAssemblyCategory);
+                                                                                       GetFailureMechanismSectionAssemblyCategories());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("failureMechanism", exception.ParamName);
+            Assert.AreEqual("failureMechanismAssemblyCategories", exception.ParamName);
         }
 
         [Test]
-        public void Constructor_GetFailureMechanismAssemblyCategoryFuncNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IFailureMechanism>();
-            mocks.ReplayAll();
-
-            // Call
-            TestDelegate call = () => new FailureMechanismAssemblyCategoriesProperties(failureMechanism,
-                                                                                       null,
-                                                                                       GetFailureMechanismSectionAssemblyCategory);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("getFailureMechanismAssemblyCategoryFunc", exception.ParamName);
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void Constructor_GetFailureMechanismSectionAssemblyCategoryFuncNull_ThrowsArgumentNullException()
         {
-            // Setup
-            var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IFailureMechanism>();
-            mocks.ReplayAll();
-
             // Call
-            TestDelegate call = () => new FailureMechanismAssemblyCategoriesProperties(failureMechanism,
-                                                                                       GetFailureMechanismAssemblyCategory,
+            TestDelegate call = () => new FailureMechanismAssemblyCategoriesProperties(GetFailureMechanismAssemblyCategories(),
                                                                                        null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("getFailureMechanismSectionAssemblyCategoryFunc", exception.ParamName);
-            mocks.VerifyAll();
+            Assert.AreEqual("failureMechanismSectionAssemblyCategories", exception.ParamName);
         }
 
         [Test]
         public void Constructor_ValidParameters_ExpectedValues()
         {
             // Setup
-            var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IFailureMechanism>();
-            mocks.ReplayAll();
+            IEnumerable<FailureMechanismAssemblyCategory> expectedFailureMechanismCategories = GetFailureMechanismAssemblyCategories();
+            IEnumerable<FailureMechanismSectionAssemblyCategory> expectedFailureMechanismSectionCategories = GetFailureMechanismSectionAssemblyCategories();
 
-            IEnumerable<FailureMechanismAssemblyCategory> expectedFailureMechanismCategories = GetFailureMechanismAssemblyCategory();
-            IEnumerable<FailureMechanismSectionAssemblyCategory> expectedFailureMechanismSectionCategories = GetFailureMechanismSectionAssemblyCategory();
-
             // Call
-            var properties = new FailureMechanismAssemblyCategoriesProperties(failureMechanism,
-                                                                              () => expectedFailureMechanismCategories,
-                                                                              () => expectedFailureMechanismSectionCategories);
+            var properties = new FailureMechanismAssemblyCategoriesProperties(expectedFailureMechanismCategories,
+                                                                              expectedFailureMechanismSectionCategories);
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<IFailureMechanism>>(properties);
-            Assert.AreSame(failureMechanism, properties.Data);
+            Assert.IsInstanceOf<ObjectProperties<IEnumerable<FailureMechanismAssemblyCategory>>>(properties);
+            Assert.AreSame(expectedFailureMechanismCategories, properties.Data);
 
             TestHelper.AssertTypeConverter<FailureMechanismAssemblyCategoriesProperties, ExpandableArrayConverter>(
                 nameof(FailureMechanismAssemblyCategoriesProperties.FailureMechanismAssemblyCategories));
@@ -132,22 +98,14 @@
                 Assert.AreEqual(category.UpperBoundary, property.UpperBoundary);
                 Assert.AreEqual(category.LowerBoundary, property.LowerBoundary);
             }
-
-            mocks.VerifyAll();
         }
 
         [Test]
         public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
         {
-            // Setup
-            var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IFailureMechanism>();
-            mocks.ReplayAll();
-
             // Call
-            var properties = new FailureMechanismAssemblyCategoriesProperties(failureMechanism,
-                                                                              GetFailureMechanismAssemblyCategory,
-                                                                              GetFailureMechanismSectionAssemblyCategory);
+            var properties = new FailureMechanismAssemblyCategoriesProperties(GetFailureMechanismAssemblyCategories(),
+                                                                              GetFailureMechanismSectionAssemblyCategories());
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
             Assert.AreEqual(2, dynamicProperties.Count);
@@ -167,22 +125,30 @@
                                                                             "Categoriegrenzen per vak",
                                                                             "De categoriegrenzen per vak voor dit toetsspoor.",
                                                                             true);
-
-            mocks.VerifyAll();
         }
 
-        private static IEnumerable<FailureMechanismSectionAssemblyCategory> GetFailureMechanismSectionAssemblyCategory()
+        private static IEnumerable<FailureMechanismSectionAssemblyCategory> GetFailureMechanismSectionAssemblyCategories()
         {
             var random = new Random(21);
 
-            yield return new FailureMechanismSectionAssemblyCategory(random.NextDouble(), random.NextDouble(), random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
+            return new[]
+            {
+                new FailureMechanismSectionAssemblyCategory(random.NextDouble(),
+                                                            random.NextDouble(),
+                                                            random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>())
+            };
         }
 
-        private static IEnumerable<FailureMechanismAssemblyCategory> GetFailureMechanismAssemblyCategory()
+        private static IEnumerable<FailureMechanismAssemblyCategory> GetFailureMechanismAssemblyCategories()
         {
             var random = new Random(21);
 
-            yield return new FailureMechanismAssemblyCategory(random.NextDouble(), random.NextDouble(), random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>());
+            return new[]
+            {
+                new FailureMechanismAssemblyCategory(random.NextDouble(), 
+                                                     random.NextDouble(), 
+                                                     random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>())
+            };
         }
     }
 }
\ No newline at end of file