diff --git a/features/testbot/bearing_param.feature b/features/testbot/bearing_param.feature
index 1efa81742..ea60856f0 100644
--- a/features/testbot/bearing_param.feature
+++ b/features/testbot/bearing_param.feature
@@ -15,11 +15,11 @@ Feature: Bearing parameter
 
         When I route I should get
             | from | to | bearings  | route | bearing |
-            | b    | c  | 90 90     | ad    | 90      |
+            | b    | c  | 90 90     | ad,ad | 90,0    |
             | b    | c  | 180 90    |       |         |
-            | b    | c  | 80 100    | ad    | 90      |
+            | b    | c  | 80 100    | ad,ad | 90,0    |
             | b    | c  | 79 100    |       |         |
-            | b    | c  | 79,11 100 | ad    | 90      |
+            | b    | c  | 79,11 100 | ad,ad | 90,0    |
 
     Scenario: Testbot - Intial bearing in simple case
         Given the node map
@@ -35,10 +35,10 @@ Feature: Bearing parameter
         When I route I should get
             | from | to | bearings | route | bearing |
             | 0    | c  | 0 0      |       |         |
-            | 0    | c  | 45 45    | bc    | 45 ~3%   |
+            | 0    | c  | 45 45    | bc,bc | 45 ~3%  |
             | 0    | c  | 85 85    |       |         |
             | 0    | c  | 95 95    |       |         |
-            | 0    | c  | 135 135  | ac    | 135 ~1%  |
+            | 0    | c  | 135 135  | ac,ac | 135 ~1% |
             | 0    | c  | 180 180  |       |         |
 
     Scenario: Testbot - Initial bearing on split way
@@ -55,19 +55,19 @@ Feature: Bearing parameter
 
         When I route I should get
             | from | to | bearings | route       | bearing       |
-            | 0    | b  | 10 10    | bc          | 0             |
-            | 0    | b  | 90 90    | ab          | 90            |
+            | 0    | b  | 10 10    | bc,bc       | 0,0            |
+            | 0    | b  | 90 90    | ab,ab       | 90,0           |
             # The returned bearing is wrong here, it's based on the snapped
             # coordinates, not the acutal edge bearing.  This should be
-            # fixed one day, but it's only a problem when we snap too vias
+            # fixed one day, but it's only a problem when we snap two vias
             # to the same point - DP
             #| 0    | b  | 170 170  | da          | 180           |
             #| 0    | b  | 189 189  | da          | 180           |
-            | 0    | 1  | 90 270   | ab,bc,cd    | 90,0,270      |
-            | 1    | d  | 10 10    | bc          | 0             |
-            | 1    | d  | 90 90    | ab,bc,cd,da | 90,0,270,180  |
-            | 1    | 0  | 189 189  | da          | 180           |
-            | 1    | d  | 270 270  | cd          | 270           |
+            | 0    | 1  | 90 270   | ab,bc,cd,cd    | 90,0,270,0      |
+            | 1    | d  | 10 10    | bc,bc          | 0,0             |
+            | 1    | d  | 90 90    | ab,bc,cd,da,da | 90,0,270,180,0  |
+            | 1    | 0  | 189 189  | da,da       | 180,0           |
+            | 1    | d  | 270 270  | cd,cd       | 270,0           |
             | 1    | d  | 349 349  |             |               |
 
     Scenario: Testbot - Initial bearing in all direction
@@ -100,12 +100,12 @@ Feature: Bearing parameter
             | ha    | yes    |
 
         When I route I should get
-            | from | to | bearings | route                      | bearing                     |
-            | 0    | q  | 0 90     | ia,ab,bc,cd,de,ef,fg,gh,ha | 0,90,180,180,270,270,0,0,90 |
-            | 0    | a  | 45 90    | jb,bc,cd,de,ef,fg,gh,ha    | 45,180,180,270,270,0,0,90   |
-            | 0    | q  | 90 90    | kc,cd,de,ef,fg,gh,ha       | 90,180,270,270,0,0,90       |
-            | 0    | a  | 135 90   | ld,de,ef,fg,gh,ha          | 135,270,270,0,0,90          |
-            | 0    | a  | 180 90   | me,ef,fg,gh,ha             | 180,270,0,0,90              |
-            | 0    | a  | 225 90   | nf,fg,gh,ha                | 225,0,0,90                  |
-            | 0    | a  | 270 90   | og,gh,ha                   | 270,0,90                    |
-            | 0    | a  | 315 90   | ph,ha                      | 315,90                      |
+            | from | to | bearings | route                         | bearing                       |
+            | 0    | q  | 0 90     | ia,ab,bc,cd,de,ef,fg,gh,ha,ha | 0,90,180,180,270,270,0,0,90,0 |
+            | 0    | a  | 45 90    | jb,bc,cd,de,ef,fg,gh,ha,ha    | 45,180,180,270,270,0,0,90,0   |
+            | 0    | q  | 90 90    | kc,cd,de,ef,fg,gh,ha,ha       | 90,180,270,270,0,0,90,0       |
+            | 0    | a  | 135 90   | ld,de,ef,fg,gh,ha,ha          | 135,270,270,0,0,90,0          |
+            | 0    | a  | 180 90   | me,ef,fg,gh,ha,ha             | 180,270,0,0,90,0              |
+            | 0    | a  | 225 90   | nf,fg,gh,ha,ha                | 225,0,0,90,0                  |
+            | 0    | a  | 270 90   | og,gh,ha,ha                   | 270,0,90,0                    |
+            | 0    | a  | 315 90   | ph,ha,ha                      | 315,90,0                      |