diff --git a/features/bad.feature b/features/bad.feature
index 14f707d22..11c767484 100644
--- a/features/bad.feature
+++ b/features/bad.feature
@@ -28,31 +28,6 @@ Feature: Handle bad data in a graceful manner
 		 | 1    | 1  |       |
 		 | 2    | 2  |       |
 
-	Scenario: Start/end point far outside data area
-		Given the node map
-		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |    | 1 |
-		 | a | b |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |    | 2 |
-		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |    | 3 |
-
-		Given the ways
-		 | nodes |
-		 | ab    |
-
-		When I route I should get
-		 | from | to | route |
-		 | 1    | a  | ab    |
-		 | 2    | a  | ab    |
-		 | 3    | a  | ab    |
-		 | 1    | b  |       |
-		 | 2    | b  |       |
-		 | 3    | b  |       |
-		 | 1    | 2  |       |
-		 | 1    | 3  |       |
-		 | 2    | 1  |       |
-		 | 2    | 3  |       |
-		 | 3    | 1  |       |
-		 | 3    | 2  |       |
-
 	@poles
 	Scenario: No routing close to the north/south pole
 	Mercator is undefined close to the poles.
diff --git a/features/snap.feature b/features/snap.feature
index c5b820031..e42a85812 100644
--- a/features/snap.feature
+++ b/features/snap.feature
@@ -94,3 +94,60 @@ Feature: Snap start/end point to the nearest way
 		 | a    | x  | xa    |
 		 | b    | x  | xb    |
 		 | c    | x  | xc    |
+	
+	@xx
+	Scenario: Find edges within 1km, but not 10km
+		Given a grid size of 1000 meters
+		Given the node map
+		 | p |   |   |   |   |   |   |   |   |   |   | i |   |   |   |   |   |   |   |   |   |   | j |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   | 8 |   | 1 |   | 2 |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   | h | a | b |   |   |   |   |   |   |   |   |   |   |
+		 | o |   |   |   |   |   |   |   |   | 7 | g | x | c | 3 |   |   |   |   |   |   |   |   | k |
+		 |   |   |   |   |   |   |   |   |   |   | f | e | d |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   | 6 |   | 5 |   | 4 |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+		 | n |   |   |   |   |   |   |   |   |   |   | m |   |   |   |   |   |   |   |   |   |   | l |
+
+		Given the ways
+		 | nodes |
+		 | xa    |
+		 | xb    |
+		 | xc    |
+		 | xd    |
+		 | xe    |
+		 | xf    |
+		 | xg    |
+		 | xh    |
+
+		When I route I should get
+		 | from | to | route |
+		 | x    | 1  | xa    |
+		 | x    | 2  | xb    |
+		 | x    | 3  | xc    |
+		 | x    | 4  | xd    |
+		 | x    | 5  | xe    |
+		 | x    | 6  | xf    |
+		 | x    | 7  | xg    |
+		 | x    | 8  | xh    |
+		 | x    | i  |       |
+		 | x    | j  |       |
+		 | x    | k  |       |
+		 | x    | l  |       |
+		 | x    | m  |       |
+		 | x    | n  |       |
+		 | x    | o  |       |
+		 | x    | p  |       |
+