diff --git a/lib/local/platform/macos.js b/lib/local/platform/macos.js
index a01f24c..40e1645 100644
--- a/lib/local/platform/macos.js
+++ b/lib/local/platform/macos.js
@@ -75,6 +75,7 @@ module.exports = {
     args: ['--args' ],
     getCommand: function(browser, url, args) {
       return browser.command + ' ' + args.join(' ') + ' --url="' + url + '"';
-    }
+    },
+    multi: true
   }
 };
diff --git a/lib/local/platform/windows.js b/lib/local/platform/windows.js
index 65852b3..de5e7c2 100644
--- a/lib/local/platform/windows.js
+++ b/lib/local/platform/windows.js
@@ -28,7 +28,8 @@ module.exports = {
     defaultLocation: path.join(programFiles, 'Opera', 'launcher.exe'),
     pathQuery: 'dir /s /b opera.exe',
     cwd: cwd,
-    imageName: 'opera.exe'
+    imageName: 'opera.exe',
+    opensTab: true
   },
   ie: {
     defaultLocation: path.join(programFiles, 'Internet Explorer', 'iexplore.exe'),
@@ -40,5 +41,14 @@ module.exports = {
     args: [path.join(__dirname, '..', '..', '..', 'resources/phantom.js')],
     multi: true,
     cwd: cwd
+  },
+  nodeWebkit: {
+    pathQuery: 'dir /s /b nw.exe',
+    multi: true,
+    cwd: cwd,
+    imageName: 'nw.exe',
+    getCommand: function(browser, url) {
+      return '"' + browser.command + '" --url="' + url + '"';
+    }
   }
 };
diff --git a/lib/local/version.js b/lib/local/version.js
index 5f2fb60..d1a1d9f 100644
--- a/lib/local/version.js
+++ b/lib/local/version.js
@@ -20,10 +20,9 @@ module.exports = function(browser) {
       // ShowVer.exe returns a non zero status code even if it works
       if (typeof stdout === 'string' && regex.test(stdout)) {
         browser.version = stdout.match(regex)[1];
-        return deferred.resolve(browser);
       }
 
-      deferred.reject(error);
+      return deferred.resolve(browser);
     });
 
     return deferred.promise;
diff --git a/package.json b/package.json
index fc85403..757fe93 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "node": "~0.10"
   },
   "scripts": {
-    "test": "grunt test"
+    "test": "grunt test --stack"
   },
   "devDependencies": {
     "mocha": "~1.6.0",