diff --git a/lib/core/test.js b/lib/core/test.js
index fe3b04063..d4b216e45 100644
--- a/lib/core/test.js
+++ b/lib/core/test.js
@@ -1,14 +1,6 @@
-var async = require('async');
-var Web3 = require('web3');
-
-var Engine = require('./engine.js');
-var RunCode = require('./runCode.js');
-var TestLogger = require('./test_logger.js');
-
 var getSimulator = function() {
   try {
-    var sim = require('ethereumjs-testrpc');
-    return sim;
+    return require('ethereumjs-testrpc');
   } catch (e) {
     if (e.code === 'MODULE_NOT_FOUND') {
       console.log('Simulator not found; Please install it with "npm install ethereumjs-testrpc --save"');
@@ -25,30 +17,44 @@ var getSimulator = function() {
   }
 };
 
-var Test = function(options) {
-  this.options = options || {};
-  var simOptions = this.options.simulatorOptions || {};
+var Test;
+Test = (function (options) {
+  var async = require('async');
+  var opts = options === undefined ? {} : options;
+  opts.logLevel = opts.hasOwnProperty('logLevel') ? opts.logLevel : 'debug';
+  opts.simulatorOptions = opts.hasOwnProperty('simulatorOptions') ? opts.simulatorOptions : {};
+  var sim = getSimulator();
 
-  this.engine = new Engine({
-    env: this.options.env || 'test',
-    // TODO: confi will need to detect if this is a obj
-    embarkConfig: this.options.embarkConfig || 'embark.json',
-    interceptLogs: false
-  });
+  function newWebThree() {
+    try {
+      var Web3 = require('web3');
+      var web3 = new Web3();
+      web3.setProvider(sim.provider(opts.simulatorOptions));
+      return web3;
+    } catch (e) {
+      throw new Error(e);
+    }
+  }
 
-  this.engine.init({
-    logger: new TestLogger({logLevel: this.options.logLevel || 'debug'})
-  });
+  function deployAll(contractsConfig, cb) {
+    var RunCode = require('./runCode.js');
+    var self = this;
 
-  this.sim = getSimulator();
-  this.web3 = new Web3();
-  this.web3.setProvider(this.sim.provider(simOptions));
-};
+    function newEngine () {
+      var Engine = require('./engine.js');
+      return new Engine({
+        env: opts.env || 'test',
+        // TODO: confi will need to detect if this is a obj
+        embarkConfig: opts.embarkConfig || 'embark.json',
+        interceptLogs: false
+      });
+    }
 
-Test.prototype.deployAll = function(contractsConfig, cb) {
-  var self = this;
+    self.web3 = newWebThree();
+    self.engine = newEngine();
+    self.engine.init();
 
-  async.waterfall([
+    async.waterfall([
       function getConfig(callback) {
         self.engine.config.contractsConfig = {contracts: contractsConfig};
         callback();
@@ -63,32 +69,39 @@ Test.prototype.deployAll = function(contractsConfig, cb) {
         callback();
       },
       function deploy(callback) {
-        self.engine.events.on('abi-contracts-vanila', function(vanillaABI) {
+        self.engine.events.on('abi-contracts-vanila', function (vanillaABI) {
           callback(null, vanillaABI);
         });
-        self.engine.deployManager.deployContracts(function(err, result) {
+        self.engine.deployManager.deployContracts(function (err, result) {
           if (err) {
             console.log(err);
             callback(err);
           }
         });
       }
-  ], function(err, result) {
-    if (err) {
-      console.log("got error");
-      process.exit();
-    }
-    // this should be part of the waterfall and not just something done at the
-    // end
-    self.web3.eth.getAccounts(function(err, accounts) { 
+    ], function (err, result) {
       if (err) {
-        throw new Error(err);
+        console.log("got error");
+        process.exit();
       }
-      self.web3.eth.defaultAccount = accounts[0];
-      RunCode.doEval(result, self.web3); // jshint ignore:line
-      cb();
+      // this should be part of the waterfall and not just something done at the
+      // end
+      self.web3.eth.getAccounts(function (err, accounts) {
+        if (err) {
+          throw new Error(err);
+        }
+        self.web3.eth.defaultAccount = accounts[0];
+        RunCode.doEval(result, self.web3); // jshint ignore:line
+        cb();
+      });
     });
-  });
-};
+  }
+
+
+  return {
+    deployAll: deployAll,
+    sim: sim
+  };
+}());
 
 module.exports = Test;
diff --git a/lib/index.js b/lib/index.js
index 46271baf5..7037f2246 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,13 +1,11 @@
 /*jshint esversion: 6 */
 var async = require('async');
-//require("./utils/debug_util.js")(__filename, async);
+// require("./utils/debug_util.js")(__filename, async);
 
 var colors = require('colors');
 
 var Engine = require('./core/engine.js');
 
-var Test = require('./core/test.js');
-
 var IPFS = require('./upload/ipfs.js');
 var Swarm = require('./upload/swarm.js');
 
@@ -167,6 +165,7 @@ var Embark = (function () {
   }
 
   function initTests (options) {
+    var Test = require('./core/test.js');
     return new Test(options);
   }
 
diff --git a/test/cmd.js b/test/cmd.js
index 8b64a97dd..8565ab3d7 100644
--- a/test/cmd.js
+++ b/test/cmd.js
@@ -2,8 +2,8 @@ var Embark = require('../lib/index');
 var Cmd = require('../lib/cmd');
 
 describe('embark.Cmd', function () {
+  this.timeout(0);
   var cmd = new Cmd(Embark);
-
   describe('#new', function () {
     it('it should not create an app without a name', function (done) {
       cmd.newApp(undefined, function (output) {
@@ -27,4 +27,15 @@ describe('embark.Cmd', function () {
       done();
     });
   });
+
+  // describe("#help", function () {
+  //   it('it should spit out helpful text if no arguments are supplied', function (done) {
+  //     cmd.process([], function (output) {
+  //       var lines = output.split('\n');
+  //       assert.equal(lines[0], '\n');
+  //       assert.equal(lines[1], 'Usage:');
+  //       done();
+  //     });
+  //   })
+  // })
 });
\ No newline at end of file
diff --git a/test_app/package.json b/test_app/package.json
index 29cd34ffa..042f454f1 100644
--- a/test_app/package.json
+++ b/test_app/package.json
@@ -10,7 +10,7 @@
   "license": "ISC",
   "homepage": "",
   "devDependencies": {
-    "embark": "../",
+    "embark": "file:../",
     "mocha": "^2.2.5"
   },
   "dependencies": {
diff --git a/test_app/test/another_storage_spec.js b/test_app/test/another_storage_spec.js
index d0e90c60d..b60297b57 100644
--- a/test_app/test/another_storage_spec.js
+++ b/test_app/test/another_storage_spec.js
@@ -1,7 +1,5 @@
 var assert = require('assert');
-var Embark = require('embark');
-var EmbarkSpec = Embark.initTests();
-var web3 = EmbarkSpec.web3;
+var EmbarkSpec = require('embark/lib/core/test.js');
 
 describe("AnotherStorage", function() {
   before(function(done) {
diff --git a/test_app/test/simple_storage_spec.js b/test_app/test/simple_storage_spec.js
index b2d3cb178..b330ced62 100644
--- a/test_app/test/simple_storage_spec.js
+++ b/test_app/test/simple_storage_spec.js
@@ -1,7 +1,5 @@
 var assert = require('assert');
-var Embark = require('embark');
-var EmbarkSpec = Embark.initTests();
-var web3 = EmbarkSpec.web3;
+var EmbarkSpec = require('embark/lib/core/test.js');
 
 describe("SimpleStorage", function() {
   before(function(done) {
diff --git a/test_app/test/token_spec.js b/test_app/test/token_spec.js
index 362ce058b..93eb28b5f 100644
--- a/test_app/test/token_spec.js
+++ b/test_app/test/token_spec.js
@@ -1,7 +1,5 @@
 var assert = require('assert');
-var Embark = require('embark');
-var EmbarkSpec = Embark.initTests();
-var web3 = EmbarkSpec.web3;
+var EmbarkSpec = require('embark/lib/core/test.js');
 
 describe("Token", function() {
   before(function(done) {