From 06744b920ff6aa2a32c9757537242be9e5fb8650 Mon Sep 17 00:00:00 2001
From: namdre <jakob.erdmann@dlr.de>
Date: Sat, 16 Mar 2019 17:42:47 +0100
Subject: [PATCH] patching expected results. refs #21, #5309

---
 .../PassingJunction/net_state.traci           |  20 +--
 .../Vehicle/ChangeLane/hold/net_state.traci   |  73 +++++----
 .../Prio_Opportunistic/net_state.traci        | 155 ++++++++----------
 .../Prio_Opportunistic/testclient.prog        |   2 +-
 .../Prio_Urgent/net_state.traci               | 152 +++++++----------
 .../Prio_Urgent/testclient.prog               |   2 +-
 6 files changed, 177 insertions(+), 227 deletions(-)

diff --git a/tests/traci/set_variable/Vehicle/ChangeLane/PassingJunction/net_state.traci b/tests/traci/set_variable/Vehicle/ChangeLane/PassingJunction/net_state.traci
index c1871fd3f59b..11ccff967e38 100644
--- a/tests/traci/set_variable/Vehicle/ChangeLane/PassingJunction/net_state.traci
+++ b/tests/traci/set_variable/Vehicle/ChangeLane/PassingJunction/net_state.traci
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Oct  1 12:44:23 2018 by Eclipse SUMO Version UNKNOWN
+<!-- generated on Sat Mar 16 17:32:04 2019 by Eclipse SUMO Version v1_1_0+0435-678c69824b
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ SPDX-License-Identifier: EPL-2.0
     </report>
 
     <traci_server>
-        <remote-port value="56255"/>
+        <remote-port value="52097"/>
     </traci_server>
 
 </configuration>
@@ -389,35 +389,35 @@ SPDX-License-Identifier: EPL-2.0
     </timestep>
     <timestep time="43.00">
         <edge id="4fi">
-            <lane id="4fi_0">
+            <lane id="4fi_0"/>
+            <lane id="4fi_1">
                 <vehicle id="veh0" pos="167.46" speed="33.29"/>
             </lane>
-            <lane id="4fi_1"/>
         </edge>
     </timestep>
     <timestep time="44.00">
         <edge id="4fi">
-            <lane id="4fi_0">
+            <lane id="4fi_0"/>
+            <lane id="4fi_1">
                 <vehicle id="veh0" pos="200.79" speed="33.33"/>
             </lane>
-            <lane id="4fi_1"/>
         </edge>
     </timestep>
     <timestep time="45.00">
         <edge id="4fi">
-            <lane id="4fi_0">
+            <lane id="4fi_0"/>
+            <lane id="4fi_1">
                 <vehicle id="veh0" pos="234.12" speed="33.33"/>
             </lane>
-            <lane id="4fi_1"/>
         </edge>
     </timestep>
     <timestep time="46.00">
         <edge id="4si">
             <lane id="4si_0"/>
-            <lane id="4si_1">
+            <lane id="4si_1"/>
+            <lane id="4si_2">
                 <vehicle id="veh0" pos="15.46" speed="33.33"/>
             </lane>
-            <lane id="4si_2"/>
         </edge>
     </timestep>
     <timestep time="47.00">
diff --git a/tests/traci/set_variable/Vehicle/ChangeLane/hold/net_state.traci b/tests/traci/set_variable/Vehicle/ChangeLane/hold/net_state.traci
index 1eb2de8a9a08..71d12f16cc41 100644
--- a/tests/traci/set_variable/Vehicle/ChangeLane/hold/net_state.traci
+++ b/tests/traci/set_variable/Vehicle/ChangeLane/hold/net_state.traci
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Mar  7 09:56:51 2014 by SUMO sumo Version dev-SVN-r15863
+<!-- generated on Sat Mar 16 17:32:04 2019 by Eclipse SUMO Version v1_1_0+0435-678c69824b
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <netstate-dump value="netstate_dump.xml"/>
     </output>
 
@@ -23,7 +24,7 @@ SPDX-License-Identifier: EPL-2.0
     </report>
 
     <traci_server>
-        <remote-port value="8810"/>
+        <remote-port value="34985"/>
     </traci_server>
 
 </configuration>
@@ -281,154 +282,154 @@ SPDX-License-Identifier: EPL-2.0
     <timestep time="31.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="0.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="32.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="10.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="33.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="20.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="34.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="30.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="35.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="40.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="36.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="50.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="37.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="60.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="38.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="70.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="39.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="80.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="40.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="90.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="41.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="100.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="42.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="110.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="43.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="120.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="44.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="130.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="45.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="140.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="46.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="150.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
     <timestep time="47.00">
         <edge id="1si">
             <lane id="1si_0"/>
-            <lane id="1si_1">
+            <lane id="1si_1"/>
+            <lane id="1si_2">
                 <vehicle id="veh0" pos="160.41" speed="10.00"/>
             </lane>
-            <lane id="1si_2"/>
         </edge>
     </timestep>
 </netstate>
diff --git a/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Opportunistic/net_state.traci b/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Opportunistic/net_state.traci
index afc350de6e09..865db502f21e 100644
--- a/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Opportunistic/net_state.traci
+++ b/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Opportunistic/net_state.traci
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Mar  7 10:52:19 2014 by SUMO sumo Version dev-SVN-r15863
+<!-- generated on Sat Mar 16 17:41:09 2019 by Eclipse SUMO Version v1_1_0+0435-678c69824b
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <netstate-dump value="netstate_dump.xml"/>
     </output>
 
@@ -23,7 +24,7 @@ SPDX-License-Identifier: EPL-2.0
     </report>
 
     <traci_server>
-        <remote-port value="8810"/>
+        <remote-port value="59307"/>
     </traci_server>
 
 </configuration>
@@ -74,269 +75,243 @@ SPDX-License-Identifier: EPL-2.0
     <timestep time="5.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="12.00" speed="4.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="0.80" speed="0.80"/>
+                <vehicle id="veh0" pos="12.00" speed="4.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="6.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="16.80" speed="4.80"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="2.40" speed="1.60"/>
+                <vehicle id="veh0" pos="16.80" speed="4.80"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="7.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="22.40" speed="5.60"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="4.80" speed="2.40"/>
+                <vehicle id="veh0" pos="22.40" speed="5.60"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="8.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="28.80" speed="6.40"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="8.00" speed="3.20"/>
+                <vehicle id="veh0" pos="28.80" speed="6.40"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="9.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="36.00" speed="7.20"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="12.00" speed="4.00"/>
+                <vehicle id="veh0" pos="36.00" speed="7.20"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="10.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="44.00" speed="8.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="16.80" speed="4.80"/>
+                <vehicle id="veh0" pos="44.00" speed="8.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="11.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="52.80" speed="8.80"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="22.40" speed="5.60"/>
+                <vehicle id="veh0" pos="52.80" speed="8.80"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="12.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="62.40" speed="9.60"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="28.80" speed="6.40"/>
+                <vehicle id="veh0" pos="62.40" speed="9.60"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="13.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="72.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="36.00" speed="7.20"/>
+                <vehicle id="veh0" pos="72.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="14.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="82.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="44.00" speed="8.00"/>
+                <vehicle id="veh0" pos="82.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="15.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="92.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="52.80" speed="8.80"/>
+                <vehicle id="veh0" pos="92.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="16.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="102.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="62.40" speed="9.60"/>
+                <vehicle id="veh0" pos="102.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="17.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="112.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="72.40" speed="10.00"/>
+                <vehicle id="veh0" pos="112.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="18.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="122.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="82.40" speed="10.00"/>
+                <vehicle id="veh0" pos="122.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="19.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="132.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="92.40" speed="10.00"/>
+                <vehicle id="veh0" pos="132.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="20.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="142.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="102.40" speed="10.00"/>
+                <vehicle id="veh0" pos="142.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="21.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="152.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="112.40" speed="10.00"/>
+                <vehicle id="veh0" pos="152.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="22.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="162.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="122.40" speed="10.00"/>
+                <vehicle id="veh0" pos="162.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="23.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="172.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="132.40" speed="10.00"/>
+                <vehicle id="veh0" pos="172.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="24.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="182.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="142.40" speed="10.00"/>
+                <vehicle id="veh0" pos="182.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="25.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="192.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="152.40" speed="10.00"/>
+                <vehicle id="veh0" pos="192.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="26.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="202.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="162.40" speed="10.00"/>
+                <vehicle id="veh0" pos="202.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="27.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="212.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="172.40" speed="10.00"/>
+                <vehicle id="veh0" pos="212.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="28.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="222.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="182.40" speed="10.00"/>
+                <vehicle id="veh0" pos="222.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="29.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="232.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="192.40" speed="10.00"/>
+                <vehicle id="veh0" pos="232.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="30.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="242.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="202.40" speed="10.00"/>
+                <vehicle id="veh0" pos="242.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="31.00">
         <edge id="1fi">
-            <lane id="1fi_0"/>
-            <lane id="1fi_1">
+            <lane id="1fi_0">
                 <vehicle id="veh1" pos="212.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
         <edge id="1si">
             <lane id="1si_0">
@@ -348,10 +323,10 @@ SPDX-License-Identifier: EPL-2.0
     </timestep>
     <timestep time="32.00">
         <edge id="1fi">
-            <lane id="1fi_0"/>
-            <lane id="1fi_1">
+            <lane id="1fi_0">
                 <vehicle id="veh1" pos="222.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
         <edge id="1si">
             <lane id="1si_0">
@@ -363,10 +338,10 @@ SPDX-License-Identifier: EPL-2.0
     </timestep>
     <timestep time="33.00">
         <edge id="1fi">
-            <lane id="1fi_0"/>
-            <lane id="1fi_1">
+            <lane id="1fi_0">
                 <vehicle id="veh1" pos="232.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
         <edge id="1si">
             <lane id="1si_0">
@@ -378,10 +353,10 @@ SPDX-License-Identifier: EPL-2.0
     </timestep>
     <timestep time="34.00">
         <edge id="1fi">
-            <lane id="1fi_0"/>
-            <lane id="1fi_1">
+            <lane id="1fi_0">
                 <vehicle id="veh1" pos="242.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
         <edge id="1si">
             <lane id="1si_0">
@@ -570,7 +545,7 @@ SPDX-License-Identifier: EPL-2.0
     <timestep time="51.00">
         <edge id="1si">
             <lane id="1si_0">
-                <vehicle id="veh0" pos="197.45" speed="7.04"/>
+                <vehicle id="veh0" pos="197.46" speed="7.05"/>
             </lane>
             <lane id="1si_1">
                 <vehicle id="veh1" pos="160.41" speed="10.00"/>
@@ -581,7 +556,7 @@ SPDX-License-Identifier: EPL-2.0
     <timestep time="52.00">
         <edge id="1si">
             <lane id="1si_0">
-                <vehicle id="veh0" pos="200.00" speed="2.54"/>
+                <vehicle id="veh0" pos="200.00" speed="2.55"/>
             </lane>
             <lane id="1si_1">
                 <vehicle id="veh1" pos="170.41" speed="10.00"/>
diff --git a/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Opportunistic/testclient.prog b/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Opportunistic/testclient.prog
index d5d8eeaf113a..c56744c412c0 100644
--- a/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Opportunistic/testclient.prog
+++ b/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Opportunistic/testclient.prog
@@ -2,7 +2,7 @@
  the default for lane change mode is 0b 10 01 01 01 01 = 0x 2 5 5
  we are changing to 0b 11 01 01 01 01 = 0x 3 5 5 %
 setvalue 0xc4 0xb6 veh1 <int> 0x355 
-setvalue 0xc4 0x13 veh1 <compound> 2 <byte> 1 <double> 100
+setvalue 0xc4 0x13 veh1 <compound> 2 <byte> 0 <double> 100
 repeat 53 simstep2 0
 setvalue 0xc4 0x13 veh1 <compound> 2 <byte> 0 <double> 1
 repeat 25 simstep2 0
diff --git a/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Urgent/net_state.traci b/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Urgent/net_state.traci
index fd7afee53d9a..88233b72d652 100644
--- a/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Urgent/net_state.traci
+++ b/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Urgent/net_state.traci
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Sep 14 08:16:34 2018 by Eclipse SUMO Version v1_0_0+0198-83a8df9
+<!-- generated on Sat Mar 16 17:40:09 2019 by Eclipse SUMO Version v1_1_0+0435-678c69824b
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -24,7 +24,7 @@ SPDX-License-Identifier: EPL-2.0
     </report>
 
     <traci_server>
-        <remote-port value="49083"/>
+        <remote-port value="56099"/>
     </traci_server>
 
 </configuration>
@@ -75,269 +75,243 @@ SPDX-License-Identifier: EPL-2.0
     <timestep time="5.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="12.00" speed="4.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="0.80" speed="0.80"/>
+                <vehicle id="veh0" pos="12.00" speed="4.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="6.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="16.80" speed="4.80"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="2.40" speed="1.60"/>
+                <vehicle id="veh0" pos="16.80" speed="4.80"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="7.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="22.40" speed="5.60"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="4.80" speed="2.40"/>
+                <vehicle id="veh0" pos="22.40" speed="5.60"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="8.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="28.80" speed="6.40"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="8.00" speed="3.20"/>
+                <vehicle id="veh0" pos="28.80" speed="6.40"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="9.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="36.00" speed="7.20"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="12.00" speed="4.00"/>
+                <vehicle id="veh0" pos="36.00" speed="7.20"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="10.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="44.00" speed="8.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="16.80" speed="4.80"/>
+                <vehicle id="veh0" pos="44.00" speed="8.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="11.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="52.80" speed="8.80"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="22.40" speed="5.60"/>
+                <vehicle id="veh0" pos="52.80" speed="8.80"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="12.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="62.40" speed="9.60"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="28.80" speed="6.40"/>
+                <vehicle id="veh0" pos="62.40" speed="9.60"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="13.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="72.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="36.00" speed="7.20"/>
+                <vehicle id="veh0" pos="72.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="14.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="82.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="44.00" speed="8.00"/>
+                <vehicle id="veh0" pos="82.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="15.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="92.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="52.80" speed="8.80"/>
+                <vehicle id="veh0" pos="92.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="16.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="102.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="62.40" speed="9.60"/>
+                <vehicle id="veh0" pos="102.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="17.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="112.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="72.40" speed="10.00"/>
+                <vehicle id="veh0" pos="112.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="18.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="122.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="82.40" speed="10.00"/>
+                <vehicle id="veh0" pos="122.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="19.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="132.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="92.40" speed="10.00"/>
+                <vehicle id="veh0" pos="132.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="20.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="142.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="102.40" speed="10.00"/>
+                <vehicle id="veh0" pos="142.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="21.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="152.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="112.40" speed="10.00"/>
+                <vehicle id="veh0" pos="152.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="22.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="162.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="122.40" speed="10.00"/>
+                <vehicle id="veh0" pos="162.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="23.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="172.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="132.40" speed="10.00"/>
+                <vehicle id="veh0" pos="172.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="24.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="182.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="142.40" speed="10.00"/>
+                <vehicle id="veh0" pos="182.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="25.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="192.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="152.40" speed="10.00"/>
+                <vehicle id="veh0" pos="192.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="26.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="202.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="162.40" speed="10.00"/>
+                <vehicle id="veh0" pos="202.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="27.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="212.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="172.40" speed="10.00"/>
+                <vehicle id="veh0" pos="212.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="28.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="222.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="182.40" speed="10.00"/>
+                <vehicle id="veh0" pos="222.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="29.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="232.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="192.40" speed="10.00"/>
+                <vehicle id="veh0" pos="232.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="30.00">
         <edge id="1fi">
             <lane id="1fi_0">
-                <vehicle id="veh0" pos="242.40" speed="10.00"/>
-            </lane>
-            <lane id="1fi_1">
                 <vehicle id="veh1" pos="202.40" speed="10.00"/>
+                <vehicle id="veh0" pos="242.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
     </timestep>
     <timestep time="31.00">
         <edge id="1fi">
-            <lane id="1fi_0"/>
-            <lane id="1fi_1">
+            <lane id="1fi_0">
                 <vehicle id="veh1" pos="212.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
         <edge id="1si">
             <lane id="1si_0">
@@ -349,10 +323,10 @@ SPDX-License-Identifier: EPL-2.0
     </timestep>
     <timestep time="32.00">
         <edge id="1fi">
-            <lane id="1fi_0"/>
-            <lane id="1fi_1">
+            <lane id="1fi_0">
                 <vehicle id="veh1" pos="222.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
         <edge id="1si">
             <lane id="1si_0">
@@ -364,10 +338,10 @@ SPDX-License-Identifier: EPL-2.0
     </timestep>
     <timestep time="33.00">
         <edge id="1fi">
-            <lane id="1fi_0"/>
-            <lane id="1fi_1">
+            <lane id="1fi_0">
                 <vehicle id="veh1" pos="232.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
         <edge id="1si">
             <lane id="1si_0">
@@ -379,10 +353,10 @@ SPDX-License-Identifier: EPL-2.0
     </timestep>
     <timestep time="34.00">
         <edge id="1fi">
-            <lane id="1fi_0"/>
-            <lane id="1fi_1">
+            <lane id="1fi_0">
                 <vehicle id="veh1" pos="242.40" speed="10.00"/>
             </lane>
+            <lane id="1fi_1"/>
         </edge>
         <edge id="1si">
             <lane id="1si_0">
@@ -571,7 +545,7 @@ SPDX-License-Identifier: EPL-2.0
     <timestep time="51.00">
         <edge id="1si">
             <lane id="1si_0">
-                <vehicle id="veh0" pos="197.45" speed="7.05"/>
+                <vehicle id="veh0" pos="197.46" speed="7.05"/>
             </lane>
             <lane id="1si_1">
                 <vehicle id="veh1" pos="160.41" speed="10.00"/>
diff --git a/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Urgent/testclient.prog b/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Urgent/testclient.prog
index f18ddf184657..e1c81eddc1f0 100644
--- a/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Urgent/testclient.prog
+++ b/tests/traci/set_variable/Vehicle/LaneChangeMode/Prio_Urgent/testclient.prog
@@ -1,6 +1,6 @@
 % see http://sumo.dlr.de/wiki/TraCI/Change_Vehicle_State
  the default for lane change mode is 0b 10 01 01 01 01 = 0x 2 5 5 %
-setvalue 0xc4 0x13 veh1 <compound> 2 <byte> 1 <double> 100
+setvalue 0xc4 0x13 veh1 <compound> 2 <byte> 0 <double> 100
 repeat 53 simstep2 0
 setvalue 0xc4 0x13 veh1 <compound> 2 <byte> 0 <double> 1
 repeat 25 simstep2 0