Index: Core/Common/test/Core.Common.TestUtil.Test/Core.Common.TestUtil.Test.csproj
===================================================================
diff -u -ra13245503f96cce3c9040a1e85699e4f03b5fe3c -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Core/Common/test/Core.Common.TestUtil.Test/Core.Common.TestUtil.Test.csproj	(.../Core.Common.TestUtil.Test.csproj)	(revision a13245503f96cce3c9040a1e85699e4f03b5fe3c)
+++ Core/Common/test/Core.Common.TestUtil.Test/Core.Common.TestUtil.Test.csproj	(.../Core.Common.TestUtil.Test.csproj)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -63,7 +63,7 @@
     <Compile Include="DataGridViewTestHelperTest.cs" />
     <Compile Include="DirectoryDisposeHelperTest.cs" />
     <Compile Include="DoubleWithToleranceComparerTest.cs" />
-    <Compile Include="EnumTestFixtureTest.cs" />
+    <Compile Include="EnumWithDisplayNameTestFixtureTest.cs" />
     <Compile Include="EnumValuesTestFixtureTest.cs" />
     <Compile Include="FileDisposeHelperTest.cs" />
     <Compile Include="DirectoryPermissionsRevokerTest.cs" />
Fisheye: Tag 203c35ed35a3455f2d09cbb4a15c0f7e824edc44 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtil.Test/EnumTestFixtureTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.TestUtil.Test/EnumWithDisplayNameTestFixtureTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil.Test/EnumWithDisplayNameTestFixtureTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil.Test/EnumWithDisplayNameTestFixtureTest.cs	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -0,0 +1,74 @@
+// 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.Collections.Generic;
+using Core.Common.TestUtil.Test.Properties;
+using Core.Common.Utils.Attributes;
+using NUnit.Framework;
+
+namespace Core.Common.TestUtil.Test
+{
+    [TestFixture]
+    public class EnumWithDisplayNameTestFixtureTest
+    {
+        [Test]
+        public void Constructor_ExpectedResult()
+        {
+            // Call
+            var displayNameEnumTest = new DisplayNameEnumTest();
+
+            // Assert
+            Assert.IsInstanceOf<EnumValuesTestFixture<EnumDisplayName, byte>>(displayNameEnumTest);
+        }
+
+        [TestFixture]
+        private class DisplayNameEnumTest : EnumWithDisplayNameTestFixture<EnumDisplayName>
+        {
+            protected override IDictionary<EnumDisplayName, string> ExpectedDisplayNameForEnumValues => new Dictionary<EnumDisplayName, string>
+            {
+                {
+                    EnumDisplayName.NoDisplayName, null
+                },
+                {
+                    EnumDisplayName.HasResourcesDisplayName, Resources.SomeDisplayName
+                }
+            };
+
+            protected override IDictionary<EnumDisplayName, byte> ExpectedValueForEnumValues => new Dictionary<EnumDisplayName, byte>
+            {
+                {
+                    EnumDisplayName.NoDisplayName, 0
+                },
+                {
+                    EnumDisplayName.HasResourcesDisplayName, 4
+                }
+            };
+        }
+
+        private enum EnumDisplayName
+        {
+            NoDisplayName,
+
+            [ResourcesDisplayName(typeof(Resources), nameof(Resources.SomeDisplayName))]
+            HasResourcesDisplayName = 4
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj
===================================================================
diff -u -ra13245503f96cce3c9040a1e85699e4f03b5fe3c -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision a13245503f96cce3c9040a1e85699e4f03b5fe3c)
+++ Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -95,7 +95,7 @@
     <Compile Include="DirectoryDisposeHelper.cs" />
     <Compile Include="DoubleWithToleranceComparer.cs" />
     <Compile Include="EnumValuesTestFixture.cs" />
-    <Compile Include="EnumTestFixture.cs" />
+    <Compile Include="EnumWithDisplayNameTestFixture.cs" />
     <Compile Include="FileDisposeHelper.cs" />
     <Compile Include="DirectoryPermissionsRevoker.cs" />
     <Compile Include="GuiTestHelper.cs" />
Fisheye: Tag 203c35ed35a3455f2d09cbb4a15c0f7e824edc44 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtil/EnumTestFixture.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.TestUtil/EnumWithDisplayNameTestFixture.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.TestUtil/EnumWithDisplayNameTestFixture.cs	(revision 0)
+++ Core/Common/test/Core.Common.TestUtil/EnumWithDisplayNameTestFixture.cs	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -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 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.Collections.Generic;
+using System.Reflection;
+using Core.Common.Utils.Attributes;
+using NUnit.Framework;
+
+namespace Core.Common.TestUtil
+{
+    [TestFixture]
+    public abstract class EnumWithDisplayNameTestFixture<TEnum>: EnumValuesTestFixture<TEnum, byte>
+    {
+        protected abstract IDictionary<TEnum, string> ExpectedDisplayNameForEnumValues { get; }
+
+        [Test]
+        public void DisplayName_Always_ReturnExpectedValues()
+        {
+            // Setup
+            foreach (TEnum value in Enum.GetValues(typeof(TEnum)))
+            {
+                // Call
+                string displayName = GetDisplayName(value);
+
+                // Assert
+                Assert.AreEqual(ExpectedDisplayNameForEnumValues[value], displayName,
+                                $"Display name for {value} incorrect.");
+            }
+        }
+
+        private static string GetDisplayName(TEnum value)
+        {
+            Type type = typeof(TEnum);
+            MemberInfo[] memInfo = type.GetMember(value.ToString());
+            object[] attributes = memInfo[0].GetCustomAttributes(typeof(ResourcesDisplayNameAttribute), false);
+            if (attributes.Length > 0)
+            {
+                return ((ResourcesDisplayNameAttribute) attributes[0]).DisplayName;
+            }
+            return null;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionCompositionTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionCompositionTest.cs	(.../AssessmentSectionCompositionTest.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionCompositionTest.cs	(.../AssessmentSectionCompositionTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -27,7 +27,7 @@
 namespace Ringtoets.Common.Data.Test.AssessmentSection
 {
     [TestFixture]
-    public class AssessmentSectionCompositionTest : EnumTestFixture<AssessmentSectionComposition>
+    public class AssessmentSectionCompositionTest : EnumWithDisplayNameTestFixture<AssessmentSectionComposition>
     {
         protected override IDictionary<AssessmentSectionComposition, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceTest.cs	(.../RingtoetsWellKnownTileSourceTest.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceTest.cs	(.../RingtoetsWellKnownTileSourceTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -27,7 +27,7 @@
 namespace Ringtoets.Common.Data.Test.AssessmentSection
 {
     [TestFixture]
-    public class RingtoetsWellKnownTileSourceTest : EnumTestFixture<RingtoetsWellKnownTileSource>
+    public class RingtoetsWellKnownTileSourceTest : EnumWithDisplayNameTestFixture<RingtoetsWellKnownTileSource>
     {
         protected override IDictionary<RingtoetsWellKnownTileSource, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/NormTypeTest.cs
===================================================================
diff -u -rb726f712c5614827e9bfa8041ee40071e02be3b9 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/NormTypeTest.cs	(.../NormTypeTest.cs)	(revision b726f712c5614827e9bfa8041ee40071e02be3b9)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/NormTypeTest.cs	(.../NormTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -27,7 +27,7 @@
 namespace Ringtoets.Common.Data.Test.Contribution
 {
     [TestFixture]
-    public class NormTypeTest : EnumTestFixture<NormType>
+    public class NormTypeTest : EnumWithDisplayNameTestFixture<NormType>
     {
         protected override IDictionary<NormType, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTypeTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTypeTest.cs	(.../BreakWaterTypeTest.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTypeTest.cs	(.../BreakWaterTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -27,7 +27,7 @@
 namespace Ringtoets.Common.Data.Test.DikeProfiles
 {
     [TestFixture]
-    public class BreakWaterTypeTest : EnumTestFixture<BreakWaterType>
+    public class BreakWaterTypeTest : EnumWithDisplayNameTestFixture<BreakWaterType>
     {
         protected override IDictionary<BreakWaterType, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/AssessmentLayerOneStateTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/AssessmentLayerOneStateTest.cs	(.../AssessmentLayerOneStateTest.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/AssessmentLayerOneStateTest.cs	(.../AssessmentLayerOneStateTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -25,7 +25,7 @@
 
 namespace Ringtoets.Common.Data.Test.FailureMechanism
 {
-    public class AssessmentLayerOneStateTest : EnumTestFixture<AssessmentLayerOneState>
+    public class AssessmentLayerOneStateTest : EnumWithDisplayNameTestFixture<AssessmentLayerOneState>
     {
         protected override IDictionary<AssessmentLayerOneState, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/AssessmentLayerTwoAResultTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/AssessmentLayerTwoAResultTest.cs	(.../AssessmentLayerTwoAResultTest.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/AssessmentLayerTwoAResultTest.cs	(.../AssessmentLayerTwoAResultTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -27,7 +27,7 @@
 namespace Ringtoets.Common.Data.Test.FailureMechanism
 {
     [TestFixture]
-    public class AssessmentLayerTwoAResultTest : EnumTestFixture<AssessmentLayerTwoAResult>
+    public class AssessmentLayerTwoAResultTest : EnumWithDisplayNameTestFixture<AssessmentLayerTwoAResult>
     {
         protected override IDictionary<AssessmentLayerTwoAResult, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/CalculationConvergenceTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/CalculationConvergenceTest.cs	(.../CalculationConvergenceTest.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/CalculationConvergenceTest.cs	(.../CalculationConvergenceTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -27,7 +27,7 @@
 namespace Ringtoets.Common.Data.Test.Hydraulics
 {
     [TestFixture]
-    public class CalculationConvergenceTest : EnumTestFixture<CalculationConvergence>
+    public class CalculationConvergenceTest : EnumWithDisplayNameTestFixture<CalculationConvergence>
     {
         protected override IDictionary<CalculationConvergence, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/CalculationConfigurationWriterTest.cs
===================================================================
diff -u -r30761b3bfd1c77faaf2c0508396b90639850ac4b -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/CalculationConfigurationWriterTest.cs	(.../CalculationConfigurationWriterTest.cs)	(revision 30761b3bfd1c77faaf2c0508396b90639850ac4b)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/CalculationConfigurationWriterTest.cs	(.../CalculationConfigurationWriterTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -76,7 +76,7 @@
             TestDelegate test = () => ExposedCalculationConfigurationWriter.PublicWriteDistributionWhenAvailable(
                 null,
                 "some name",
-                null);
+                new StochastConfiguration());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -95,7 +95,7 @@
             TestDelegate test = () => ExposedCalculationConfigurationWriter.PublicWriteDistributionWhenAvailable(
                 xmlWriter,
                 null,
-                null);
+                new StochastConfiguration());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -149,7 +149,7 @@
             TestDelegate test = () => ExposedCalculationConfigurationWriter.PublicWriteDistributionWhenAvailable(
                 null,
                 "some name",
-                null);
+                new StochastConfiguration());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -168,7 +168,7 @@
             TestDelegate test = () => ExposedCalculationConfigurationWriter.PublicWriteDistributionWhenAvailable(
                 xmlWriter,
                 null,
-                null);
+                new StochastConfiguration());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -222,7 +222,7 @@
             TestDelegate test = () => ExposedCalculationConfigurationWriter.PublicWriteElementWhenContentAvailable(
                 null,
                 "some name",
-                (string) null);
+                "some value");
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -241,7 +241,7 @@
             TestDelegate test = () => ExposedCalculationConfigurationWriter.PublicWriteElementWhenContentAvailable(
                 xmlWriter,
                 null,
-                (string) null);
+                "some value");
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -295,7 +295,7 @@
             TestDelegate test = () => ExposedCalculationConfigurationWriter.PublicWriteElementWhenContentAvailable(
                 null,
                 "some name",
-                (double?) null);
+                0.1);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -314,7 +314,7 @@
             TestDelegate test = () => ExposedCalculationConfigurationWriter.PublicWriteElementWhenContentAvailable(
                 xmlWriter,
                 null,
-                (double?) null);
+                0.2);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -368,7 +368,7 @@
             TestDelegate test = () => ExposedCalculationConfigurationWriter.PublicWriteElementWhenContentAvailable(
                 null,
                 "some name",
-                (bool?) null);
+                false);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -387,7 +387,7 @@
             TestDelegate test = () => ExposedCalculationConfigurationWriter.PublicWriteElementWhenContentAvailable(
                 xmlWriter,
                 null,
-                (bool?) null);
+                false);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -440,7 +440,7 @@
             // Call
             TestDelegate test = () => ExposedCalculationConfigurationWriter.PublicWriteWaveReductionWhenAvailable(
                 null,
-                null);
+                new WaveReductionConfiguration());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeHeightCalculationTypeTest.cs
===================================================================
diff -u -raeb6e1a439617630e7613b9ed5af152c345fa2c6 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeHeightCalculationTypeTest.cs	(.../DikeHeightCalculationTypeTest.cs)	(revision aeb6e1a439617630e7613b9ed5af152c345fa2c6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeHeightCalculationTypeTest.cs	(.../DikeHeightCalculationTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -26,7 +26,7 @@
 namespace Ringtoets.GrassCoverErosionInwards.Data.Test
 {
     [TestFixture]
-    public class DikeHeightCalculationTypeTest : EnumTestFixture<DikeHeightCalculationType>
+    public class DikeHeightCalculationTypeTest : EnumWithDisplayNameTestFixture<DikeHeightCalculationType>
     {
         protected override IDictionary<DikeHeightCalculationType, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateCalculationTypeTest.cs
===================================================================
diff -u -raeb6e1a439617630e7613b9ed5af152c345fa2c6 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateCalculationTypeTest.cs	(.../OvertoppingRateCalculationTypeTest.cs)	(revision aeb6e1a439617630e7613b9ed5af152c345fa2c6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateCalculationTypeTest.cs	(.../OvertoppingRateCalculationTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -26,7 +26,7 @@
 namespace Ringtoets.GrassCoverErosionInwards.Data.Test
 {
     [TestFixture]
-    public class OvertoppingRateCalculationTypeTest : EnumTestFixture<OvertoppingRateCalculationType>
+    public class OvertoppingRateCalculationTypeTest : EnumWithDisplayNameTestFixture<OvertoppingRateCalculationType>
     {
         protected override IDictionary<OvertoppingRateCalculationType, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridDeterminationTypeTest.cs
===================================================================
diff -u -r5007be256ef2923a6aecbc2639b1e80f38f45539 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridDeterminationTypeTest.cs	(.../MacroStabilityInwardsGridDeterminationTypeTest.cs)	(revision 5007be256ef2923a6aecbc2639b1e80f38f45539)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridDeterminationTypeTest.cs	(.../MacroStabilityInwardsGridDeterminationTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -26,7 +26,7 @@
 namespace Ringtoets.MacroStabilityInwards.Data.Test
 {
     [TestFixture]
-    public class MacroStabilityInwardsGridDeterminationTypeTest : EnumTestFixture<MacroStabilityInwardsGridDeterminationType>
+    public class MacroStabilityInwardsGridDeterminationTypeTest : EnumWithDisplayNameTestFixture<MacroStabilityInwardsGridDeterminationType>
     {
         protected override IDictionary<MacroStabilityInwardsGridDeterminationType, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsShearStrengthModelTest.cs
===================================================================
diff -u -r9fa257acbd8aeded7918b346a8e120fdc80f95b0 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsShearStrengthModelTest.cs	(.../MacroStabilityInwardsShearStrengthModelTest.cs)	(revision 9fa257acbd8aeded7918b346a8e120fdc80f95b0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsShearStrengthModelTest.cs	(.../MacroStabilityInwardsShearStrengthModelTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -27,7 +27,7 @@
 namespace Ringtoets.MacroStabilityInwards.Data.Test
 {
     [TestFixture]
-    public class MacroStabilityInwardsShearStrengthModelTest : EnumTestFixture<MacroStabilityInwardsShearStrengthModel>
+    public class MacroStabilityInwardsShearStrengthModelTest : EnumWithDisplayNameTestFixture<MacroStabilityInwardsShearStrengthModel>
     {
         protected override IDictionary<MacroStabilityInwardsShearStrengthModel, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsTangentLineDeterminationTypeTest.cs
===================================================================
diff -u -r9743fa24b1c44e916c046064a361f4901f993f92 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsTangentLineDeterminationTypeTest.cs	(.../MacroStabilityInwardsTangentLineDeterminationTypeTest.cs)	(revision 9743fa24b1c44e916c046064a361f4901f993f92)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsTangentLineDeterminationTypeTest.cs	(.../MacroStabilityInwardsTangentLineDeterminationTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -26,7 +26,7 @@
 namespace Ringtoets.MacroStabilityInwards.Data.Test
 {
     [TestFixture]
-    public class MacroStabilityInwardsTangentLineDeterminationTypeTest : EnumTestFixture<MacroStabilityInwardsTangentLineDeterminationType>
+    public class MacroStabilityInwardsTangentLineDeterminationTypeTest : EnumWithDisplayNameTestFixture<MacroStabilityInwardsTangentLineDeterminationType>
     {
         protected override IDictionary<MacroStabilityInwardsTangentLineDeterminationType, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs
===================================================================
diff -u -r3ac5065bf73f4816c743eed9668504af7485b4bc -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs	(.../MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs)	(revision 3ac5065bf73f4816c743eed9668504af7485b4bc)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs	(.../MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -26,7 +26,7 @@
 namespace Ringtoets.MacroStabilityInwards.Data.Test
 {
     [TestFixture]
-    public class MacroStabilityInwardsZoningBoundariesDeterminationTypeTest : EnumTestFixture<MacroStabilityInwardsZoningBoundariesDeterminationType>
+    public class MacroStabilityInwardsZoningBoundariesDeterminationTypeTest : EnumWithDisplayNameTestFixture<MacroStabilityInwardsZoningBoundariesDeterminationType>
     {
         protected override IDictionary<MacroStabilityInwardsZoningBoundariesDeterminationType, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsDikeSoilScenarioTest.cs
===================================================================
diff -u -rf9cb0b4f173deb3519922fb8f073d8815c516950 -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsDikeSoilScenarioTest.cs	(.../MacroStabilityInwardsDikeSoilScenarioTest.cs)	(revision f9cb0b4f173deb3519922fb8f073d8815c516950)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsDikeSoilScenarioTest.cs	(.../MacroStabilityInwardsDikeSoilScenarioTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -26,7 +26,7 @@
 namespace Ringtoets.MacroStabilityInwards.Primitives.Test
 {
     [TestFixture]
-    public class MacroStabilityInwardsDikeSoilScenarioTest : EnumTestFixture<MacroStabilityInwardsDikeSoilScenario>
+    public class MacroStabilityInwardsDikeSoilScenarioTest : EnumWithDisplayNameTestFixture<MacroStabilityInwardsDikeSoilScenario>
     {
         protected override IDictionary<MacroStabilityInwardsDikeSoilScenario, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/SoilProfileTypeTest.cs
===================================================================
diff -u -rd78f01e3de6c12c9982dbd25b8693ab374bee32f -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/SoilProfileTypeTest.cs	(.../SoilProfileTypeTest.cs)	(revision d78f01e3de6c12c9982dbd25b8693ab374bee32f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/SoilProfileTypeTest.cs	(.../SoilProfileTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -26,7 +26,7 @@
 namespace Ringtoets.Piping.Primitives.Test
 {
     [TestFixture]
-    public class SoilProfileTypeTest : EnumTestFixture<SoilProfileType>
+    public class SoilProfileTypeTest : EnumWithDisplayNameTestFixture<SoilProfileType>
     {
         protected override IDictionary<SoilProfileType, string> ExpectedDisplayNameForEnumValues
         {
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeTest.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeTest.cs	(.../WaveConditionsInputStepSizeTest.cs)	(revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeTest.cs	(.../WaveConditionsInputStepSizeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
@@ -26,7 +26,7 @@
 namespace Ringtoets.Revetment.Data.Test
 {
     [TestFixture]
-    public class WaveConditionsInputStepSizeTest : EnumTestFixture<WaveConditionsInputStepSize>
+    public class WaveConditionsInputStepSizeTest : EnumWithDisplayNameTestFixture<WaveConditionsInputStepSize>
     {
         protected override IDictionary<WaveConditionsInputStepSize, string> ExpectedDisplayNameForEnumValues
         {