Index: Core/Components/test/Core.Components.Chart.Test/Data/ChartPointSymbolTest.cs
===================================================================
diff -u -r4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae -r38820934a4a3b732c890b5fe1745e89e706d923b
--- Core/Components/test/Core.Components.Chart.Test/Data/ChartPointSymbolTest.cs	(.../ChartPointSymbolTest.cs)	(revision 4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae)
+++ Core/Components/test/Core.Components.Chart.Test/Data/ChartPointSymbolTest.cs	(.../ChartPointSymbolTest.cs)	(revision 38820934a4a3b732c890b5fe1745e89e706d923b)
@@ -27,7 +27,7 @@
 namespace Core.Components.Chart.Test.Data
 {
     [TestFixture]
-    public class ChartPointSymbolTest : EnumTestFixture<ChartPointSymbol>
+    public class ChartPointSymbolTest : EnumWithDisplayNameTestFixture<ChartPointSymbol>
     {
         protected override IDictionary<ChartPointSymbol, string> ExpectedDisplayNameForEnumValues
         {
Index: Core/Components/test/Core.Components.Chart.Test/Styles/ChartLineDashStyleTest.cs
===================================================================
diff -u -r4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae -r38820934a4a3b732c890b5fe1745e89e706d923b
--- Core/Components/test/Core.Components.Chart.Test/Styles/ChartLineDashStyleTest.cs	(.../ChartLineDashStyleTest.cs)	(revision 4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae)
+++ Core/Components/test/Core.Components.Chart.Test/Styles/ChartLineDashStyleTest.cs	(.../ChartLineDashStyleTest.cs)	(revision 38820934a4a3b732c890b5fe1745e89e706d923b)
@@ -27,7 +27,7 @@
 namespace Core.Components.Chart.Test.Styles
 {
     [TestFixture]
-    public class ChartLineDashStyleTest : EnumTestFixture<ChartLineDashStyle>
+    public class ChartLineDashStyleTest : EnumWithDisplayNameTestFixture<ChartLineDashStyle>
     {
         protected override IDictionary<ChartLineDashStyle, string> ExpectedDisplayNameForEnumValues
         {
Index: Core/Components/test/Core.Components.Gis.Test/Data/WellKnownTileSourceTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r38820934a4a3b732c890b5fe1745e89e706d923b
--- Core/Components/test/Core.Components.Gis.Test/Data/WellKnownTileSourceTest.cs	(.../WellKnownTileSourceTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.Gis.Test/Data/WellKnownTileSourceTest.cs	(.../WellKnownTileSourceTest.cs)	(revision 38820934a4a3b732c890b5fe1745e89e706d923b)
@@ -27,7 +27,7 @@
 namespace Core.Components.Gis.Test.Data
 {
     [TestFixture]
-    public class WellKnownTileSourceTest : EnumTestFixture<WellKnownTileSource>
+    public class WellKnownTileSourceTest : EnumWithDisplayNameTestFixture<WellKnownTileSource>
     {
         protected override IDictionary<WellKnownTileSource, string> ExpectedDisplayNameForEnumValues
         {
Index: Core/Components/test/Core.Components.Gis.Test/Style/LineDashStyleTest.cs
===================================================================
diff -u -r08c072f8a36f1cc7c14b38b8eab27a57f61d01f4 -r38820934a4a3b732c890b5fe1745e89e706d923b
--- Core/Components/test/Core.Components.Gis.Test/Style/LineDashStyleTest.cs	(.../LineDashStyleTest.cs)	(revision 08c072f8a36f1cc7c14b38b8eab27a57f61d01f4)
+++ Core/Components/test/Core.Components.Gis.Test/Style/LineDashStyleTest.cs	(.../LineDashStyleTest.cs)	(revision 38820934a4a3b732c890b5fe1745e89e706d923b)
@@ -27,7 +27,7 @@
 namespace Core.Components.Gis.Test.Style
 {
     [TestFixture]
-    public class LineDashStyleTest : EnumTestFixture<LineDashStyle>
+    public class LineDashStyleTest : EnumWithDisplayNameTestFixture<LineDashStyle>
     {
         protected override IDictionary<LineDashStyle, string> ExpectedDisplayNameForEnumValues
         {
Index: Core/Components/test/Core.Components.Gis.Test/Style/PointSymbolTest.cs
===================================================================
diff -u -r85584f274b6803b1fb5df0119cc78b5e4a870125 -r38820934a4a3b732c890b5fe1745e89e706d923b
--- Core/Components/test/Core.Components.Gis.Test/Style/PointSymbolTest.cs	(.../PointSymbolTest.cs)	(revision 85584f274b6803b1fb5df0119cc78b5e4a870125)
+++ Core/Components/test/Core.Components.Gis.Test/Style/PointSymbolTest.cs	(.../PointSymbolTest.cs)	(revision 38820934a4a3b732c890b5fe1745e89e706d923b)
@@ -27,7 +27,7 @@
 namespace Core.Components.Gis.Test.Style
 {
     [TestFixture]
-    public class PointSymbolTest : EnumTestFixture<PointSymbol>
+    public class PointSymbolTest : EnumWithDisplayNameTestFixture<PointSymbol>
     {
         protected override IDictionary<PointSymbol, string> ExpectedDisplayNameForEnumValues
         {