diff --git a/tests/resource/ResourceServerTest.php b/tests/resource/ResourceServerTest.php
index 04f988ca..aee81b52 100644
--- a/tests/resource/ResourceServerTest.php
+++ b/tests/resource/ResourceServerTest.php
@@ -4,19 +4,19 @@ use \Mockery as m;
 
 class Resource_Server_test extends PHPUnit_Framework_TestCase
 {
-	private $session;
+    private $session;
 
-	public function setUp()
-	{
+    public function setUp()
+    {
         $this->session = M::mock('League\OAuth2\Server\Storage\SessionInterface');
-	}
+    }
 
-	private function returnDefault()
-	{
-		return new League\OAuth2\Server\Resource($this->session);
-	}
+    private function returnDefault()
+    {
+        return new League\OAuth2\Server\Resource($this->session);
+    }
 
-	public function test_setRequest()
+    public function test_setRequest()
     {
         $s = $this->returnDefault();
         $request = new League\OAuth2\Server\Util\Request();
@@ -49,7 +49,7 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase
     public function test_setTokenKey()
     {
         $s = $this->returnDefault();
-       	$s->setTokenKey('oauth_token');
+           $s->setTokenKey('oauth_token');
 
         $reflector = new ReflectionClass($s);
         $requestProperty = $reflector->getProperty('tokenKey');
@@ -70,17 +70,17 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase
      */
     public function test_determineAccessToken_missingToken()
     {
-    	$_SERVER['HTTP_AUTHORIZATION'] = 'Bearer';
-   		$request = new League\OAuth2\Server\Util\Request(array(), array(), array(), array(), $_SERVER);
+        $_SERVER['HTTP_AUTHORIZATION'] = 'Bearer';
+           $request = new League\OAuth2\Server\Util\Request(array(), array(), array(), array(), $_SERVER);
 
-    	$s = $this->returnDefault();
-    	$s->setRequest($request);
+        $s = $this->returnDefault();
+        $s->setRequest($request);
 
-    	$reflector = new ReflectionClass($s);
-	    $method = $reflector->getMethod('determineAccessToken');
-	    $method->setAccessible(true);
+        $reflector = new ReflectionClass($s);
+        $method = $reflector->getMethod('determineAccessToken');
+        $method->setAccessible(true);
 
-	    $method->invoke($s);
+        $method->invoke($s);
     }
 
     /**
@@ -114,14 +114,14 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase
         $s = $this->returnDefault();
         $s->setRequest($request);
 
-    	$reflector = new ReflectionClass($s);
+        $reflector = new ReflectionClass($s);
 
-	    $method = $reflector->getMethod('determineAccessToken');
-	    $method->setAccessible(true);
+        $method = $reflector->getMethod('determineAccessToken');
+        $method->setAccessible(true);
 
-	    $result = $method->invoke($s);
+        $result = $method->invoke($s);
 
-	    $this->assertEquals('abcdef', $result);
+        $this->assertEquals('abcdef', $result);
     }
 
     public function test_determineAccessToken_fromBrokenCurlHeader()
@@ -149,21 +149,21 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase
 
     public function test_determineAccessToken_fromMethod()
     {
-    	$s = $this->returnDefault();
+        $s = $this->returnDefault();
 
-    	$_GET[$s->getTokenKey()] = 'abcdef';
-    	$_SERVER['REQUEST_METHOD'] = 'get';
+        $_GET[$s->getTokenKey()] = 'abcdef';
+        $_SERVER['REQUEST_METHOD'] = 'get';
 
-   		$request = new League\OAuth2\Server\Util\Request($_GET, array(), array(), array(), $_SERVER);
-    	$s->setRequest($request);
+           $request = new League\OAuth2\Server\Util\Request($_GET, array(), array(), array(), $_SERVER);
+        $s->setRequest($request);
 
-    	$reflector = new ReflectionClass($s);
-	    $method = $reflector->getMethod('determineAccessToken');
-	    $method->setAccessible(true);
+        $reflector = new ReflectionClass($s);
+        $method = $reflector->getMethod('determineAccessToken');
+        $method->setAccessible(true);
 
-	    $result = $method->invoke($s);
+        $result = $method->invoke($s);
 
-	    $this->assertEquals('abcdef', $result);
+        $this->assertEquals('abcdef', $result);
     }
 
     /**
@@ -171,9 +171,9 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase
      */
     public function test_isValid_notValid()
     {
-    	$this->session->shouldReceive('validateAccessToken')->andReturn(false);
+        $this->session->shouldReceive('validateAccessToken')->andReturn(false);
 
-    	$request = new League\OAuth2\Server\Util\Request();
+        $request = new League\OAuth2\Server\Util\Request();
         $requestReflector = new ReflectionClass($request);
         $param = $requestReflector->getProperty('headers');
         $param->setAccessible(true);
@@ -188,19 +188,19 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase
 
     public function test_isValid_valid()
     {
-    	$this->session->shouldReceive('validateAccessToken')->andReturn(array(
-    		'session_id'  =>	1,
-    		'owner_type'  =>	'user',
-    		'owner_id'    =>	123,
+        $this->session->shouldReceive('validateAccessToken')->andReturn(array(
+            'session_id'  =>    1,
+            'owner_type'  =>    'user',
+            'owner_id'    =>    123,
             'client_id' =>  'testapp'
-    	));
+        ));
 
-    	$this->session->shouldReceive('getScopes')->andReturn(array(
+        $this->session->shouldReceive('getScopes')->andReturn(array(
             array('scope' =>  'foo'),
             array('scope' =>  'bar')
         ));
 
-   		$request = new League\OAuth2\Server\Util\Request();
+           $request = new League\OAuth2\Server\Util\Request();
         $requestReflector = new ReflectionClass($request);
         $param = $requestReflector->getProperty('headers');
         $param->setAccessible(true);
@@ -211,16 +211,16 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase
         $s = $this->returnDefault();
         $s->setRequest($request);
 
-    	$this->assertTrue($s->isValid());
-    	$this->assertEquals(123, $s->getOwnerId());
-    	$this->assertEquals('user', $s->getOwnerType());
-    	$this->assertEquals('abcdef', $s->getAccessToken());
+        $this->assertTrue($s->isValid());
+        $this->assertEquals(123, $s->getOwnerId());
+        $this->assertEquals('user', $s->getOwnerType());
+        $this->assertEquals('abcdef', $s->getAccessToken());
         $this->assertEquals('testapp', $s->getClientId());
-    	$this->assertTrue($s->hasScope('foo'));
-    	$this->assertTrue($s->hasScope('bar'));
-    	$this->assertTrue($s->hasScope(array('foo', 'bar')));
-    	$this->assertFalse($s->hasScope(array('foobar')));
-    	$this->assertFalse($s->hasScope('foobar'));
-    	$this->assertFalse($s->hasScope(new StdClass));
+        $this->assertTrue($s->hasScope('foo'));
+        $this->assertTrue($s->hasScope('bar'));
+        $this->assertTrue($s->hasScope(array('foo', 'bar')));
+        $this->assertFalse($s->hasScope(array('foobar')));
+        $this->assertFalse($s->hasScope('foobar'));
+        $this->assertFalse($s->hasScope(new StdClass));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/util/RedirectUriTest.php b/tests/util/RedirectUriTest.php
index 9ae67f0b..07b913ba 100644
--- a/tests/util/RedirectUriTest.php
+++ b/tests/util/RedirectUriTest.php
@@ -2,14 +2,14 @@
 
 class RedirectUri_test extends PHPUnit_Framework_TestCase
 {
-	function test_make()
-	{
-		$v1 = League\OAuth2\Server\Util\RedirectUri::make('https://foobar/', array('foo'=>'bar'));
-		$v2 = League\OAuth2\Server\Util\RedirectUri::make('https://foobar/', array('foo'=>'bar'), '#');
-		$v3 = League\OAuth2\Server\Util\RedirectUri::make('https://foobar/', array('foo'=>'bar', 'bar' => 'foo'));
+    function test_make()
+    {
+        $v1 = League\OAuth2\Server\Util\RedirectUri::make('https://foobar/', array('foo'=>'bar'));
+        $v2 = League\OAuth2\Server\Util\RedirectUri::make('https://foobar/', array('foo'=>'bar'), '#');
+        $v3 = League\OAuth2\Server\Util\RedirectUri::make('https://foobar/', array('foo'=>'bar', 'bar' => 'foo'));
 
-		$this->assertEquals('https://foobar/?foo=bar', $v1);
-		$this->assertEquals('https://foobar/#foo=bar', $v2);
-		$this->assertEquals('https://foobar/?foo=bar&bar=foo', $v3);
-	}
-}
\ No newline at end of file
+        $this->assertEquals('https://foobar/?foo=bar', $v1);
+        $this->assertEquals('https://foobar/#foo=bar', $v2);
+        $this->assertEquals('https://foobar/?foo=bar&bar=foo', $v3);
+    }
+}
diff --git a/tests/util/RequestTest.php b/tests/util/RequestTest.php
index 205c70ad..1f6de94a 100644
--- a/tests/util/RequestTest.php
+++ b/tests/util/RequestTest.php
@@ -2,86 +2,86 @@
 
 class Request_test extends PHPUnit_Framework_TestCase
 {
-	private $request;
+    private $request;
 
-	function setUp()
-	{
-		$this->request = new League\OAuth2\Server\Util\Request(
-			array('foo' => 'bar'),
-			array('foo' => 'bar'),
-			array('foo' => 'bar'),
-			array('foo' => 'bar'),
-			array('HTTP_HOST' => 'foobar.com')
-		);
-	}
+    function setUp()
+    {
+        $this->request = new League\OAuth2\Server\Util\Request(
+            array('foo' => 'bar'),
+            array('foo' => 'bar'),
+            array('foo' => 'bar'),
+            array('foo' => 'bar'),
+            array('HTTP_HOST' => 'foobar.com')
+        );
+    }
 
-	function test_buildFromIndex()
-	{
-		$r = new League\OAuth2\Server\Util\Request();
-		$r->buildFromGlobals();
+    function test_buildFromIndex()
+    {
+        $r = new League\OAuth2\Server\Util\Request();
+        $r->buildFromGlobals();
 
-		$this->assertTrue($r instanceof League\OAuth2\Server\Util\Request);
-	}
+        $this->assertTrue($r instanceof League\OAuth2\Server\Util\Request);
+    }
 
-	function test_get()
-	{
-		$this->assertEquals('bar', $this->request->get('foo'));
-		$this->assertEquals(array('foo' => 'bar'), $this->request->get());
-	}
+    function test_get()
+    {
+        $this->assertEquals('bar', $this->request->get('foo'));
+        $this->assertEquals(array('foo' => 'bar'), $this->request->get());
+    }
 
-	function test_post()
-	{
-		$this->assertEquals('bar', $this->request->post('foo'));
-		$this->assertEquals(array('foo' => 'bar'), $this->request->post());
-	}
+    function test_post()
+    {
+        $this->assertEquals('bar', $this->request->post('foo'));
+        $this->assertEquals(array('foo' => 'bar'), $this->request->post());
+    }
 
-	function test_file()
-	{
-		$this->assertEquals('bar', $this->request->file('foo'));
-		$this->assertEquals(array('foo' => 'bar'), $this->request->file());
-	}
+    function test_file()
+    {
+        $this->assertEquals('bar', $this->request->file('foo'));
+        $this->assertEquals(array('foo' => 'bar'), $this->request->file());
+    }
 
-	function test_cookie()
-	{
-		$this->assertEquals('bar', $this->request->cookie('foo'));
-		$this->assertEquals(array('foo' => 'bar'), $this->request->cookie());
-	}
+    function test_cookie()
+    {
+        $this->assertEquals('bar', $this->request->cookie('foo'));
+        $this->assertEquals(array('foo' => 'bar'), $this->request->cookie());
+    }
 
-	function test_server()
-	{
-		$this->assertEquals('foobar.com', $this->request->server('HTTP_HOST'));
-		$this->assertEquals(array('HTTP_HOST' => 'foobar.com'), $this->request->server());
-	}
+    function test_server()
+    {
+        $this->assertEquals('foobar.com', $this->request->server('HTTP_HOST'));
+        $this->assertEquals(array('HTTP_HOST' => 'foobar.com'), $this->request->server());
+    }
 
-	function test_header()
-	{
-		$this->assertEquals('foobar.com', $this->request->header('Host'));
-		$this->assertEquals(array('Host' => 'foobar.com'), $this->request->header());
-	}
+    function test_header()
+    {
+        $this->assertEquals('foobar.com', $this->request->header('Host'));
+        $this->assertEquals(array('Host' => 'foobar.com'), $this->request->header());
+    }
 
-	function test_canonical_header()
-	{
-		$request = new League\OAuth2\Server\Util\Request(
-			array('foo' => 'bar'),
-			array('foo' => 'bar'),
-			array('foo' => 'bar'),
-			array('foo' => 'bar'),
-			array('HTTP_HOST' => 'foobar.com'),
-			array('authorization' => 'Bearer ajdfkljadslfjasdlkj')
-		);
+    function test_canonical_header()
+    {
+        $request = new League\OAuth2\Server\Util\Request(
+            array('foo' => 'bar'),
+            array('foo' => 'bar'),
+            array('foo' => 'bar'),
+            array('foo' => 'bar'),
+            array('HTTP_HOST' => 'foobar.com'),
+            array('authorization' => 'Bearer ajdfkljadslfjasdlkj')
+        );
 
-		$this->assertEquals('Bearer ajdfkljadslfjasdlkj', $request->header('Authorization'));
-	}
+        $this->assertEquals('Bearer ajdfkljadslfjasdlkj', $request->header('Authorization'));
+    }
 
-	/**
-	 * @expectedException InvalidArgumentException
-	 */
-	function test_unknownProperty()
-	{
-		$reflector = new ReflectionClass($this->request);
-		$method = $reflector->getMethod('getPropertyValue');
-		$method->setAccessible(true);
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    function test_unknownProperty()
+    {
+        $reflector = new ReflectionClass($this->request);
+        $method = $reflector->getMethod('getPropertyValue');
+        $method->setAccessible(true);
 
-		$method->invoke($this->request, 'blah');
-	}
-}
\ No newline at end of file
+        $method->invoke($this->request, 'blah');
+    }
+}
diff --git a/tests/util/SecureKeyTest.php b/tests/util/SecureKeyTest.php
index 2ce8659e..da59bee4 100644
--- a/tests/util/SecureKeyTest.php
+++ b/tests/util/SecureKeyTest.php
@@ -2,16 +2,16 @@
 
 class Secure_Key_test extends PHPUnit_Framework_TestCase
 {
-	function test_make()
-	{
-		$v1 = League\OAuth2\Server\Util\SecureKey::make();
-		$v2 = League\OAuth2\Server\Util\SecureKey::make();
-		$v3 = League\OAuth2\Server\Util\SecureKey::make(50);
+    function test_make()
+    {
+        $v1 = League\OAuth2\Server\Util\SecureKey::make();
+        $v2 = League\OAuth2\Server\Util\SecureKey::make();
+        $v3 = League\OAuth2\Server\Util\SecureKey::make(50);
 
-		$this->assertEquals(40, strlen($v1));
-		$this->assertTrue($v1 !== $v2);
-		$this->assertEquals(50, strlen($v3));
-	}
+        $this->assertEquals(40, strlen($v1));
+        $this->assertTrue($v1 !== $v2);
+        $this->assertEquals(50, strlen($v3));
+    }
 
     public function test_make_with_different_algorithm()
     {
@@ -29,4 +29,4 @@ class Secure_Key_test extends PHPUnit_Framework_TestCase
         $this->assertSame($algorithm, League\OAuth2\Server\Util\SecureKey::getAlgorithm());
         $this->assertEquals($result, League\OAuth2\Server\Util\SecureKey::make(11));
     }
-}
\ No newline at end of file
+}