Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs
===================================================================
diff -u -reefc89546a801a4083259094a763fe7fd93b6c47 -r7342ccce69e53838422f3fd9e96029d674ceacb4
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs	(.../FeatureBasedMapDataConverterTest.cs)	(revision eefc89546a801a4083259094a763fe7fd93b6c47)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs	(.../FeatureBasedMapDataConverterTest.cs)	(revision 7342ccce69e53838422f3fd9e96029d674ceacb4)
@@ -30,7 +30,6 @@
 using Core.Components.DotSpatial.TestUtil;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Geometries;
-using Core.Components.Gis.TestUtil.Theme;
 using Core.Components.Gis.Theme;
 using DotSpatial.Controls;
 using DotSpatial.Data;
Index: Core/Components/test/Core.Components.Gis.Test/Theme/MapThemeTest.cs
===================================================================
diff -u -r0eefe4fd03e9a34a58295a2f94705597189df4cd -r7342ccce69e53838422f3fd9e96029d674ceacb4
--- Core/Components/test/Core.Components.Gis.Test/Theme/MapThemeTest.cs	(.../MapThemeTest.cs)	(revision 0eefe4fd03e9a34a58295a2f94705597189df4cd)
+++ Core/Components/test/Core.Components.Gis.Test/Theme/MapThemeTest.cs	(.../MapThemeTest.cs)	(revision 7342ccce69e53838422f3fd9e96029d674ceacb4)
@@ -23,7 +23,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.TestUtil;
-using Core.Components.Gis.TestUtil.Theme;
+using Core.Components.Gis.TestUtil;
 using Core.Components.Gis.Theme;
 using NUnit.Framework;
 
Index: Core/Components/test/Core.Components.Gis.TestUtil.Test/CategoryThemeTestFactoryTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.TestUtil.Test/CategoryThemeTestFactoryTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.TestUtil.Test/CategoryThemeTestFactoryTest.cs	(revision 7342ccce69e53838422f3fd9e96029d674ceacb4)
@@ -0,0 +1,41 @@
+// 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 Lesser 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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.Drawing;
+using NUnit.Framework;
+
+namespace Core.Components.Gis.TestUtil.Test
+{
+    [TestFixture]
+    public class CategoryThemeTestFactoryTest
+    {
+        [Test]
+        public void CreateDefaultCategoryTheme_ReturnsCategoryTheme()
+        {
+            // Call
+            var theme = CategoryThemeTestFactory.CreateCategoryTheme();
+
+            // Assert
+            Assert.AreEqual(Color.Aqua, theme.Color);
+            Assert.IsNotNull(theme.Criteria);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.TestUtil.Test/Core.Components.Gis.TestUtil.Test.csproj
===================================================================
diff -u -reefc89546a801a4083259094a763fe7fd93b6c47 -r7342ccce69e53838422f3fd9e96029d674ceacb4
--- Core/Components/test/Core.Components.Gis.TestUtil.Test/Core.Components.Gis.TestUtil.Test.csproj	(.../Core.Components.Gis.TestUtil.Test.csproj)	(revision eefc89546a801a4083259094a763fe7fd93b6c47)
+++ Core/Components/test/Core.Components.Gis.TestUtil.Test/Core.Components.Gis.TestUtil.Test.csproj	(.../Core.Components.Gis.TestUtil.Test.csproj)	(revision 7342ccce69e53838422f3fd9e96029d674ceacb4)
@@ -16,7 +16,7 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Theme\CategoryThemeTestFactoryTest.cs" />
+    <Compile Include="CategoryThemeTestFactoryTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestImageBasedMapDataTest.cs" />
     <Compile Include="WmtsMapDataTestHelperTest.cs" />
Fisheye: Tag 7342ccce69e53838422f3fd9e96029d674ceacb4 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.TestUtil.Test/Theme/CategoryThemeTestFactoryTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/test/Core.Components.Gis.TestUtil/CategoryThemeTestFactory.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.TestUtil/CategoryThemeTestFactory.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.TestUtil/CategoryThemeTestFactory.cs	(revision 7342ccce69e53838422f3fd9e96029d674ceacb4)
@@ -0,0 +1,46 @@
+// 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 Lesser 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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.Drawing;
+using Core.Common.TestUtil;
+using Core.Components.Gis.Theme;
+
+namespace Core.Components.Gis.TestUtil
+{
+    /// <summary>
+    /// Creates valid instances of <see cref="CategoryTheme"/> which can be used for testing.
+    /// </summary>
+    public static class CategoryThemeTestFactory
+    {
+        /// <summary>
+        /// Creates a fully configured <see cref="CategoryTheme"/>
+        /// </summary>
+        /// <returns>A fully configured <see cref="CategoryTheme"/>.</returns>
+        public static CategoryTheme CreateCategoryTheme()
+        {
+            var random = new Random(21);
+            return new CategoryTheme(Color.Aqua,
+                                     new ValueCriteria(random.NextEnumValue<ValueCriteriaOperator>(),
+                                                       random.NextDouble()));
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.TestUtil/Core.Components.Gis.TestUtil.csproj
===================================================================
diff -u -reefc89546a801a4083259094a763fe7fd93b6c47 -r7342ccce69e53838422f3fd9e96029d674ceacb4
--- Core/Components/test/Core.Components.Gis.TestUtil/Core.Components.Gis.TestUtil.csproj	(.../Core.Components.Gis.TestUtil.csproj)	(revision eefc89546a801a4083259094a763fe7fd93b6c47)
+++ Core/Components/test/Core.Components.Gis.TestUtil/Core.Components.Gis.TestUtil.csproj	(.../Core.Components.Gis.TestUtil.csproj)	(revision 7342ccce69e53838422f3fd9e96029d674ceacb4)
@@ -12,7 +12,7 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Theme\CategoryThemeTestFactory.cs" />
+    <Compile Include="CategoryThemeTestFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestImageBasedMapData.cs" />
     <Compile Include="WmtsMapDataTestHelper.cs" />
Fisheye: Tag 7342ccce69e53838422f3fd9e96029d674ceacb4 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.TestUtil/Theme/CategoryThemeTestFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?