diff --git a/tests/netedit/demandelements/stop/busstop/inspect_selection/routes.rou.xml b/tests/netedit/demandelements/stop/busstop/inspect_selection/routes.rou.xml
index 824423d27715..f665468cc96e 100644
--- a/tests/netedit/demandelements/stop/busstop/inspect_selection/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/busstop/inspect_selection/routes.rou.xml
@@ -39,6 +39,8 @@
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <route edges="Edge0 Edge1 Edge2" color="yellow" id="route_0">
         <stop busStop="busStopA" duration="70.00" until="12.00" extension="10.00" expected="perA perB" parking="1" permitted="A B" actType="walking" triggered="person" tripId="tripA" line="lineA" onDemand="false"/>
+    </route>
+	<route edges="EdgeCenter0 EdgeCenter1" color="yellow" id="route_1">
         <stop busStop="busStopB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="true"/>
     </route>
 </routes>
diff --git a/tests/netedit/demandelements/stop/containerstop/inspect_selection/routes.rou.xml b/tests/netedit/demandelements/stop/containerstop/inspect_selection/routes.rou.xml
index 1732a11139fa..1c8d2eccce26 100644
--- a/tests/netedit/demandelements/stop/containerstop/inspect_selection/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/containerstop/inspect_selection/routes.rou.xml
@@ -37,8 +37,10 @@
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <trip id="trip" depart="0.00" from="Edge0" to="Edge2">
+    <trip id="tripA" depart="0.00" from="Edge0" to="Edge2">
         <stop containerStop="containerStopA" duration="70.00" until="12.00" extension="10.00" expected="perA perB" parking="1" permitted="A B" actType="walking" triggered="person" tripId="tripA" line="lineA" onDemand="true"/>
+    </trip>
+	<trip id="tripB" depart="0.00" from="EdgeCenter0" to="EdgeCenter1">
         <stop containerStop="containerStopB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="false"/>
     </trip>
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/inspect_selection/routes.rou.xml b/tests/netedit/demandelements/stop/lane/inspect_selection/routes.rou.xml
index b593a6de1b14..1a6aa028f24e 100644
--- a/tests/netedit/demandelements/stop/lane/inspect_selection/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/inspect_selection/routes.rou.xml
@@ -38,7 +38,9 @@
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <route edges="Edge0 Edge1 Edge2" color="yellow" id="route_0">
-        <stop lane="Edge0_0" startPos="7.00" friendlyPos="0" posLat="10.00" endPos="17.00" duration="70.00" until="12.00" extension="10.00" expected="perA perB" parking="1" permitted="A B" actType="walking" triggered="person" tripId="tripA" line="lineA" onDemand="true"/>
-        <stop lane="Edge2_0" startPos="7.00" friendlyPos="1" posLat="20.00" endPos="17.00" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="false"/>
+        <stop lane="Edge0_1" startPos="7.00" friendlyPos="0" posLat="10.00" endPos="17.00" duration="70.00" until="12.00" extension="10.00" expected="perA perB" parking="1" permitted="A B" actType="walking" triggered="person" tripId="tripA" line="lineA" onDemand="true"/>
+    </route>
+	<route edges="EdgeCenter0 EdgeCenter1" color="yellow" id="route_1">
+        <stop lane="EdgeCenter1_0" startPos="7.00" friendlyPos="1" posLat="20.00" endPos="17.00" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="false"/>
     </route>
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/acttype/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/acttype/routes.rou.xml
index 23fb58afa658..af60f28d2dca 100644
--- a/tests/netedit/demandelements/stop/lane/load/acttype/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/acttype/routes.rou.xml
@@ -41,15 +41,15 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" actType=""/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" actType=""/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" actType=";;;;"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" actType=";;;;"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" actType="waiting"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" actType="waiting"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/containertrigger/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/containertrigger/routes.rou.xml
index f218497d060b..9ce3d4a79b1a 100644
--- a/tests/netedit/demandelements/stop/lane/load/containertrigger/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/containertrigger/routes.rou.xml
@@ -41,27 +41,27 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="dummy"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="dummy"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered=""/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered=""/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="-4"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="-4"/>
     </flow>
 
     <flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="0"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="0"/>
     </flow>
 
     <flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="2.3"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="2.3"/>
     </flow>
 
     <flow id="routeFlow_5" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="true"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="true"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/default/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/default/routes.rou.xml
index b7a0a2ef7a96..9dadad490c50 100644
--- a/tests/netedit/demandelements/stop/lane/load/default/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/default/routes.rou.xml
@@ -41,7 +41,7 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/duration/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/duration/routes.rou.xml
index cdce6bd81463..e44d5ffbc708 100644
--- a/tests/netedit/demandelements/stop/lane/load/duration/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/duration/routes.rou.xml
@@ -41,23 +41,23 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="dummyDuration"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="dummyDuration"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration=""/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration=""/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="-3"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="-3"/>
     </flow>
 
     <flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="0"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="0"/>
     </flow>
 
     <flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="2"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="2"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/expected/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/expected/routes.rou.xml
index c4a151e110ae..d3b5f701f3c4 100644
--- a/tests/netedit/demandelements/stop/lane/load/expected/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/expected/routes.rou.xml
@@ -41,19 +41,19 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="1" expected=""/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="1" expected=""/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="1" expected=";;;;"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="1" expected=";;;;"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="1" expected="ID1"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="1" expected="ID1"/>
     </flow>
 
     <flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="1" expected="ID1 ID2"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="1" expected="ID1 ID2"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/expectedcontainers/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/expectedcontainers/routes.rou.xml
index e651af56845b..c3e034663cc6 100644
--- a/tests/netedit/demandelements/stop/lane/load/expectedcontainers/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/expectedcontainers/routes.rou.xml
@@ -41,19 +41,19 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers=""/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers=""/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers=";;;;"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers=";;;;"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers="ID1"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers="ID1"/>
     </flow>
 
     <flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers="ID1 ID2"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers="ID1 ID2"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/extension/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/extension/routes.rou.xml
index 3394b9e502e3..5d47c9d626d3 100644
--- a/tests/netedit/demandelements/stop/lane/load/extension/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/extension/routes.rou.xml
@@ -41,23 +41,23 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="dummyDuration"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="dummyDuration"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension=""/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension=""/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="-4"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="-4"/>
     </flow>
 
     <flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="0"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="0"/>
     </flow>
 
     <flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="2.3"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="2.3"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/line/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/line/routes.rou.xml
index 274e8e4afa3e..5eaaf46a4fc5 100644
--- a/tests/netedit/demandelements/stop/lane/load/line/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/line/routes.rou.xml
@@ -41,15 +41,15 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" line=""/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" line=""/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" line=";;;;"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" line=";;;;"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" line="customLine"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" line="customLine"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/ondemand/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/ondemand/routes.rou.xml
index 4971f3e16050..0a409eb9c8c0 100644
--- a/tests/netedit/demandelements/stop/lane/load/ondemand/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/ondemand/routes.rou.xml
@@ -41,11 +41,11 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" onDemand=""/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" onDemand=""/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" onDemand="true"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" onDemand="true"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/parking/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/parking/routes.rou.xml
index 279ced32f2fe..53e5b9b9e8ec 100644
--- a/tests/netedit/demandelements/stop/lane/load/parking/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/parking/routes.rou.xml
@@ -41,27 +41,27 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="dummy"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="dummy"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking=""/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking=""/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="-4"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="-4"/>
     </flow>
 
     <flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="0"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="0"/>
     </flow>
 
     <flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="2.3"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="2.3"/>
     </flow>
 
     <flow id="routeFlow_5" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="true"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="true"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/triggered/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/triggered/routes.rou.xml
index 2949f8505aa5..b90b99384522 100644
--- a/tests/netedit/demandelements/stop/lane/load/triggered/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/triggered/routes.rou.xml
@@ -41,27 +41,27 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="dummy"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="dummy"/>
     </flow>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered=""/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered=""/>
     </flow>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="-4"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="-4"/>
     </flow>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="0"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="0"/>
     </flow>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="2.3"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="2.3"/>
     </flow>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="true"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="true"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/tripid/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/tripid/routes.rou.xml
index 46d44f492dd8..ad8cec7be586 100644
--- a/tests/netedit/demandelements/stop/lane/load/tripid/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/tripid/routes.rou.xml
@@ -41,15 +41,15 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" tripId=""/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" tripId=""/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" tripId=";;;;"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" tripId=";;;;"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" tripId="customTripID"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" tripId="customTripID"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/lane/load/until/routes.rou.xml b/tests/netedit/demandelements/stop/lane/load/until/routes.rou.xml
index 5a3fad84f162..81b298636c52 100644
--- a/tests/netedit/demandelements/stop/lane/load/until/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/lane/load/until/routes.rou.xml
@@ -41,23 +41,23 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="dummyDuration"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="dummyDuration"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" until=""/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" until=""/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="-4"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="-4"/>
     </flow>
 
     <flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="0"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="0"/>
     </flow>
 
     <flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="2.3"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="2.3"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/stop/parkingarea/inspect_selection/routes.rou.xml b/tests/netedit/demandelements/stop/parkingarea/inspect_selection/routes.rou.xml
index 90f51e519ce0..0b61b45983a1 100644
--- a/tests/netedit/demandelements/stop/parkingarea/inspect_selection/routes.rou.xml
+++ b/tests/netedit/demandelements/stop/parkingarea/inspect_selection/routes.rou.xml
@@ -40,6 +40,9 @@
     <vehicle id="vehicle_0" depart="0.00">
         <route edges="Edge0 Edge1 Edge2" color="yellow"/>
         <stop parkingArea="parkingAreaA" duration="70.00" until="12.00" extension="10.00" expected="perA perB" permitted="A B" actType="walking" triggered="person" tripId="tripA" line="lineA" onDemand="true"/>
+    </vehicle>
+	<vehicle id="vehicle_1" depart="0.00">
+        <route edges="EdgeCenter0 EdgeCenter1" color="yellow"/>
         <stop parkingArea="parkingAreaB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="false"/>
     </vehicle>
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/busstop/inspect_selection/routes.rou.xml b/tests/netedit/demandelements/waypoint/busstop/inspect_selection/routes.rou.xml
index 35bcfb10c2b1..ee4a1bee8ee6 100644
--- a/tests/netedit/demandelements/waypoint/busstop/inspect_selection/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/busstop/inspect_selection/routes.rou.xml
@@ -39,6 +39,8 @@
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <route edges="Edge0 Edge1 Edge2" color="yellow" id="route_0">
         <stop busStop="busStopA" duration="70.00" until="12.00" extension="10.00" parking="1" permitted="A B" actType="walking" speed="10" tripId="tripA" line="lineA"/>
+    </route>
+	<route edges="EdgeCenter0 EdgeCenter1" color="yellow" id="route_1">
         <stop busStop="busStopB" duration="60.00" until="20.00" extension="20.00" parking="0" permitted="C D" actType="singing" speed="22.5" tripId="tripB" line="lineB"/>
     </route>
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/containerstop/inspect_selection/routes.rou.xml b/tests/netedit/demandelements/waypoint/containerstop/inspect_selection/routes.rou.xml
index 51c930020b7c..2b9316e5d877 100644
--- a/tests/netedit/demandelements/waypoint/containerstop/inspect_selection/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/containerstop/inspect_selection/routes.rou.xml
@@ -37,8 +37,10 @@
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <trip id="trip" depart="0.00" from="Edge0" to="Edge2">
+    <trip id="tripA" depart="0.00" from="Edge0" to="Edge2">
         <stop containerStop="containerStopA" duration="70.00" until="12.00" extension="10.00" parking="1" permitted="A B" actType="walking" speed="10" tripId="tripA" line="lineA"/>
+    </trip>
+	<trip id="tripB" depart="0.00" from="EdgeCenter0" to="EdgeCenter1">
         <stop containerStop="containerStopB" duration="60.00" until="20.00" extension="20.00" parking="0" permitted="C D" actType="singing" speed="22.5" tripId="tripB" line="lineB"/>
     </trip>
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/lane/inspect_selection/routes.rou.xml b/tests/netedit/demandelements/waypoint/lane/inspect_selection/routes.rou.xml
index ce7f27e2c843..d3422afe51d0 100644
--- a/tests/netedit/demandelements/waypoint/lane/inspect_selection/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/lane/inspect_selection/routes.rou.xml
@@ -38,7 +38,9 @@
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <route edges="Edge0 Edge1 Edge2" color="yellow" id="route_0">
-        <stop lane="Edge0_0" startPos="7.00" friendlyPos="0" posLat="10.00" endPos="17.00" duration="70.00" until="12.00" extension="10.00" parking="1" permitted="A B" actType="walking" speed="10" tripId="tripA" line="lineA"/>
-        <stop lane="Edge2_0" startPos="7.00" friendlyPos="1" posLat="20.00" endPos="17.00" duration="60.00" until="20.00" extension="20.00" parking="0" permitted="C D" actType="singing" speed="22.5" tripId="tripB" line="lineB"/>
+        <stop lane="Edge0_1" startPos="7.00" friendlyPos="0" posLat="10.00" endPos="17.00" duration="70.00" until="12.00" extension="10.00" parking="1" permitted="A B" actType="walking" speed="10" tripId="tripA" line="lineA"/>
+    </route>
+	<route edges="EdgeCenter0 EdgeCenter1" color="yellow" id="route_1">
+        <stop lane="EdgeCenter1_0" startPos="7.00" friendlyPos="1" posLat="20.00" endPos="17.00" duration="60.00" until="20.00" extension="20.00" parking="0" permitted="C D" actType="singing" speed="22.5" tripId="tripB" line="lineB"/>
     </route>
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/lane/load/acttype/routes.rou.xml b/tests/netedit/demandelements/waypoint/lane/load/acttype/routes.rou.xml
index 57419c5aed60..a66a7f3d4d6b 100644
--- a/tests/netedit/demandelements/waypoint/lane/load/acttype/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/lane/load/acttype/routes.rou.xml
@@ -41,15 +41,15 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" actType="" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" actType="" speed="10"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" actType=";;;;" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" actType=";;;;" speed="10"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" actType="waiting" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" actType="waiting" speed="10"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/lane/load/containertrigger/routes.rou.xml b/tests/netedit/demandelements/waypoint/lane/load/containertrigger/routes.rou.xml
index 75cebdb66382..6f17251167d9 100644
--- a/tests/netedit/demandelements/waypoint/lane/load/containertrigger/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/lane/load/containertrigger/routes.rou.xml
@@ -41,27 +41,27 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="dummy" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="dummy" speed="10"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="" speed="10"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="-4" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="-4" speed="10"/>
     </flow>
 
     <flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="0" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="0" speed="10"/>
     </flow>
 
     <flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="2.3" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="2.3" speed="10"/>
     </flow>
 
     <flow id="routeFlow_5" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="true" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="true" speed="10"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/lane/load/default/routes.rou.xml b/tests/netedit/demandelements/waypoint/lane/load/default/routes.rou.xml
index 9c6f429752cb..edf72a92f15a 100644
--- a/tests/netedit/demandelements/waypoint/lane/load/default/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/lane/load/default/routes.rou.xml
@@ -41,7 +41,7 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" speed="10"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/lane/load/duration/routes.rou.xml b/tests/netedit/demandelements/waypoint/lane/load/duration/routes.rou.xml
index 2a550e6eee61..96efafdbae26 100644
--- a/tests/netedit/demandelements/waypoint/lane/load/duration/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/lane/load/duration/routes.rou.xml
@@ -41,23 +41,23 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="dummyDuration" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="dummyDuration" speed="10"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="" speed="10"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="-3" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="-3" speed="10"/>
     </flow>
 
     <flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="0" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="0" speed="10"/>
     </flow>
 
     <flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="2" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="2" speed="10"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/lane/load/extension/routes.rou.xml b/tests/netedit/demandelements/waypoint/lane/load/extension/routes.rou.xml
index 94db7e83be49..25b6108a2abd 100644
--- a/tests/netedit/demandelements/waypoint/lane/load/extension/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/lane/load/extension/routes.rou.xml
@@ -41,23 +41,23 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="dummyDuration"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="dummyDuration"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="" speed="10"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="-4" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="-4" speed="10"/>
     </flow>
 
     <flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="0" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="0" speed="10"/>
     </flow>
 
     <flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="2.3" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="2.3" speed="10"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/lane/load/line/routes.rou.xml b/tests/netedit/demandelements/waypoint/lane/load/line/routes.rou.xml
index fcf3a100cd00..aa4f112b5052 100644
--- a/tests/netedit/demandelements/waypoint/lane/load/line/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/lane/load/line/routes.rou.xml
@@ -41,15 +41,15 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" line="" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" line="" speed="10"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" line=";;;;" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" line=";;;;" speed="10"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" line="customLine" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" line="customLine" speed="10"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/lane/load/parking/routes.rou.xml b/tests/netedit/demandelements/waypoint/lane/load/parking/routes.rou.xml
index 869bdf426ca0..8724bc58a586 100644
--- a/tests/netedit/demandelements/waypoint/lane/load/parking/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/lane/load/parking/routes.rou.xml
@@ -41,27 +41,27 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="dummy" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="dummy" speed="10"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="" speed="10"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="-4" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="-4" speed="10"/>
     </flow>
 
     <flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="0" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="0" speed="10"/>
     </flow>
 
     <flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="2.3" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="2.3" speed="10"/>
     </flow>
 
     <flow id="routeFlow_5" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="true" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="true" speed="10"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/lane/load/tripid/routes.rou.xml b/tests/netedit/demandelements/waypoint/lane/load/tripid/routes.rou.xml
index 5af62190e3e7..f4e245c42fa4 100644
--- a/tests/netedit/demandelements/waypoint/lane/load/tripid/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/lane/load/tripid/routes.rou.xml
@@ -41,15 +41,15 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" tripId="" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" tripId="" speed="10"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" tripId=";;;;" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" tripId=";;;;" speed="10"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" tripId="customTripID" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" tripId="customTripID" speed="10"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/lane/load/until/routes.rou.xml b/tests/netedit/demandelements/waypoint/lane/load/until/routes.rou.xml
index 38146301bfbc..5d6b9bba2e5c 100644
--- a/tests/netedit/demandelements/waypoint/lane/load/until/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/lane/load/until/routes.rou.xml
@@ -41,23 +41,23 @@
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>
 
     <flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="dummyDuration" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="dummyDuration" speed="10"/>
     </flow>
 
     <flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="" speed="10"/>
     </flow>
 
     <flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="-4" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="-4" speed="10"/>
     </flow>
 
     <flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="0" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="0" speed="10"/>
     </flow>
 
     <flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
-        <stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="2.3" speed="10"/>
+        <stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="2.3" speed="10"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/parkingarea/inspect_selection/routes.rou.xml b/tests/netedit/demandelements/waypoint/parkingarea/inspect_selection/routes.rou.xml
index 207b4e1ef077..7d675c672270 100644
--- a/tests/netedit/demandelements/waypoint/parkingarea/inspect_selection/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/parkingarea/inspect_selection/routes.rou.xml
@@ -40,6 +40,9 @@
     <vehicle id="vehicle_0" depart="0.00">
         <route edges="Edge0 Edge1 Edge2" color="yellow"/>
         <stop parkingArea="parkingAreaA" duration="70.00" until="12.00" extension="10.00" permitted="A B" actType="walking" speed="10" tripId="tripA" line="lineA"/>
+    </vehicle>
+	<vehicle id="vehicle_1" depart="0.00">
+        <route edges="EdgeCenter0 EdgeCenter1" color="yellow"/>
         <stop parkingArea="parkingAreaB" duration="60.00" until="20.00" extension="20.00" permitted="C D" actType="singing" speed="20.5" tripId="tripB" line="lineB"/>
     </vehicle>
 </routes>
diff --git a/tests/netedit/demandelements/waypoint/trainstop/inspect_selection/routes.rou.xml b/tests/netedit/demandelements/waypoint/trainstop/inspect_selection/routes.rou.xml
index b61e54d0ddd9..dcb8744621f0 100644
--- a/tests/netedit/demandelements/waypoint/trainstop/inspect_selection/routes.rou.xml
+++ b/tests/netedit/demandelements/waypoint/trainstop/inspect_selection/routes.rou.xml
@@ -39,6 +39,8 @@
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <route edges="Edge0 Edge1 Edge2" color="yellow" id="route_0">
         <stop busStop="trainStopA" duration="70.00" until="12.00" extension="10.00" parking="1" permitted="A B" actType="walking" speed="10" tripId="tripA" line="lineA"/>
+    </route>
+	<route edges="EdgeCenter0 EdgeCenter1" color="yellow" id="route_1">
         <stop busStop="trainStopB" duration="60.00" until="20.00" extension="20.00" parking="0" permitted="C D" actType="singing" speed="22.5" tripId="tripB" line="lineB"/>
     </route>
 </routes>
diff --git a/tests/netedit/testPositions.py b/tests/netedit/testPositions.py
index 109d120ff36e..c278c23be8ca 100644
--- a/tests/netedit/testPositions.py
+++ b/tests/netedit/testPositions.py
@@ -94,7 +94,7 @@ class trainStop:
 
     class containerStop:
         x = 615
-        y = 12
+        y = -9
 
     class chargingStation:
         x = 500