diff --git a/tests/Unirest/RequestTest.php b/tests/Unirest/RequestTest.php
index 732f2f2..00a68aa 100644
--- a/tests/Unirest/RequestTest.php
+++ b/tests/Unirest/RequestTest.php
@@ -2,192 +2,7 @@
 
 class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 {
-    public function testGet()
-    {
-        $response = Unirest\Request::get('http://httpbin.org/get?name=Mark', array(
-            'Accept' => 'application/json'
-        ), array(
-            'nick' => 'thefosk'
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $args = $response->body->args;
-        $this->assertEquals('Mark', $args->name);
-        $this->assertEquals('thefosk', $args->nick);
-    }
-
-    public function testGetMultidimensionalArray()
-    {
-        $response = Unirest\Request::get('http://httpbin.org/get', array(
-            'Accept' => 'application/json'
-        ), array(
-            'key' => 'value',
-            'items' => array(
-                'item1',
-                'item2'
-            )
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $args = $response->body->args;
-
-        $this->assertEquals('value', $args->key);
-        $this->assertEquals('item1', $args->{'items[0]'});
-        $this->assertEquals('item2', $args->{'items[1]'});
-    }
-
-    public function testGetWithDots()
-    {
-        $response = Unirest\Request::get('http://httpbin.org/get', array(
-            'Accept' => 'application/json'
-        ), array(
-            'user.name' => 'Mark',
-            'nick' => 'thefosk'
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $args = $response->body->args;
-        $this->assertEquals('Mark', $args->{'user.name'});
-        $this->assertEquals('thefosk', $args->nick);
-    }
-
-    public function testGetWithDots2()
-    {
-        $response = Unirest\Request::get('http://httpbin.org/get', array(
-            'Accept' => 'application/json'
-        ), array(
-            'user.name' => 'Mark Bond',
-            'nick' => 'thefosk'
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $args = $response->body->args;
-        $this->assertEquals('Mark Bond', $args->{'user.name'});
-        $this->assertEquals('thefosk', $args->nick);
-    }
-
-    public function testPost()
-    {
-        $response = Unirest\Request::post('http://httpbin.org/post', array(
-            'Accept' => 'application/json'
-        ), array(
-            'name' => 'Mark',
-            'nick' => 'thefosk'
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $form = $response->body->form;
-        $this->assertEquals('Mark', $form->name);
-        $this->assertEquals('thefosk', $form->nick);
-    }
-
-    public function testPostWithEqualSign()
-    {
-        $response = Unirest\Request::post('http://httpbin.org/post', array(
-            'Accept' => 'application/json'
-        ), array(
-            'name' => 'Mark=Hello'
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $form = $response->body->form;
-        $this->assertEquals('Mark=Hello', $form->name);
-    }
-
-    public function testGetWithEqualSign()
-    {
-        $response = Unirest\Request::get('http://httpbin.org/get', array(
-            'Accept' => 'application/json'
-        ), array(
-            'name' => 'Mark=Hello'
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $args = $response->body->args;
-        $this->assertEquals('Mark=Hello', $args->name);
-
-        $response = Unirest\Request::get('http://httpbin.org/get', array(
-            'Accept' => 'application/json'
-        ), array(
-            'name' => 'Mark=Hello=John'
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $args = $response->body->args;
-        $this->assertEquals('Mark=Hello=John', $args->name);
-    }
-
-    public function testPostArray()
-    {
-        $response = Unirest\Request::post('http://httpbin.org/post', array(
-            'Accept' => 'application/json'
-        ), array(
-            'name[0]' => 'Mark',
-            'name[1]' => 'John'
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $form = $response->body->form;
-
-        $this->assertEquals('Mark', $form->{'name[0]'});
-        $this->assertEquals('John', $form->{'name[1]'});
-    }
-
-    public function testGetArray()
-    {
-        $response = Unirest\Request::get('http://httpbin.org/get', array(), array(
-            'name[0]' => 'Mark',
-            'name[1]' => 'John'
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $args = $response->body->args;
-        $this->assertEquals('Mark', $args->{'name[0]'});
-        $this->assertEquals('John', $args->{'name[1]'});
-    }
-
-    public function testPostWithDots()
-    {
-        $response = Unirest\Request::post('http://httpbin.org/post', array(
-            'Accept' => 'application/json'
-        ), array(
-            'user.name' => 'Mark',
-            'nick' => 'thefosk'
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $form = $response->body->form;
-        $this->assertEquals('Mark', $form->{'user.name'});
-        $this->assertEquals('thefosk', $form->nick);
-    }
-
-    public function testRawPost()
-    {
-        $response = Unirest\Request::post('http://httpbin.org/post', array(
-            'Accept' => 'application/json',
-            'Content-Type' => 'application/json'
-        ), json_encode(array(
-            'author' => 'Sam Sullivan'
-        )));
-
-        $this->assertEquals(200, $response->code);
-
-        $json = $response->body->json;
-
-        $this->assertEquals('Sam Sullivan', $json->author);
-    }
-
+    // Generic
     public function testHttpBuildQueryWhenCurlFile()
     {
         $file = Unirest\File::add(UPLOAD_FIXTURE);
@@ -201,107 +16,6 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($result['file'], $file);
     }
 
-    public function testUpload()
-    {
-        $response = Unirest\Request::post('http://httpbin.org/post', array(
-            'Accept' => 'application/json'
-        ), array(
-            'name' => 'Mark',
-            'file' => Unirest\File::add(UPLOAD_FIXTURE)
-        ));
-        $this->assertEquals(200, $response->code);
-
-        $files = $response->body->files;
-        $this->assertEquals('This is a test', $files->file);
-
-        $form = $response->body->form;
-        $this->assertEquals('Mark', $form->name);
-    }
-
-    public function testUploadIfFilePartOfData()
-    {
-        $response = Unirest\Request::post('http://httpbin.org/post', array(
-            'Accept' => 'application/json'
-        ), array(
-            'name' => 'Mark',
-            'files[owl.gif]' => Unirest\File::add(UPLOAD_FIXTURE)
-        ));
-        $this->assertEquals(200, $response->code);
-
-        //$files = $response->body->files;
-        //$this->assertEquals('This is a test', $files->file);
-
-        $form = $response->body->form;
-        $this->assertEquals('Mark', $form->name);
-    }
-
-    public function testPostMultidimensionalArray()
-    {
-        $response = Unirest\Request::post('http://httpbin.org/post', array(
-            'Accept' => 'application/json'
-        ), array(
-            'key' => 'value',
-            'items' => array(
-                'item1',
-                'item2'
-            )
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $form = $response->body->form;
-        $this->assertEquals('value', $form->key);
-        $this->assertEquals('item1', $form->{'items[0]'});
-        $this->assertEquals('item2', $form->{'items[1]'});
-    }
-
-    public function testPut()
-    {
-        $response = Unirest\Request::put('http://httpbin.org/put', array(
-            'Accept' => 'application/json'
-        ), array(
-            'name' => 'Mark',
-            'nick' => 'thefosk'
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $form = $response->body->form;
-        $this->assertEquals('Mark', $form->name);
-        $this->assertEquals('thefosk', $form->nick);
-    }
-
-    public function testPatch()
-    {
-        $response = Unirest\Request::patch('http://httpbin.org/patch', array(
-            'Accept' => 'application/json'
-        ), array(
-            'name' => 'Mark',
-            'nick' => 'thefosk'
-        ));
-
-        $this->assertEquals(200, $response->code);
-
-        $form = $response->body->form;
-        $this->assertEquals('Mark', $form->name);
-        $this->assertEquals('thefosk', $form->nick);
-    }
-
-    public function testDelete()
-    {
-        $response = Unirest\Request::delete('http://httpbin.org/delete', array(
-            'Accept' => 'application/json',
-            'Content-Type' => 'application/x-www-form-urlencoded'
-        ), array(
-            'name' => 'Mark',
-            'nick' => 'thefosk'
-        ));
-
-        $this->assertEquals(200, $response->code);
-        $data = $response->body->data;
-        $this->assertTrue(empty($data));
-    }
-
     /**
      * @expectedException Exception
      */
@@ -375,4 +89,297 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
         $headers    = $response->body->headers;
         $this->assertEquals('ciao', $headers->{'User-Agent'});
     }
+
+    // GET
+    public function testGet()
+    {
+        $response = Unirest\Request::get('http://httpbin.org/get?name=Mark', array(
+            'Accept' => 'application/json'
+        ), array(
+            'nick' => 'thefosk'
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $args = $response->body->args;
+        $this->assertEquals('Mark', $args->name);
+        $this->assertEquals('thefosk', $args->nick);
+    }
+
+    public function testGetMultidimensionalArray()
+    {
+        $response = Unirest\Request::get('http://httpbin.org/get', array(
+            'Accept' => 'application/json'
+        ), array(
+            'key' => 'value',
+            'items' => array(
+                'item1',
+                'item2'
+            )
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $args = $response->body->args;
+
+        $this->assertEquals('value', $args->key);
+        $this->assertEquals('item1', $args->{'items[0]'});
+        $this->assertEquals('item2', $args->{'items[1]'});
+    }
+
+    public function testGetWithDots()
+    {
+        $response = Unirest\Request::get('http://httpbin.org/get', array(
+            'Accept' => 'application/json'
+        ), array(
+            'user.name' => 'Mark',
+            'nick' => 'thefosk'
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $args = $response->body->args;
+        $this->assertEquals('Mark', $args->{'user.name'});
+        $this->assertEquals('thefosk', $args->nick);
+    }
+
+    public function testGetWithDotsAlt()
+    {
+        $response = Unirest\Request::get('http://httpbin.org/get', array(
+            'Accept' => 'application/json'
+        ), array(
+            'user.name' => 'Mark Bond',
+            'nick' => 'thefosk'
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $args = $response->body->args;
+        $this->assertEquals('Mark Bond', $args->{'user.name'});
+        $this->assertEquals('thefosk', $args->nick);
+    }
+
+    public function testGetWithEqualSign()
+    {
+        $response = Unirest\Request::get('http://httpbin.org/get', array(
+            'Accept' => 'application/json'
+        ), array(
+            'name' => 'Mark=Hello'
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $args = $response->body->args;
+        $this->assertEquals('Mark=Hello', $args->name);
+
+        $response = Unirest\Request::get('http://httpbin.org/get', array(
+            'Accept' => 'application/json'
+        ), array(
+            'name' => 'Mark=Hello=John'
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $args = $response->body->args;
+        $this->assertEquals('Mark=Hello=John', $args->name);
+    }
+
+    public function testGetArray()
+    {
+        $response = Unirest\Request::get('http://httpbin.org/get', array(), array(
+            'name[0]' => 'Mark',
+            'name[1]' => 'John'
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $args = $response->body->args;
+        $this->assertEquals('Mark', $args->{'name[0]'});
+        $this->assertEquals('John', $args->{'name[1]'});
+    }
+
+    // POST
+    public function testPost()
+    {
+        $response = Unirest\Request::post('http://httpbin.org/post', array(
+            'Accept' => 'application/json'
+        ), array(
+            'name' => 'Mark',
+            'nick' => 'thefosk'
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $form = $response->body->form;
+        $this->assertEquals('Mark', $form->name);
+        $this->assertEquals('thefosk', $form->nick);
+    }
+
+    public function testPostWithEqualSign()
+    {
+        $response = Unirest\Request::post('http://httpbin.org/post', array(
+            'Accept' => 'application/json'
+        ), array(
+            'name' => 'Mark=Hello'
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $form = $response->body->form;
+        $this->assertEquals('Mark=Hello', $form->name);
+    }
+
+    public function testPostArray()
+    {
+        $response = Unirest\Request::post('http://httpbin.org/post', array(
+            'Accept' => 'application/json'
+        ), array(
+            'name[0]' => 'Mark',
+            'name[1]' => 'John'
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $form = $response->body->form;
+
+        $this->assertEquals('Mark', $form->{'name[0]'});
+        $this->assertEquals('John', $form->{'name[1]'});
+    }
+
+    public function testPostWithDots()
+    {
+        $response = Unirest\Request::post('http://httpbin.org/post', array(
+            'Accept' => 'application/json'
+        ), array(
+            'user.name' => 'Mark',
+            'nick' => 'thefosk'
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $form = $response->body->form;
+        $this->assertEquals('Mark', $form->{'user.name'});
+        $this->assertEquals('thefosk', $form->nick);
+    }
+
+    public function testRawPost()
+    {
+        $response = Unirest\Request::post('http://httpbin.org/post', array(
+            'Accept' => 'application/json',
+            'Content-Type' => 'application/json'
+        ), json_encode(array(
+            'author' => 'Sam Sullivan'
+        )));
+
+        $this->assertEquals(200, $response->code);
+
+        $json = $response->body->json;
+
+        $this->assertEquals('Sam Sullivan', $json->author);
+    }
+
+    public function testPostMultidimensionalArray()
+    {
+        $response = Unirest\Request::post('http://httpbin.org/post', array(
+            'Accept' => 'application/json'
+        ), array(
+            'key' => 'value',
+            'items' => array(
+                'item1',
+                'item2'
+            )
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $form = $response->body->form;
+        $this->assertEquals('value', $form->key);
+        $this->assertEquals('item1', $form->{'items[0]'});
+        $this->assertEquals('item2', $form->{'items[1]'});
+    }
+
+    // PUT
+    public function testPut()
+    {
+        $response = Unirest\Request::put('http://httpbin.org/put', array(
+            'Accept' => 'application/json'
+        ), array(
+            'name' => 'Mark',
+            'nick' => 'thefosk'
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $form = $response->body->form;
+        $this->assertEquals('Mark', $form->name);
+        $this->assertEquals('thefosk', $form->nick);
+    }
+
+    // PATCH
+    public function testPatch()
+    {
+        $response = Unirest\Request::patch('http://httpbin.org/patch', array(
+            'Accept' => 'application/json'
+        ), array(
+            'name' => 'Mark',
+            'nick' => 'thefosk'
+        ));
+
+        $this->assertEquals(200, $response->code);
+
+        $form = $response->body->form;
+        $this->assertEquals('Mark', $form->name);
+        $this->assertEquals('thefosk', $form->nick);
+    }
+
+    // DELETE
+    public function testDelete()
+    {
+        $response = Unirest\Request::delete('http://httpbin.org/delete', array(
+            'Accept' => 'application/json',
+            'Content-Type' => 'application/x-www-form-urlencoded'
+        ), array(
+            'name' => 'Mark',
+            'nick' => 'thefosk'
+        ));
+
+        $this->assertEquals(200, $response->code);
+        $data = $response->body->data;
+        $this->assertTrue(empty($data));
+    }
+
+    // Upload
+    public function testUpload()
+    {
+        $response = Unirest\Request::post('http://httpbin.org/post', array(
+            'Accept' => 'application/json'
+        ), array(
+            'name' => 'Mark',
+            'file' => Unirest\File::add(UPLOAD_FIXTURE)
+        ));
+        $this->assertEquals(200, $response->code);
+
+        $files = $response->body->files;
+        $this->assertEquals('This is a test', $files->file);
+
+        $form = $response->body->form;
+        $this->assertEquals('Mark', $form->name);
+    }
+
+    public function testUploadIfFilePartOfData()
+    {
+        $response = Unirest\Request::post('http://httpbin.org/post', array(
+            'Accept' => 'application/json'
+        ), array(
+            'name' => 'Mark',
+            'files[owl.gif]' => Unirest\File::add(UPLOAD_FIXTURE)
+        ));
+        $this->assertEquals(200, $response->code);
+
+        //$files = $response->body->files;
+        //$this->assertEquals('This is a test', $files->file);
+
+        $form = $response->body->form;
+        $this->assertEquals('Mark', $form->name);
+    }
 }