Travis

4 files changed, 648 insertions, 521 deletions

diff --git a/examples/example.php b/examples/example.php
index 2a72f4f..9148a9d 100644
--- a/examples/example.php
+++ b/examples/example.php
@@ -6,7 +6,7 @@ require dirname(__DIR__).'/lib/SendGrid.php';
 
 // Configuration
 $apiKey = getenv('SENDGRID_API_KEY');
-$sg = new SendGrid($apiKey);
+$sg = new \SendGrid($apiKey);
 
 // GET Collection
 $query_params = array('limit' => 100, 'offset' => 0);
diff --git a/lib/SendGrid.php b/lib/SendGrid.php
index 2b300cf..71d8f32 100644
--- a/lib/SendGrid.php
+++ b/lib/SendGrid.php
@@ -10,9 +10,6 @@
   * @version   GIT: <git_id>
   * @link      http://packagist.org/packages/sendgrid/sendgrid
   */
-namespace SendGrid;
-
-require dirname(__DIR__).'/vendor/autoload.php';
 
 /**
   * Interface to the SendGrid Web API
@@ -42,23 +39,6 @@ class SendGrid
             'User-Agent: sendgrid/' . $this->version . ';php'
             );
         $host = isset($options['host']) ? $options['host'] : 'https://api.sendgrid.com';
-        $this->client = new Client($host, $headers, '/v3', null);
-    }
-
-    public static function register_autoloader()
-    {
-        spl_autoload_register(array('SendGrid', 'autoloader'));
+        $this->client = new \SendGrid\Client($host, $headers, '/v3', null);
     }
-
-    public static function autoloader($class)
-    {
-        // Check that the class starts with 'SendGrid'
-        if ($class == 'SendGrid' || stripos($class, 'SendGrid\\') === 0) {
-            $file = str_replace('\\', '/', $class);
-            if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
-                require_once(dirname(__FILE__) . '/' . $file . '.php');
-            }
-        }
-    }
-
 }
diff --git a/test/unit/SendGridTest.php b/test/unit/SendGridTest.php
index a25e0ef..86898c8 100644
--- a/test/unit/SendGridTest.php
+++ b/test/unit/SendGridTest.php
@@ -7,9 +7,12 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->apiKey = "SENDGRID_API_KEY";
-        echo "Here";
-        require_once(dirname(dirname(__FILE__)) . '/../lib/SendGrid.php');
-        $this->sg = new SendGrid($this->apiKey, array('host' => 'http://localhost:4010'));
+        if(getenv('TRAVIS')) {
+            $host = array('host' => getenv('MOCK_HOST'));
+        } else {
+            $host = array('host' => 'http://localhost:4010');
+        }
+        $this->sg = new SendGrid($this->apiKey, $host);
     }
 
     public function testVersion()
@@ -32,16 +35,15 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $this->assertEquals($sg->client->version, "/v3");
 
         $apiKey = "SENDGRID_API_KEY";
-        //include_once(dirname(dirname(__FILE__)) . '/../lib/SendGrid.php');
         $sg2 = new SendGrid($apiKey, array('host' => 'https://api.test.com'));
         $this->assertEquals($sg2->client->host, "https://api.test.com");
     }
 
     public function test_access_settings_activity_get()
     {
-        $query_params = json_decode("{'limit': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->access_settings()->activity()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"limit": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->access_settings()->activity()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_access_settings_whitelist_post()
@@ -59,14 +61,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     }
   ]
 }');
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->access_settings()->whitelist()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->access_settings()->whitelist()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_access_settings_whitelist_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->access_settings()->whitelist()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->access_settings()->whitelist()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_access_settings_whitelist_delete()
@@ -78,22 +82,25 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     3
   ]
 }');
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->access_settings()->whitelist()->delete($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->access_settings()->whitelist()->delete($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_access_settings_whitelist__rule_id__get()
     {
+        $query_params = json_decode('null');
         $rule_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->access_settings()->whitelist()->_($rule_id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->access_settings()->whitelist()->_($rule_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_access_settings_whitelist__rule_id__delete()
     {
+        $query_params = json_decode('null');
         $rule_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->access_settings()->whitelist()->_($rule_id)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->access_settings()->whitelist()->_($rule_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_api_keys_post()
@@ -106,14 +113,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     "alerts.read"
   ]
 }');
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->api_keys()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->api_keys()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_api_keys_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->api_keys()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->api_keys()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_api_keys__api_key_id__put()
@@ -125,9 +134,10 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     "user.profile.update"
   ]
 }');
+        $query_params = json_decode('null');
         $api_key_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->api_keys()->_($api_key_id)->put($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->api_keys()->_($api_key_id)->put($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_api_keys__api_key_id__patch()
@@ -135,23 +145,26 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "name": "A New Hope"
 }');
+        $query_params = json_decode('null');
         $api_key_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->api_keys()->_($api_key_id)->patch($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->api_keys()->_($api_key_id)->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_api_keys__api_key_id__get()
     {
+        $query_params = json_decode('null');
         $api_key_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->api_keys()->_($api_key_id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->api_keys()->_($api_key_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_api_keys__api_key_id__delete()
     {
+        $query_params = json_decode('null');
         $api_key_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->api_keys()->_($api_key_id)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->api_keys()->_($api_key_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_asm_groups_post()
@@ -161,14 +174,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "is_default": False,
   "name": "A group name"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->asm()->groups()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->asm()->groups()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_asm_groups_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->asm()->groups()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->asm()->groups()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_asm_groups__group_id__patch()
@@ -178,23 +193,26 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "id": 103,
   "name": "Item Suggestions"
 }');
+        $query_params = json_decode('null');
         $group_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->asm()->groups()->_($group_id)->patch($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->asm()->groups()->_($group_id)->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_asm_groups__group_id__get()
     {
+        $query_params = json_decode('null');
         $group_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->asm()->groups()->_($group_id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->asm()->groups()->_($group_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_asm_groups__group_id__delete()
     {
+        $query_params = json_decode('null');
         $group_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->asm()->groups()->_($group_id)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->asm()->groups()->_($group_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_asm_groups__group_id__suppressions_post()
@@ -205,24 +223,27 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     "test2@example.com"
   ]
 }');
+        $query_params = json_decode('null');
         $group_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->asm()->groups()->_($group_id)->suppressions()->post($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->asm()->groups()->_($group_id)->suppressions()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_asm_groups__group_id__suppressions_get()
     {
+        $query_params = json_decode('null');
         $group_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->asm()->groups()->_($group_id)->suppressions()->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->asm()->groups()->_($group_id)->suppressions()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_asm_groups__group_id__suppressions__email__delete()
     {
+        $query_params = json_decode('null');
         $group_id = "test_url_param";
         $email = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->asm()->groups()->_($group_id)->suppressions()->_($email)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->asm()->groups()->_($group_id)->suppressions()->_($email)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_asm_suppressions_global_post()
@@ -233,29 +254,32 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     "test2@example.com"
   ]
 }');
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->asm()->suppressions()->global()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->asm()->suppressions()->global()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_asm_suppressions_global__email__get()
     {
+        $query_params = json_decode('null');
         $email = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->asm()->suppressions()->global()->_($email)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->asm()->suppressions()->global()->_($email)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_asm_suppressions_global__email__delete()
     {
+        $query_params = json_decode('null');
         $email = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->asm()->suppressions()->global()->_($email)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->asm()->suppressions()->global()->_($email)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_browsers_stats_get()
     {
-        $query_params = json_decode("{'end_date': '2016-04-01', 'aggregated_by': 'day', 'browsers': 'test_string', 'limit': 'test_string', 'offset': 'test_string', 'start_date': '2016-01-01'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->browsers()->stats()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"end_date": "2016-04-01", "aggregated_by": "day", "browsers": "test_string", "limit": "test_string", "offset": "test_string", "start_date": "2016-01-01"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->browsers()->stats()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_campaigns_post()
@@ -280,15 +304,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "suppression_group_id": 42,
   "title": "March Newsletter"
 }');
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->campaigns()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->campaigns()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_campaigns_get()
     {
-        $query_params = json_decode("{'limit': 0, 'offset': 0}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->campaigns()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"limit": 0, "offset": 0}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->campaigns()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_campaigns__campaign_id__patch()
@@ -302,23 +327,26 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "subject": "New Products for Summer!",
   "title": "May Newsletter"
 }');
+        $query_params = json_decode('null');
         $campaign_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->campaigns()->_($campaign_id)->patch($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->campaigns()->_($campaign_id)->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_campaigns__campaign_id__get()
     {
+        $query_params = json_decode('null');
         $campaign_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->campaigns()->_($campaign_id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->campaigns()->_($campaign_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_campaigns__campaign_id__delete()
     {
+        $query_params = json_decode('null');
         $campaign_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->campaigns()->_($campaign_id)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->campaigns()->_($campaign_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_campaigns__campaign_id__schedules_patch()
@@ -326,9 +354,10 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "send_at": 1489451436
 }');
+        $query_params = json_decode('null');
         $campaign_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->campaigns()->_($campaign_id)->schedules()->patch($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->campaigns()->_($campaign_id)->schedules()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_campaigns__campaign_id__schedules_post()
@@ -336,30 +365,34 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "send_at": 1489771528
 }');
+        $query_params = json_decode('null');
         $campaign_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->campaigns()->_($campaign_id)->schedules()->post($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->campaigns()->_($campaign_id)->schedules()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_campaigns__campaign_id__schedules_get()
     {
+        $query_params = json_decode('null');
         $campaign_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->campaigns()->_($campaign_id)->schedules()->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->campaigns()->_($campaign_id)->schedules()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_campaigns__campaign_id__schedules_delete()
     {
+        $query_params = json_decode('null');
         $campaign_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->campaigns()->_($campaign_id)->schedules()->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->campaigns()->_($campaign_id)->schedules()->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_campaigns__campaign_id__schedules_now_post()
     {
+        $query_params = json_decode('null');
         $campaign_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->campaigns()->_($campaign_id)->schedules()->now()->post(null, null, $request_headers);
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->campaigns()->_($campaign_id)->schedules()->now()->post(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_campaigns__campaign_id__schedules_test_post()
@@ -367,45 +400,46 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "to": "your.email@example.com"
 }');
+        $query_params = json_decode('null');
         $campaign_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->campaigns()->_($campaign_id)->schedules()->test()->post($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->campaigns()->_($campaign_id)->schedules()->test()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_categories_get()
     {
-        $query_params = json_decode("{'category': 'test_string', 'limit': 1, 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->categories()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"category": "test_string", "limit": 1, "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->categories()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_categories_stats_get()
     {
-        $query_params = json_decode("{'end_date': '2016-04-01', 'aggregated_by': 'day', 'limit': 1, 'offset': 1, 'start_date': '2016-01-01', 'categories': 'test_string'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->categories()->stats()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"end_date": "2016-04-01", "aggregated_by": "day", "limit": 1, "offset": 1, "start_date": "2016-01-01", "categories": "test_string"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->categories()->stats()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_categories_stats_sums_get()
     {
-        $query_params = json_decode("{'end_date': '2016-04-01', 'aggregated_by': 'day', 'limit': 1, 'sort_by_metric': 'test_string', 'offset': 1, 'start_date': '2016-01-01', 'sort_by_direction': 'asc'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->categories()->stats()->sums()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"end_date": "2016-04-01", "aggregated_by": "day", "limit": 1, "sort_by_metric": "test_string", "offset": 1, "start_date": "2016-01-01", "sort_by_direction": "asc"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->categories()->stats()->sums()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_clients_stats_get()
     {
-        $query_params = json_decode("{'aggregated_by': 'day', 'start_date': '2016-01-01', 'end_date': '2016-04-01'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->clients()->stats()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"aggregated_by": "day", "start_date": "2016-01-01", "end_date": "2016-04-01"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->clients()->stats()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_clients__client_type__stats_get()
     {
-        $query_params = json_decode("{'aggregated_by': 'day', 'start_date': '2016-01-01', 'end_date': '2016-04-01'}");
+        $query_params = json_decode('{"aggregated_by": "day", "start_date": "2016-01-01", "end_date": "2016-04-01"}');
         $client_type = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->clients()->_($client_type)->stats()->get(null, $query_params, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->clients()->_($client_type)->stats()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_custom_fields_post()
@@ -414,28 +448,32 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "name": "pet",
   "type": "text"
 }');
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->contactdb()->custom_fields()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->contactdb()->custom_fields()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_contactdb_custom_fields_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->custom_fields()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->custom_fields()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_custom_fields__custom_field_id__get()
     {
+        $query_params = json_decode('null');
         $custom_field_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->custom_fields()->_($custom_field_id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->custom_fields()->_($custom_field_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_custom_fields__custom_field_id__delete()
     {
+        $query_params = json_decode('null');
         $custom_field_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 202}");
-        $response = $this->sg->client()->contactdb()->custom_fields()->_($custom_field_id)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 202");
+        $response = $this->sg->client->contactdb()->custom_fields()->_($custom_field_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 202);
     }
     public function test_contactdb_lists_post()
@@ -443,14 +481,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "name": "your list name"
 }');
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->contactdb()->lists()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->contactdb()->lists()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_contactdb_lists_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->lists()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->lists()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_lists_delete()
@@ -461,8 +501,9 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   3,
   4
 ]');
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->contactdb()->lists()->delete($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->contactdb()->lists()->delete($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_contactdb_lists__list_id__patch()
@@ -470,26 +511,26 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "name": "newlistname"
 }');
-        $query_params = json_decode("{'list_id': 0}");
+        $query_params = json_decode('{"list_id": 0}');
         $list_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->lists()->_($list_id)->patch($request_body, $query_params, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->lists()->_($list_id)->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_lists__list_id__get()
     {
-        $query_params = json_decode("{'list_id': 0}");
+        $query_params = json_decode('{"list_id": 0}');
         $list_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->lists()->_($list_id)->get(null, $query_params, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->lists()->_($list_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_lists__list_id__delete()
     {
-        $query_params = json_decode("{'delete_contacts': 'true'}");
+        $query_params = json_decode('{"delete_contacts": "true"}');
         $list_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 202}");
-        $response = $this->sg->client()->contactdb()->lists()->_($list_id)->delete(null, $query_params, $request_headers);
+        $request_headers = array("X-Mock: 202");
+        $response = $this->sg->client->contactdb()->lists()->_($list_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 202);
     }
     public function test_contactdb_lists__list_id__recipients_post()
@@ -498,34 +539,36 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "recipient_id1",
   "recipient_id2"
 ]');
+        $query_params = json_decode('null');
         $list_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->contactdb()->lists()->_($list_id)->recipients()->post($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->contactdb()->lists()->_($list_id)->recipients()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_contactdb_lists__list_id__recipients_get()
     {
-        $query_params = json_decode("{'page': 1, 'page_size': 1, 'list_id': 0}");
+        $query_params = json_decode('{"page": 1, "page_size": 1, "list_id": 0}');
         $list_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->lists()->_($list_id)->recipients()->get(null, $query_params, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->lists()->_($list_id)->recipients()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_lists__list_id__recipients__recipient_id__post()
     {
+        $query_params = json_decode('null');
         $list_id = "test_url_param";
         $recipient_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->contactdb()->lists()->_($list_id)->recipients()->_($recipient_id)->post(null, null, $request_headers);
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->contactdb()->lists()->_($list_id)->recipients()->_($recipient_id)->post(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_contactdb_lists__list_id__recipients__recipient_id__delete()
     {
-        $query_params = json_decode("{'recipient_id': 0, 'list_id': 0}");
+        $query_params = json_decode('{"recipient_id": 0, "list_id": 0}');
         $list_id = "test_url_param";
         $recipient_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->contactdb()->lists()->_($list_id)->recipients()->_($recipient_id)->delete(null, $query_params, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->contactdb()->lists()->_($list_id)->recipients()->_($recipient_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_contactdb_recipients_patch()
@@ -537,8 +580,9 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     "last_name": "Jones"
   }
 ]');
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->contactdb()->recipients()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->contactdb()->recipients()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_contactdb_recipients_post()
@@ -557,15 +601,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     "last_name": "User"
   }
 ]');
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->contactdb()->recipients()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->contactdb()->recipients()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_contactdb_recipients_get()
     {
-        $query_params = json_decode("{'page': 1, 'page_size': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->recipients()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"page": 1, "page_size": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->recipients()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_recipients_delete()
@@ -574,54 +619,61 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "recipient_id1",
   "recipient_id2"
 ]');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->recipients()->delete($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->recipients()->delete($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_recipients_billable_count_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->recipients()->billable_count()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->recipients()->billable_count()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_recipients_count_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->recipients()->count()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->recipients()->count()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_recipients_search_get()
     {
-        $query_params = json_decode("{'{field_name}': 'test_string'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->recipients()->search()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"{field_name}": "test_string"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->recipients()->search()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_recipients__recipient_id__get()
     {
+        $query_params = json_decode('null');
         $recipient_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->recipients()->_($recipient_id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->recipients()->_($recipient_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_recipients__recipient_id__delete()
     {
+        $query_params = json_decode('null');
         $recipient_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->contactdb()->recipients()->_($recipient_id)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->contactdb()->recipients()->_($recipient_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_contactdb_recipients__recipient_id__lists_get()
     {
+        $query_params = json_decode('null');
         $recipient_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->recipients()->_($recipient_id)->lists()->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->recipients()->_($recipient_id)->lists()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_reserved_fields_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->reserved_fields()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->reserved_fields()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_segments_post()
@@ -650,14 +702,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "list_id": 4,
   "name": "Last Name Miller"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->segments()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->segments()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_segments_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->segments()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->segments()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_segments__segment_id__patch()
@@ -674,61 +728,62 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "list_id": 5,
   "name": "The Millers"
 }');
-        $query_params = json_decode("{'segment_id': 'test_string'}");
+        $query_params = json_decode('{"segment_id": "test_string"}');
         $segment_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->segments()->_($segment_id)->patch($request_body, $query_params, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->segments()->_($segment_id)->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_segments__segment_id__get()
     {
-        $query_params = json_decode("{'segment_id': 0}");
+        $query_params = json_decode('{"segment_id": 0}');
         $segment_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->segments()->_($segment_id)->get(null, $query_params, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->segments()->_($segment_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_contactdb_segments__segment_id__delete()
     {
-        $query_params = json_decode("{'delete_contacts': 'true'}");
+        $query_params = json_decode('{"delete_contacts": "true"}');
         $segment_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->contactdb()->segments()->_($segment_id)->delete(null, $query_params, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->contactdb()->segments()->_($segment_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_contactdb_segments__segment_id__recipients_get()
     {
-        $query_params = json_decode("{'page': 1, 'page_size': 1}");
+        $query_params = json_decode('{"page": 1, "page_size": 1}');
         $segment_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->contactdb()->segments()->_($segment_id)->recipients()->get(null, $query_params, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->contactdb()->segments()->_($segment_id)->recipients()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_devices_stats_get()
     {
-        $query_params = json_decode("{'aggregated_by': 'day', 'limit': 1, 'start_date': '2016-01-01', 'end_date': '2016-04-01', 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->devices()->stats()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"aggregated_by": "day", "limit": 1, "start_date": "2016-01-01", "end_date": "2016-04-01", "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->devices()->stats()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_geo_stats_get()
     {
-        $query_params = json_decode("{'end_date': '2016-04-01', 'country': 'US', 'aggregated_by': 'day', 'limit': 1, 'offset': 1, 'start_date': '2016-01-01'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->geo()->stats()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"end_date": "2016-04-01", "country": "US", "aggregated_by": "day", "limit": 1, "offset": 1, "start_date": "2016-01-01"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->geo()->stats()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_ips_get()
     {
-        $query_params = json_decode("{'subuser': 'test_string', 'ip': 'test_string', 'limit': 1, 'exclude_whitelabels': 'true', 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->ips()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"subuser": "test_string", "ip": "test_string", "limit": 1, "exclude_whitelabels": "true", "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->ips()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_ips_assigned_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->ips()->assigned()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->ips()->assigned()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_ips_pools_post()
@@ -736,14 +791,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "name": "marketing"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->ips()->pools()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->ips()->pools()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_ips_pools_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->ips()->pools()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->ips()->pools()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_ips_pools__pool_name__put()
@@ -751,23 +808,26 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "name": "new_pool_name"
 }');
+        $query_params = json_decode('null');
         $pool_name = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->ips()->pools()->_($pool_name)->put($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->ips()->pools()->_($pool_name)->put($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_ips_pools__pool_name__get()
     {
+        $query_params = json_decode('null');
         $pool_name = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->ips()->pools()->_($pool_name)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->ips()->pools()->_($pool_name)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_ips_pools__pool_name__delete()
     {
+        $query_params = json_decode('null');
         $pool_name = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->ips()->pools()->_($pool_name)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->ips()->pools()->_($pool_name)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_ips_pools__pool_name__ips_post()
@@ -775,17 +835,19 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "ip": "0.0.0.0"
 }');
+        $query_params = json_decode('null');
         $pool_name = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->ips()->pools()->_($pool_name)->ips()->post($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->ips()->pools()->_($pool_name)->ips()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_ips_pools__pool_name__ips__ip__delete()
     {
+        $query_params = json_decode('null');
         $pool_name = "test_url_param";
         $ip = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->ips()->pools()->_($pool_name)->ips()->_($ip)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->ips()->pools()->_($pool_name)->ips()->_($ip)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_ips_warmup_post()
@@ -793,48 +855,55 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "ip": "0.0.0.0"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->ips()->warmup()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->ips()->warmup()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_ips_warmup_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->ips()->warmup()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->ips()->warmup()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_ips_warmup__ip_address__get()
     {
+        $query_params = json_decode('null');
         $ip_address = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->ips()->warmup()->_($ip_address)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->ips()->warmup()->_($ip_address)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_ips_warmup__ip_address__delete()
     {
+        $query_params = json_decode('null');
         $ip_address = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->ips()->warmup()->_($ip_address)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->ips()->warmup()->_($ip_address)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_ips__ip_address__get()
     {
+        $query_params = json_decode('null');
         $ip_address = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->ips()->_($ip_address)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->ips()->_($ip_address)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_batch_post()
     {
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->mail()->batch()->post(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->mail()->batch()->post(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_mail_batch__batch_id__get()
     {
+        $query_params = json_decode('null');
         $batch_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail()->batch()->_($batch_id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail()->batch()->_($batch_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_send_beta_post()
@@ -982,15 +1051,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     }
   }
 }');
-        $request_headers = json_decode("{'X-Mock': 202}");
-        $response = $this->sg->client()->mail()->send()->beta()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 202");
+        $response = $this->sg->client->mail()->send()->beta()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 202);
     }
     public function test_mail_settings_get()
     {
-        $query_params = json_decode("{'limit': 1, 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"limit": 1, "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_address_whitelist_patch()
@@ -1002,14 +1072,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     "example.com"
   ]
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->address_whitelist()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->address_whitelist()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_address_whitelist_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->address_whitelist()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->address_whitelist()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_bcc_patch()
@@ -1018,14 +1090,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "email": "email@example.com",
   "enabled": False
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->bcc()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->bcc()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_bcc_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->bcc()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->bcc()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_bounce_purge_patch()
@@ -1035,14 +1109,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "hard_bounces": 5,
   "soft_bounces": 5
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->bounce_purge()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->bounce_purge()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_bounce_purge_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->bounce_purge()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->bounce_purge()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_footer_patch()
@@ -1052,14 +1128,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "html_content": "...",
   "plain_content": "..."
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->footer()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->footer()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_footer_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->footer()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->footer()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_forward_bounce_patch()
@@ -1068,14 +1146,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "email": "example@example.com",
   "enabled": True
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->forward_bounce()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->forward_bounce()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_forward_bounce_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->forward_bounce()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->forward_bounce()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_forward_spam_patch()
@@ -1084,14 +1164,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "email": "",
   "enabled": False
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->forward_spam()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->forward_spam()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_forward_spam_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->forward_spam()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->forward_spam()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_plain_content_patch()
@@ -1099,14 +1181,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "enabled": False
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->plain_content()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->plain_content()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_plain_content_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->plain_content()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->plain_content()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_spam_check_patch()
@@ -1116,14 +1200,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "max_score": 5,
   "url": "url"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->spam_check()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->spam_check()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_spam_check_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->spam_check()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->spam_check()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_template_patch()
@@ -1132,28 +1218,30 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "enabled": True,
   "html_content": "<% body %>"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->template()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->template()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mail_settings_template_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mail_settings()->template()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mail_settings()->template()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_mailbox_providers_stats_get()
     {
-        $query_params = json_decode("{'end_date': '2016-04-01', 'mailbox_providers': 'test_string', 'aggregated_by': 'day', 'limit': 1, 'offset': 1, 'start_date': '2016-01-01'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->mailbox_providers()->stats()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"end_date": "2016-04-01", "mailbox_providers": "test_string", "aggregated_by": "day", "limit": 1, "offset": 1, "start_date": "2016-01-01"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->mailbox_providers()->stats()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_partner_settings_get()
     {
-        $query_params = json_decode("{'limit': 1, 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->partner_settings()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"limit": 1, "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->partner_settings()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_partner_settings_new_relic_patch()
@@ -1163,27 +1251,30 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "enabled": True,
   "license_key": ""
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->partner_settings()->new_relic()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->partner_settings()->new_relic()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_partner_settings_new_relic_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->partner_settings()->new_relic()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->partner_settings()->new_relic()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_scopes_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->scopes()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->scopes()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_stats_get()
     {
-        $query_params = json_decode("{'aggregated_by': 'day', 'limit': 1, 'start_date': '2016-01-01', 'end_date': '2016-04-01', 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->stats()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"aggregated_by": "day", "limit": 1, "start_date": "2016-01-01", "end_date": "2016-04-01", "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->stats()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_subusers_post()
@@ -1197,43 +1288,44 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "password": "johns_password",
   "username": "John@example.com"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->subusers()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->subusers()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_subusers_get()
     {
-        $query_params = json_decode("{'username': 'test_string', 'limit': 0, 'offset': 0}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->subusers()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"username": "test_string", "limit": 0, "offset": 0}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->subusers()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_subusers_reputations_get()
     {
-        $query_params = json_decode("{'usernames': 'test_string'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->subusers()->reputations()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"usernames": "test_string"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->subusers()->reputations()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_subusers_stats_get()
     {
-        $query_params = json_decode("{'end_date': '2016-04-01', 'aggregated_by': 'day', 'limit': 1, 'offset': 1, 'start_date': '2016-01-01', 'subusers': 'test_string'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->subusers()->stats()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"end_date": "2016-04-01", "aggregated_by": "day", "limit": 1, "offset": 1, "start_date": "2016-01-01", "subusers": "test_string"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->subusers()->stats()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_subusers_stats_monthly_get()
     {
-        $query_params = json_decode("{'subuser': 'test_string', 'limit': 1, 'sort_by_metric': 'test_string', 'offset': 1, 'date': 'test_string', 'sort_by_direction': 'asc'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->subusers()->stats()->monthly()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"subuser": "test_string", "limit": 1, "sort_by_metric": "test_string", "offset": 1, "date": "test_string", "sort_by_direction": "asc"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->subusers()->stats()->monthly()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_subusers_stats_sums_get()
     {
-        $query_params = json_decode("{'end_date': '2016-04-01', 'aggregated_by': 'day', 'limit': 1, 'sort_by_metric': 'test_string', 'offset': 1, 'start_date': '2016-01-01', 'sort_by_direction': 'asc'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->subusers()->stats()->sums()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"end_date": "2016-04-01", "aggregated_by": "day", "limit": 1, "sort_by_metric": "test_string", "offset": 1, "start_date": "2016-01-01", "sort_by_direction": "asc"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->subusers()->stats()->sums()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_subusers__subuser_name__patch()
@@ -1241,16 +1333,18 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "disabled": False
 }');
+        $query_params = json_decode('null');
         $subuser_name = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->subusers()->_($subuser_name)->patch($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->subusers()->_($subuser_name)->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_subusers__subuser_name__delete()
     {
+        $query_params = json_decode('null');
         $subuser_name = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->subusers()->_($subuser_name)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->subusers()->_($subuser_name)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_subusers__subuser_name__ips_put()
@@ -1258,9 +1352,10 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('[
   "127.0.0.1"
 ]');
+        $query_params = json_decode('null');
         $subuser_name = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->subusers()->_($subuser_name)->ips()->put($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->subusers()->_($subuser_name)->ips()->put($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_subusers__subuser_name__monitor_put()
@@ -1269,9 +1364,10 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "email": "example@example.com",
   "frequency": 500
 }');
+        $query_params = json_decode('null');
         $subuser_name = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->subusers()->_($subuser_name)->monitor()->put($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->subusers()->_($subuser_name)->monitor()->put($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_subusers__subuser_name__monitor_post()
@@ -1280,38 +1376,41 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "email": "example@example.com",
   "frequency": 50000
 }');
+        $query_params = json_decode('null');
         $subuser_name = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->subusers()->_($subuser_name)->monitor()->post($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->subusers()->_($subuser_name)->monitor()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_subusers__subuser_name__monitor_get()
     {
+        $query_params = json_decode('null');
         $subuser_name = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->subusers()->_($subuser_name)->monitor()->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->subusers()->_($subuser_name)->monitor()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_subusers__subuser_name__monitor_delete()
     {
+        $query_params = json_decode('null');
         $subuser_name = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->subusers()->_($subuser_name)->monitor()->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->subusers()->_($subuser_name)->monitor()->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_subusers__subuser_name__stats_monthly_get()
     {
-        $query_params = json_decode("{'date': 'test_string', 'sort_by_direction': 'asc', 'limit': 0, 'sort_by_metric': 'test_string', 'offset': 1}");
+        $query_params = json_decode('{"date": "test_string", "sort_by_direction": "asc", "limit": 0, "sort_by_metric": "test_string", "offset": 1}');
         $subuser_name = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->subusers()->_($subuser_name)->stats()->monthly()->get(null, $query_params, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->subusers()->_($subuser_name)->stats()->monthly()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_suppression_blocks_get()
     {
-        $query_params = json_decode("{'start_time': 1, 'limit': 1, 'end_time': 1, 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->suppression()->blocks()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"start_time": 1, "limit": 1, "end_time": 1, "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->suppression()->blocks()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_suppression_blocks_delete()
@@ -1323,29 +1422,32 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     "example2@example.com"
   ]
 }');
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->suppression()->blocks()->delete($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->suppression()->blocks()->delete($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_suppression_blocks__email__get()
     {
+        $query_params = json_decode('null');
         $email = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->suppression()->blocks()->_($email)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->suppression()->blocks()->_($email)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_suppression_blocks__email__delete()
     {
+        $query_params = json_decode('null');
         $email = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->suppression()->blocks()->_($email)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->suppression()->blocks()->_($email)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_suppression_bounces_get()
     {
-        $query_params = json_decode("{'start_time': 0, 'end_time': 0}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->suppression()->bounces()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"start_time": 0, "end_time": 0}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->suppression()->bounces()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_suppression_bounces_delete()
@@ -1357,30 +1459,32 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     "example2@example.com"
   ]
 }');
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->suppression()->bounces()->delete($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->suppression()->bounces()->delete($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_suppression_bounces__email__get()
     {
+        $query_params = json_decode('null');
         $email = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->suppression()->bounces()->_($email)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->suppression()->bounces()->_($email)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_suppression_bounces__email__delete()
     {
-        $query_params = json_decode("{'email_address': 'example@example.com'}");
+        $query_params = json_decode('{"email_address": "example@example.com"}');
         $email = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->suppression()->bounces()->_($email)->delete(null, $query_params, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->suppression()->bounces()->_($email)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_suppression_invalid_emails_get()
     {
-        $query_params = json_decode("{'start_time': 1, 'limit': 1, 'end_time': 1, 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->suppression()->invalid_emails()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"start_time": 1, "limit": 1, "end_time": 1, "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->suppression()->invalid_emails()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_suppression_invalid_emails_delete()
@@ -1392,43 +1496,48 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     "example2@example.com"
   ]
 }');
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->suppression()->invalid_emails()->delete($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->suppression()->invalid_emails()->delete($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_suppression_invalid_emails__email__get()
     {
+        $query_params = json_decode('null');
         $email = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->suppression()->invalid_emails()->_($email)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->suppression()->invalid_emails()->_($email)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_suppression_invalid_emails__email__delete()
     {
+        $query_params = json_decode('null');
         $email = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->suppression()->invalid_emails()->_($email)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->suppression()->invalid_emails()->_($email)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_suppression_spam_report__email__get()
     {
+        $query_params = json_decode('null');
         $email = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->suppression()->spam_report()->_($email)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->suppression()->spam_report()->_($email)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_suppression_spam_report__email__delete()
     {
+        $query_params = json_decode('null');
         $email = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->suppression()->spam_report()->_($email)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->suppression()->spam_report()->_($email)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_suppression_spam_reports_get()
     {
-        $query_params = json_decode("{'start_time': 1, 'limit': 1, 'end_time': 1, 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->suppression()->spam_reports()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"start_time": 1, "limit": 1, "end_time": 1, "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->suppression()->spam_reports()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_suppression_spam_reports_delete()
@@ -1440,15 +1549,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
     "example2@example.com"
   ]
 }');
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->suppression()->spam_reports()->delete($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->suppression()->spam_reports()->delete($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_suppression_unsubscribes_get()
     {
-        $query_params = json_decode("{'start_time': 1, 'limit': 1, 'end_time': 1, 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->suppression()->unsubscribes()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"start_time": 1, "limit": 1, "end_time": 1, "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->suppression()->unsubscribes()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_templates_post()
@@ -1456,14 +1566,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "name": "example_name"
 }');
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->templates()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->templates()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_templates_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->templates()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->templates()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_templates__template_id__patch()
@@ -1471,23 +1583,26 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "name": "new_example_name"
 }');
+        $query_params = json_decode('null');
         $template_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->templates()->_($template_id)->patch($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->templates()->_($template_id)->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_templates__template_id__get()
     {
+        $query_params = json_decode('null');
         $template_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->templates()->_($template_id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->templates()->_($template_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_templates__template_id__delete()
     {
+        $query_params = json_decode('null');
         $template_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->templates()->_($template_id)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->templates()->_($template_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_templates__template_id__versions_post()
@@ -1500,9 +1615,10 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "subject": "<%subject%>",
   "template_id": "ddb96bbc-9b92-425e-8979-99464621b543"
 }');
+        $query_params = json_decode('null');
         $template_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->templates()->_($template_id)->versions()->post($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->templates()->_($template_id)->versions()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_templates__template_id__versions__version_id__patch()
@@ -1514,41 +1630,45 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "plain_content": "<%body%>",
   "subject": "<%subject%>"
 }');
+        $query_params = json_decode('null');
         $template_id = "test_url_param";
         $version_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->templates()->_($template_id)->versions()->_($version_id)->patch($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->templates()->_($template_id)->versions()->_($version_id)->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_templates__template_id__versions__version_id__get()
     {
+        $query_params = json_decode('null');
         $template_id = "test_url_param";
         $version_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->templates()->_($template_id)->versions()->_($version_id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->templates()->_($template_id)->versions()->_($version_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_templates__template_id__versions__version_id__delete()
     {
+        $query_params = json_decode('null');
         $template_id = "test_url_param";
         $version_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->templates()->_($template_id)->versions()->_($version_id)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->templates()->_($template_id)->versions()->_($version_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_templates__template_id__versions__version_id__activate_post()
     {
+        $query_params = json_decode('null');
         $template_id = "test_url_param";
         $version_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->templates()->_($template_id)->versions()->_($version_id)->activate()->post(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->templates()->_($template_id)->versions()->_($version_id)->activate()->post(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_tracking_settings_get()
     {
-        $query_params = json_decode("{'limit': 1, 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->tracking_settings()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"limit": 1, "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->tracking_settings()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_tracking_settings_click_patch()
@@ -1556,14 +1676,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "enabled": True
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->tracking_settings()->click()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->tracking_settings()->click()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_tracking_settings_click_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->tracking_settings()->click()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->tracking_settings()->click()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_tracking_settings_google_analytics_patch()
@@ -1576,14 +1698,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "utm_source": "sendgrid.com",
   "utm_term": ""
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->tracking_settings()->google_analytics()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->tracking_settings()->google_analytics()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_tracking_settings_google_analytics_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->tracking_settings()->google_analytics()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->tracking_settings()->google_analytics()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_tracking_settings_open_patch()
@@ -1591,14 +1715,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "enabled": True
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->tracking_settings()->open()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->tracking_settings()->open()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_tracking_settings_open_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->tracking_settings()->open()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->tracking_settings()->open()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_tracking_settings_subscription_patch()
@@ -1611,26 +1737,30 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "replace": "replacement tag",
   "url": "url"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->tracking_settings()->subscription()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->tracking_settings()->subscription()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_tracking_settings_subscription_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->tracking_settings()->subscription()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->tracking_settings()->subscription()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_account_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->account()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->account()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_credits_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->credits()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->credits()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_email_put()
@@ -1638,14 +1768,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "email": "example@example.com"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->email()->put($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->email()->put($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_email_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->email()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->email()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_password_put()
@@ -1654,8 +1786,9 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "new_password": "new_password",
   "old_password": "old_password"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->password()->put($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->password()->put($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_profile_patch()
@@ -1665,14 +1798,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "first_name": "Example",
   "last_name": "User"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->profile()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->profile()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_profile_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->profile()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->profile()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_scheduled_sends_post()
@@ -1681,14 +1816,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "batch_id": "YOUR_BATCH_ID",
   "status": "pause"
 }');
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->user()->scheduled_sends()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->user()->scheduled_sends()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_user_scheduled_sends_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->scheduled_sends()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->scheduled_sends()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_scheduled_sends__batch_id__patch()
@@ -1696,23 +1833,26 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "status": "pause"
 }');
+        $query_params = json_decode('null');
         $batch_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->user()->scheduled_sends()->_($batch_id)->patch($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->user()->scheduled_sends()->_($batch_id)->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_user_scheduled_sends__batch_id__get()
     {
+        $query_params = json_decode('null');
         $batch_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->scheduled_sends()->_($batch_id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->scheduled_sends()->_($batch_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_scheduled_sends__batch_id__delete()
     {
+        $query_params = json_decode('null');
         $batch_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->user()->scheduled_sends()->_($batch_id)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->user()->scheduled_sends()->_($batch_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_user_settings_enforced_tls_patch()
@@ -1721,14 +1861,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "require_tls": True,
   "require_valid_cert": False
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->settings()->enforced_tls()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->settings()->enforced_tls()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_settings_enforced_tls_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->settings()->enforced_tls()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->settings()->enforced_tls()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_username_put()
@@ -1736,14 +1878,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "username": "test_username"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->username()->put($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->username()->put($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_username_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->username()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->username()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_webhooks_event_settings_patch()
@@ -1763,14 +1907,16 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "unsubscribe": True,
   "url": "url"
 }');
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->webhooks()->event()->settings()->patch($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->webhooks()->event()->settings()->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_webhooks_event_settings_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->webhooks()->event()->settings()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->webhooks()->event()->settings()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_webhooks_event_test_post()
@@ -1778,21 +1924,23 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "url": "url"
 }');
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->user()->webhooks()->event()->test()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->user()->webhooks()->event()->test()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_user_webhooks_parse_settings_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->webhooks()->parse()->settings()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->webhooks()->parse()->settings()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_user_webhooks_parse_stats_get()
     {
-        $query_params = json_decode("{'aggregated_by': 'day', 'limit': 'test_string', 'start_date': '2016-01-01', 'end_date': '2016-04-01', 'offset': 'test_string'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->user()->webhooks()->parse()->stats()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"aggregated_by": "day", "limit": "test_string", "start_date": "2016-01-01", "end_date": "2016-04-01", "offset": "test_string"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->user()->webhooks()->parse()->stats()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_domains_post()
@@ -1809,33 +1957,37 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "subdomain": "news",
   "username": "john@example.com"
 }');
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->whitelabel()->domains()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->whitelabel()->domains()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_whitelabel_domains_get()
     {
-        $query_params = json_decode("{'username': 'test_string', 'domain': 'test_string', 'exclude_subusers': 'true', 'limit': 1, 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->domains()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"username": "test_string", "domain": "test_string", "exclude_subusers": "true", "limit": 1, "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->domains()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_domains_default_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->domains()->default()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->domains()->default()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_domains_subuser_get()
     {
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->domains()->subuser()->get(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->domains()->subuser()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_domains_subuser_delete()
     {
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->whitelabel()->domains()->subuser()->delete(null, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->whitelabel()->domains()->subuser()->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_whitelabel_domains__domain_id__patch()
@@ -1844,23 +1996,26 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "custom_spf": True,
   "default": False
 }');
+        $query_params = json_decode('null');
         $domain_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->domains()->_($domain_id)->patch($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->domains()->_($domain_id)->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_domains__domain_id__get()
     {
+        $query_params = json_decode('null');
         $domain_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->domains()->_($domain_id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->domains()->_($domain_id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_domains__domain_id__delete()
     {
+        $query_params = json_decode('null');
         $domain_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->whitelabel()->domains()->_($domain_id)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->whitelabel()->domains()->_($domain_id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_whitelabel_domains__domain_id__subuser_post()
@@ -1868,9 +2023,10 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "username": "jane@example.com"
 }');
+        $query_params = json_decode('null');
         $domain_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->whitelabel()->domains()->_($domain_id)->subuser()->post($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->whitelabel()->domains()->_($domain_id)->subuser()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_whitelabel_domains__id__ips_post()
@@ -1878,24 +2034,27 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "ip": "192.168.0.1"
 }');
+        $query_params = json_decode('null');
         $id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->domains()->_($id)->ips()->post($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->domains()->_($id)->ips()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_domains__id__ips__ip__delete()
     {
+        $query_params = json_decode('null');
         $id = "test_url_param";
         $ip = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->domains()->_($id)->ips()->_($ip)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->domains()->_($id)->ips()->_($ip)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_domains__id__validate_post()
     {
+        $query_params = json_decode('null');
         $id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->domains()->_($id)->validate()->post(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->domains()->_($id)->validate()->post(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_ips_post()
@@ -1905,36 +2064,40 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "ip": "192.168.1.1",
   "subdomain": "email"
 }');
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->whitelabel()->ips()->post($request_body, null, $request_headers);
+        $query_params = json_decode('null');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->whitelabel()->ips()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_whitelabel_ips_get()
     {
-        $query_params = json_decode("{'ip': 'test_string', 'limit': 1, 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->ips()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"ip": "test_string", "limit": 1, "offset": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->ips()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_ips__id__get()
     {
+        $query_params = json_decode('null');
         $id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->ips()->_($id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->ips()->_($id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_ips__id__delete()
     {
+        $query_params = json_decode('null');
         $id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->whitelabel()->ips()->_($id)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->whitelabel()->ips()->_($id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_whitelabel_ips__id__validate_post()
     {
+        $query_params = json_decode('null');
         $id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->ips()->_($id)->validate()->post(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->ips()->_($id)->validate()->post(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_links_post()
@@ -1944,37 +2107,37 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
   "domain": "example.com",
   "subdomain": "mail"
 }');
-        $query_params = json_decode("{'limit': 1, 'offset': 1}");
-        $request_headers = json_decode("{'X-Mock': 201}");
-        $response = $this->sg->client()->whitelabel()->links()->post($request_body, $query_params, $request_headers);
+        $query_params = json_decode('{"limit": 1, "offset": 1}');
+        $request_headers = array("X-Mock: 201");
+        $response = $this->sg->client->whitelabel()->links()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 201);
     }
     public function test_whitelabel_links_get()
     {
-        $query_params = json_decode("{'limit': 1}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->links()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"limit": 1}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->links()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_links_default_get()
     {
-        $query_params = json_decode("{'domain': 'test_string'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->links()->default()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"domain": "test_string"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->links()->default()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_links_subuser_get()
     {
-        $query_params = json_decode("{'username': 'test_string'}");
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->links()->subuser()->get(null, $query_params, $request_headers);
+        $query_params = json_decode('{"username": "test_string"}');
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->links()->subuser()->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_links_subuser_delete()
     {
-        $query_params = json_decode("{'username': 'test_string'}");
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->whitelabel()->links()->subuser()->delete(null, $query_params, $request_headers);
+        $query_params = json_decode('{"username": "test_string"}');
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->whitelabel()->links()->subuser()->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_whitelabel_links__id__patch()
@@ -1982,30 +2145,34 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "default": True
 }');
+        $query_params = json_decode('null');
         $id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->links()->_($id)->patch($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->links()->_($id)->patch($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_links__id__get()
     {
+        $query_params = json_decode('null');
         $id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->links()->_($id)->get(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->links()->_($id)->get(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_links__id__delete()
     {
+        $query_params = json_decode('null');
         $id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 204}");
-        $response = $this->sg->client()->whitelabel()->links()->_($id)->delete(null, null, $request_headers);
+        $request_headers = array("X-Mock: 204");
+        $response = $this->sg->client->whitelabel()->links()->_($id)->delete(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 204);
     }
     public function test_whitelabel_links__id__validate_post()
     {
+        $query_params = json_decode('null');
         $id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->links()->_($id)->validate()->post(null, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->links()->_($id)->validate()->post(null, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }
     public function test_whitelabel_links__link_id__subuser_post()
@@ -2013,8 +2180,9 @@ class SendGridTest_SendGrid extends \PHPUnit_Framework_TestCase
         $request_body = json_decode('{
   "username": "jane@example.com"
 }');
+        $query_params = json_decode('null');
         $link_id = "test_url_param";
-        $request_headers = json_decode("{'X-Mock': 200}");
-        $response = $this->sg->client()->whitelabel()->links()->_($link_id)->subuser()->post($request_body, null, $request_headers);
+        $request_headers = array("X-Mock: 200");
+        $response = $this->sg->client->whitelabel()->links()->_($link_id)->subuser()->post($request_body, $query_params, $request_headers);
         $this->assertEquals($response->statusCode(), 200);
     }}
diff --git a/test/unit/bootstrap.php b/test/unit/bootstrap.php
index dc22830..5332279 100644
--- a/test/unit/bootstrap.php
+++ b/test/unit/bootstrap.php
@@ -1,25 +1,4 @@
 <?php
 include(dirname(dirname(__FILE__)) . '/../lib/SendGrid.php');
 include(dirname(dirname(__FILE__)) . '/../lib/helpers/mail/Mail.php');
-require __DIR__ . '/../../vendor/autoload.php';
-
-SendGrid::register_autoloader();
-
-function autoload_tests($class)
-{
-    if (strpos($class, 'SendGridTest_') !== 0) {
-        return;
-    }
-
-    if (strpos($class, 'MailTest_') !== 0) {
-        return;
-    }
-
-    $class = substr($class, 13);
-    $file = str_replace('_', '/', $class);
-    if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
-        require_once(dirname(__FILE__) . '/' . $file . '.php');
-    }
-}
-
-spl_autoload_register('autoload_tests');
\ No newline at end of file
+?>
\ No newline at end of file