diff --git a/features/bicycle/roundabout.feature b/features/bicycle/roundabout.feature
index da6effa7d..5f4f5a384 100644
--- a/features/bicycle/roundabout.feature
+++ b/features/bicycle/roundabout.feature
@@ -21,7 +21,7 @@ Feature: Roundabout Instructions
             | abcda | roundabout |
 
         When I route I should get
-            | from | to | route | turns                            |
+            | from | to | route | turns                           |
             | s    | t  | sa,tb | depart,roundabout-exit-1,arrive |
             | s    | u  | sa,uc | depart,roundabout-exit-2,arrive |
             | s    | v  | sa,vd | depart,roundabout-exit-3,arrive |
diff --git a/features/support/data.js b/features/support/data.js
index bf5e75db0..29e517093 100644
--- a/features/support/data.js
+++ b/features/support/data.js
@@ -201,6 +201,7 @@ module.exports = function () {
         exec(cmd, (err) => {
             if (err) {
                 this.log(util.format('*** Exited with code %d', err.code), 'preprocess');
+                process.chdir('../');
                 return callback(this.ExtractError(err.code, util.format('osrm-extract exited with code %d', err.code)));
             }
 
@@ -247,6 +248,7 @@ module.exports = function () {
         exec(cmd, (err) => {
             if (err) {
                 this.log(util.format('*** Exited with code %d', err.code), 'preprocess');
+                process.chdir('../');
                 return callback(this.ContractError(err.code, util.format('osrm-contract exited with code %d', err.code)));
             }
 
diff --git a/features/testbot/alternative_loop.feature b/features/testbot/alternative_loop.feature
index 995009cd4..5aff73134 100644
--- a/features/testbot/alternative_loop.feature
+++ b/features/testbot/alternative_loop.feature
@@ -19,7 +19,7 @@ Feature: Alternative route
             | ca    | yes    |
 
         And the query options
-            | alternative | true |
+            | alternatives | true |
 
         When I route I should get
             | from | to | route          | alternative |