diff --git a/lib/runner/clientmanager.js b/lib/runner/clientmanager.js
index 7af1bc8181..f2c43c672b 100644
--- a/lib/runner/clientmanager.js
+++ b/lib/runner/clientmanager.js
@@ -26,8 +26,10 @@ ClientManager.prototype.init = function(opts) {
   this['@client'].once('selenium:session_create', function() {
     var capabilities = this.api.capabilities || {};
     var browserName = (capabilities.browserName && capabilities.browserName.toUpperCase()) || '';
+    var browserVersion = this.api.capabilities.version || this.api.capabilities.browserVersion;
+    var platformVersion = this.api.capabilities.platform || this.api.capabilities.platformVersion;
 
-    self.options.report_prefix = browserName + '_' + this.api.capabilities.version + '_' + this.api.capabilities.platform + '_';
+    self.options.report_prefix = browserName + '_' + browserVersion + '_' + platformVersion + '_';
   });
   return this;
 };
diff --git a/lib/runner/reporters/junit.js b/lib/runner/reporters/junit.js
index d0ed8599e7..5623f574f5 100644
--- a/lib/runner/reporters/junit.js
+++ b/lib/runner/reporters/junit.js
@@ -66,12 +66,10 @@ module.exports = new (function() {
     var filename = path.join(output_folder, opts.filename_prefix + moduleName + '.xml');
 
     var rendered = ejs.render(data, {
-      locals: {
-        module     : module,
-        moduleName : moduleName,
-        className  : className,
-        systemerr  : globalResults.errmessages.join('\n')
-      }
+      module: module,
+      moduleName: moduleName,
+      className: className,
+      systemerr: globalResults.errmessages.join('\n')
     });
 
     fs.writeFile(filename, rendered, function(err) {
diff --git a/package.json b/package.json
index 509a5de1fa..883324636c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nightwatch",
-  "description": "A node.js bindings implementation for selenium 2.0/webdriver",
+  "description": "Easy to use Node.js based End-to-End testing solution for browser based apps and websites, using the W3C WebDriver API.",
   "version": "0.9.17",
   "author": {
     "name": "Andrei Rusu",
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "chai-nightwatch": "~0.1.x",
-    "ejs": "0.8.3",
+    "ejs": "2.5.7",
     "lodash.clone": "3.0.3",
     "lodash.defaultsdeep": "4.3.2",
     "minimatch": "3.0.3",
diff --git a/test/lib/mocks.json b/test/lib/mocks.json
index 7cc963644e..6e44af58b9 100644
--- a/test/lib/mocks.json
+++ b/test/lib/mocks.json
@@ -4,7 +4,7 @@
     {
       "url" : "/wd/hub/session",
       "postdata" : "{\"desiredCapabilities\":{\"browserName\":\"firefox\",\"javascriptEnabled\":true,\"acceptSslCerts\":true,\"platform\":\"ANY\"}}",
-      "response" : "{\"status\": 0, \"sessionId\": \"1352110219202\", \"value\": { \"javascriptEnabled\": true, \"browserName\": \"firefox\", \"version\": \"TEST\", \"platform\": \"TEST\"}, \"state\": null}",
+      "response" : "{\"status\": 0, \"sessionId\": \"1352110219202\", \"value\": { \"javascriptEnabled\": true, \"browserName\": \"firefox\", \"browserVersion\": \"TEST\", \"platformVersion\": \"TEST\"}, \"state\": null}",
       "responseHeaders" : {
       },
       "statusCode" : 201,
diff --git a/test/src/core/testNightwatchApi.js b/test/src/core/testNightwatchApi.js
index 786e423118..b180c9ae2a 100644
--- a/test/src/core/testNightwatchApi.js
+++ b/test/src/core/testNightwatchApi.js
@@ -18,8 +18,8 @@ module.exports = MochaTest.add('test Nightwatch Api', {
     assert.deepEqual(api.capabilities, {
       javascriptEnabled: true,
       browserName: 'firefox',
-      version: 'TEST',
-      platform: 'TEST'
+      browserVersion: 'TEST',
+      platformVersion: 'TEST'
     });
 
     assert.deepEqual(api.globals, {
diff --git a/test/src/runner/testRunner.js b/test/src/runner/testRunner.js
index 07ed9b72ed..2a12d3401d 100644
--- a/test/src/runner/testRunner.js
+++ b/test/src/runner/testRunner.js
@@ -202,7 +202,7 @@ module.exports = {
           }
           var content = data.toString();
           try {
-            assert.ok(content.indexOf('<failure message="AssertionError: 1 == 0 - expected &quot;0&quot; but got: &quot;1&quot;">') > 0, 'Report contains failure information.')
+            assert.ok(content.indexOf('<failure message="AssertionError: 1 == 0 - expected &#34;0&#34; but got: &#34;1&#34;">') > 0, 'Report contains failure information.')
             done();
           } catch (err) {
             done(err);