diff --git a/LibMpcTest/MpdConf.cs b/LibMpcTest/MpdConf.cs
index 0570f42..fa6dbde 100644
--- a/LibMpcTest/MpdConf.cs
+++ b/LibMpcTest/MpdConf.cs
@@ -28,19 +28,19 @@ namespace LibMpcTest
             builder.AppendLine("port \"6600\"");
             builder.AppendLine("audio_output {");
             builder.AppendLine("type \"null\"");
-            builder.AppendLine("name \"Output One\"");
+            builder.AppendLine("name \"Enabled output to be disabled\"");
             builder.AppendLine("enabled \"true\"");
             builder.AppendLine("mixer_type \"none\"");
             builder.AppendLine("}");
             builder.AppendLine("audio_output {");
             builder.AppendLine("type \"null\"");
-            builder.AppendLine("name \"Output Two\"");
+            builder.AppendLine("name \"Disabled output to be enabled\"");
             builder.AppendLine("enabled \"false\"");
             builder.AppendLine("mixer_type \"none\"");
             builder.AppendLine("}");
             builder.AppendLine("audio_output {");
             builder.AppendLine("type \"null\"");
-            builder.AppendLine("name \"Output Three\"");
+            builder.AppendLine("name \"Enabled output to be toggled\"");
             builder.AppendLine("enabled \"true\"");
             builder.AppendLine("mixer_type \"none\"");
             builder.AppendLine("}");
diff --git a/LibMpcTest/Tests/OutputCommandsTest.cs b/LibMpcTest/Tests/OutputCommandsTest.cs
index 264c363..d055646 100644
--- a/LibMpcTest/Tests/OutputCommandsTest.cs
+++ b/LibMpcTest/Tests/OutputCommandsTest.cs
@@ -12,9 +12,9 @@ namespace LibMpcTest
         public async Task DisableOutputTest()
         {
             var responseOutputs = await Mpc.SendAsync(new Commands.Output.Outputs());
-            Assert.True(responseOutputs.Response.Body.Single(output => output.Id.Equals(2)).IsEnabled);
+            Assert.True(responseOutputs.Response.Body.Single(output => output.Id.Equals(0)).IsEnabled);
 
-            var response = await Mpc.SendAsync(new Commands.Output.DisableOutput(2));
+            var response = await Mpc.SendAsync(new Commands.Output.DisableOutput(0));
 
             TestOutput.WriteLine("DisableOutputTest Result:");
             TestOutput.WriteLine(JsonConvert.SerializeObject(response, Formatting.Indented));
@@ -23,7 +23,7 @@ namespace LibMpcTest
             Assert.True(response.Response.State.Status.Equals("OK"));
 
             responseOutputs = await Mpc.SendAsync(new Commands.Output.Outputs());
-            Assert.False(responseOutputs.Response.Body.Single(output => output.Id.Equals(2)).IsEnabled);
+            Assert.False(responseOutputs.Response.Body.Single(output => output.Id.Equals(0)).IsEnabled);
         }
 
         [Fact]