Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/AssemblyToolCalculatorFactory.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/AssemblyToolCalculatorFactory.cs	(revision 0)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/AssemblyToolCalculatorFactory.cs	(revision e46fd2b67241ff5a016d418c35c830ed69fc3b46)
@@ -0,0 +1,59 @@
+// 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 Ringtoets.AssemblyTool.Data.Input;
+using Ringtoets.AssemblyTool.KernelWrapper.Calculators.CategoryBoundaries;
+using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.Calculators
+{
+    /// <summary>
+    /// Factory which creates calculators for performing assembly tool calculations.
+    /// </summary>
+    public class AssemblyToolCalculatorFactory : IAssemblyToolCalculatorFactory
+    {
+        private static IAssemblyToolCalculatorFactory instance;
+
+        private AssemblyToolCalculatorFactory() {}
+
+        /// <summary>
+        /// Gets or sets an instance of <see cref="IAssemblyToolCalculatorFactory"/>.
+        /// </summary>
+        public static IAssemblyToolCalculatorFactory Instance
+        {
+            get
+            {
+                return instance ?? (instance = new AssemblyToolCalculatorFactory());
+            }
+            internal set
+            {
+                instance = value;
+            }
+        }
+
+        public IAssemblyCategoryBoundariesCalculator CreateAssemblyCategoryBoundariesCalculator(AssemblyCategoryBoundariesCalculatorInput input,
+                                                                                                IAssemblyToolKernelFactory factory)
+        {
+            return new AssemblyCategoryBoundariesCalculator(input, factory);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/CategoryBoundaries/AssemblyCategoryBoundariesCalculator.cs
===================================================================
diff -u -rf80f2e7df0e861f28e00eddc4a4ecaa4739e0951 -re46fd2b67241ff5a016d418c35c830ed69fc3b46
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/CategoryBoundaries/AssemblyCategoryBoundariesCalculator.cs	(.../AssemblyCategoryBoundariesCalculator.cs)	(revision f80f2e7df0e861f28e00eddc4a4ecaa4739e0951)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/CategoryBoundaries/AssemblyCategoryBoundariesCalculator.cs	(.../AssemblyCategoryBoundariesCalculator.cs)	(revision e46fd2b67241ff5a016d418c35c830ed69fc3b46)
@@ -39,6 +39,7 @@
         /// <param name="input">The <see cref="AssemblyCategoryBoundariesCalculatorInput"/> containing
         /// all the values required for performing the assembly category boundaries calculation.</param>
         /// <param name="factory">The factory responsible for creating the assembly category boundaries kernel.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public AssemblyCategoryBoundariesCalculator(AssemblyCategoryBoundariesCalculatorInput input, IAssemblyToolKernelFactory factory)
         {
             if (input == null)
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactory.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactory.cs	(revision 0)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactory.cs	(revision e46fd2b67241ff5a016d418c35c830ed69fc3b46)
@@ -0,0 +1,45 @@
+// 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 Ringtoets.AssemblyTool.Data.Input;
+using Ringtoets.AssemblyTool.KernelWrapper.Calculators.CategoryBoundaries;
+using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.Calculators
+{
+    /// <summary>
+    /// Interface for a factory which creates calculators for performing assembly tool calculations.
+    /// </summary>
+    public interface IAssemblyToolCalculatorFactory
+    {
+        /// <summary>
+        /// Creates an assembly category boundaries calculator.
+        /// </summary>
+        /// <param name="input">The <see cref="AssemblyCategoryBoundariesCalculatorInput"/> containing
+        /// all the values required for performing the assembly category boundaries calculation.</param>
+        /// <param name="factory">The factory responsible for creating the assembly category boundaries kernel.</param>
+        /// <returns>The assembly category boundaries calculator.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        IAssemblyCategoryBoundariesCalculator CreateAssemblyCategoryBoundariesCalculator(AssemblyCategoryBoundariesCalculatorInput input,
+                                                                                         IAssemblyToolKernelFactory factory);
+    }
+}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Ringtoets.AssemblyTool.KernelWrapper.csproj
===================================================================
diff -u -rf80f2e7df0e861f28e00eddc4a4ecaa4739e0951 -re46fd2b67241ff5a016d418c35c830ed69fc3b46
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Ringtoets.AssemblyTool.KernelWrapper.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.csproj)	(revision f80f2e7df0e861f28e00eddc4a4ecaa4739e0951)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Ringtoets.AssemblyTool.KernelWrapper.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.csproj)	(revision e46fd2b67241ff5a016d418c35c830ed69fc3b46)
@@ -11,8 +11,10 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Calculators\AssemblyToolCalculatorFactory.cs" />
     <Compile Include="Calculators\CategoryBoundaries\AssemblyCategoryBoundariesCalculator.cs" />
     <Compile Include="Calculators\CategoryBoundaries\IAssemblyCategoryBoundariesCalculator.cs" />
+    <Compile Include="Calculators\IAssemblyToolCalculatorFactory.cs" />
     <Compile Include="Kernels\AssemblyToolKernelWrapperFactory.cs" />
     <Compile Include="Kernels\CategoryBoundaries\AssemblyCategoryBoundariesKernelWrapper.cs" />
     <Compile Include="Kernels\CategoryBoundaries\IAssemblyCategoryBoundariesKernel.cs" />
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryTest.cs	(revision 0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryTest.cs	(revision e46fd2b67241ff5a016d418c35c830ed69fc3b46)
@@ -0,0 +1,87 @@
+// 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 NUnit.Framework;
+using Ringtoets.AssemblyTool.Data.Input;
+using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
+using Ringtoets.AssemblyTool.KernelWrapper.Calculators.CategoryBoundaries;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.Test.Calculators
+{
+    [TestFixture]
+    public class AssemblyToolCalculatorFactoryTest
+    {
+        [Test]
+        public void Instance_Always_ReturnsAnInstance()
+        {
+            // Call
+            IAssemblyToolCalculatorFactory factory = AssemblyToolCalculatorFactory.Instance;
+
+            // Assert
+            Assert.IsInstanceOf<AssemblyToolCalculatorFactory>(factory);
+        }
+
+        [Test]
+        public void Instance_WhenSetToNull_ReturnsNewInstance()
+        {
+            // Setup
+            IAssemblyToolCalculatorFactory firstFactory = AssemblyToolCalculatorFactory.Instance;
+            AssemblyToolCalculatorFactory.Instance = null;
+
+            // Call
+            IAssemblyToolCalculatorFactory secondFactory = AssemblyToolCalculatorFactory.Instance;
+
+            // Assert
+            Assert.AreNotSame(firstFactory, secondFactory);
+        }
+
+        [Test]
+        public void Instance_WhenSetToInstance_ReturnsThatInstance()
+        {
+            // Setup
+            var firstFactory = new TestAssemblyToolCalculatorFactory();
+            AssemblyToolCalculatorFactory.Instance = firstFactory;
+
+            // Call
+            IAssemblyToolCalculatorFactory secondFactory = AssemblyToolCalculatorFactory.Instance;
+
+            // Assert
+            Assert.AreSame(firstFactory, secondFactory);
+        }
+
+        [Test]
+        public void CreateAssemblyCategoryBoundariesCalculator_WithCalculatorInput_ReturnsAssemblyCategoryBoundariesCalculator()
+        {
+            // Setup
+            IAssemblyToolCalculatorFactory factory = AssemblyToolCalculatorFactory.Instance;
+
+            // Call
+            IAssemblyCategoryBoundariesCalculator calculator = factory.CreateAssemblyCategoryBoundariesCalculator(
+                new AssemblyCategoryBoundariesCalculatorInput(0, 0),
+                new TestAssemblyToolKernelFactory());
+
+            // Assert
+            Assert.IsInstanceOf<AssemblyCategoryBoundariesCalculator>(calculator);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj
===================================================================
diff -u -rf80f2e7df0e861f28e00eddc4a4ecaa4739e0951 -re46fd2b67241ff5a016d418c35c830ed69fc3b46
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.Test.csproj)	(revision f80f2e7df0e861f28e00eddc4a4ecaa4739e0951)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.Test.csproj)	(revision e46fd2b67241ff5a016d418c35c830ed69fc3b46)
@@ -17,6 +17,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Calculators\AssemblyToolCalculatorFactoryTest.cs" />
     <Compile Include="Calculators\CategoryBoundaries\AssemblyCategoryBoundariesCalculatorTest.cs" />
     <Compile Include="Kernels\AssemblyToolKernelWrapperFactoryTest.cs" />
     <Compile Include="Kernels\CategoryBoundaries\AssemblyCategoryBoundariesKernelWrapperTest.cs" />
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/CategoryBoundaries/AssemblyCategoryBoundariesCalculatorStubTest.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/CategoryBoundaries/AssemblyCategoryBoundariesCalculatorStubTest.cs	(revision 0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/CategoryBoundaries/AssemblyCategoryBoundariesCalculatorStubTest.cs	(revision e46fd2b67241ff5a016d418c35c830ed69fc3b46)
@@ -0,0 +1,42 @@
+// 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 NUnit.Framework;
+using Ringtoets.AssemblyTool.KernelWrapper.Calculators.CategoryBoundaries;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.CategoryBoundaries;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators.CategoryBoundaries
+{
+    [TestFixture]
+    public class AssemblyCategoryBoundariesCalculatorStubTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var calculator = new AssemblyCategoryBoundariesCalculatorStub();
+
+            // Assert
+            Assert.IsInstanceOf<IAssemblyCategoryBoundariesCalculator>(calculator);
+            Assert.IsNull(calculator.Input);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/TestAssemblyToolCalculatorFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/TestAssemblyToolCalculatorFactoryTest.cs	(revision 0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/TestAssemblyToolCalculatorFactoryTest.cs	(revision e46fd2b67241ff5a016d418c35c830ed69fc3b46)
@@ -0,0 +1,62 @@
+// 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 NUnit.Framework;
+using Ringtoets.AssemblyTool.Data.Input;
+using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.CategoryBoundaries;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators
+{
+    [TestFixture]
+    public class TestAssemblyToolCalculatorFactoryTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var factory = new TestAssemblyToolCalculatorFactory();
+
+            // Assert
+            Assert.IsInstanceOf<IAssemblyToolCalculatorFactory>(factory);
+            Assert.IsNotNull(factory.LastCreatedAssemblyCategoryBoundariesCalculator);
+            Assert.IsNull(factory.LastCreatedAssemblyCategoryBoundariesCalculator.Input);
+        }
+
+        [Test]
+        public void CreateAssemblyCategoryBoundariesCalculator_Always_ReturnStubWithInputSet()
+        {
+            // Setup
+            var factory = new TestAssemblyToolCalculatorFactory();
+            var input = new AssemblyCategoryBoundariesCalculatorInput(0, 0);
+
+            // Call
+            var calculator = (AssemblyCategoryBoundariesCalculatorStub) factory.CreateAssemblyCategoryBoundariesCalculator(
+                input,
+                new TestAssemblyToolKernelFactory());
+
+            // Assert
+            Assert.AreSame(input, calculator.Input);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj
===================================================================
diff -u -rac3bbab8cdfee2bee4faeea59a40240e79c20d33 -re46fd2b67241ff5a016d418c35c830ed69fc3b46
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj)	(revision ac3bbab8cdfee2bee4faeea59a40240e79c20d33)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj)	(revision e46fd2b67241ff5a016d418c35c830ed69fc3b46)
@@ -14,6 +14,8 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Calculators\CategoryBoundaries\AssemblyCategoryBoundariesCalculatorStubTest.cs" />
+    <Compile Include="Calculators\TestAssemblyToolCalculatorFactoryTest.cs" />
     <Compile Include="Kernels\CategoryBoundaries\AssemblyCategoryBoundariesKernelStubTest.cs" />
     <Compile Include="Kernels\TestAssemblyToolKernelFactoryTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -25,6 +27,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Ringtoets.AssemblyTool.Data\Ringtoets.AssemblyTool.Data.csproj">
+      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
+      <Name>Ringtoets.AssemblyTool.Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.AssemblyTool.KernelWrapper\Ringtoets.AssemblyTool.KernelWrapper.csproj">
       <Project>{358B6DA2-A1DF-477F-B6AC-C30204265CB0}</Project>
       <Name>Ringtoets.AssemblyTool.KernelWrapper</Name>
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/CategoryBoundaries/AssemblyCategoryBoundariesCalculatorStub.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/CategoryBoundaries/AssemblyCategoryBoundariesCalculatorStub.cs	(revision 0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/CategoryBoundaries/AssemblyCategoryBoundariesCalculatorStub.cs	(revision e46fd2b67241ff5a016d418c35c830ed69fc3b46)
@@ -0,0 +1,37 @@
+// 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 Ringtoets.AssemblyTool.Data.Input;
+using Ringtoets.AssemblyTool.KernelWrapper.Calculators.CategoryBoundaries;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.CategoryBoundaries
+{
+    /// <summary>
+    /// Assembly category boundaries calculator stub for testing purposes.
+    /// </summary>
+    public class AssemblyCategoryBoundariesCalculatorStub : IAssemblyCategoryBoundariesCalculator
+    {
+        /// <summary>
+        /// Gets or sets the assembly category boundaries calculator input.
+        /// </summary>
+        public AssemblyCategoryBoundariesCalculatorInput Input { get; set; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactory.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactory.cs	(revision 0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactory.cs	(revision e46fd2b67241ff5a016d418c35c830ed69fc3b46)
@@ -0,0 +1,56 @@
+// 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 Ringtoets.AssemblyTool.Data.Input;
+using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
+using Ringtoets.AssemblyTool.KernelWrapper.Calculators.CategoryBoundaries;
+using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.CategoryBoundaries;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators
+{
+    /// <summary>
+    /// Factory which creates assembly tool calculator stubs for testing purposes.
+    /// </summary>
+    public class TestAssemblyToolCalculatorFactory : IAssemblyToolCalculatorFactory
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="TestAssemblyToolCalculatorFactory"/>.
+        /// </summary>
+        public TestAssemblyToolCalculatorFactory()
+        {
+            LastCreatedAssemblyCategoryBoundariesCalculator = new AssemblyCategoryBoundariesCalculatorStub();
+        }
+
+        /// <summary>
+        /// Gets the last created <see cref="AssemblyCategoryBoundariesCalculatorStub"/>.
+        /// </summary>
+        public AssemblyCategoryBoundariesCalculatorStub LastCreatedAssemblyCategoryBoundariesCalculator { get; }
+
+        public IAssemblyCategoryBoundariesCalculator CreateAssemblyCategoryBoundariesCalculator(AssemblyCategoryBoundariesCalculatorInput input,
+                                                                                                IAssemblyToolKernelFactory factory)
+        {
+            LastCreatedAssemblyCategoryBoundariesCalculator.Input = input;
+
+            return LastCreatedAssemblyCategoryBoundariesCalculator;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj
===================================================================
diff -u -rac3bbab8cdfee2bee4faeea59a40240e79c20d33 -re46fd2b67241ff5a016d418c35c830ed69fc3b46
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj)	(revision ac3bbab8cdfee2bee4faeea59a40240e79c20d33)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj)	(revision e46fd2b67241ff5a016d418c35c830ed69fc3b46)
@@ -11,6 +11,8 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Calculators\CategoryBoundaries\AssemblyCategoryBoundariesCalculatorStub.cs" />
+    <Compile Include="Calculators\TestAssemblyToolCalculatorFactory.cs" />
     <Compile Include="Kernels\CategoryBoundaries\AssemblyCategoryBoundariesKernelStub.cs" />
     <Compile Include="Kernels\TestAssemblyToolKernelFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -21,6 +23,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Ringtoets.AssemblyTool.Data\Ringtoets.AssemblyTool.Data.csproj">
+      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
+      <Name>Ringtoets.AssemblyTool.Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.AssemblyTool.KernelWrapper\Ringtoets.AssemblyTool.KernelWrapper.csproj">
       <Project>{358B6DA2-A1DF-477F-B6AC-C30204265CB0}</Project>
       <Name>Ringtoets.AssemblyTool.KernelWrapper</Name>