diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php
deleted file mode 100644
index f7b40a82..00000000
--- a/app/controllers/HomeController.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-use openid\XRDS\XRDSDocumentBuilder;
-
-class HomeController extends BaseController
-{
-
-    private $discovery;
-
-    public function __construct(DiscoveryController $discovery)
-    {
-        $this->discovery = $discovery;
-    }
-
-    public function index()
-    {
-        //This field contains a semicolon-separated list of representation schemes
-        //which will be accepted in the response to this request.
-        $accept          = Request::header('Accept');
-        if (strstr($accept, XRDSDocumentBuilder::ContentType))
-            return $this->discovery->idp();
-        if (Auth::guest())
-            return View::make("home");
-        else {
-            return Redirect::action("UserController@getProfile");
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/controllers/OAuth2ProviderController.php b/app/controllers/oauth2/OAuth2ProviderController.php
similarity index 100%
rename from app/controllers/OAuth2ProviderController.php
rename to app/controllers/oauth2/OAuth2ProviderController.php
diff --git a/app/controllers/DiscoveryController.php b/app/controllers/openid/DiscoveryController.php
similarity index 73%
rename from app/controllers/DiscoveryController.php
rename to app/controllers/openid/DiscoveryController.php
index 4167e275..ca644b86 100644
--- a/app/controllers/DiscoveryController.php
+++ b/app/controllers/openid/DiscoveryController.php
@@ -5,7 +5,7 @@ use openid\services\IServerConfigurationService;
 use openid\XRDS\XRDSDocumentBuilder;
 use utils\services\IAuthService;
 
-class DiscoveryController extends BaseController
+class DiscoveryController extends OpenIdController
 {
 
     private $openid_protocol;
@@ -25,12 +25,10 @@ class DiscoveryController extends BaseController
      */
     public function idp()
     {
-        //This field contains a semicolon-separated list of representation schemes
-        //which will be accepted in the response to this request.
-        $accept = Request::header('Accept');
-        if (strstr($accept, XRDSDocumentBuilder::ContentType)) {
+
+        if ($this->isDiscoveryRequest()) {
             $response = Response::make($this->openid_protocol->getXRDSDiscovery(IOpenIdProtocol::OpenIdXRDSModeIdp), 200);
-            $response->header('Content-Type', "application/xrds+xml; charset=UTF-8");
+            $this->setDiscoveryResponseType($response);
         } else {
             $response = View::make("home");
         }
@@ -51,13 +49,11 @@ class DiscoveryController extends BaseController
         $user = $this->auth_service->getUserByOpenId($identifier);
         if (is_null($user))
             return View::make("404");
-        //This field contains a semicolon-separated list of representation schemes
-        //which will be accepted in the response to this request.
-        $accept = Request::header('Accept');
+
         $local_identifier = $this->server_config_service->getUserIdentityEndpointURL($identifier);
-        if (strstr($accept, XRDSDocumentBuilder::ContentType)) {
+        if ($this->isDiscoveryRequest()) {
             $response = Response::make($this->openid_protocol->getXRDSDiscovery(IOpenIdProtocol::OpenIdXRDSModeUser, $local_identifier), 200);
-            $response->header('Content-Type', "application/xrds+xml; charset=UTF-8");
+            $this->setDiscoveryResponseType($response);
         } else {
             $response = View::make("identity");
         }
diff --git a/app/controllers/openid/HomeController.php b/app/controllers/openid/HomeController.php
new file mode 100644
index 00000000..510383fc
--- /dev/null
+++ b/app/controllers/openid/HomeController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Class HomeController
+ */
+class HomeController extends OpenIdController
+{
+
+    private $discovery;
+
+    public function __construct(DiscoveryController $discovery)
+    {
+        $this->discovery = $discovery;
+    }
+
+    public function index()
+    {
+
+        if ($this->isDiscoveryRequest())
+            return $this->discovery->idp();
+        if (Auth::guest())
+            return View::make("home");
+        else
+            return Redirect::action("UserController@getProfile");
+    }
+}
\ No newline at end of file
diff --git a/app/controllers/openid/OpenIdController.php b/app/controllers/openid/OpenIdController.php
new file mode 100644
index 00000000..10db8def
--- /dev/null
+++ b/app/controllers/openid/OpenIdController.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright 2015 Openstack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use openid\XRDS\XRDSDocumentBuilder;
+
+/**
+ * Class OpenIdController
+ */
+abstract class OpenIdController extends BaseController {
+
+    /**
+     * @return bool
+     */
+    protected function isDiscoveryRequest(){
+        //This field contains a semicolon-separated list of representation schemes
+        //which will be accepted in the response to this request.
+        $accept = Request::header('Accept');
+        return strstr($accept, XRDSDocumentBuilder::ContentType) !== false;
+    }
+
+    /**
+     * @param $response
+     */
+    protected function setDiscoveryResponseType($response){
+        $response->header('Content-Type', implode('; ', array(XRDSDocumentBuilder::ContentType, XRDSDocumentBuilder::Charset)));
+    }
+}
\ No newline at end of file
diff --git a/app/controllers/OpenIdProviderController.php b/app/controllers/openid/OpenIdProviderController.php
similarity index 96%
rename from app/controllers/OpenIdProviderController.php
rename to app/controllers/openid/OpenIdProviderController.php
index 44f3656e..26665aed 100644
--- a/app/controllers/OpenIdProviderController.php
+++ b/app/controllers/openid/OpenIdProviderController.php
@@ -6,6 +6,9 @@ use openid\IOpenIdProtocol;
 use openid\services\IMementoOpenIdRequestService;
 use openid\strategies\OpenIdResponseStrategyFactoryMethod;
 
+/**
+ * Class OpenIdProviderController
+ */
 class OpenIdProviderController extends BaseController
 {
     private $openid_protocol;
diff --git a/app/controllers/UserController.php b/app/controllers/openid/UserController.php
similarity index 97%
rename from app/controllers/UserController.php
rename to app/controllers/openid/UserController.php
index 63de4ee4..0672397f 100644
--- a/app/controllers/UserController.php
+++ b/app/controllers/openid/UserController.php
@@ -21,7 +21,10 @@ use strategies\OAuth2LoginStrategy;
 use utils\services\IAuthService;
 use utils\services\IServerConfigurationService as IUtilsServerConfigurationService;
 
-class UserController extends BaseController
+/**
+ * Class UserController
+ */
+class UserController extends OpenIdController
 {
 
     private $openid_memento_service;
@@ -175,10 +178,8 @@ class UserController extends BaseController
             $user = $this->auth_service->getUserByOpenId($identifier);
             if (is_null($user))
                 return View::make("404");
-            //This field contains a semicolon-separated list of representation schemes
-            //which will be accepted in the response to this request.
-            $accept = Request::header('Accept');
-            if (strstr($accept, XRDSDocumentBuilder::ContentType)) {
+
+            if ($this->isDiscoveryRequest()) {
                 /*
                 * If the Claimed Identifier was not previously discovered by the Relying Party
                 * (the "openid.identity" in the request was "http://specs.openid.net/auth/2.0/identifier_select"
diff --git a/app/database/migrations/2015_03_19_190534_insert_marketplace_api_endpoints_scopes.php b/app/database/migrations/2015_03_19_190534_insert_marketplace_api_endpoints_scopes.php
index 7c77645f..a1873273 100644
--- a/app/database/migrations/2015_03_19_190534_insert_marketplace_api_endpoints_scopes.php
+++ b/app/database/migrations/2015_03_19_190534_insert_marketplace_api_endpoints_scopes.php
@@ -13,8 +13,9 @@ class InsertMarketplaceApiEndpointsScopes extends Migration {
 	public function up()
 	{
 
-			$resource_server = ResourceServer::first();
+		$resource_server = ResourceServer::first();
 
+		if(!$resource_server) return;
 		// public clouds
 		Api::create(
 			array(
diff --git a/app/libs/openid/XRDS/XRDSDocumentBuilder.php b/app/libs/openid/XRDS/XRDSDocumentBuilder.php
index 8c2b5ff1..7fa57e44 100644
--- a/app/libs/openid/XRDS/XRDSDocumentBuilder.php
+++ b/app/libs/openid/XRDS/XRDSDocumentBuilder.php
@@ -9,8 +9,9 @@ namespace openid\XRDS;
 final class XRDSDocumentBuilder
 {
 
-    const ContentType = 'application/xrds+xml';
-    const XRDNamespace = 'xri://$xrd*($v*2.0)';
+    const ContentType   = 'application/xrds+xml';
+    const Charset       = 'charset=UTF-8';
+    const XRDNamespace  = 'xri://$xrd*($v*2.0)';
     const XRDSNamespace = 'xri://$xrds';
 
     private $elements;
diff --git a/app/tests/OAuth2ProtectedApiTest.php b/app/tests/OAuth2ProtectedApiTest.php
index 1735ca2f..cdbf58a8 100644
--- a/app/tests/OAuth2ProtectedApiTest.php
+++ b/app/tests/OAuth2ProtectedApiTest.php
@@ -19,7 +19,7 @@ use utils\services\IAuthService;
 /**
  * Class OAuth2ProtectedApiTest
  */
-abstract class OAuth2ProtectedApiTest extends TestCase {
+abstract class OAuth2ProtectedApiTest extends OpenStackIDBaseTest {
 
     protected $access_token;
     protected $client_id;
diff --git a/app/tests/OAuth2ProtocolTest.php b/app/tests/OAuth2ProtocolTest.php
index 22438d38..0eca8165 100644
--- a/app/tests/OAuth2ProtocolTest.php
+++ b/app/tests/OAuth2ProtocolTest.php
@@ -8,7 +8,7 @@ use utils\services\IAuthService;
  * Class OAuth2ProtocolTest
  * Test Suite for OAuth2 Protocol
  */
-class OAuth2ProtocolTest extends TestCase
+class OAuth2ProtocolTest extends OpenStackIDBaseTest
 {
 
     private $current_realm;
diff --git a/app/tests/OpenIdProtocolTest.php b/app/tests/OpenIdProtocolTest.php
index 35829575..b512a4dd 100644
--- a/app/tests/OpenIdProtocolTest.php
+++ b/app/tests/OpenIdProtocolTest.php
@@ -14,7 +14,7 @@ use Zend\Crypt\PublicKey\DiffieHellman;
  * Class OpenIdProtocolTest
  * Test Suite for OpenId Protocol
  */
-class OpenIdProtocolTest extends TestCase
+class OpenIdProtocolTest extends OpenStackIDBaseTest
 {
     private $current_realm;
     private $g;
@@ -755,4 +755,22 @@ class OpenIdProtocolTest extends TestCase
         $content = $response->getContent();
     }
 
+    public function testDiscovery(){
+        $response = $this->action("GET", "HomeController@index",
+            array(),
+            array(),
+            array(),
+            // Symfony interally prefixes headers with "HTTP", so
+            array('HTTP_Accept' => 'text/html; q=0.3, application/xhtml+xml; q=0.5, application/xrds+xml'));
+        $this->assertResponseStatus(200);
+        // I just needed to access the public
+        // headers var (which is a Symfony ResponseHeaderBag object)
+        $this->assertEquals('application/xrds+xml; charset=UTF-8', $response->headers->get('Content-Type'));
+
+        $content = $response->getContent();
+
+        $this->assertTrue(strpos($content,'<xrds:XRDS')!==false);
+        $this->assertTrue(strpos($content,'http://specs.openid.net/auth/2.0/server')!==false);
+    }
+
 }
diff --git a/app/tests/OpenStackIDBaseTest.php b/app/tests/OpenStackIDBaseTest.php
new file mode 100644
index 00000000..7d12cf26
--- /dev/null
+++ b/app/tests/OpenStackIDBaseTest.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright 2015 Openstack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+/**
+ * Class OpenStackIDBaseTest
+ */
+abstract class OpenStackIDBaseTest extends TestCase {
+
+    protected function prepareForTests()
+    {
+        DB::table('banned_ips')->delete();
+        DB::table('user_exceptions_trail')->delete();
+        DB::table('server_configuration')->delete();
+        DB::table('server_extensions')->delete();
+
+        DB::table('oauth2_client_api_scope')->delete();
+        DB::table('oauth2_client_authorized_uri')->delete();
+        DB::table('oauth2_access_token')->delete();
+        DB::table('oauth2_refresh_token')->delete();
+        DB::table('oauth2_client')->delete();
+
+        DB::table('openid_trusted_sites')->delete();
+        DB::table('openid_associations')->delete();
+        DB::table('openid_users')->delete();
+
+        DB::table('oauth2_api_endpoint_api_scope')->delete();
+        DB::table('oauth2_api_endpoint')->delete();
+        DB::table('oauth2_api_scope')->delete();
+        DB::table('oauth2_api')->delete();
+        DB::table('oauth2_resource_server')->delete();
+
+        parent::prepareForTests();
+    }
+}
\ No newline at end of file