diff --git a/.gitignore b/.gitignore
index 2669fbe..49549c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ node_modules/
 coverage/
 pages/
 public/
+kvstore/
diff --git a/dist/npmextra.classes.keyvaluestore.d.ts b/dist/npmextra.classes.keyvaluestore.d.ts
index 16d74e3..1ee58d5 100644
--- a/dist/npmextra.classes.keyvaluestore.d.ts
+++ b/dist/npmextra.classes.keyvaluestore.d.ts
@@ -1,4 +1,7 @@
 export declare type TKeyValueStore = 'path' | 'gitProject' | 'custom';
+/**
+ * kvStore is a simple key vlaue store to store data about projects between runs
+ */
 export declare class KeyValueStore {
     type: TKeyValueStore;
     identity: string;
@@ -23,9 +26,5 @@ export declare class KeyValueStore {
     /**
      * computes the identity
      */
-    private initIdentity(customStringArg);
-    /**
-     * computes the filePath
-     */
     private initFilePath();
 }
diff --git a/dist/npmextra.classes.keyvaluestore.js b/dist/npmextra.classes.keyvaluestore.js
index 5df0bde..6d90d11 100644
--- a/dist/npmextra.classes.keyvaluestore.js
+++ b/dist/npmextra.classes.keyvaluestore.js
@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmextra.plugins");
 const paths = require("./npmextra.paths");
+/**
+ * kvStore is a simple key vlaue store to store data about projects between runs
+ */
 class KeyValueStore {
     constructor(typeArg, customStringArg) {
         // set kvStoreType
         this.type = typeArg;
         this.identity = customStringArg;
-        this.initIdentity(customStringArg);
+        this.initFilePath();
     }
     /**
      * reads a keyValueFile from disk
@@ -32,10 +35,10 @@ class KeyValueStore {
     /**
      * computes the identity
      */
-    initIdentity(customStringArg) {
+    initFilePath() {
+        // determine the right base directory
         let baseDir;
         if (this.type === 'custom') {
-            this.identity = customStringArg;
             baseDir = paths.kvCustomDir;
         }
         else if (this.type === 'gitProject') {
@@ -47,11 +50,6 @@ class KeyValueStore {
         this.filePath = plugins.path.join(baseDir, this.identity + '.json');
         plugins.smartfile.fs.ensureFileSync(this.filePath, '{}');
     }
-    /**
-     * computes the filePath
-     */
-    initFilePath() {
-    }
 }
 exports.KeyValueStore = KeyValueStore;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZXh0cmEuY2xhc3Nlcy5rZXl2YWx1ZXN0b3JlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZXh0cmEuY2xhc3Nlcy5rZXl2YWx1ZXN0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsOENBQTZDO0FBQzdDLDBDQUF5QztBQUl6QztJQUlFLFlBQVksT0FBdUIsRUFBRSxlQUF3QjtRQUMzRCxrQkFBa0I7UUFDbEIsSUFBSSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUE7UUFDbkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxlQUFlLENBQUE7UUFDL0IsSUFBSSxDQUFDLFlBQVksQ0FBQyxlQUFlLENBQUMsQ0FBQTtJQUNwQyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxJQUFJO0lBRUosQ0FBQztJQUVEOztPQUVHO0lBQ0gsS0FBSztJQUVMLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUk7SUFFSixDQUFDO0lBRUQ7O09BRUc7SUFDSCxNQUFNO0lBRU4sQ0FBQztJQUVEOztPQUVHO0lBQ0ssWUFBWSxDQUFDLGVBQXVCO1FBQzFDLElBQUksT0FBZSxDQUFBO1FBQ25CLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztZQUMzQixJQUFJLENBQUMsUUFBUSxHQUFHLGVBQWUsQ0FBQTtZQUMvQixPQUFPLEdBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQTtRQUM3QixDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLEtBQUssWUFBWSxDQUFDLENBQUMsQ0FBQztZQUN0QyxPQUFPLEdBQUcsS0FBSyxDQUFDLFFBQVEsQ0FBQTtRQUMxQixDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQztZQUVoQyxPQUFPLEdBQUcsS0FBSyxDQUFDLFNBQVMsQ0FBQTtRQUMzQixDQUFDO1FBQ0QsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUMsQ0FBQTtRQUNuRSxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQTtJQUMxRCxDQUFDO0lBRUQ7O09BRUc7SUFDSyxZQUFZO0lBRXBCLENBQUM7Q0FDRjtBQS9ERCxzQ0ErREMifQ==
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZXh0cmEuY2xhc3Nlcy5rZXl2YWx1ZXN0b3JlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZXh0cmEuY2xhc3Nlcy5rZXl2YWx1ZXN0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsOENBQTZDO0FBQzdDLDBDQUF5QztBQUl6Qzs7R0FFRztBQUNIO0lBSUUsWUFBWSxPQUF1QixFQUFFLGVBQXdCO1FBQzNELGtCQUFrQjtRQUNsQixJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQTtRQUNuQixJQUFJLENBQUMsUUFBUSxHQUFHLGVBQWUsQ0FBQTtRQUMvQixJQUFJLENBQUMsWUFBWSxFQUFFLENBQUE7SUFDckIsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSTtJQUVKLENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUs7SUFFTCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxJQUFJO0lBRUosQ0FBQztJQUVEOztPQUVHO0lBQ0gsTUFBTTtJQUVOLENBQUM7SUFFRDs7T0FFRztJQUNLLFlBQVk7UUFDbEIscUNBQXFDO1FBQ3JDLElBQUksT0FBZSxDQUFBO1FBQ25CLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztZQUMzQixPQUFPLEdBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQTtRQUM3QixDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLEtBQUssWUFBWSxDQUFDLENBQUMsQ0FBQztZQUN0QyxPQUFPLEdBQUcsS0FBSyxDQUFDLFFBQVEsQ0FBQTtRQUMxQixDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQztZQUVoQyxPQUFPLEdBQUcsS0FBSyxDQUFDLFNBQVMsQ0FBQTtRQUMzQixDQUFDO1FBQ0QsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUMsQ0FBQTtRQUNuRSxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQTtJQUMxRCxDQUFDO0NBQ0Y7QUF4REQsc0NBd0RDIn0=
\ No newline at end of file
diff --git a/dist/npmextra.paths.d.ts b/dist/npmextra.paths.d.ts
index 6388853..c3a5f71 100644
--- a/dist/npmextra.paths.d.ts
+++ b/dist/npmextra.paths.d.ts
@@ -13,7 +13,7 @@ export declare let kvCustomDir: string;
  */
 export declare let kvGitDir: string;
 /**
- * keyValue for path based Key
+ * keyValue for path based keyValue store
  */
 export declare let kvPathDir: string;
 export declare let configFile: string;
diff --git a/dist/npmextra.paths.js b/dist/npmextra.paths.js
index 223931d..02e4f27 100644
--- a/dist/npmextra.paths.js
+++ b/dist/npmextra.paths.js
@@ -20,7 +20,7 @@ exports.kvCustomDir = plugins.path.join(exports.kvBase, 'custom');
  */
 exports.kvGitDir = plugins.path.join(exports.kvBase, 'git');
 /**
- * keyValue for path based Key
+ * keyValue for path based keyValue store
  */
 exports.kvPathDir = plugins.path.join(exports.kvBase, 'path');
 // files
diff --git a/package.json b/package.json
index 7ec2872..02fe13c 100644
--- a/package.json
+++ b/package.json
@@ -24,11 +24,8 @@
     "q": "^1.4.1",
     "smartfile": "^4.1.9",
     "smartq": "^1.1.1",
+    "tapbundle": "^1.1.0",
     "typings-global": "^1.0.14"
   },
-  "devDependencies": {
-    "@types/should": "^8.1.30",
-    "should": "^11.2.1",
-    "typings-test": "^1.0.3"
-  }
+  "devDependencies": {}
 }
diff --git a/test/test.d.ts b/test/test.d.ts
deleted file mode 100644
index 2fd432a..0000000
--- a/test/test.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-import 'typings-test';
diff --git a/test/test.js b/test/test.js
deleted file mode 100644
index ad1dc0e..0000000
--- a/test/test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("typings-test");
-const should = require("should");
-const npmExtra = require("../dist/index");
-let testNpmextra;
-describe('npmextra', function () {
-    it('should create a new Npmtextra instance', function () {
-        testNpmextra = new npmExtra.Npmextra('./test/');
-        should(testNpmextra).be.instanceof(npmExtra.Npmextra);
-    });
-    it('should state wether a npmextra.json exists', function () {
-        should(testNpmextra.npmextraJsonExists).be.true();
-    });
-    it('should pass through default value, if not overriden by config from file', function () {
-        let testData = testNpmextra.dataFor('testTool', { someKey2: 'someValue2' });
-        console.log(testData);
-        should(testData).have.ownProperty('someKey2');
-    });
-    it('should read a config file', function () {
-        let testData = testNpmextra.dataFor('testTool', {
-            someKey2: 'someValue2'
-        });
-        should(testData).have.ownProperty('someKey2');
-        should(testData.testValue).equal(2);
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3QkFBcUI7QUFFckIsaUNBQWdDO0FBRWhDLDBDQUEwQztBQUUxQyxJQUFJLFlBQStCLENBQUE7QUFFbkMsUUFBUSxDQUFDLFVBQVUsRUFBRTtJQUNuQixFQUFFLENBQUMsd0NBQXdDLEVBQUU7UUFDM0MsWUFBWSxHQUFHLElBQUksUUFBUSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUMvQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDdkQsQ0FBQyxDQUFDLENBQUE7SUFDRixFQUFFLENBQUMsNENBQTRDLEVBQUU7UUFDL0MsTUFBTSxDQUFDLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUNuRCxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQyx5RUFBeUUsRUFBRTtRQUM1RSxJQUFJLFFBQVEsR0FBRyxZQUFZLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxFQUFFLFFBQVEsRUFBRSxZQUFZLEVBQUUsQ0FBQyxDQUFBO1FBQzNFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDckIsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUE7SUFDL0MsQ0FBQyxDQUFDLENBQUE7SUFDRixFQUFFLENBQUMsMkJBQTJCLEVBQUU7UUFDOUIsSUFBSSxRQUFRLEdBQUcsWUFBWSxDQUFDLE9BQU8sQ0FDakMsVUFBVSxFQUNWO1lBQ0UsUUFBUSxFQUFFLFlBQVk7U0FDdkIsQ0FDRixDQUFBO1FBQ0QsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUE7UUFDN0MsTUFBTSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDckMsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDLENBQUMsQ0FBQSJ9
\ No newline at end of file
diff --git a/test/test.ts b/test/test.ts
index 0b3ee3c..5b02bbc 100644
--- a/test/test.ts
+++ b/test/test.ts
@@ -1,32 +1,36 @@
-import 'typings-test'
+import { expect, tap } from 'tapbundle'
 import path = require('path')
-import * as should from 'should'
 
+// module to test
 import npmExtra = require('../dist/index')
 
 let testNpmextra: npmExtra.Npmextra
 
-describe('npmextra', function () {
-  it('should create a new Npmtextra instance', function () {
-    testNpmextra = new npmExtra.Npmextra('./test/')
-    should(testNpmextra).be.instanceof(npmExtra.Npmextra)
-  })
-  it('should state wether a npmextra.json exists', function () {
-    should(testNpmextra.npmextraJsonExists).be.true()
-  })
-  it('should pass through default value, if not overriden by config from file', function () {
-    let testData = testNpmextra.dataFor('testTool', { someKey2: 'someValue2' })
-    console.log(testData)
-    should(testData).have.ownProperty('someKey2')
-  })
-  it('should read a config file', function () {
-    let testData = testNpmextra.dataFor<any>(
-      'testTool',
-      {
-        someKey2: 'someValue2'
-      }
-    )
-    should(testData).have.ownProperty('someKey2')
-    should(testData.testValue).equal(2)
-  })
+tap.test('should create a new Npmtextra instance', async () => {
+  testNpmextra = new npmExtra.Npmextra('./test/')
+  expect(testNpmextra).be.instanceof(npmExtra.Npmextra)
 })
+
+tap.test('should state wether a npmextra.json exists', async () => {
+  // tslint:disable-next-line:no-unused-expression
+  expect(testNpmextra.npmextraJsonExists).be.true
+})
+
+tap.test('should pass through default value, if not overriden by config from file', async () => {
+  let testData = testNpmextra.dataFor('testTool', { someKey2: 'someValue2' })
+  console.log(testData)
+  expect(testData).have.ownProperty('someKey2')
+})
+
+tap.test('should read a config file', async () => {
+  let testData = testNpmextra.dataFor<any>(
+    'testTool',
+    {
+      someKey2: 'someValue2'
+    }
+  )
+  expect(testData).have.ownProperty('someKey2')
+  expect(testData.testValue).equal(2)
+})
+
+tap.start()
diff --git a/ts/npmextra.classes.keyvaluestore.ts b/ts/npmextra.classes.keyvaluestore.ts
index e1f6399..a23d32d 100644
--- a/ts/npmextra.classes.keyvaluestore.ts
+++ b/ts/npmextra.classes.keyvaluestore.ts
@@ -3,6 +3,9 @@ import * as paths from './npmextra.paths'
 
 export type TKeyValueStore = 'path' | 'gitProject' | 'custom'
 
+/**
+ * kvStore is a simple key vlaue store to store data about projects between runs
+ */
 export class KeyValueStore {
   type: TKeyValueStore // the type of the kvStore
   identity: string // the identity of the kvStore
@@ -11,7 +14,7 @@ export class KeyValueStore {
     // set kvStoreType
     this.type = typeArg
     this.identity = customStringArg
-    this.initIdentity(customStringArg)
+    this.initFilePath()
   }
 
   /**
@@ -45,10 +48,10 @@ export class KeyValueStore {
   /**
    * computes the identity
    */
-  private initIdentity(customStringArg: string) {
+  private initFilePath() {
+    // determine the right base directory
     let baseDir: string
     if (this.type === 'custom') {
-      this.identity = customStringArg
       baseDir = paths.kvCustomDir
     } else if (this.type === 'gitProject') {
       baseDir = paths.kvGitDir
@@ -59,11 +62,4 @@ export class KeyValueStore {
     this.filePath = plugins.path.join(baseDir, this.identity + '.json')
     plugins.smartfile.fs.ensureFileSync(this.filePath, '{}')
   }
-
-  /**
-   * computes the filePath 
-   */
-  private initFilePath() {
-
-  }
 }
diff --git a/ts/npmextra.paths.ts b/ts/npmextra.paths.ts
index f9cfdea..21c9538 100644
--- a/ts/npmextra.paths.ts
+++ b/ts/npmextra.paths.ts
@@ -24,7 +24,7 @@ export let kvCustomDir = plugins.path.join(kvBase, 'custom')
 export let kvGitDir = plugins.path.join(kvBase, 'git')
 
 /**
- * keyValue for path based Key
+ * keyValue for path based keyValue store
  */
 export let kvPathDir = plugins.path.join(kvBase, 'path')
 
diff --git a/yarn.lock b/yarn.lock
index ce97fa4..754f8a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,27 @@
 # yarn lockfile v1
 
 
+"@types/chai-as-promised@0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-0.0.29.tgz#43d52892aa998e185a3de3e2477edb8573be1d77"
+  dependencies:
+    "@types/chai" "*"
+    "@types/promises-a-plus" "*"
+
+"@types/chai-string@^1.1.30":
+  version "1.1.30"
+  resolved "https://registry.yarnpkg.com/@types/chai-string/-/chai-string-1.1.30.tgz#4d8744b31a5a2295fc01c981ed1e2d4c8a070f0a"
+  dependencies:
+    "@types/chai" "*"
+
+"@types/chai@*":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.0.1.tgz#37fea779617cfec3fd2b19a0247e8bbdd5133bf6"
+
+"@types/chai@^3.4.35":
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-3.5.2.tgz#c11cd2817d3a401b7ba0f5a420f35c56139b1c1e"
+
 "@types/fs-extra@0.x.x":
   version "0.0.37"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-0.0.37.tgz#195f11bcd9a1b97d9e412c6b66899b545471a1f7"
@@ -12,14 +33,14 @@
   version "4.14.55"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.55.tgz#75d7d4eba020ee4103d4cbd0f2a3ef5db8f7534f"
 
-"@types/mocha@^2.2.31":
-  version "2.2.40"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.40.tgz#9811dd800ece544cd84b5b859917bf584a150c4c"
-
 "@types/node@*":
   version "7.0.8"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.8.tgz#25e4dd804b630c916ae671233e6d71f6ce18124a"
 
+"@types/promises-a-plus@*":
+  version "0.0.27"
+  resolved "https://registry.yarnpkg.com/@types/promises-a-plus/-/promises-a-plus-0.0.27.tgz#c64651134614c84b8f5d7114ce8901d36a609780"
+
 "@types/q@0.x.x":
   version "0.0.34"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.34.tgz#e5d3a54e7a56309d904cdf1dc34f61ac595fae2e"
@@ -28,9 +49,11 @@
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.0.0.tgz#57e5465d665b370d4217e69b344b20faa6b724f5"
 
-"@types/should@^8.1.30":
-  version "8.1.30"
-  resolved "https://registry.yarnpkg.com/@types/should/-/should-8.1.30.tgz#e6b4f3ca4fb0799f6ce3303f3a8c003df6585aa3"
+"@types/shelljs@^0.7.2":
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.2.tgz#c2bdb3fe80cd7a3da08750ca898ae44c589671f3"
+  dependencies:
+    "@types/node" "*"
 
 "@types/vinyl@^2.0.0":
   version "2.0.0"
@@ -38,6 +61,10 @@
   dependencies:
     "@types/node" "*"
 
+"@types/which@^1.0.28":
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
+
 ansi-256-colors@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ansi-256-colors/-/ansi-256-colors-1.1.0.tgz#910de50efcc7c09e3d82f2f87abd6b700c18818a"
@@ -56,6 +83,10 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+assertion-error@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
+
 balanced-match@^0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@@ -80,6 +111,10 @@ beautylog@^6.1.5:
     smartq "^1.1.1"
     typings-global "^1.0.14"
 
+bindings@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
+
 brace-expansion@^1.0.0:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
@@ -91,6 +126,24 @@ buffer-shims@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
 
+chai-as-promised@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-6.0.0.tgz#1a02a433a6f24dafac63b9c96fa1684db1aa8da6"
+  dependencies:
+    check-error "^1.0.2"
+
+chai-string@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/chai-string/-/chai-string-1.4.0.tgz#359140c051d36a4e4b1a5fc6b910152f438a8d49"
+
+chai@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
+  dependencies:
+    assertion-error "^1.0.1"
+    deep-eql "^0.1.3"
+    type-detect "^1.0.0"
+
 chalk@^1.0.0, chalk@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -101,6 +154,10 @@ chalk@^1.0.0, chalk@^1.1.1:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+check-error@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -139,6 +196,24 @@ core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+deep-eql@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
+  dependencies:
+    type-detect "0.1.1"
+
+early@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/early/-/early-2.1.1.tgz#841e23254ea5dc54d8afaeee82f5ab65c00ee23c"
+  dependencies:
+    beautycolor "^1.0.7"
+    smartq "^1.1.1"
+    typings-global "^1.0.16"
+
+es6-error@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
+
 escape-string-regexp@^1.0.2:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -222,6 +297,10 @@ isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
 js-yaml@^3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721"
@@ -235,6 +314,20 @@ jsonfile@^2.1.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+leakage@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/leakage/-/leakage-0.3.0.tgz#15d698abdc76bbc6439601f4f3020e77e2d50c39"
+  dependencies:
+    es6-error "^4.0.2"
+    left-pad "^1.1.3"
+    memwatch-next "^0.3.0"
+    minimist "^1.2.0"
+    pretty-bytes "^4.0.2"
+
+left-pad@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a"
+
 lodash@^4.17.2, lodash@^4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
@@ -245,6 +338,13 @@ log-symbols@^1.0.2:
   dependencies:
     chalk "^1.0.0"
 
+memwatch-next@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/memwatch-next/-/memwatch-next-0.3.0.tgz#2111050f9a906e0aa2d72a4ec0f0089c78726f8f"
+  dependencies:
+    bindings "^1.2.1"
+    nan "^2.3.2"
+
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@@ -255,6 +355,14 @@ minimatch@^3.0.2:
   dependencies:
     brace-expansion "^1.0.0"
 
+minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+nan@^2.3.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
+
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -292,6 +400,10 @@ pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
+pretty-bytes@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
+
 process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@@ -355,48 +467,36 @@ shelljs@^0.7.4:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-should-equal@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/should-equal/-/should-equal-1.0.1.tgz#0b6e9516f2601a9fb0bb2dcc369afa1c7e200af7"
+shelljs@^0.7.8:
+  version "0.7.8"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
   dependencies:
-    should-type "^1.0.0"
-
-should-format@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/should-format/-/should-format-3.0.3.tgz#9bfc8f74fa39205c53d38c34d717303e277124f1"
-  dependencies:
-    should-type "^1.3.0"
-    should-type-adaptors "^1.0.1"
-
-should-type-adaptors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/should-type-adaptors/-/should-type-adaptors-1.0.1.tgz#efe5553cdf68cff66e5c5f51b712dc351c77beaa"
-  dependencies:
-    should-type "^1.3.0"
-    should-util "^1.0.0"
-
-should-type@^1.0.0, should-type@^1.3.0, should-type@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/should-type/-/should-type-1.4.0.tgz#0756d8ce846dfd09843a6947719dfa0d4cff5cf3"
-
-should-util@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/should-util/-/should-util-1.0.0.tgz#c98cda374aa6b190df8ba87c9889c2b4db620063"
-
-should@^11.2.1:
-  version "11.2.1"
-  resolved "https://registry.yarnpkg.com/should/-/should-11.2.1.tgz#90f55145552d01cfc200666e4e818a1c9670eda2"
-  dependencies:
-    should-equal "^1.0.0"
-    should-format "^3.0.2"
-    should-type "^1.4.0"
-    should-type-adaptors "^1.0.1"
-    should-util "^1.0.0"
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
 
 signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
+smartchai@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/smartchai/-/smartchai-1.0.3.tgz#de6d010bb8b5aef24cb70b31a5f5334e8c41b72f"
+  dependencies:
+    "@types/chai" "^3.4.35"
+    "@types/chai-as-promised" "0.0.29"
+    "@types/chai-string" "^1.1.30"
+    chai "^3.5.0"
+    chai-as-promised "^6.0.0"
+    chai-string "^1.3.0"
+
+smartdelay@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/smartdelay/-/smartdelay-1.0.3.tgz#5fd44dad77262d110702f0293efa80c072cfb579"
+  dependencies:
+    smartq "^1.1.1"
+    typings-global "^1.0.16"
+
 smartenv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/smartenv/-/smartenv-2.0.0.tgz#ede4e2044efcf9bec318388bb1dab53024ee3d16"
@@ -444,6 +544,17 @@ smartrequest@^1.0.4:
     smartq "^1.1.0"
     typings-global "^1.0.14"
 
+smartshell@^1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/smartshell/-/smartshell-1.0.8.tgz#1535756c0fe8069f7e6da1e3f9cb6c8f77094e42"
+  dependencies:
+    "@types/shelljs" "^0.7.2"
+    "@types/which" "^1.0.28"
+    shelljs "^0.7.8"
+    smartq "^1.1.1"
+    typings-global "^1.0.19"
+    which "^1.2.14"
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -481,6 +592,17 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
+tapbundle@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/tapbundle/-/tapbundle-1.1.0.tgz#e0547f683ae36260f639ecd7435df95f0af01683"
+  dependencies:
+    early "^2.1.1"
+    leakage "^0.3.0"
+    smartchai "^1.0.3"
+    smartdelay "^1.0.3"
+    smartq "^1.1.1"
+    typings-global "^1.0.19"
+
 through2@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -488,23 +610,31 @@ through2@^2.0.1:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
+type-detect@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
+
+type-detect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
+
 typed-promisify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/typed-promisify/-/typed-promisify-0.3.0.tgz#1ba0af5e444c87d8047406f18ce49092a1191853"
 
-typings-global@*, typings-global@^1.0.14:
+typings-global@^1.0.14:
   version "1.0.14"
   resolved "https://registry.yarnpkg.com/typings-global/-/typings-global-1.0.14.tgz#ab682720a03d6b9278869fb5c30c30d7dc61d12c"
   dependencies:
     semver "^5.3.0"
     shelljs "^0.7.4"
 
-typings-test@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/typings-test/-/typings-test-1.0.3.tgz#fbab895eb3f0c44842e73db059f65946b971e369"
+typings-global@^1.0.16, typings-global@^1.0.19:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/typings-global/-/typings-global-1.0.19.tgz#3376a72d4de1e5541bf5702248ff64c3e6ea316c"
   dependencies:
-    "@types/mocha" "^2.2.31"
-    typings-global "*"
+    semver "^5.3.0"
+    smartshell "^1.0.6"
 
 util-deprecate@~1.0.1:
   version "1.0.2"
@@ -532,6 +662,12 @@ vinyl@^2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
+which@^1.2.14:
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+  dependencies:
+    isexe "^2.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"