diff --git a/features/car/access.feature b/features/car/access.feature
index 2e1acd1e5..a2aca3b57 100644
--- a/features/car/access.feature
+++ b/features/car/access.feature
@@ -32,7 +32,7 @@ Reference: http://wiki.openstreetmap.org/wiki/Key:access
 
 	Scenario: Car - Access tag hierachy on nodes
 		Then routability should be
-		 | node/access | node/vehicle | node/motor_vehicle | mnode/otorcar | bothw |
+		 | node/access | node/vehicle | node/motor_vehicle | node/motorcar | bothw |
 		 |             |              |                    |               | x     |
 		 | yes         |              |                    |               | x     |
 		 | no          |              |                    |               |       |
diff --git a/features/testbot/weight.feature b/features/testbot/weight.feature
index 4b82c0f5e..b884a37bf 100644
--- a/features/testbot/weight.feature
+++ b/features/testbot/weight.feature
@@ -6,19 +6,21 @@ Feature: Choosing route based on length, speed, etc
 	
 	Scenario: Pick the geometrically shortest route, way types being equal
 		Given the node map
-		 |   | s |   |
-		 |   | t |   |
-		 | a |   | b |
+		 |   |   | s |   |   |
+		 |   |   | t |   |   |
+		 | x | a |   | b | y |
 
 		And the ways
 		 | nodes | highway |
+		 | xa    | primary |
+		 | by    | primary |
 		 | atb   | primary |
 		 | asb   | primary |
 
 		When I route I should get
-		 | from | to | route |
-		 | a    | b  | atb   |
-		 | b    | a  | atb   |
+		 | from | to | route     |
+		 | x    | y  | xa,atb,by |
+		 | y    | x  | by,atb,xa |
 
 	Scenario: Pick  the shortest travel time, even when it's longer
 		Given the node map
@@ -34,4 +36,3 @@ Feature: Choosing route based on length, speed, etc
 		 | from | to | route |
 		 | a    | b  | apb   |
 		 | b    | a  | apb   |
-