diff --git a/app/utils/bunyan.tests.js b/app/utils/bunyan.tests.js
new file mode 100644
index 000000000..5fee42745
--- /dev/null
+++ b/app/utils/bunyan.tests.js
@@ -0,0 +1,23 @@
+/* eslint-env node, mocha */
+const assert = require('assert');
+const rewire = require('rewire');
+const bunyan = rewire('./bunyan');
+
+const responseCodeMapper = bunyan.__get__('responseCodeMapper');
+
+describe('utils', () => {
+  describe('bunyan', () => {
+    describe('responseCodeMapper', () => {
+      it('error', async () => {
+        assert.equal(responseCodeMapper(500), 'error');
+      });
+      it('warn', async () => {
+        assert.equal(responseCodeMapper(400), 'warn');
+        assert.equal(responseCodeMapper(404), 'warn');
+      });
+      it('info', async () => {
+        assert.equal(responseCodeMapper(200), 'info');
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/app/utils/cluster.tests.js b/app/utils/cluster.tests.js
new file mode 100644
index 000000000..3370a66ea
--- /dev/null
+++ b/app/utils/cluster.tests.js
@@ -0,0 +1,162 @@
+/* eslint-env node, mocha */
+const assert = require('assert');
+const mongodb = require('mongo-mock');
+var httpMocks = require('node-mocks-http');
+const log = require('../log').log;
+
+let getCluster = require('./cluster').getCluster;
+let cleanObjKeysMongo = require('./cluster').cleanObjKeysForMongo;
+
+let db = {};
+
+describe('utils', () => {
+  describe('cleanObjKeysMongo', () => {
+    it('Replace invalid characters with underscore for object keys', () => {
+      let data = { '$fudge': { b: 'somegarbage', '*more*trash': 'somevalue' } };
+      let cleanData = cleanObjKeysMongo(data);
+      assert.equal(JSON.stringify(cleanData), JSON.stringify({ '_fudge': { b: 'somegarbage', '_more_trash': 'somevalue' } }));
+    });
+  });
+
+  describe('getCluster', () => {
+
+    before(function (done) {
+      mongodb.max_delay = 0;
+      const MongoClient = mongodb.MongoClient;
+      MongoClient.connect('someconnectstring', {}, (err, database) => {
+        database.collection('clusters', () => {
+          database.collection('resources', () => {
+            database.collection('resourceStats', () => {
+              db = database;
+              done();
+            });
+          });
+        });
+      });
+    });
+
+    after(function () {
+      db.close();
+    });
+
+    it('should return 401 if missing org ID', async () => {
+      // Setup
+      var request = httpMocks.createRequest({
+        method: 'POST',
+        url: 'someclusterid/resources',
+        params: {
+          cluster_id: 'someclusterid'
+        },
+        log: log,
+        db: db
+      });
+      request._setBody(undefined);
+
+      var response = httpMocks.createResponse();
+      // Test
+      let nextCalled = false;
+      let next = (err) => {
+        assert.equal(err.message, null);
+        nextCalled = true;
+      };
+
+      await getCluster(request, response, next);
+
+      assert.equal(nextCalled, false);
+
+      assert.equal(response.statusCode, 401);
+    });
+
+    it('should return 401 if missing cluster ID', async () => {
+      // Setup
+      var request = httpMocks.createRequest({
+        method: 'POST',
+        url: 'someclusterid/resources',
+        params: {
+        },
+        org: {
+          _id: 1
+        },
+        log: log,
+        db: db
+      });
+      request._setBody(undefined);
+
+      var response = httpMocks.createResponse();
+      // Test
+      let nextCalled = false;
+      let next = (err) => {
+        assert.equal(err.message, null);
+        nextCalled = true;
+      };
+
+      await getCluster(request, response, next);
+
+      assert.equal(nextCalled, false);
+
+      assert.equal(response.statusCode, 401);
+    });
+
+    it('should return 403 if cannot find cluster', async () => {
+      // Setup
+      var request = httpMocks.createRequest({
+        method: 'POST',
+        url: 'someclusterid/resources',
+        params: {
+          cluster_id: 'someclusterid'
+        },
+        org: {
+          _id: 1
+        },
+        log: log,
+        db: db
+      });
+      request._setBody(undefined);
+
+      var response = httpMocks.createResponse();
+      // Test
+      let nextCalled = false;
+      let next = (err) => {
+        assert.equal(err.message, null);
+        nextCalled = true;
+      };
+
+      await getCluster(request, response, next);
+
+      assert.equal(nextCalled, false);
+
+      assert.equal(response.statusCode, 403);
+    });
+
+    it('should call next', async () => {
+      // Setup
+      const Clusters = db.collection('clusters');
+      await Clusters.insertOne({ cluster_id: 'someclusterid', org_id: 2, somedata: 'xyz' });
+      var request = httpMocks.createRequest({
+        method: 'POST',
+        url: 'someclusterid/resources',
+        params: {
+          cluster_id: 'someclusterid'
+        },
+        org: {
+          _id: 2
+        },
+        log: log,
+        db: db
+      });
+      request._setBody(undefined);
+
+      var response = httpMocks.createResponse();
+      // Test
+      let nextCalled = false;
+      let next = () => {
+        nextCalled = true;
+      };
+
+      await getCluster(request, response, next);
+
+      assert.equal(request.cluster.somedata, 'xyz');
+      assert.equal(nextCalled, true);
+    });
+  });
+});
diff --git a/app/utils/crypt.tests.js b/app/utils/crypt.tests.js
new file mode 100644
index 000000000..49dba599a
--- /dev/null
+++ b/app/utils/crypt.tests.js
@@ -0,0 +1,18 @@
+/* eslint-env node, mocha */
+const assert = require('assert');
+
+let tokenCrypt = require('./crypt');
+
+
+describe('utils', () => {
+  describe('crypt', () => {
+    it('should encrypt and decrypt', ()=> {
+      const token = 'abcdefg';
+      const data = 'my secret';
+      const encode = tokenCrypt.encrypt(data, token );
+      assert.notEqual(encode, data);
+      const decode = tokenCrypt.decrypt(encode, token);
+      assert.equal(decode, data);
+    });
+  });
+});
diff --git a/app/utils/orgs.tests.js b/app/utils/orgs.tests.js
new file mode 100644
index 000000000..a221cf84b
--- /dev/null
+++ b/app/utils/orgs.tests.js
@@ -0,0 +1,118 @@
+/* eslint-env node, mocha */
+const assert = require('assert');
+const mongodb = require('mongo-mock');
+var httpMocks = require('node-mocks-http');
+const log = require('../log').log;
+
+let getOrg = require('./orgs').getOrg;
+
+let db = {};
+
+describe('utils', () => {
+
+  describe('orgs', () => {
+
+    before((done) => {
+      mongodb.max_delay = 0;
+      const MongoClient = mongodb.MongoClient;
+      MongoClient.connect('someconnectstring', {}, (err, database) => {
+        database.collection('orgs', () => {
+          db = database;
+          done();
+        });
+      });
+    });
+
+    after(function () {
+      db.close();
+    });
+
+    it('should return 401 if missing orgKey', async () => {
+      // Setup
+      var request = httpMocks.createRequest({
+        method: 'POST',
+        url: 'someclusterid/resources',
+        params: {
+          cluster_id: 'someclusterid'
+        },
+        log: log,
+        db: db
+      });
+      request._setBody(undefined);
+
+      var response = httpMocks.createResponse();
+      // Test
+      let nextCalled = false;
+      let next = (err) => {
+        assert.equal(err.message, null);
+        nextCalled = true;
+      };
+
+      await getOrg(request, response, next);
+
+      assert.equal(nextCalled, false);
+
+      assert.equal(response.statusCode, 401);
+    });
+
+    it('should return 403 if cannot find org', async () => {
+      // Setup
+      const Orgs = db.collection('orgs');
+      await Orgs.insertOne({ orgKeys: 'dummy', somedata: 'xyz' });
+      var request = httpMocks.createRequest({
+        method: 'POST',
+        url: 'someclusterid/resources',
+        params: {
+          cluster_id: 'someclusterid'
+        },
+        orgKey: 10,
+        log: log,
+        db: db
+      });
+      request._setBody(undefined);
+
+      var response = httpMocks.createResponse();
+      // Test
+      let nextCalled = false;
+      let next = (err) => {
+        assert.equal(err.message, null);
+        nextCalled = true;
+      };
+
+      await getOrg(request, response, next);
+
+      assert.equal(nextCalled, false);
+
+      assert.equal(response.statusCode, 403);
+    });
+
+    it('should call next', async () => {
+      // Setup
+      const Orgs = db.collection('orgs');
+      await Orgs.insertOne({ orgKeys: 11, somedata: 'xyz' });
+      var request = httpMocks.createRequest({
+        method: 'POST',
+        url: 'someclusterid/resources',
+        params: {
+          cluster_id: 'someclusterid'
+        },
+        orgKey: 11,
+        log: log,
+        db: db
+      });
+      request._setBody(undefined);
+
+      var response = httpMocks.createResponse();
+      // Test
+      let nextCalled = false;
+      let next = () => {
+        nextCalled = true;
+      };
+
+      await getOrg(request, response, next);
+
+      assert.equal(request.org.somedata, 'xyz');
+      assert.equal(nextCalled, true);
+    });
+  });
+});