diff --git a/src/index.js b/src/index.js
index 2f8887b..7e548ad 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,10 +1,2 @@
-import 'isomorphic-fetch';
-
-export default class Test {
-  getUrl (url) {
-    return fetch(url)
-      .then((response) => {
-        return response;
-      });
-  }
-}
+export {default as Keystone} from './keystone';
+export {default as Glance} from './glance';
diff --git a/test/functional/indexTest.js b/test/functional/indexTest.js
deleted file mode 100644
index 7f32936..0000000
--- a/test/functional/indexTest.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Test from "../../src/index";
-import config from "./helpers/cloudsConfig";
-
-describe("Simple functional test", () => {
-
-  it("should call keystone URL", (done) => {
-    const testKeystone = function(response) {
-      expect(response.status).toBe(200);
-      done();
-    };
-
-    const failTest = function(error) {
-      expect(error).toBeUndefined();
-      done();
-    };
-
-    const t = new Test();
-    t.getUrl(config.clouds.devstack.auth.auth_url + '/v2.0')
-      .then(testKeystone)
-      .catch(failTest);
-  });
-
-});
diff --git a/test/unit/indexTest.js b/test/unit/indexTest.js
deleted file mode 100644
index b1100ff..0000000
--- a/test/unit/indexTest.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Test from "../../src/index";
-
-const FetchMock = require('fetch-mock');
-
-describe("Simple test", () => {
-
-  afterEach(() => {
-    FetchMock.reset();
-  });
-
-  it("should export a class", () => {
-    let t = new Test();
-    expect(t).toBeDefined();
-  });
-
-  it("should retrieve URL's", (done) => {
-    FetchMock.get("http://example.com/", {
-      status: 200,
-      body: "This is a test"
-    });
-
-    let t = new Test();
-    t.getUrl("http://example.com/")
-      .then((response) => {
-        return response.text();
-      })
-      .then((body) => {
-        expect(body).toEqual("This is a test");
-        done();
-      });
-  });
-});