diff --git a/karma.conf.js b/karma.conf.js
index 650d409c1..a194c5a3a 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -45,7 +45,6 @@ module.exports = function(config) {
 
       //App-specific Code
       'js/app.js',
-      'js/log.js',
       'js/routes.js',
       'js/services/*.js',
       'js/directives.js',
diff --git a/test/util.log.js b/test/util.log.js
index c6749c528..13694c105 100644
--- a/test/util.log.js
+++ b/test/util.log.js
@@ -6,20 +6,24 @@ var sinon = sinon || require('sinon');
 var should = chai.should();
 var log = require('../js/util/log');
 
-describe.only('log utils', function() {
+describe('log utils', function() {
   afterEach(function() {
     log.setLevel('info');
   });
 
-  it('should log debug', function() {
-    sinon.stub(console,'log');
-    log.setLevel('debug');
-    log.debug('hola');
+  it('should log fatal', function() {
+    if (console.warn.restore)
+      console.warn.restore();
 
-    var arg = console.log.getCall(0).args[0];
+    sinon.stub(console,'warn');
+
+    log.setLevel('debug');
+    log.warn('hola');
+
+    var arg = console.warn.getCall(0).args[0];
     arg.should.contain('util.log.js');
     arg.should.contain('hola');
-    console.log.restore();
+    console.warn.restore();
   });
 
   it('should not log debug', function() {
@@ -34,6 +38,4 @@ describe.only('log utils', function() {
     log.getLevels().debug.should.equal(0);
     log.getLevels().fatal.should.equal(5);
   });
-
-
 });
diff --git a/util/build.js b/util/build.js
index cad8dc831..5bbd0264e 100644
--- a/util/build.js
+++ b/util/build.js
@@ -81,6 +81,13 @@ var createBundle = function(opts) {
   b.require('./js/models/PluginManager', {
     expose: '../js/models/PluginManager'
   });
+  b.require('./js/util/HTTP', {
+    expose: '../js/util/HTTP'
+  });
+   b.require('./js/util/log', {
+    expose: '../js/util/log'
+  });
+ 
   if (!opts.disablePlugins) {
     b.require('./js/plugins/GoogleDrive', {
       expose: '../plugins/GoogleDrive'
@@ -109,9 +116,6 @@ var createBundle = function(opts) {
 
   // The following 2 lines fix karma tests
   b.require('sjcl');
-  b.require('./js/util/log', {
-    expose: '../../log.js'
-  });
 
   if (opts.debug) {
     //include dev dependencies