diff --git a/README.md b/README.md
index a1f48c37..eb16e602 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,10 @@ The resource server allows you to secure your API endpoints by checking for a va
 * Support for [JSON web tokens](http://tools.ietf.org/wg/oauth/draft-ietf-oauth-json-web-token/).
 * Support for [SAML assertions](http://tools.ietf.org/wg/oauth/draft-ietf-oauth-saml2-bearer/).
 
+### Client support
+
+* Merge in https://github.com/philsturgeon/codeigniter-oauth2
+
 ---
 
 This code will be developed as part of the [Linkey](http://linkey.blogs.lincoln.ac.uk) project which has been funded by [JISC](http://jisc.ac.uk) under the Access and Identity Management programme.
\ No newline at end of file
diff --git a/tests/resource/server_test.php b/tests/resource/server_test.php
index fdb35be4..7feb4389 100644
--- a/tests/resource/server_test.php
+++ b/tests/resource/server_test.php
@@ -72,7 +72,7 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException        \Oauth2\Resource\OAuthResourceServerException
+	 * @expectedException        \Oauth2\Resource\ClientException
 	 * @expectedExceptionMessage An access token was not presented with the request
 	 */
 	function test_init_missingToken()
@@ -81,7 +81,7 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException        \Oauth2\Resource\OAuthResourceServerException
+	 * @expectedException        \Oauth2\Resource\ClientException
 	 * @expectedExceptionMessage The access token is not registered with the resource server
 	 */
 	function test_init_wrongToken()