diff --git a/package.json b/package.json
index bdd9d5b65a..40dbe6135f 100644
--- a/package.json
+++ b/package.json
@@ -18,15 +18,15 @@
     "build_es6": "rm -rf dist/es6 && tsc src/Rx.ts src/Rx.KitchenSink.ts --outDir dist/es6 --sourceMap --target ES6 -d --diagnostics",
     "build_closure": "java -jar ./node_modules/google-closure-compiler/compiler.jar ./dist/global/Rx.js --create_source_map ./dist/global/Rx.min.js.map --js_output_file ./dist/global/Rx.min.js",
     "build_global": "rm -rf dist/global && mkdir \"dist/global\" && browserify src/Rx.global.js --outfile dist/global/Rx.js && npm run build_closure",
-    "build_perf": "npm run build_es6 && npm run build_cjs && npm run build_global && webdriver-manager update && npm run perf",
-    "build_test": "rm -rf dist/ && npm run lint && npm run build_es6 && npm run build_cjs && jasmine",
-    "build_cover": "rm -rf dist/ && npm run lint && npm run build_es6 && npm run build_cjs && npm run cover",
+    "build_perf": "npm run build_cjs && npm run build_global && webdriver-manager update && npm run perf",
+    "build_test": "rm -rf dist/ && npm run lint && npm run build_cjs && jasmine",
+    "build_cover": "rm -rf dist/ && npm run lint && npm run build_cjs && npm run cover",
     "build_docs": "./docgen.sh",
     "lint_perf": "eslint perf/ --fix",
     "lint_spec": "eslint spec/**/*.js --fix",
     "lint_src": "tslint -c .tslintrc src/*.ts src/**/*.ts src/**/**/*.ts",
     "lint": "npm run lint_src && npm run lint_spec && npm run lint_perf",
-    "cover": "istanbul cover -x \"*-spec.js index.js *-helper.js\" jasmine && npm run cover_remapping",
+    "cover": "istanbul cover -x \"*-spec.js index.js *-helper.js spec/helpers/*\" jasmine && npm run cover_remapping",
     "cover_remapping": "remap-istanbul -i coverage/coverage.json -o coverage/coverage-remapped.json && remap-istanbul -i coverage/coverage.json -o coverage/coverage-remapped.lcov -t lcovonly && remap-istanbul -i coverage/coverage.json -o coverage/coverage-remapped -t html",
     "test": "jasmine && markdown-doctest",
     "watch": "watch \"echo triggering build && npm run build_test && echo build completed\" src -d -u -w=15",
@@ -80,7 +80,7 @@
     "benchpress": "2.0.0-alpha.37.2",
     "browserify": "11.0.0",
     "colors": "1.1.2",
-    "commitizen": "2.3.0",
+    "commitizen": "2.4.4",
     "coveralls": "2.11.4",
     "cz-conventional-changelog": "1.1.4",
     "esdoc": "0.2.5",
@@ -88,7 +88,7 @@
     "fs-extra": "0.24.0",
     "ghooks": "0.3.2",
     "glob": "5.0.14",
-    "google-closure-compiler": "20150920.0.0",
+    "google-closure-compiler": "20151015.0.0",
     "http-server": "0.8.0",
     "istanbul": "0.3.22",
     "jasmine": "2.3.2",
diff --git a/src/observables/ForkJoinObservable.ts b/src/observables/ForkJoinObservable.ts
index 00b4a2c824..2de7f57908 100644
--- a/src/observables/ForkJoinObservable.ts
+++ b/src/observables/ForkJoinObservable.ts
@@ -9,7 +9,7 @@ export class ForkJoinObservable<T> extends Observable<T> {
                                     Promise<any> |
                                     ((...values: Array<any>) => any)>) {
      super();
-   }
+  }
 
   static create(...sources: Array<Observable<any> |
                                   Promise<any> |
diff --git a/wallaby.js b/wallaby.js
index 22fc819eba..fcdb998ce4 100644
--- a/wallaby.js
+++ b/wallaby.js
@@ -2,7 +2,7 @@ module.exports = wallaby => ({
   files: [
     'index.js',
     'src/**/*.ts',
-    {pattern: 'spec/helpers/test-helper.js', instrument: false}
+    {pattern: 'spec/helpers/*.js', instrument: false}
   ],
 
   tests: ['spec/**/*-spec.js'],