diff --git a/tests/authorization/AuthCodeGrantTest.php b/tests/authorization/AuthCodeGrantTest.php
index acea6775..38a8e27c 100644
--- a/tests/authorization/AuthCodeGrantTest.php
+++ b/tests/authorization/AuthCodeGrantTest.php
@@ -325,6 +325,8 @@ class Auth_Code_Grant_Test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('deleteSession')->andReturn(null);
         $this->session->shouldReceive('createSession')->andReturn(1);
         $this->session->shouldReceive('associateScope')->andReturn(null);
+        $this->session->shouldReceive('associateRedirectUri')->andReturn(null);
+        $this->session->shouldReceive('associateAuthCode')->andReturn(null);
 
         $a = $this->returnDefault();
         $g = new OAuth2\Grant\AuthCode($a);
diff --git a/tests/authorization/AuthServerTest.php b/tests/authorization/AuthServerTest.php
index feb0118d..5ffa92fb 100644
--- a/tests/authorization/AuthServerTest.php
+++ b/tests/authorization/AuthServerTest.php
@@ -347,8 +347,14 @@ class Authorization_Server_test extends PHPUnit_Framework_TestCase
             'name'  =>  'Example Client'
         ));
 
-        $this->session->shouldReceive('validateAuthCode')->andReturn(1);
+        $this->session->shouldReceive('validateAuthCode')->andReturn(array(
+            'id'    =>  1,
+            'scope_ids' =>  '1'
+        ));
         $this->session->shouldReceive('updateSession')->andReturn(null);
+        $this->session->shouldReceive('removeAuthCode')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
+        $this->session->shouldReceive('associateScope')->andReturn(null);
 
         $a = $this->returnDefault();
         $a->addGrantType(new OAuth2\Grant\AuthCode($a));
@@ -381,6 +387,8 @@ class Authorization_Server_test extends PHPUnit_Framework_TestCase
 
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('updateSession')->andReturn(null);
+        $this->session->shouldReceive('removeAuthCode')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
 
         $a = $this->returnDefault();
         $a->addGrantType(new OAuth2\Grant\AuthCode($a));
@@ -416,6 +424,8 @@ class Authorization_Server_test extends PHPUnit_Framework_TestCase
 
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('updateSession')->andReturn(null);
+        $this->session->shouldReceive('removeAuthCode')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
 
         $a = $this->returnDefault();
         $a->addGrantType(new OAuth2\Grant\AuthCode($a));
diff --git a/tests/authorization/ClientCredentialsGrantTest.php b/tests/authorization/ClientCredentialsGrantTest.php
index 8ea1af20..327030d9 100644
--- a/tests/authorization/ClientCredentialsGrantTest.php
+++ b/tests/authorization/ClientCredentialsGrantTest.php
@@ -93,7 +93,6 @@ class Client_Credentials_Grant_Test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('createSession')->andReturn(1);
         $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
 
         $a = $this->returnDefault();
         $a->addGrantType(new OAuth2\Grant\ClientCredentials($a));
@@ -110,7 +109,7 @@ class Client_Credentials_Grant_Test extends PHPUnit_Framework_TestCase
     {
         $this->scope->shouldReceive('getScope')->andReturn(array(
             'id'    =>  1,
-            'scope' =>  'foo',
+            'key' =>  'foo',
             'name'  =>  'Foo Name',
             'description'   =>  'Foo Name Description'
         ));
@@ -126,8 +125,8 @@ class Client_Credentials_Grant_Test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('createSession')->andReturn(1);
         $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
         $this->session->shouldReceive('associateScope')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
 
         $a = $this->returnDefault();
         $a->addGrantType(new OAuth2\Grant\ClientCredentials($a));
@@ -161,7 +160,6 @@ class Client_Credentials_Grant_Test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('createSession')->andReturn(1);
         $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
         $this->session->shouldReceive('associateScope')->andReturn(null);
 
         $a = $this->returnDefault();
@@ -179,7 +177,7 @@ class Client_Credentials_Grant_Test extends PHPUnit_Framework_TestCase
     {
         $this->scope->shouldReceive('getScope')->andReturn(array(
             'id'    =>  1,
-            'scope' =>  'foo',
+            'key' =>  'foo',
             'name'  =>  'Foo Name',
             'description'   =>  'Foo Name Description'
         ));
@@ -195,8 +193,8 @@ class Client_Credentials_Grant_Test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('createSession')->andReturn(1);
         $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
         $this->session->shouldReceive('associateScope')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
 
         $a = $this->returnDefault();
         $a->addGrantType(new OAuth2\Grant\ClientCredentials($a));
@@ -223,7 +221,7 @@ class Client_Credentials_Grant_Test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('createSession')->andReturn(1);
         $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
 
         $a = $this->returnDefault();
         $a->addGrantType(new OAuth2\Grant\ClientCredentials($a));
@@ -258,7 +256,7 @@ class Client_Credentials_Grant_Test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('createSession')->andReturn(1);
         $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
 
         $a = $this->returnDefault();
         $a->addGrantType(new OAuth2\Grant\ClientCredentials($a));
@@ -296,7 +294,7 @@ class Client_Credentials_Grant_Test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('createSession')->andReturn(1);
         $this->session->shouldReceive('deleteSession')->andReturn(null);
-        $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
 
         $a = $this->returnDefault();
         $a->addGrantType(new OAuth2\Grant\ClientCredentials($a));
diff --git a/tests/authorization/PasswordGrantTest.php b/tests/authorization/PasswordGrantTest.php
index 22d6b035..bb54d808 100644
--- a/tests/authorization/PasswordGrantTest.php
+++ b/tests/authorization/PasswordGrantTest.php
@@ -312,6 +312,7 @@ class Password_Grant_Test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('deleteSession')->andReturn(null);
         $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
         $this->session->shouldReceive('associateScope')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
 
         $testCredentials = function($u, $p) { return 1; };
 
@@ -354,6 +355,7 @@ class Password_Grant_Test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('deleteSession')->andReturn(null);
         $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
         $this->session->shouldReceive('associateScope')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
 
         $testCredentials = function($u, $p) { return 1; };
 
@@ -387,6 +389,7 @@ class Password_Grant_Test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('createSession')->andReturn(1);
         $this->session->shouldReceive('deleteSession')->andReturn(null);
         $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
 
         $testCredentials = function($u, $p) { return 1; };
 
@@ -428,6 +431,7 @@ class Password_Grant_Test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('createSession')->andReturn(1);
         $this->session->shouldReceive('deleteSession')->andReturn(null);
         $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
 
         $testCredentials = function($u, $p) { return 1; };
 
@@ -467,11 +471,12 @@ class Password_Grant_Test extends PHPUnit_Framework_TestCase
         ));
 
         $this->client->shouldReceive('validateRefreshToken')->andReturn(1);
-
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('createSession')->andReturn(1);
         $this->session->shouldReceive('deleteSession')->andReturn(null);
         $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
+        $this->session->shouldReceive('associateRefreshToken')->andReturn(null);
 
         $testCredentials = function($u, $p) { return 1; };
 
diff --git a/tests/authorization/RefreshTokenTest.php b/tests/authorization/RefreshTokenTest.php
index 8ec7aa0f..188eb6fb 100644
--- a/tests/authorization/RefreshTokenTest.php
+++ b/tests/authorization/RefreshTokenTest.php
@@ -31,6 +31,9 @@ class Refresh_Token_test extends PHPUnit_Framework_TestCase
 
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('updateSession')->andReturn(null);
+        $this->session->shouldReceive('removeAuthCode')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
+        $this->session->shouldReceive('associateRefreshToken')->andReturn(1);
 
         $a = $this->returnDefault();
         $a->addGrantType(new OAuth2\Grant\AuthCode($a));
@@ -171,6 +174,10 @@ class Refresh_Token_test extends PHPUnit_Framework_TestCase
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('updateSession')->andReturn(null);
         $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
+        $this->session->shouldReceive('associateRefreshToken')->andReturn(1);
+        $this->session->shouldReceive('getAccessToken')->andReturn(null);
+        $this->session->shouldReceive('getScopes')->andReturn(array());
 
         $a = $this->returnDefault();
         $a->addGrantType(new OAuth2\Grant\RefreshToken($a));
@@ -205,10 +212,14 @@ class Refresh_Token_test extends PHPUnit_Framework_TestCase
         ));
 
         $this->session->shouldReceive('validateRefreshToken')->andReturn(1);
-
         $this->session->shouldReceive('validateAuthCode')->andReturn(1);
         $this->session->shouldReceive('updateSession')->andReturn(null);
         $this->session->shouldReceive('updateRefreshToken')->andReturn(null);
+        $this->session->shouldReceive('getAccessToken')->andReturn(null);
+        $this->session->shouldReceive('getScopes')->andReturn(array('id'    =>  1));
+        $this->session->shouldReceive('associateAccessToken')->andReturn(1);
+        $this->session->shouldReceive('associateRefreshToken')->andReturn(1);
+        $this->session->shouldReceive('associateScope')->andReturn(null);
 
         $a = $this->returnDefault();
         $a->addGrantType(new OAuth2\Grant\RefreshToken($a));
diff --git a/tests/resource/ResourceServerTest.php b/tests/resource/ResourceServerTest.php
index b0bb830e..f4e16c16 100644
--- a/tests/resource/ResourceServerTest.php
+++ b/tests/resource/ResourceServerTest.php
@@ -59,6 +59,12 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase
         $this->assertEquals('oauth_token', $v);
     }
 
+    public function test_getScopes()
+    {
+        $s = $this->returnDefault();
+        $this->assertEquals(array(), $s->getScopes());
+    }
+
     /**
      * @expectedException OAuth2\Exception\InvalidAccessTokenException
      */