diff --git a/tests/authentication/database_mock.php b/tests/authentication/database_mock.php
deleted file mode 100644
index 315ca10e..00000000
--- a/tests/authentication/database_mock.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-use OAuth2\Authentication\Database;
-
-class OAuthdb implements Database
-{
-    private $sessions = array();
-    private $sessions_client_type_id = array();
-    private $sessions_code = array();
-    private $session_scopes = array();
-
-    private $clients = array(0 => array(
-        'client_id' =>  'test',
-        'client_secret' =>  'test',
-        'redirect_uri'  =>  'http://example.com/test',
-        'name'  =>  'Test Client'
-    ));
-
-    private $scopes = array('test' => array(
-        'id'    =>  1,
-        'scope' =>  'test',
-        'name'  =>  'test',
-        'description'   =>  'test'
-    ));
-
-    public function validateClient($clientId, $clientSecret = null, $redirectUri = null)
-    {
-        if ($clientId !== $this->clients[0]['client_id']) {
-            return false;
-        }
-
-        if ($clientSecret !== null && $clientSecret !== $this->clients[0]['client_secret']) {
-            return false;
-        }
-
-        if ($redirectUri !== null && $redirectUri !== $this->clients[0]['redirect_uri']) {
-            return false;
-        }
-
-        return $this->clients[0];
-    }
-
-    public function newSession($clientId, $redirectUri, $type = 'user', $typeId = null, $authCode = null, $accessToken = null, $refreshToken = null, $accessTokenExpire = null, $stage = 'requested')
-    {
-        $id = count($this->sessions);
-
-        $this->sessions[$id] = array(
-            'id'    =>  $id,
-            'client_id' =>  $clientId,
-            'redirect_uri'  =>  $redirectUri,
-            'owner_type'    =>  $type,
-            'owner_id'  =>  $typeId,
-            'auth_code' =>  $authCode,
-            'access_token'  =>  $accessToken,
-            'refresh_token' =>  $refreshToken,
-            'access_token_expire'   =>  $accessTokenExpire,
-            'stage' =>  $stage
-        );
-
-        $this->sessions_client_type_id[$clientId . ':' . $type . ':' . $typeId] = $id;
-        $this->sessions_code[$clientId . ':' . $redirectUri . ':' . $authCode] = $id;
-
-        return $id;
-    }
-
-    public function updateSession($sessionId, $authCode = null, $accessToken = null, $refreshToken = null, $accessTokenExpire = null, $stage = 'requested')
-    {
-        $this->sessions[$sessionId]['auth_code'] = $authCode;
-        $this->sessions[$sessionId]['access_token'] = $accessToken;
-        $this->sessions[$sessionId]['refresh_token'] = $refreshToken;
-        $this->sessions[$sessionId]['access_token_expire'] = $accessTokenExpire;
-        $this->sessions[$sessionId]['stage'] = $stage;
-
-        return true;
-    }
-
-    public function deleteSession($clientId, $type, $typeId)
-    {
-        $key = $clientId . ':' . $type . ':' . $typeId;
-        if (isset($this->sessions_client_type_id[$key])) {
-            unset($this->sessions[$this->sessions_client_type_id[$key]]);
-        }
-        return true;
-    }
-
-    public function refreshToken($currentRefreshToken, $newAccessToken, $newRefreshToken, $accessTokenExpires)
-    {
-        die('not implemented refreshToken');
-    }
-
-    public function validateAuthCode($clientId, $redirectUri, $authCode)
-    {
-        $key = $clientId . ':' . $redirectUri . ':' . $authCode;
-
-        if (isset($this->sessions_code[$key])) {
-            return $this->sessions[$this->sessions_code[$key]];
-        }
-
-        return false;
-    }
-
-    public function hasSession($type, $typeId, $clientId)
-    {
-        die('not implemented hasSession');
-    }
-
-    public function getAccessToken($sessionId)
-    {
-        die('not implemented getAccessToken');
-    }
-
-    public function removeAuthCode($sessionId)
-    {
-        die('not implemented removeAuthCode');
-    }
-
-    public function setAccessToken($sessionId, $accessToken)
-    {
-        die('not implemented setAccessToken');
-    }
-
-    public function addSessionScope($sessionId, $scope)
-    {
-        if ( ! isset($this->session_scopes[$sessionId])) {
-            $this->session_scopes[$sessionId] = array();
-        }
-
-        $this->session_scopes[$sessionId][] = $scope;
-
-        return true;
-    }
-
-    public function getScope($scope)
-    {
-        if ( ! isset($this->scopes[$scope])) {
-            return false;
-        }
-
-        return $this->scopes[$scope];
-    }
-
-    public function updateSessionScopeAccessToken($sessionId, $accessToken)
-    {
-        return true;
-    }
-
-    public function accessTokenScopes($accessToken)
-    {
-        die('not implemented accessTokenScopes');
-    }
-
-    public function validateRefreshToken($refreshToken, $clientId)
-    {
-        if ($refreshToken !== $this->sessions[0]['refresh_token'])
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function updateRefreshToken($sessionId, $newAccessToken, $newRefreshToken, $accessTokenExpires)
-    {
-        $this->sessions[$sessionId]['access_token'] = $newAccessToken;
-        $this->sessions[$sessionId]['refresh_token'] = $newRefreshToken;
-        $this->sessions[$sessionId]['access_token_expire'] = $accessTokenExpires;
-    }
-}
\ No newline at end of file
diff --git a/tests/authentication/server_test.php b/tests/authentication/server_test.php
deleted file mode 100644
index 77029403..00000000
--- a/tests/authentication/server_test.php
+++ /dev/null
@@ -1,912 +0,0 @@
-<?php
-
-class Authentication_Server_test extends PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        $this->oauth = new OAuth2\Authentication\Server();
-
-        require_once 'database_mock.php';
-        $this->oauthdb = new OAuthdb();
-        $this->assertInstanceOf('OAuth2\Authentication\Database', $this->oauthdb);
-        $this->oauth->registerDbAbstractor($this->oauthdb);
-    }
-
-    public function test_setupWithOptions()
-    {
-        $o = new OAuth2\Authentication\Server(array(
-            'access_token_ttl'  =>  86400
-        ));
-
-        $reflector = new ReflectionClass($o);
-        $param = $reflector->getProperty('_config');
-        $param->setAccessible(true);
-        $array = $param->getValue($o);
-
-        $this->assertEquals(86400, $array['access_token_ttl']);
-    }
-
-    public function test_generateCode()
-    {
-        $reflector = new ReflectionClass($this->oauth);
-        $method = $reflector->getMethod('_generateCode');
-        $method->setAccessible(true);
-
-        $result = $method->invoke($this->oauth);
-        $result2 = $method->invoke($this->oauth);
-
-        $this->assertEquals(40, strlen($result));
-        $this->assertNotEquals($result, $result2);
-    }
-
-    public function test_redirectUri()
-    {
-        $result1 = $this->oauth->redirectUri('http://example.com/foo');
-        $result2 = $this->oauth->redirectUri('http://example.com/foo', array('foo' => 'bar'));
-        $result3 = $this->oauth->redirectUri('http://example.com/foo', array('foo' => 'bar'), '#');
-
-        $this->assertEquals('http://example.com/foo?', $result1);
-        $this->assertEquals('http://example.com/foo?foo=bar', $result2);
-        $this->assertEquals('http://example.com/foo#foo=bar', $result3);
-    }
-
-    public function test_checkClientAuthoriseParams_GET()
-    {
-        $_GET['client_id'] = 'test';
-        $_GET['redirect_uri'] = 'http://example.com/test';
-        $_GET['response_type'] = 'code';
-        $_GET['scope'] = 'test';
-
-        $expect = array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'client_details'    =>  array(
-                'client_id' =>  'test',
-                'client_secret' =>  'test',
-                'redirect_uri'  =>  'http://example.com/test',
-                'name'  =>  'Test Client'
-            ),
-            'response_type' =>  'code',
-            'scopes'    =>  array(
-                    0 => array(
-                    'id'    =>  1,
-                    'scope' =>  'test',
-                    'name'  =>  'test',
-                    'description'   =>  'test'
-                )
-            )
-        );
-
-        $result = $this->oauth->checkClientAuthoriseParams();
-
-        $this->assertEquals($expect, $result);
-    }
-
-    public function test_checkClientAuthoriseParams_PassedParams()
-    {
-        unset($_GET['client_id']);
-        unset($_GET['redirect_uri']);
-        unset($_GET['response_type']);
-        unset($_GET['scope']);
-
-        $params = array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'response_type' =>  'code',
-            'scope' =>  'test'
-        );
-
-        $this->assertEquals(array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'client_details'    =>  array(
-                'client_id' =>  'test',
-                'client_secret' =>  'test',
-                'redirect_uri'  =>  'http://example.com/test',
-                'name'  =>  'Test Client'
-            ),
-            'response_type' =>  'code',
-            'scopes'    =>  array(0 => array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ), $this->oauth->checkClientAuthoriseParams($params));
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_checkClientAuthoriseParams_missingClientId()
-    {
-        $this->oauth->checkClientAuthoriseParams();
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_checkClientAuthoriseParams_missingRedirectUri()
-    {
-        $_GET['client_id'] = 'test';
-
-        $this->oauth->checkClientAuthoriseParams();
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_checkClientAuthoriseParams_missingResponseType()
-    {
-        $_GET['client_id'] = 'test';
-        $_GET['redirect_uri'] = 'http://example.com/test';
-
-        $this->oauth->checkClientAuthoriseParams();
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_checkClientAuthoriseParams_missingScopes()
-    {
-        $_GET['client_id'] = 'test';
-        $_GET['redirect_uri'] = 'http://example.com/test';
-        $_GET['response_type'] = 'code';
-        $_GET['scope'] = ' ';
-
-        $this->oauth->checkClientAuthoriseParams();
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    4
-     */
-    public function test_checkClientAuthoriseParams_invalidScopes()
-    {
-        $_GET['client_id'] = 'test';
-        $_GET['redirect_uri'] = 'http://example.com/test';
-        $_GET['response_type'] = 'code';
-        $_GET['scope'] = 'blah';
-
-        $this->oauth->checkClientAuthoriseParams();
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    8
-     */
-    public function test_checkClientAuthoriseParams_invalidClient()
-    {
-        $_GET['client_id'] = 'test';
-        $_GET['redirect_uri'] = 'http://example.com/test2';
-        $_GET['response_type'] = 'code';
-        $_GET['scope'] = 'blah';
-
-        $this->oauth->checkClientAuthoriseParams();
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    3
-     */
-    public function test_checkClientAuthoriseParams_invalidResponseType()
-    {
-        $_GET['client_id'] = 'test';
-        $_GET['redirect_uri'] = 'http://example.com/test';
-        $_GET['response_type'] = 'blah';
-        $_GET['scope'] = 'blah';
-
-        $this->oauth->checkClientAuthoriseParams();
-    }
-
-    public function test_newAuthoriseRequest()
-    {
-        $result = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $this->assertEquals(40, strlen($result));
-    }
-
-    public function test_newAuthoriseRequest_isUnique()
-    {
-        $result1 = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $result2 = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $this->assertNotEquals($result1, $result2);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    7
-     */
-    public function test_issueAccessTokenNoRegisteredGrant()
-    {
-        $auth_code = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $_POST['client_id'] = 'test';
-        $_POST['client_secret'] = 'test';
-        $_POST['redirect_uri'] = 'http://example.com/test';
-        $_POST['grant_type'] = 'authorization_code';
-        $_POST['code'] = $auth_code;
-
-        $result = $this->oauth->issueAccessToken();
-    }
-
-    public function test_issueAccessToken_POST_authorization_code()
-    {
-        $auth_code = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $_POST['client_id'] = 'test';
-        $_POST['client_secret'] = 'test';
-        $_POST['redirect_uri'] = 'http://example.com/test';
-        $_POST['grant_type'] = 'authorization_code';
-        $_POST['code'] = $auth_code;
-
-        $this->oauth->enableGrantType('authorization_code');
-        $result = $this->oauth->issueAccessToken();
-
-        $this->assertCount(4, $result);
-        $this->assertArrayHasKey('access_token', $result);
-        $this->assertArrayHasKey('token_type', $result);
-        $this->assertArrayHasKey('expires_in', $result);
-        $this->assertArrayHasKey('expires', $result);
-    }
-
-    public function test_issueAccessToken_PassedParams_authorization_code()
-    {
-        $auth_code = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $params['client_id'] = 'test';
-        $params['client_secret'] = 'test';
-        $params['redirect_uri'] = 'http://example.com/test';
-        $params['grant_type'] = 'authorization_code';
-        $params['code'] = $auth_code;
-
-        $this->oauth->enableGrantType('authorization_code');
-        $result = $this->oauth->issueAccessToken($params);
-
-        $this->assertCount(4, $result);
-        $this->assertArrayHasKey('access_token', $result);
-        $this->assertArrayHasKey('token_type', $result);
-        $this->assertArrayHasKey('expires_in', $result);
-        $this->assertArrayHasKey('expires', $result);
-    }
-
-    public function test_issueAccessToken_refresh_token()
-    {
-        $this->oauth->enableGrantType('authorization_code');
-        $this->oauth->enableGrantType('refresh_token');
-
-        $auth_code = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $params['client_id'] = 'test';
-        $params['client_secret'] = 'test';
-        $params['redirect_uri'] = 'http://example.com/test';
-        $params['grant_type'] = 'authorization_code';
-        $params['code'] = $auth_code;
-
-        $result = $this->oauth->issueAccessToken($params);
-
-        $this->assertCount(5, $result);
-        $this->assertArrayHasKey('access_token', $result);
-        $this->assertArrayHasKey('token_type', $result);
-        $this->assertArrayHasKey('expires_in', $result);
-        $this->assertArrayHasKey('expires', $result);
-        $this->assertArrayHasKey('refresh_token', $result);
-
-        // Wait for a few seconds for the access token to age
-        sleep(1);
-
-        // Refresh the token
-        $params2['client_id'] = 'test';
-        $params2['client_secret'] = 'test';
-        $params2['redirect_uri'] = 'http://example.com/test';
-        $params2['grant_type'] = 'refresh_token';
-        $params2['refresh_token'] = $result['refresh_token'];
-
-        $result2 = $this->oauth->issueAccessToken($params2);
-
-        $this->assertCount(5, $result2);
-        $this->assertArrayHasKey('access_token', $result2);
-        $this->assertArrayHasKey('token_type', $result2);
-        $this->assertArrayHasKey('expires_in', $result2);
-        $this->assertArrayHasKey('expires', $result2);
-        $this->assertArrayHasKey('refresh_token', $result2);
-
-        $this->assertNotEquals($result['access_token'], $result2['access_token']);
-        $this->assertNotEquals($result['refresh_token'], $result2['refresh_token']);
-        $this->assertNotEquals($result['expires'], $result2['expires']);
-        $this->assertEquals($result['expires_in'], $result2['expires_in']);
-        $this->assertEquals($result['token_type'], $result2['token_type']);
-    }
-
-    public function test_issueAccessToken_client_credentials()
-    {
-        $this->oauth->enableGrantType('client_credentials');
-
-        $auth_code = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $params['client_id'] = 'test';
-        $params['client_secret'] = 'test';
-        $params['redirect_uri'] = 'http://example.com/test';
-        $params['grant_type'] = 'client_credentials';
-        $params['code'] = $auth_code;
-
-        $result = $this->oauth->issueAccessToken($params);
-
-        $this->assertCount(4, $result);
-        $this->assertArrayHasKey('access_token', $result);
-        $this->assertArrayHasKey('token_type', $result);
-        $this->assertArrayHasKey('expires_in', $result);
-        $this->assertArrayHasKey('expires', $result);
-    }
-
-    public function test_issueAccessToken_client_credentialsPOST()
-    {
-        $this->oauth->enableGrantType('client_credentials');
-
-        $auth_code = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $_POST['client_id'] = 'test';
-        $_POST['client_secret'] = 'test';
-        $_POST['redirect_uri'] = 'http://example.com/test';
-        $_POST['grant_type'] = 'client_credentials';
-        $_POST['code'] = $auth_code;
-
-        $result = $this->oauth->issueAccessToken();
-
-        $this->assertCount(4, $result);
-        $this->assertArrayHasKey('access_token', $result);
-        $this->assertArrayHasKey('token_type', $result);
-        $this->assertArrayHasKey('expires_in', $result);
-        $this->assertArrayHasKey('expires', $result);
-    }
-
-    public function test_issueAccessToken_client_credentials_withRefreshToken()
-    {
-        $this->oauth->enableGrantType('client_credentials');
-        $this->oauth->enableGrantType('refresh_token');
-
-        $auth_code = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $params['client_id'] = 'test';
-        $params['client_secret'] = 'test';
-        $params['redirect_uri'] = 'http://example.com/test';
-        $params['grant_type'] = 'client_credentials';
-        $params['code'] = $auth_code;
-
-        $result = $this->oauth->issueAccessToken($params);
-
-        $this->assertCount(5, $result);
-        $this->assertArrayHasKey('access_token', $result);
-        $this->assertArrayHasKey('token_type', $result);
-        $this->assertArrayHasKey('expires_in', $result);
-        $this->assertArrayHasKey('expires', $result);
-        $this->assertArrayHasKey('refresh_token', $result);
-    }
-
-    public function test_issueAccessToken_refresh_tokenPOST()
-    {
-        $this->oauth->enableGrantType('authorization_code');
-        $this->oauth->enableGrantType('refresh_token');
-
-        $auth_code = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $_POST['client_id'] = 'test';
-        $_POST['client_secret'] = 'test';
-        $_POST['redirect_uri'] = 'http://example.com/test';
-        $_POST['grant_type'] = 'authorization_code';
-        $_POST['code'] = $auth_code;
-
-        $result = $this->oauth->issueAccessToken();
-
-        $this->assertCount(5, $result);
-        $this->assertArrayHasKey('access_token', $result);
-        $this->assertArrayHasKey('token_type', $result);
-        $this->assertArrayHasKey('expires_in', $result);
-        $this->assertArrayHasKey('expires', $result);
-        $this->assertArrayHasKey('refresh_token', $result);
-
-        // Wait for a few seconds for the access token to age
-        sleep(1);
-
-        // Refresh the token
-        $_POST['client_id'] = 'test';
-        $_POST['client_secret'] = 'test';
-        $_POST['redirect_uri'] = 'http://example.com/test';
-        $_POST['grant_type'] = 'refresh_token';
-        $_POST['refresh_token'] = $result['refresh_token'];
-
-        $result2 = $this->oauth->issueAccessToken();
-
-        $this->assertCount(5, $result2);
-        $this->assertArrayHasKey('access_token', $result2);
-        $this->assertArrayHasKey('token_type', $result2);
-        $this->assertArrayHasKey('expires_in', $result2);
-        $this->assertArrayHasKey('expires', $result2);
-        $this->assertArrayHasKey('refresh_token', $result2);
-
-        $this->assertNotEquals($result['access_token'], $result2['access_token']);
-        $this->assertNotEquals($result['refresh_token'], $result2['refresh_token']);
-        $this->assertNotEquals($result['expires'], $result2['expires']);
-        $this->assertEquals($result['expires_in'], $result2['expires_in']);
-        $this->assertEquals($result['token_type'], $result2['token_type']);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_refresh_tokenMissingToken()
-    {
-        $this->oauth->enableGrantType('authorization_code');
-        $this->oauth->enableGrantType('refresh_token');
-
-        $auth_code = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $_POST['client_id'] = 'test';
-        $_POST['client_secret'] = 'test';
-        $_POST['redirect_uri'] = 'http://example.com/test';
-        $_POST['grant_type'] = 'authorization_code';
-        $_POST['code'] = $auth_code;
-
-        $result = $this->oauth->issueAccessToken();
-
-        $this->assertCount(5, $result);
-        $this->assertArrayHasKey('access_token', $result);
-        $this->assertArrayHasKey('token_type', $result);
-        $this->assertArrayHasKey('expires_in', $result);
-        $this->assertArrayHasKey('expires', $result);
-        $this->assertArrayHasKey('refresh_token', $result);
-
-        // Wait for a few seconds for the access token to age
-        sleep(1);
-
-        // Refresh the token
-        $_POST['client_id'] = 'test';
-        $_POST['client_secret'] = 'test';
-        $_POST['redirect_uri'] = 'http://example.com/test';
-        $_POST['grant_type'] = 'refresh_token';
-
-        $result2 = $this->oauth->issueAccessToken();
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_invalid_refresh_token()
-    {
-        $this->oauth->enableGrantType('authorization_code');
-        $this->oauth->enableGrantType('refresh_token');
-
-        $auth_code = $this->oauth->newAuthoriseRequest('user', '123', array(
-            'client_id' =>  'test',
-            'redirect_uri'  =>  'http://example.com/test',
-            'scopes'    =>  array(array(
-                'id'    =>  1,
-                'scope' =>  'test',
-                'name'  =>  'test',
-                'description'   =>  'test'
-            ))
-        ));
-
-        $params['client_id'] = 'test';
-        $params['client_secret'] = 'test';
-        $params['redirect_uri'] = 'http://example.com/test';
-        $params['grant_type'] = 'authorization_code';
-        $params['code'] = $auth_code;
-
-        $result = $this->oauth->issueAccessToken($params);
-
-        $this->assertCount(5, $result);
-        $this->assertArrayHasKey('access_token', $result);
-        $this->assertArrayHasKey('token_type', $result);
-        $this->assertArrayHasKey('expires_in', $result);
-        $this->assertArrayHasKey('expires', $result);
-        $this->assertArrayHasKey('refresh_token', $result);
-
-        // Wait for a few seconds for the access token to age
-        sleep(1);
-
-        // Refresh the token
-        $params2['client_id'] = 'test';
-        $params2['client_secret'] = 'test';
-        $params2['redirect_uri'] = 'http://example.com/test';
-        $params2['grant_type'] = 'refresh_token';
-        $params2['refresh_token'] = 'blah';
-
-        $result2 = $this->oauth->issueAccessToken($params2);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ServerException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_password_grant_Missing_Callback()
-    {
-        $this->oauth->enableGrantType('password');
-    }
-
-    public function test_issueAccessToken_password_grant()
-    {
-        $this->oauth->enableGrantType('password', function(){
-            return true;
-        });
-
-        $params['client_id'] = 'test';
-        $params['client_secret'] = 'test';
-        $params['grant_type'] = 'password';
-        $params['username'] = 'alexbilbie';
-        $params['password'] = 'helloworld';
-
-        $result = $this->oauth->issueAccessToken($params);
-
-        $this->assertCount(4, $result);
-        $this->assertArrayHasKey('access_token', $result);
-        $this->assertArrayHasKey('token_type', $result);
-        $this->assertArrayHasKey('expires_in', $result);
-        $this->assertArrayHasKey('expires', $result);
-    }
-
-    public function test_issueAccessToken_password_grantPOST()
-    {
-        $this->oauth->enableGrantType('password', function(){
-            return true;
-        });
-
-        $_POST['client_id'] = 'test';
-        $_POST['client_secret'] = 'test';
-        $_POST['grant_type'] = 'password';
-        $_POST['username'] = 'alexbilbie';
-        $_POST['password'] = 'helloworld';
-
-        $result = $this->oauth->issueAccessToken();
-
-        $this->assertCount(4, $result);
-        $this->assertArrayHasKey('access_token', $result);
-        $this->assertArrayHasKey('token_type', $result);
-        $this->assertArrayHasKey('expires_in', $result);
-        $this->assertArrayHasKey('expires', $result);
-    }
-
-     public function test_issueAccessToken_password_grant_withRefreshToken()
-    {
-        $this->oauth->enableGrantType('password', function(){
-            return true;
-        });
-
-        $this->oauth->enableGrantType('refresh_token');
-
-        $params['client_id'] = 'test';
-        $params['client_secret'] = 'test';
-        $params['grant_type'] = 'password';
-        $params['username'] = 'alexbilbie';
-        $params['password'] = 'helloworld';
-
-        $result = $this->oauth->issueAccessToken($params);
-
-        $this->assertCount(5, $result);
-        $this->assertArrayHasKey('access_token', $result);
-        $this->assertArrayHasKey('token_type', $result);
-        $this->assertArrayHasKey('expires_in', $result);
-        $this->assertArrayHasKey('expires', $result);
-        $this->assertArrayHasKey('refresh_token', $result);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_password_grant_wrongCreds()
-    {
-        $this->oauth->enableGrantType('password', function(){
-            return false;
-        });
-
-        $params['client_id'] = 'test';
-        $params['client_secret'] = 'test';
-        $params['grant_type'] = 'password';
-        $params['username'] = 'alexbilbie';
-        $params['password'] = 'helloworld';
-
-        $result = $this->oauth->issueAccessToken($params);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_password_grant_missingUsername()
-    {
-        $this->oauth->enableGrantType('password', function(){
-            return true;
-        });
-
-        $params['client_id'] = 'test';
-        $params['client_secret'] = 'test';
-        $params['grant_type'] = 'password';
-
-        $result = $this->oauth->issueAccessToken($params);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_password_grant_missingPassword()
-    {
-        $this->oauth->enableGrantType('password', function(){
-            return true;
-        });
-
-        $params['client_id'] = 'test';
-        $params['client_secret'] = 'test';
-        $params['grant_type'] = 'password';
-        $params['username'] = 'alexbilbie';
-
-        $result = $this->oauth->issueAccessToken($params);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_issueAccessToken_missingGrantType()
-    {
-        $this->oauth->issueAccessToken();
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    7
-     */
-    public function test_issueAccessToken_unsupportedGrantType()
-    {
-        $params['grant_type'] = 'blah';
-
-        $this->oauth->issueAccessToken($params);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_completeAuthCodeGrant_missingClientId()
-    {
-        $reflector = new ReflectionClass($this->oauth);
-        $method = $reflector->getMethod('_completeAuthCodeGrant');
-        $method->setAccessible(true);
-
-        $method->invoke($this->oauth);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_completeAuthCodeGrant_missingClientSecret()
-    {
-        $reflector = new ReflectionClass($this->oauth);
-        $method = $reflector->getMethod('_completeAuthCodeGrant');
-        $method->setAccessible(true);
-
-        $authParams['client_id'] = 'test';
-
-        $method->invoke($this->oauth, $authParams);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_completeAuthCodeGrant_missingRedirectUri()
-    {
-        $reflector = new ReflectionClass($this->oauth);
-        $method = $reflector->getMethod('_completeAuthCodeGrant');
-        $method->setAccessible(true);
-
-        $authParams['client_id'] = 'test';
-        $authParams['client_secret'] = 'test';
-
-        $method->invoke($this->oauth, $authParams);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    8
-     */
-    public function test_completeAuthCodeGrant_invalidClient()
-    {
-        $reflector = new ReflectionClass($this->oauth);
-        $method = $reflector->getMethod('_completeAuthCodeGrant');
-        $method->setAccessible(true);
-
-        $authParams['client_id'] = 'test';
-        $authParams['client_secret'] = 'test123';
-        $authParams['redirect_uri'] = 'http://example.com/test';
-
-        $method->invoke($this->oauth, $authParams);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    0
-     */
-    public function test_completeAuthCodeGrant_missingCode()
-    {
-        $reflector = new ReflectionClass($this->oauth);
-        $method = $reflector->getMethod('_completeAuthCodeGrant');
-        $method->setAccessible(true);
-
-        $authParams['client_id'] = 'test';
-        $authParams['client_secret'] = 'test';
-        $authParams['redirect_uri'] = 'http://example.com/test';
-
-        $method->invoke($this->oauth, $authParams);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ClientException
-     * @expectedExceptionCode    9
-     */
-    public function test_completeAuthCodeGrant_invalidCode()
-    {
-        $reflector = new ReflectionClass($this->oauth);
-        $method = $reflector->getMethod('_completeAuthCodeGrant');
-        $method->setAccessible(true);
-
-        $authParams['client_id'] = 'test';
-        $authParams['client_secret'] = 'test';
-        $authParams['redirect_uri'] = 'http://example.com/test';
-        $authParams['code'] = 'blah';
-
-        $method->invoke($this->oauth, $authParams);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ServerException
-     * @expectedExceptionMessage No registered database abstractor
-     */
-    public function test_noRegisteredDatabaseAbstractor()
-    {
-        $reflector = new ReflectionClass($this->oauth);
-        $method = $reflector->getMethod('_dbCall');
-        $method->setAccessible(true);
-
-        $dbAbstractor = $reflector->getProperty('_db');
-        $dbAbstractor->setAccessible(true);
-        $dbAbstractor->setValue($this->oauth, null);
-
-        $result = $method->invoke($this->oauth);
-    }
-
-    /**
-     * @expectedException        OAuth2\Authentication\ServerException
-     * @expectedExceptionMessage Registered database abstractor is not an instance of OAuth2\Authentication\Database
-     */
-    public function test_invalidRegisteredDatabaseAbstractor()
-    {
-        $fake = new stdClass;
-        $this->oauth->registerDbAbstractor($fake);
-
-        $reflector = new ReflectionClass($this->oauth);
-        $method = $reflector->getMethod('_dbCall');
-        $method->setAccessible(true);
-
-        $result = $method->invoke($this->oauth);
-    }
-
-}