diff --git a/features/data/loop_small.osm b/features/data/loop_small.osm
deleted file mode 100644
index ea5ac69f3..000000000
--- a/features/data/loop_small.osm
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
-  <bounds minlat='55.65825' minlon='12.56879' maxlat='55.66252' maxlon='12.57783' origin='0.42-6-gf39a160-dirty' />
-  <node id='8088602' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1' lat='55.6602463' lon='12.5717242' />
-  <node id='8088603' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1' lat='55.660027' lon='12.5723008' />
-  <node id='8088604' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1' lat='55.660184' lon='12.5725037' />
-  <node id='8088605' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1' lat='55.6604146' lon='12.5719299' />
-  <node id='8088608' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1' lat='55.659941' lon='12.5727592' />
-  <node id='8088609' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1' lat='55.6606727' lon='12.5736932' />
-  <node id='8088610' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1' lat='55.6603422' lon='12.5732619' />
-  <node id='456042970' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1' lat='55.6607785' lon='12.5739097' />
-  <node id='1374722566' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1' lat='55.6600566' lon='12.572507' />
-  <way id='1881363' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1'>
-    <nd ref='8088602' />
-    <nd ref='8088603' />
-    <nd ref='1374722566' />
-    <tag k='highway' v='residential' />
-    <tag k='name' v='Axel Heides Gade' />
-  </way>
-  <way id='26178031' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1'>
-    <nd ref='456042970' />
-    <nd ref='8088609' />
-    <nd ref='8088610' />
-    <nd ref='8088608' />
-    <tag k='highway' v='residential' />
-    <tag k='name' v='Artillerivej' />
-  </way>
-  <way id='123206850' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1'>
-    <nd ref='1374722566' />
-    <nd ref='8088604' />
-    <nd ref='8088605' />
-    <tag k='highway' v='residential' />
-    <tag k='name' v='Axel Heides Gade' />
-  </way>
-  <way id='123206853' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1'>
-    <nd ref='8088602' />
-    <nd ref='8088605' />
-    <tag k='highway' v='residential' />
-    <tag k='name' v='' />
-  </way>
-  <way id='157510551' timestamp='1969-12-31T23:59:59Z' version='1' changeset='1'>
-    <nd ref='1374722566' />
-    <nd ref='8088608' />
-    <tag k='highway' v='residential' />
-    <tag k='name' v='Axel Heides Gade' />
-  </way>
-</osm>
diff --git a/features/testbot/loop.feature b/features/testbot/loop.feature
index 55c3cdaff..a67af6217 100644
--- a/features/testbot/loop.feature
+++ b/features/testbot/loop.feature
@@ -4,19 +4,34 @@ Feature: Avoid weird loops caused by rounding errors
     Background:
         Given the profile "testbot"
 
-    Scenario: Avoid weird loops, small input file
-        Given the input file features/data/loop_small.osm
+    Scenario: Avoid weird loops 1
+        Given the node locations
+            | node | lat        | lon        |
+            | a    | 55.6602463 | 12.5717242 |
+            | b    | 55.6600270 | 12.5723008 |
+            | c    | 55.6601840 | 12.5725037 |
+            | d    | 55.6604146 | 12.5719299 |
+            | e    | 55.6599410 | 12.5727592 |
+            | f    | 55.6606727 | 12.5736932 |
+            | g    | 55.6603422 | 12.5732619 |
+            | h    | 55.6607785 | 12.5739097 |
+            | i    | 55.6600566 | 12.5725070 |
+            | x    | 55.6608180 | 12.5740510 |
+            | y    | 55.6600730 | 12.5740670 |
 
-        And the node locations
-            | node | lat       | lon       |
-            | a    | 55.660818 | 12.574051 |
-            | b    | 55.660073 | 12.574067 |
+        And the ways
+            | nodes |
+            | ab    |
+            | hfgd  |
+            | icd   |
+            | ad    |
+            | ie    |
 
         When I route I should get
-            | from | to | route        | turns            |
-            | a    | b  | Artillerivej | head,destination |
+            | from | to | route | turns            |
+            | x    | y  | hfgd  | head,destination |
 
-    Scenario: Avoid weird loops, manual input
+    Scenario: Avoid weird loops 2
         Given the node locations
             | node | lat       | lon       |
             | a    | 55.660778 | 12.573909 |