diff --git a/source/birchwood/client/core.d b/source/birchwood/client/core.d
index 01ed1cf..d7dc76f 100644
--- a/source/birchwood/client/core.d
+++ b/source/birchwood/client/core.d
@@ -509,6 +509,9 @@ public class Client : Thread
                 /* Ensure valid characters in first channel */
                 if(isValidText(channelLine))
                 {
+                    /* Append on a trailing `,` */
+                    channelLine ~= ",";
+
                     for(ulong i = 1; i < channels.length; i++)
                     {
                         string currentChannel = channels[i];
@@ -1210,6 +1213,17 @@ public class Client : Thread
 
         /**
          * Test sending a message to multiple channels
+         * Test sending a message to a single channel (singular)
+         */
+        client.channelMessage("This is a test message sent to a channel 1", ["#birchwood"]);
+
+        /**
+         * Test sending a message to a single channel (multi)
+         */
+        client.channelMessage("This is a test message sent to a channel 2", "#birchwood");
+
+        /**
+         * Test sending a message to multiple channels (multi)
          */
         client.channelMessage("This is a message sent to multiple channels one-shot", ["#birchwood", "#birchwood2"]);
 
@@ -1220,6 +1234,11 @@ public class Client : Thread
 
         // }
 
+        /**
+         * Test sending a message to myself (singular)
+         */
+        client.directMessage("Message to myself", "birchwood");
+
         // TODO: Don't forget to re-enable this when done testing!
         Thread.sleep(dur!("seconds")(15));
         client.quit();