Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs
===================================================================
diff -u -r3beb793b4db2bc773a4ae68783902c359db1e6bb -r4b5d80639ec5b56ed227ef2b467e42edc191ca91
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs	(.../AssemblyCategoryCreatorTest.cs)	(revision 3beb793b4db2bc773a4ae68783902c359db1e6bb)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs	(.../AssemblyCategoryCreatorTest.cs)	(revision 4b5d80639ec5b56ed227ef2b467e42edc191ca91)
@@ -37,21 +37,6 @@
     [TestFixture]
     public class AssemblyCategoryCreatorTest
     {
-        private static IEnumerable<TestCaseData> GetAssessmentSectionAssemblyCategoryGroupConversions
-        {
-            get
-            {
-                yield return new TestCaseData(EAssessmentGrade.APlus, AssessmentSectionAssemblyCategoryGroup.APlus);
-                yield return new TestCaseData(EAssessmentGrade.A, AssessmentSectionAssemblyCategoryGroup.A);
-                yield return new TestCaseData(EAssessmentGrade.B, AssessmentSectionAssemblyCategoryGroup.B);
-                yield return new TestCaseData(EAssessmentGrade.C, AssessmentSectionAssemblyCategoryGroup.C);
-                yield return new TestCaseData(EAssessmentGrade.D, AssessmentSectionAssemblyCategoryGroup.D);
-                yield return new TestCaseData(EAssessmentGrade.Gr, AssessmentSectionAssemblyCategoryGroup.None);
-                yield return new TestCaseData(EAssessmentGrade.Nvt, AssessmentSectionAssemblyCategoryGroup.NotApplicable);
-                yield return new TestCaseData(EAssessmentGrade.Ngo, AssessmentSectionAssemblyCategoryGroup.NotAssessed);
-            }
-        }
-
         [Test]
         public void CreateAssessmentSectionAssemblyCategories_CategoryLimitsNull_ThrowsArgumentNullException()
         {
@@ -102,7 +87,7 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(GetAssessmentSectionAssemblyCategoryGroupConversions))]
+        [TestCaseSource(typeof(AssessmentGradeConversionTestHelper), nameof(AssessmentGradeConversionTestHelper.AsssementGradeConversionCases))]
         public void CreateAssessmentSectionAssemblyCategories_CategoryWithValidAssessmentGrade_ExpectedAssessmentSectionAssemblyCategoryResultType(
             EAssessmentGrade categoryGroup,
             AssessmentSectionAssemblyCategoryGroup expectedCategoryGroup)
@@ -140,7 +125,7 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(GetAssessmentSectionAssemblyCategoryGroupConversions))]
+        [TestCaseSource(typeof(AssessmentGradeConversionTestHelper), nameof(AssessmentGradeConversionTestHelper.AsssementGradeConversionCases))]
         public void CreateAssessmentSectionAssemblyCategory_WithValidAssessmentGrade_ExpectedAssessmentSectionAssemblyCategoryResultType(
             EAssessmentGrade categoryGroup,
             AssessmentSectionAssemblyCategoryGroup expectedCategoryGroup)
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyCreatorTest.cs
===================================================================
diff -u -r3beb793b4db2bc773a4ae68783902c359db1e6bb -r4b5d80639ec5b56ed227ef2b467e42edc191ca91
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyCreatorTest.cs	(.../AssessmentSectionAssemblyCreatorTest.cs)	(revision 3beb793b4db2bc773a4ae68783902c359db1e6bb)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyCreatorTest.cs	(.../AssessmentSectionAssemblyCreatorTest.cs)	(revision 4b5d80639ec5b56ed227ef2b467e42edc191ca91)
@@ -26,6 +26,7 @@
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
 using Ringtoets.AssemblyTool.KernelWrapper.Creators;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil;
 
 namespace Ringtoets.AssemblyTool.KernelWrapper.Test.Creators
 {
@@ -59,14 +60,7 @@
         }
 
         [Test]
-        [TestCase(EAssessmentGrade.APlus, AssessmentSectionAssemblyCategoryGroup.APlus)]
-        [TestCase(EAssessmentGrade.A, AssessmentSectionAssemblyCategoryGroup.A)]
-        [TestCase(EAssessmentGrade.B, AssessmentSectionAssemblyCategoryGroup.B)]
-        [TestCase(EAssessmentGrade.C, AssessmentSectionAssemblyCategoryGroup.C)]
-        [TestCase(EAssessmentGrade.D, AssessmentSectionAssemblyCategoryGroup.D)]
-        [TestCase(EAssessmentGrade.Gr, AssessmentSectionAssemblyCategoryGroup.None)]
-        [TestCase(EAssessmentGrade.Nvt, AssessmentSectionAssemblyCategoryGroup.NotApplicable)]
-        [TestCase(EAssessmentGrade.Ngo, AssessmentSectionAssemblyCategoryGroup.NotAssessed)]
+        [TestCaseSource(typeof(AssessmentGradeConversionTestHelper), nameof(AssessmentGradeConversionTestHelper.AsssementGradeConversionCases))]
         public void CreateAssessmentSectionAssemblyWithProbability_WithValidEnum_ReturnsExpectedValues(EAssessmentGrade originalGroup,
                                                                                                        AssessmentSectionAssemblyCategoryGroup expectedGroup)
         {
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/AssessmentGradeConversionTestHelperTest.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/AssessmentGradeConversionTestHelperTest.cs	(revision 0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/AssessmentGradeConversionTestHelperTest.cs	(revision 4b5d80639ec5b56ed227ef2b467e42edc191ca91)
@@ -0,0 +1,60 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Assembly.Kernel.Model;
+using NUnit.Framework;
+using Ringtoets.AssemblyTool.Data;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test
+{
+    [TestFixture]
+    public class AssessmentGradeConversionTestHelperTest
+    {
+        [Test]
+        public void AsssementGradeConversionCases_Always_ReturnsExpectedCases()
+        {
+            // Setup
+            IEnumerable<TestCaseData> testCases = AssessmentGradeConversionTestHelper.AsssementGradeConversionCases.ToArray();
+
+            // Assert
+            var expectedCases = new[]
+            {
+                new TestCaseData(EAssessmentGrade.APlus, AssessmentSectionAssemblyCategoryGroup.APlus),
+                new TestCaseData(EAssessmentGrade.A, AssessmentSectionAssemblyCategoryGroup.A),
+                new TestCaseData(EAssessmentGrade.B, AssessmentSectionAssemblyCategoryGroup.B),
+                new TestCaseData(EAssessmentGrade.C, AssessmentSectionAssemblyCategoryGroup.C),
+                new TestCaseData(EAssessmentGrade.D, AssessmentSectionAssemblyCategoryGroup.D),
+                new TestCaseData(EAssessmentGrade.Gr, AssessmentSectionAssemblyCategoryGroup.None),
+                new TestCaseData(EAssessmentGrade.Nvt, AssessmentSectionAssemblyCategoryGroup.NotApplicable),
+                new TestCaseData(EAssessmentGrade.Ngo, AssessmentSectionAssemblyCategoryGroup.NotAssessed)
+            };
+
+            Assert.AreEqual(expectedCases.Length, testCases.Count());
+            for (var i = 0; i < testCases.Count(); i++)
+            {
+                Assert.AreEqual(expectedCases[i].Arguments[0], testCases.ElementAt(i).Arguments[0]);
+                Assert.AreEqual(expectedCases[i].Arguments[1], testCases.ElementAt(i).Arguments[1]);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj
===================================================================
diff -u -r8ffedce6423c90651a76ae74c34c75a298c10194 -r4b5d80639ec5b56ed227ef2b467e42edc191ca91
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj)	(revision 8ffedce6423c90651a76ae74c34c75a298c10194)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj)	(revision 4b5d80639ec5b56ed227ef2b467e42edc191ca91)
@@ -17,6 +17,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AssessmentGradeConversionTestHelperTest.cs" />
     <Compile Include="Calculators\AssemblyToolCalculatorFactoryConfigTest.cs" />
     <Compile Include="Calculators\Assembly\AssessmentSectionAssemblyCalculatorStubTest.cs" />
     <Compile Include="Calculators\Assembly\FailureMechanismAssemblyCalculatorStubTest.cs" />
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/AssessmentGradeConversionTestHelper.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/AssessmentGradeConversionTestHelper.cs	(revision 0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/AssessmentGradeConversionTestHelper.cs	(revision 4b5d80639ec5b56ed227ef2b467e42edc191ca91)
@@ -0,0 +1,53 @@
+// 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.Collections.Generic;
+using Assembly.Kernel.Model;
+using NUnit.Framework;
+using Ringtoets.AssemblyTool.Data;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil
+{
+    /// <summary>
+    /// Class that can be used to assert the conversions of <see cref="EAssessmentGrade"/>.
+    /// </summary>
+    public static class AssessmentGradeConversionTestHelper
+    {
+        /// <summary>
+        /// Gets a collection of test cases to test the conversion between <see cref="EAssessmentGrade"/>
+        /// and <see cref="AssessmentSectionAssemblyCategoryGroup"/>.
+        /// </summary>
+        public static IEnumerable<TestCaseData> AsssementGradeConversionCases
+        {
+            get
+            {
+                yield return new TestCaseData(EAssessmentGrade.APlus, AssessmentSectionAssemblyCategoryGroup.APlus);
+                yield return new TestCaseData(EAssessmentGrade.A, AssessmentSectionAssemblyCategoryGroup.A);
+                yield return new TestCaseData(EAssessmentGrade.B, AssessmentSectionAssemblyCategoryGroup.B);
+                yield return new TestCaseData(EAssessmentGrade.C, AssessmentSectionAssemblyCategoryGroup.C);
+                yield return new TestCaseData(EAssessmentGrade.D, AssessmentSectionAssemblyCategoryGroup.D);
+                yield return new TestCaseData(EAssessmentGrade.Gr, AssessmentSectionAssemblyCategoryGroup.None);
+                yield return new TestCaseData(EAssessmentGrade.Nvt, AssessmentSectionAssemblyCategoryGroup.NotApplicable);
+                yield return new TestCaseData(EAssessmentGrade.Ngo, AssessmentSectionAssemblyCategoryGroup.NotAssessed);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj
===================================================================
diff -u -r8ffedce6423c90651a76ae74c34c75a298c10194 -r4b5d80639ec5b56ed227ef2b467e42edc191ca91
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj)	(revision 8ffedce6423c90651a76ae74c34c75a298c10194)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj)	(revision 4b5d80639ec5b56ed227ef2b467e42edc191ca91)
@@ -18,6 +18,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyCategoryAssert.cs" />
+    <Compile Include="AssessmentGradeConversionTestHelper.cs" />
     <Compile Include="Calculators\AssemblyToolCalculatorFactoryConfig.cs" />
     <Compile Include="Calculators\Assembly\AssessmentSectionAssemblyCalculatorStub.cs" />
     <Compile Include="Calculators\Assembly\FailureMechanismAssemblyCalculatorStub.cs" />