diff --git a/MPF.Test/Converters/EnumConverterTest.cs b/MPF.Test/Converters/EnumConverterTest.cs
index 82389547..9c95c3b5 100644
--- a/MPF.Test/Converters/EnumConverterTest.cs
+++ b/MPF.Test/Converters/EnumConverterTest.cs
@@ -34,7 +34,7 @@ namespace MPF.Test.Converters
         [InlineData(CommandStrings.XBOX, MediaType.DVD)]
         public void BaseCommandToMediaTypeTest(string command, MediaType? expected)
         {
-            MediaType? actual = Modules.DiscImageCreator.Converters.ToMediaType(command);
+            MediaType? actual = MPF.Modules.DiscImageCreator.Converters.ToMediaType(command);
             Assert.Equal(expected, actual);
         }
 
@@ -58,7 +58,7 @@ namespace MPF.Test.Converters
         [InlineData(CommandStrings.XBOX, RedumpSystem.MicrosoftXbox)]
         public void BaseCommandToRedumpSystemTest(string command, RedumpSystem? expected)
         {
-            RedumpSystem? actual = Modules.DiscImageCreator.Converters.ToRedumpSystem(command);
+            RedumpSystem? actual = MPF.Modules.DiscImageCreator.Converters.ToRedumpSystem(command);
             Assert.Equal(expected, actual);
         }
 
@@ -72,7 +72,7 @@ namespace MPF.Test.Converters
         [InlineData(MediaType.NONE, null)]
         public void MediaTypeToExtensionTest(MediaType? mediaType, string expected)
         {
-            string actual = Modules.DiscImageCreator.Converters.Extension(mediaType);
+            string actual = MPF.Modules.DiscImageCreator.Converters.Extension(mediaType);
             Assert.Equal(expected, actual);
         }
 
diff --git a/MPF.Test/Converters/MediaTypeExtensionsTest.cs b/MPF.Test/Converters/MediaTypeExtensionsTest.cs
index f62f1eea..8af340ee 100644
--- a/MPF.Test/Converters/MediaTypeExtensionsTest.cs
+++ b/MPF.Test/Converters/MediaTypeExtensionsTest.cs
@@ -37,7 +37,7 @@ namespace MPF.Test.Converters
         [InlineData(MediaType.NONE, null)]
         public void ExtensionTest(MediaType? mediaType, string expected)
         {
-            string actual = Modules.DiscImageCreator.Converters.Extension(mediaType);
+            string actual = MPF.Modules.DiscImageCreator.Converters.Extension(mediaType);
 
             Assert.Equal(expected, actual);
         }
diff --git a/MPF.Test/Modules/DiscImageCreatorTests.cs b/MPF.Test/Modules/DiscImageCreatorTests.cs
new file mode 100644
index 00000000..db13f648
--- /dev/null
+++ b/MPF.Test/Modules/DiscImageCreatorTests.cs
@@ -0,0 +1,38 @@
+using MPF.Modules.DiscImageCreator;
+using Xunit;
+
+namespace MPF.Test.Modules
+{
+    public class DiscImageCreatorTests
+    {
+        [Fact]
+        public void DiscImageCreatorAudioParametersTest()
+        {
+            string originalParameters = "audio F \"ISO\\Audio CD\\Audio CD.bin\" 72 -5 0";
+
+            // Validate that a common audio commandline is parsed
+            var parametersObject = new Parameters(originalParameters);
+            Assert.NotNull(parametersObject);
+
+            // Validate that the same set of parameters are generated on the output
+            string newParameters = parametersObject.GenerateParameters();
+            Assert.NotNull(newParameters);
+            Assert.Equal(originalParameters, newParameters);
+        }
+
+        [Fact]
+        public void DiscImageCreatorDataParametersTest()
+        {
+            string originalParameters = "data F \"ISO\\Data CD\\Data CD.bin\" 72 -5 0";
+
+            // Validate that a common audio commandline is parsed
+            var parametersObject = new Parameters(originalParameters);
+            Assert.NotNull(parametersObject);
+
+            // Validate that the same set of parameters are generated on the output
+            string newParameters = parametersObject.GenerateParameters();
+            Assert.NotNull(newParameters);
+            Assert.Equal(originalParameters, newParameters);
+        }
+    }
+}