diff --git a/features/time.feature b/features/time.feature
index e2da7fc57..1594013b8 100644
--- a/features/time.feature
+++ b/features/time.feature
@@ -4,9 +4,13 @@ Feature: Estimation of travel time
 	15km/h = 15000m/3600s = 150m/36s = 100m/24s
 	5km/h = 5000m/3600s = 50m/36s = 100m/72s
 	
+	Going dioganally causes the distance to increase by sqrt(2):
+	24s * sqrt(2)=  33.941125496954285s
+	
 	Background: Use specific speeds
 		Given the speedprofile "bicycle"
-
+	
+	@basic_time
 	Scenario: Basic travel time, 1m scale
 		Given a grid size of 1 meters
 		Given the node map
@@ -36,6 +40,37 @@ Feature: Estimation of travel time
 		 | x    | g  | xg    | 0s  |
 		 | x    | h  | xh    | 0s  |
 	
+	@basic_time
+	Scenario: Basic travel time, 10m scale
+		Given a grid size of 10 meters
+		Given the node map
+		 | h | a | b |
+		 | g | x | c |
+		 | f | e | d |
+
+		And the ways
+		 | nodes | highway   |
+		 | xa    | primary   |
+		 | xb    | primary   |
+		 | xc    | primary   |
+		 | xd    | primary   |
+		 | xe    | primary   |
+		 | xf    | primary   |
+		 | xg    | primary   |
+		 | xh    | primary   |
+
+		When I route I should get
+		 | from | to | route | time |
+		 | x    | a  | xa    | 2s  |
+		 | x    | b  | xb    | 3s  |
+		 | x    | c  | xc    | 2s  |
+		 | x    | d  | xd    | 3s  |
+		 | x    | e  | xe    | 2s  |
+		 | x    | f  | xf    | 3s  |
+		 | x    | g  | xg    | 2s  |
+		 | x    | h  | xh    | 3s  |
+
+	@basic_time
 	Scenario: Basic travel time, 100m scale
 		Given a grid size of 100 meters
 		Given the node map
@@ -64,7 +99,38 @@ Feature: Estimation of travel time
 		 | x    | f  | xf    | 34s  |
 		 | x    | g  | xg    | 24s  |
 		 | x    | h  | xh    | 34s  |
-	
+
+	@basic_time
+	Scenario: Basic travel time, 1km scale
+		Given a grid size of 1000 meters
+		Given the node map
+		 | h | a | b |
+		 | g | x | c |
+		 | f | e | d |
+
+		And the ways
+		 | nodes | highway   |
+		 | xa    | primary   |
+		 | xb    | primary   |
+		 | xc    | primary   |
+		 | xd    | primary   |
+		 | xe    | primary   |
+		 | xf    | primary   |
+		 | xg    | primary   |
+		 | xh    | primary   |
+
+		When I route I should get
+		 | from | to | route | time |
+		 | x    | a  | xa    | 240s  |
+		 | x    | b  | xb    | 339s  |
+		 | x    | c  | xc    | 240s  |
+		 | x    | d  | xd    | 339s  |
+		 | x    | e  | xe    | 240s  |
+		 | x    | f  | xf    | 339s  |
+		 | x    | g  | xg    | 240s  |
+		 | x    | h  | xh    | 339s  |
+
+	@basic_time
 	Scenario: Basic travel time, 10km scale
 		Given a grid size of 10000 meters
 		Given the node map
@@ -86,13 +152,43 @@ Feature: Estimation of travel time
 		When I route I should get
 		 | from | to | route | time |
 		 | x    | a  | xa    | 2400s  |
-		 | x    | b  | xb    | 3400s  |
+		 | x    | b  | xb    | 3394s  |
 		 | x    | c  | xc    | 2400s  |
-		 | x    | d  | xd    | 3400s  |
+		 | x    | d  | xd    | 3394s  |
 		 | x    | e  | xe    | 2400s  |
-		 | x    | f  | xf    | 3400s  |
+		 | x    | f  | xf    | 3394s  |
 		 | x    | g  | xg    | 2400s  |
-		 | x    | h  | xh    | 3400s  |
+		 | x    | h  | xh    | 3394s  |
+
+	@basic_time
+	Scenario: Basic travel time, 100km scale
+		Given a grid size of 100000 meters
+		Given the node map
+		 | h | a | b |
+		 | g | x | c |
+		 | f | e | d |
+
+		And the ways
+		 | nodes | highway   |
+		 | xa    | primary   |
+		 | xb    | primary   |
+		 | xc    | primary   |
+		 | xd    | primary   |
+		 | xe    | primary   |
+		 | xf    | primary   |
+		 | xg    | primary   |
+		 | xh    | primary   |
+
+		When I route I should get
+		 | from | to | route | time |
+		 | x    | a  | xa    | 24000s  |
+		 | x    | b  | xb    | 33941s  |
+		 | x    | c  | xc    | 24000s  |
+		 | x    | d  | xd    | 33941s  |
+		 | x    | e  | xe    | 24000s  |
+		 | x    | f  | xf    | 33941s  |
+		 | x    | g  | xg    | 24000s  |
+		 | x    | h  | xh    | 33941s  |
 
 	Scenario: Time of travel depending on way type
 		Given the node map