diff --git a/SabreTools.Core/SabreTools.Core.csproj b/SabreTools.Core/SabreTools.Core.csproj
index 83429f0d..0f080476 100644
--- a/SabreTools.Core/SabreTools.Core.csproj
+++ b/SabreTools.Core/SabreTools.Core.csproj
@@ -4,6 +4,10 @@
     <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="SabreTools.Test" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
diff --git a/SabreTools.Core/Tools/Converters.cs b/SabreTools.Core/Tools/Converters.cs
index 0ec1fdf4..9843f0b3 100644
--- a/SabreTools.Core/Tools/Converters.cs
+++ b/SabreTools.Core/Tools/Converters.cs
@@ -317,7 +317,7 @@ namespace SabreTools.Core.Tools
         /// <param name="value">String value to parse/param>
         /// <typeparam name="T">Enum type that is expected</typeparam>
         /// <returns>Enum value representing the input, default on error</returns>
-        private static T AsEnumValue<T>(string value)
+        internal static T AsEnumValue<T>(string value)
         {
             // Get the mapping dictionary
             var mappings = GenerateToEnum<T>();
@@ -334,13 +334,13 @@ namespace SabreTools.Core.Tools
             // Otherwise, return the default value for the enum
             return default;
         }
-        
+
         /// <summary>
         /// Get a set of mappings from strings to enum values
         /// </summary>
         /// <typeparam name="T">Enum type that is expected</typeparam>
         /// <returns>Dictionary of string to enum values</returns>
-        private static Dictionary<string, T> GenerateToEnum<T>()
+        internal static Dictionary<string, T> GenerateToEnum<T>()
         {
             try
             {
@@ -565,7 +565,7 @@ namespace SabreTools.Core.Tools
         /// <param name="useSecond">True to use the second mapping option, if it exists</param>
         /// <typeparam name="T">Enum type that is expected</typeparam>
         /// <returns>String value representing the input, default on error</returns>
-        private static string? AsStringValue<T>(T value, bool useSecond = false)
+        internal static string? AsStringValue<T>(T value, bool useSecond = false)
         {
             // Get the mapping dictionary
             var mappings = GenerateToString<T>(useSecond);
@@ -577,14 +577,14 @@ namespace SabreTools.Core.Tools
             // Otherwise, return null
             return null;
         }
-        
+
         /// <summary>
         /// Get a set of mappings from enum values to string
         /// </summary>
         /// <param name="useSecond">True to use the second mapping option, if it exists</param>
         /// <typeparam name="T">Enum type that is expected</typeparam>
         /// <returns>Dictionary of enum to string values</returns>
-        private static Dictionary<T, string> GenerateToString<T>(bool useSecond)
+        internal static Dictionary<T, string> GenerateToString<T>(bool useSecond)
         {
             try
             {
diff --git a/SabreTools.Test/Core/ConvertersTests.cs b/SabreTools.Test/Core/ConvertersTests.cs
index 2f8dd620..8d994c23 100644
--- a/SabreTools.Test/Core/ConvertersTests.cs
+++ b/SabreTools.Test/Core/ConvertersTests.cs
@@ -857,5 +857,41 @@ namespace SabreTools.Test.Core
         }
 
         #endregion
+
+        #region Generators
+
+        [Theory]
+        [InlineData(ChipType.NULL, 2)]
+        [InlineData(ControlType.NULL, 15)]
+        [InlineData(DatHeaderField.NULL, 94)]
+        [InlineData(DatItemField.NULL, 197)]
+        [InlineData(DeviceType.NULL, 21)]
+        [InlineData(DisplayType.NULL, 5)]
+        [InlineData(Endianness.NULL, 2)]
+        [InlineData(FeatureStatus.NULL, 2)]
+        [InlineData(FeatureType.NULL, 14)]
+        [InlineData(ItemStatus.NULL, 7)]
+        [InlineData(ItemType.NULL, 51)]
+        [InlineData(LoadFlag.NULL, 14)]
+        [InlineData(LogLevel.VERBOSE, 4)]
+        [InlineData(MachineField.NULL, 68)]
+        [InlineData(MachineType.None, 6)]
+        [InlineData(MergingFlag.None, 12)]
+        [InlineData(NodumpFlag.None, 4)]
+        [InlineData(OpenMSXSubType.NULL, 3)]
+        [InlineData(PackingFlag.None, 7)]
+        [InlineData(Relation.NULL, 6)]
+        [InlineData(Runnable.NULL, 3)]
+        [InlineData(SoftwareListStatus.None, 3)]
+        [InlineData(Supported.NULL, 5)]
+        [InlineData(SupportStatus.NULL, 3)]
+        public void GenerateToEnumTest<T>(T value, int expected)
+        {
+            var actual = Converters.GenerateToEnum<T>();
+            Assert.Equal(default, value);
+            Assert.Equal(expected, actual.Keys.Count);
+        }
+
+        #endregion
     }
 }
\ No newline at end of file