Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelWrapperFactory.cs
===================================================================
diff -u -rbc85d5aa0b1c0eefd837eb1f12b392305ab7a45e -r2edcd7944ce0d87b3299baa2887ab67a3cfe15e3
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelWrapperFactory.cs	(.../AssemblyToolKernelWrapperFactory.cs)	(revision bc85d5aa0b1c0eefd837eb1f12b392305ab7a45e)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelWrapperFactory.cs	(.../AssemblyToolKernelWrapperFactory.cs)	(revision 2edcd7944ce0d87b3299baa2887ab67a3cfe15e3)
@@ -37,7 +37,7 @@
         {
             get
             {
-                return instance ?? new AssemblyToolKernelWrapperFactory();
+                return instance ?? (instance = new AssemblyToolKernelWrapperFactory());
             }
             set
             {
@@ -47,7 +47,7 @@
 
         public IAssemblyCategoryBoundariesKernel CreateAssemblyCategoryBoundariesKernel()
         {
-            throw new NotImplementedException();
+            return new AssemblyCategoryBoundariesKernelWrapper();
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelWrapperFactoryTest.cs
===================================================================
diff -u -rac3bbab8cdfee2bee4faeea59a40240e79c20d33 -r2edcd7944ce0d87b3299baa2887ab67a3cfe15e3
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelWrapperFactoryTest.cs	(.../AssemblyToolKernelWrapperFactoryTest.cs)	(revision ac3bbab8cdfee2bee4faeea59a40240e79c20d33)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelWrapperFactoryTest.cs	(.../AssemblyToolKernelWrapperFactoryTest.cs)	(revision 2edcd7944ce0d87b3299baa2887ab67a3cfe15e3)
@@ -21,6 +21,7 @@
 
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.AssemblyTool.KernelWrapper.Kernels.CategoryBoundaries;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels;
 
 namespace Ringtoets.AssemblyTool.KernelWrapper.Test.Kernels
@@ -65,5 +66,18 @@
             // Assert
             Assert.AreSame(firstFactory, secondFactory);
         }
+
+        [Test]
+        public void CreateAssemblyCategoryBoundariesKernel_Always_ReturnsAssemblyCategoryBoundariesKernelWrapper()
+        {
+            // Setup
+            IAssemblyToolKernelFactory factory = AssemblyToolKernelWrapperFactory.Instance;
+
+            // Call
+            IAssemblyCategoryBoundariesKernel assemblyCategoryBoundariesKernel = factory.CreateAssemblyCategoryBoundariesKernel();
+
+            // Assert
+            Assert.IsInstanceOf<AssemblyCategoryBoundariesKernelWrapper>(assemblyCategoryBoundariesKernel);
+        }
     }
 }
\ No newline at end of file