diff --git a/.gitignore b/.gitignore
index 91bd119..4fa7f9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 vendor
 composer.lock
 .phpunit.result.cache
+composer.phar
\ No newline at end of file
diff --git a/src/Messaging/Controllers/APIController.php b/src/Messaging/Controllers/APIController.php
index 0a7eca2..99e1fda 100644
--- a/src/Messaging/Controllers/APIController.php
+++ b/src/Messaging/Controllers/APIController.php
@@ -137,9 +137,10 @@ public function getMedia(
 
         //process optional query parameters
         $_queryBuilder = APIHelper::appendUrlWithTemplateParameters($_queryBuilder, array (
-            'accountId' => $accountId,
-            'mediaId'   => $mediaId,
-            ));
+            'accountId'  => $accountId,
+            'mediaId' => $mediaId,
+            ), false
+        );
 
         //validate and preprocess url
         $_queryUrl = APIHelper::cleanUrl($this->config->getBaseUri(Servers::MESSAGINGDEFAULT) . $_queryBuilder);
@@ -232,9 +233,10 @@ public function uploadMedia(
 
         //process optional query parameters
         $_queryBuilder = APIHelper::appendUrlWithTemplateParameters($_queryBuilder, array (
-            'accountId'     => $accountId,
-            'mediaId'       => $mediaId,
-            ));
+            'accountId'  => $accountId,
+            'mediaId' => $mediaId,
+            ), false
+        );
 
         //validate and preprocess url
         $_queryUrl = APIHelper::cleanUrl($this->config->getBaseUri(Servers::MESSAGINGDEFAULT) . $_queryBuilder);
@@ -325,9 +327,10 @@ public function deleteMedia(
 
         //process optional query parameters
         $_queryBuilder = APIHelper::appendUrlWithTemplateParameters($_queryBuilder, array (
-            'accountId' => $accountId,
-            'mediaId'   => $mediaId,
-            ));
+            'accountId'  => $accountId,
+            'mediaId' => $mediaId,
+            ), false
+        );
 
         //validate and preprocess url
         $_queryUrl = APIHelper::cleanUrl($this->config->getBaseUri(Servers::MESSAGINGDEFAULT) . $_queryBuilder);
diff --git a/tests/ApiTest.php b/tests/ApiTest.php
index 31d8e3f..95d6dbb 100644
--- a/tests/ApiTest.php
+++ b/tests/ApiTest.php
@@ -61,7 +61,7 @@ public function testCreateMessageInvalidPhoneNumber() {
     public function testUploadDownloadMedia() {
         //constants
 
-        $mediaFileName = "php_monitoring";
+        $mediaFileName = "php-monitoring";
         $mediaFile = "12345"; //todo: confirm binary string?
         //media upload
         $this->bandwidthClient->getMessaging()->getClient()->uploadMedia(getenv("BW_ACCOUNT_ID"), $mediaFileName, $mediaFile);
@@ -69,6 +69,9 @@ public function testUploadDownloadMedia() {
         //media download
         $downloadedMediaFile = $this->bandwidthClient->getMessaging()->getClient()->getMedia(getenv("BW_ACCOUNT_ID"), $mediaFileName)->getResult();
 
+        //media delete
+        $deleteMedaiFile = $this->bandwidthClient->getMessaging()->getClient()->deleteMedia(getenv("BW_ACCOUNT_ID"), $mediaFileName);
+
         //validate that response is the same
         $this->assertEquals($downloadedMediaFile, $mediaFile);
     }