Index: Ringtoets/Common/src/Ringtoets.Common.Data/IllustrationPoints/CombinationType.cs
===================================================================
diff -u -ra82f053cd598d56bb1b7b8df663d104d7b9c1214 -r27b56bdb2dc8ec9e4810889b2b57ff394c34ccfe
--- Ringtoets/Common/src/Ringtoets.Common.Data/IllustrationPoints/CombinationType.cs	(.../CombinationType.cs)	(revision a82f053cd598d56bb1b7b8df663d104d7b9c1214)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/IllustrationPoints/CombinationType.cs	(.../CombinationType.cs)	(revision 27b56bdb2dc8ec9e4810889b2b57ff394c34ccfe)
@@ -26,7 +26,7 @@
     /// </summary>
     public enum CombinationType
     {
-        Or,
-        And
+        Or = 1,
+        And = 2
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/CombinationTypeConverterTest.cs
===================================================================
diff -u -rc883bd5e03754a2a020f36683abb0e4c9d324d2d -r27b56bdb2dc8ec9e4810889b2b57ff394c34ccfe
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/CombinationTypeConverterTest.cs	(.../CombinationTypeConverterTest.cs)	(revision c883bd5e03754a2a020f36683abb0e4c9d324d2d)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/CombinationTypeConverterTest.cs	(.../CombinationTypeConverterTest.cs)	(revision 27b56bdb2dc8ec9e4810889b2b57ff394c34ccfe)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.ComponentModel;
 using Core.Common.TestUtil;
 using NUnit.Framework;
@@ -44,17 +43,16 @@
         }
 
         [Test]
-        public void Create_ValidHydraRingCombinationType_ReturnCombinationType()
+        [TestCase(HydraRingCombinationType.And, CombinationType.And)]
+        [TestCase(HydraRingCombinationType.Or, CombinationType.Or)]
+        public void Create_HydraRingCombinationType_ReturnCombinationType(HydraRingCombinationType hydraRingCombinationType,
+                                                                          CombinationType expectedCombinationType)
         {
-            // Setup
-            var random = new Random();
-            var hydraRingCombinationType = random.NextEnumValue<HydraRingCombinationType>();
-
             // Call
             CombinationType combinationType = CombinationTypeConverter.Create(hydraRingCombinationType);
 
             // Assert
-            Assert.AreEqual((int) hydraRingCombinationType, (int) combinationType);
+            Assert.AreEqual(expectedCombinationType, combinationType);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/FaultTreeIllustrationPointConverterTest.cs
===================================================================
diff -u -r2c00fea093af45947307620c4203188ceb872951 -r27b56bdb2dc8ec9e4810889b2b57ff394c34ccfe
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/FaultTreeIllustrationPointConverterTest.cs	(.../FaultTreeIllustrationPointConverterTest.cs)	(revision 2c00fea093af45947307620c4203188ceb872951)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/FaultTreeIllustrationPointConverterTest.cs	(.../FaultTreeIllustrationPointConverterTest.cs)	(revision 27b56bdb2dc8ec9e4810889b2b57ff394c34ccfe)
@@ -69,7 +69,7 @@
             // Assert
             Assert.AreEqual(hydraRingFaultTreeIllustrationPoint.Beta, faultTreeIllustrationPoint.Beta, faultTreeIllustrationPoint.Beta.GetAccuracy());
             Assert.AreEqual(hydraRingFaultTreeIllustrationPoint.Name, faultTreeIllustrationPoint.Name);
-            Assert.AreEqual((int) hydraRingFaultTreeIllustrationPoint.CombinationType, (int) faultTreeIllustrationPoint.CombinationType);
+            Assert.AreEqual(CombinationType.And, faultTreeIllustrationPoint.CombinationType);
 
             Stochast stochast = faultTreeIllustrationPoint.Stochasts.Single();
             Assert.AreEqual(hydraRingStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy());
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs
===================================================================
diff -u -rbe44404797296f09605f5fc861c87f5766c14478 -r27b56bdb2dc8ec9e4810889b2b57ff394c34ccfe
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs	(.../GeneralResultConverterTest.cs)	(revision be44404797296f09605f5fc861c87f5766c14478)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs	(.../GeneralResultConverterTest.cs)	(revision 27b56bdb2dc8ec9e4810889b2b57ff394c34ccfe)
@@ -268,7 +268,7 @@
                 "IllustrationPoint",
                 random.NextDouble(),
                 Enumerable.Empty<HydraRingStochast>(),
-                random.NextEnumValue<HydraRingCombinationType>());
+                HydraRingCombinationType.Or);
             var hydraRingIllustrationTreeNode = new HydraRingIllustrationPointTreeNode(hydraRingIllustrationPoint);
 
             double governingWindDirectionAngle = random.NextDouble();
@@ -309,7 +309,7 @@
             Assert.AreEqual(hydraRingIllustrationPoint.Name, faultTreeIllustrationPointData.Name);
             Assert.AreEqual(hydraRingIllustrationPoint.Beta, faultTreeIllustrationPointData.Beta,
                             faultTreeIllustrationPointData.Beta.GetAccuracy());
-            Assert.AreEqual((CombinationType) hydraRingIllustrationPoint.CombinationType, faultTreeIllustrationPointData.CombinationType);
+            Assert.AreEqual(CombinationType.Or, faultTreeIllustrationPointData.CombinationType);
         }
 
         private static void AssertWindDirection(HydraRingWindDirection hydraRingWindDirection, WindDirection windDirection)
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs
===================================================================
diff -u -rd71b7ff94e33c33d3d8a7b38eee416c9df03f06a -r27b56bdb2dc8ec9e4810889b2b57ff394c34ccfe
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs	(.../IllustrationPointNodeConverterTest.cs)	(revision d71b7ff94e33c33d3d8a7b38eee416c9df03f06a)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs	(.../IllustrationPointNodeConverterTest.cs)	(revision 27b56bdb2dc8ec9e4810889b2b57ff394c34ccfe)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Linq;
-using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.IllustrationPoints;
 using Ringtoets.Common.Service.IllustrationPoints;
@@ -56,7 +55,7 @@
         {
             // Setup
             var hydraRingStochast = new HydraRingStochast("stochast", 1, 2);
-            var hydraRingFaultTreeIllustrationPoint = new HydraRingFaultTreeIllustrationPoint("point", 3, new []
+            var hydraRingFaultTreeIllustrationPoint = new HydraRingFaultTreeIllustrationPoint("point", 3, new[]
             {
                 hydraRingStochast
             }, HydraRingCombinationType.And);
@@ -71,7 +70,7 @@
 
             Assert.AreEqual(hydraRingFaultTreeIllustrationPoint.Name, faultTreeIllustrationPointTreeNodeData.Name);
             Assert.AreEqual(hydraRingFaultTreeIllustrationPoint.Beta, faultTreeIllustrationPointTreeNodeData.Beta);
-            Assert.AreEqual((int) hydraRingFaultTreeIllustrationPoint.CombinationType, (int) faultTreeIllustrationPointTreeNodeData.CombinationType);
+            Assert.AreEqual(CombinationType.And, faultTreeIllustrationPointTreeNodeData.CombinationType);
             Assert.AreEqual(hydraRingFaultTreeIllustrationPoint.Stochasts.Count(), faultTreeIllustrationPointTreeNodeData.Stochasts.Count());
             Stochast stochast = faultTreeIllustrationPointTreeNodeData.Stochasts.First();