diff --git a/tests/sumo/junction_model/avoid_spill_back/2junctions_not_enough_contiguous_space/tripinfos.sumo.meso b/tests/sumo/junction_model/avoid_spill_back/2junctions_not_enough_contiguous_space/tripinfos.sumo.meso
new file mode 100644
index 000000000000..a32c3990503d
--- /dev/null
+++ b/tests/sumo/junction_model/avoid_spill_back/2junctions_not_enough_contiguous_space/tripinfos.sumo.meso
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Mon Oct 19 14:36:41 2020 by Eclipse SUMO sumo Version v1_7_0+0644-c2b60a409c
+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
+http://www.eclipse.org/legal/epl-v20.html
+SPDX-License-Identifier: EPL-2.0
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+    </output>
+
+    <time>
+        <end value="30"/>
+    </time>
+
+    <processing>
+        <default.speeddev value="0"/>
+        <pedestrian.model value="nonInteracting"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <xml-validation.routes value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+    <mesoscopic>
+        <mesosim value="true"/>
+        <meso-junction-control value="true"/>
+    </mesoscopic>
+
+</configuration>
+-->
+
+<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
+    <tripinfo id="across" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="9.00" arrivalLane="" arrivalPos="18.55" arrivalSpeed="13.90" duration="9.00" routeLength="113.80" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_across" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+</tripinfos>
diff --git a/tests/sumo/junction_model/avoid_spill_back/large_junction_short_edge/output.sumo.meso b/tests/sumo/junction_model/avoid_spill_back/large_junction_short_edge/output.sumo.meso
new file mode 100644
index 000000000000..dcf7cc8f2b6d
--- /dev/null
+++ b/tests/sumo/junction_model/avoid_spill_back/large_junction_short_edge/output.sumo.meso
@@ -0,0 +1,21 @@
+Loading net-file from 'net.net.xml' ... done (3ms).
+Loading done.
+Simulation version v1_7_0+0644-c2b60a409c started with time: 0.00
+Simulation ended at time: 80.00
+Reason: All vehicles have left the simulation.
+Performance: 
+ Duration: 0.00s
+ Real time factor: 40000
+ UPS: 332000.000000
+Vehicles: 
+ Inserted: 20
+ Running: 0
+ Waiting: 0
+Statistics (avg):
+ RouteLength: 256.80
+ Speed: 7.74
+ Duration: 33.20
+ WaitingTime: 0.00
+ TimeLoss: 0.45
+ DepartDelay: 13.15
+
diff --git a/tests/sumo/junction_model/avoid_spill_back/network_ends_behind_junction/output.sumo.meso b/tests/sumo/junction_model/avoid_spill_back/network_ends_behind_junction/output.sumo.meso
new file mode 100644
index 000000000000..1d14f3bcac57
--- /dev/null
+++ b/tests/sumo/junction_model/avoid_spill_back/network_ends_behind_junction/output.sumo.meso
@@ -0,0 +1,21 @@
+Loading net-file from 'net.net.xml' ... done (3ms).
+Loading done.
+Simulation version v1_7_0+0644-c2b60a409c started with time: 0.00
+Simulation ended at time: 42.00
+Reason: All vehicles have left the simulation.
+Performance: 
+ Duration: 0.00s
+ Real time factor: 21000
+ UPS: 95500.000000
+Vehicles: 
+ Inserted: 20
+ Running: 0
+ Waiting: 0
+Statistics (avg):
+ RouteLength: 116.80
+ Speed: 12.31
+ Duration: 9.55
+ WaitingTime: 0.00
+ TimeLoss: 0.56
+ DepartDelay: 6.10
+
diff --git a/tests/sumo/junction_model/avoid_spill_back/no_space_behind_junction/tripinfos.sumo.meso b/tests/sumo/junction_model/avoid_spill_back/no_space_behind_junction/tripinfos.sumo.meso
new file mode 100644
index 000000000000..a32c3990503d
--- /dev/null
+++ b/tests/sumo/junction_model/avoid_spill_back/no_space_behind_junction/tripinfos.sumo.meso
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Mon Oct 19 14:36:41 2020 by Eclipse SUMO sumo Version v1_7_0+0644-c2b60a409c
+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
+http://www.eclipse.org/legal/epl-v20.html
+SPDX-License-Identifier: EPL-2.0
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+    </output>
+
+    <time>
+        <end value="30"/>
+    </time>
+
+    <processing>
+        <default.speeddev value="0"/>
+        <pedestrian.model value="nonInteracting"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <xml-validation.routes value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+    <mesoscopic>
+        <mesosim value="true"/>
+        <meso-junction-control value="true"/>
+    </mesoscopic>
+
+</configuration>
+-->
+
+<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
+    <tripinfo id="across" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="9.00" arrivalLane="" arrivalPos="18.55" arrivalSpeed="13.90" duration="9.00" routeLength="113.80" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_across" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+</tripinfos>
diff --git a/tests/sumo/junction_model/avoid_spill_back/no_space_behind_junction_blocker_braking/tripinfos.sumo.meso b/tests/sumo/junction_model/avoid_spill_back/no_space_behind_junction_blocker_braking/tripinfos.sumo.meso
new file mode 100644
index 000000000000..a32c3990503d
--- /dev/null
+++ b/tests/sumo/junction_model/avoid_spill_back/no_space_behind_junction_blocker_braking/tripinfos.sumo.meso
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Mon Oct 19 14:36:41 2020 by Eclipse SUMO sumo Version v1_7_0+0644-c2b60a409c
+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
+http://www.eclipse.org/legal/epl-v20.html
+SPDX-License-Identifier: EPL-2.0
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+    </output>
+
+    <time>
+        <end value="30"/>
+    </time>
+
+    <processing>
+        <default.speeddev value="0"/>
+        <pedestrian.model value="nonInteracting"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <xml-validation.routes value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+    <mesoscopic>
+        <mesosim value="true"/>
+        <meso-junction-control value="true"/>
+    </mesoscopic>
+
+</configuration>
+-->
+
+<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
+    <tripinfo id="across" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="9.00" arrivalLane="" arrivalPos="18.55" arrivalSpeed="13.90" duration="9.00" routeLength="113.80" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_across" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+</tripinfos>
diff --git a/tests/sumo/junction_model/avoid_spill_back/small_junction_before_tls/fcd.sumo.meso b/tests/sumo/junction_model/avoid_spill_back/small_junction_before_tls/fcd.sumo.meso
new file mode 100644
index 000000000000..abdfc2061857
--- /dev/null
+++ b/tests/sumo/junction_model/avoid_spill_back/small_junction_before_tls/fcd.sumo.meso
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Mon Oct 19 14:36:42 2020 by Eclipse SUMO sumo Version v1_7_0+0644-c2b60a409c
+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
+http://www.eclipse.org/legal/epl-v20.html
+SPDX-License-Identifier: EPL-2.0
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <fcd-output value="fcd.xml"/>
+    </output>
+
+    <time>
+        <begin value="80"/>
+        <end value="90"/>
+        <step-length value="0.5"/>
+    </time>
+
+    <processing>
+        <default.speeddev value="0"/>
+        <pedestrian.model value="nonInteracting"/>
+    </processing>
+
+    <report>
+        <verbose value="true"/>
+        <xml-validation value="never"/>
+        <xml-validation.routes value="never"/>
+        <duration-log.statistics value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+    <mesoscopic>
+        <mesosim value="true"/>
+        <meso-junction-control value="true"/>
+    </mesoscopic>
+
+    <gui_only>
+        <tracker-interval value="0.5"/>
+    </gui_only>
+
+</configuration>
+-->
+
+<fcd-export xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/fcd_file.xsd">
+    <timestep time="80.00"/>
+    <timestep time="80.50"/>
+    <timestep time="81.00">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="81.50">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="82.00">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="82.50">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="83.00">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="83.50">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="84.00">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="84.50">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="85.00">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="85.50">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="86.00">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="86.50">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="87.00">
+        <vehicle id="1" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="87.50">
+        <vehicle id="1" x="-20.30" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.01" pos="0.00" edge="beg2" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="88.00">
+        <vehicle id="1" x="-20.30" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.01" pos="0.00" edge="beg2" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="88.50">
+        <vehicle id="1" x="-5.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.01" pos="0.00" edge="beg3" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="89.00">
+        <vehicle id="1" x="-5.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.01" pos="0.00" edge="beg3" slope="0.00"/>
+        <vehicle id="2" x="-120.00" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="beg" slope="0.00"/>
+    </timestep>
+    <timestep time="89.50">
+        <vehicle id="1" x="27.20" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.00" pos="0.00" edge="end" slope="0.00"/>
+        <vehicle id="2" x="-20.30" y="-1.60" angle="90.00" type="DEFAULT_VEHTYPE" speed="14.01" pos="0.00" edge="beg2" slope="0.00"/>
+    </timestep>
+</fcd-export>
diff --git a/tests/sumo/junction_model/indirect_left_turn/internal_junction_uncontrolled/output.sumo.meso b/tests/sumo/junction_model/indirect_left_turn/internal_junction_uncontrolled/output.sumo.meso
index e344e56c7348..290b5fdd53be 100644
--- a/tests/sumo/junction_model/indirect_left_turn/internal_junction_uncontrolled/output.sumo.meso
+++ b/tests/sumo/junction_model/indirect_left_turn/internal_junction_uncontrolled/output.sumo.meso
@@ -1,23 +1,23 @@
-Loading net-file from 'net.net.xml' ... done (8ms).
+Loading net-file from 'net.net.xml' ... done (6ms).
 Loading done.
-Simulation version v1_6_0+0674-e659555e74 started with time: 0.00
-Simulation ended at time: 242.00
+Simulation version v1_7_0+0644-c2b60a409c started with time: 0.00
+Simulation ended at time: 245.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 4ms
- Real time factor: 60500
- UPS: 275000.000000
+ Duration: 0.00s
+ Real time factor: 81666.7
+ UPS: 376333.333333
 Vehicles: 
  Inserted: 25
  Running: 0
  Waiting: 0
 Statistics (avg):
  RouteLength: 172.45
- Speed: 4.28
- Duration: 44.00
+ Speed: 4.17
+ Duration: 45.16
  WaitingTime: 4.36
- TimeLoss: 12.20
+ TimeLoss: 13.39
  DepartDelay: 0.00
 
 DijkstraRouter answered 25 queries and explored 4.00 edges on average.
-DijkstraRouter spent 0ms answering queries (0.00ms on average).
+DijkstraRouter spent 0.00s answering queries (0.00ms on average).
diff --git a/tests/sumo/junction_model/junction_type/tls/off_internal_cont_major/output.sumo.meso b/tests/sumo/junction_model/junction_type/tls/off_internal_cont_major/output.sumo.meso
index a87cb7041fe2..0a8001ce472a 100644
--- a/tests/sumo/junction_model/junction_type/tls/off_internal_cont_major/output.sumo.meso
+++ b/tests/sumo/junction_model/junction_type/tls/off_internal_cont_major/output.sumo.meso
@@ -1,21 +1,21 @@
-Loading net-file from 'net2.net.xml' ... done (12ms).
+Loading net-file from 'net2.net.xml' ... done (4ms).
 Loading done.
-Simulation version v1_6_0+0655-4cf5eade13 started with time: 0.00
+Simulation version v1_7_0+0644-c2b60a409c started with time: 0.00
 Simulation ended at time: 112.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 3ms
- Real time factor: 37333.3
- UPS: 113666.666667
+ Duration: 0.00s
+ Real time factor: 56000
+ UPS: 170500.000000
 Vehicles: 
  Inserted: 24
  Running: 0
  Waiting: 0
 Statistics (avg):
  RouteLength: 183.90
- Speed: 12.96
+ Speed: 12.97
  Duration: 14.21
- WaitingTime: 0.17
- TimeLoss: 0.20
+ WaitingTime: 0.20
+ TimeLoss: 0.22
  DepartDelay: 0.23
 
diff --git a/tests/sumo/junction_model/junction_type/zipper/action_step_offset/tripinfos.sumo.meso b/tests/sumo/junction_model/junction_type/zipper/action_step_offset/tripinfos.sumo.meso
index 5a6e452ba7d4..ff8ced82ca36 100644
--- a/tests/sumo/junction_model/junction_type/zipper/action_step_offset/tripinfos.sumo.meso
+++ b/tests/sumo/junction_model/junction_type/zipper/action_step_offset/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Wed May  6 14:41:51 2020 by Eclipse SUMO Version v1_6_0+0116-fc17f5a0a5
+<!-- generated on Mon Oct 19 14:36:47 2020 by Eclipse SUMO sumo Version v1_7_0+0644-c2b60a409c
 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
@@ -29,12 +29,14 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
+        <xml-validation.routes value="never"/>
         <duration-log.disable value="true"/>
         <no-step-log value="true"/>
     </report>
 
     <mesoscopic>
         <mesosim value="true"/>
+        <meso-junction-control value="true"/>
     </mesoscopic>
 
     <gui_only>
@@ -46,5 +48,5 @@ SPDX-License-Identifier: EPL-2.0
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
     <tripinfo id="right" depart="0.00" departLane="" departPos="295.50" departSpeed="13.89" departDelay="0.00" arrival="86.00" arrivalLane="" arrivalPos="1094.00" arrivalSpeed="13.89" duration="86.00" routeLength="1192.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_right" vType="t0" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="left" depart="0.50" departLane="" departPos="295.50" departSpeed="13.27" departDelay="0.00" arrival="88.00" arrivalLane="" arrivalPos="1094.00" arrivalSpeed="13.89" duration="87.50" routeLength="1192.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="1.17" rerouteNo="0" devices="tripinfo_left" vType="t1" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="left" depart="0.50" departLane="" departPos="295.50" departSpeed="13.27" departDelay="0.00" arrival="88.00" arrivalLane="" arrivalPos="1094.00" arrivalSpeed="13.89" duration="87.50" routeLength="1192.50" waitingTime="0.83" waitingCount="0" stopTime="0.00" timeLoss="1.17" rerouteNo="0" devices="tripinfo_left" vType="t1" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/junction_model/junction_type/zipper/symmetric_approach/tripinfos.sumo.meso b/tests/sumo/junction_model/junction_type/zipper/symmetric_approach/tripinfos.sumo.meso
index 4d00196049b0..fc2dcf49e425 100644
--- a/tests/sumo/junction_model/junction_type/zipper/symmetric_approach/tripinfos.sumo.meso
+++ b/tests/sumo/junction_model/junction_type/zipper/symmetric_approach/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Wed May  6 14:41:51 2020 by Eclipse SUMO Version v1_6_0+0116-fc17f5a0a5
+<!-- generated on Mon Oct 19 14:36:46 2020 by Eclipse SUMO sumo Version v1_7_0+0644-c2b60a409c
 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
@@ -25,18 +25,20 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
+        <xml-validation.routes value="never"/>
         <duration-log.disable value="true"/>
         <no-step-log value="true"/>
     </report>
 
     <mesoscopic>
         <mesosim value="true"/>
+        <meso-junction-control value="true"/>
     </mesoscopic>
 
 </configuration>
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="right" depart="0.00" departLane="" departPos="298.88" departSpeed="13.89" departDelay="0.00" arrival="87.00" arrivalLane="" arrivalPos="1098.50" arrivalSpeed="13.89" duration="87.00" routeLength="1198.12" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_right" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="left" depart="0.00" departLane="" departPos="298.88" departSpeed="12.44" departDelay="0.00" arrival="88.00" arrivalLane="" arrivalPos="1098.50" arrivalSpeed="13.89" duration="88.00" routeLength="1198.12" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="1.67" rerouteNo="0" devices="tripinfo_left" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="right" depart="0.00" departLane="" departPos="298.88" departSpeed="13.89" departDelay="0.00" arrival="87.00" arrivalLane="" arrivalPos="1098.50" arrivalSpeed="13.89" duration="87.00" routeLength="1198.13" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_right" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="left" depart="0.00" departLane="" departPos="298.88" departSpeed="12.44" departDelay="0.00" arrival="88.00" arrivalLane="" arrivalPos="1098.50" arrivalSpeed="13.89" duration="88.00" routeLength="1198.13" waitingTime="0.83" waitingCount="0" stopTime="0.00" timeLoss="1.67" rerouteNo="0" devices="tripinfo_left" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/junction_model/junction_type/zipper/variations/output.sumo.meso b/tests/sumo/junction_model/junction_type/zipper/variations/output.sumo.meso
index e5d58e00bd87..5e02723ad96e 100644
--- a/tests/sumo/junction_model/junction_type/zipper/variations/output.sumo.meso
+++ b/tests/sumo/junction_model/junction_type/zipper/variations/output.sumo.meso
@@ -1,12 +1,12 @@
-Loading net-file from 'net.net.xml' ... done (1ms).
+Loading net-file from 'net.net.xml' ... done (2ms).
 Loading done.
-Simulation version v1_6_0+0116-fc17f5a0a5 started with time: 0.00
+Simulation version v1_7_0+0644-c2b60a409c started with time: 0.00
 Simulation ended at time: 1016.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 23ms
- Real time factor: 44173.9
- UPS: 330434.782609
+ Duration: 0.02s
+ Real time factor: 53473.7
+ UPS: 400000.000000
 Vehicles: 
  Inserted: 400
  Running: 0
@@ -15,7 +15,7 @@ Statistics (avg):
  RouteLength: 242.00
  Speed: 12.77
  Duration: 19.00
- WaitingTime: 0.00
+ WaitingTime: 0.42
  TimeLoss: 0.83
  DepartDelay: 0.00
 
diff --git a/tests/sumo/junction_model/junction_type/zipper/variations_subsecond/output.sumo.meso b/tests/sumo/junction_model/junction_type/zipper/variations_subsecond/output.sumo.meso
index bcbd12de2913..4f6798823066 100644
--- a/tests/sumo/junction_model/junction_type/zipper/variations_subsecond/output.sumo.meso
+++ b/tests/sumo/junction_model/junction_type/zipper/variations_subsecond/output.sumo.meso
@@ -1,12 +1,12 @@
-Loading net-file from 'net.net.xml' ... done (1ms).
+Loading net-file from 'net.net.xml' ... done (3ms).
 Loading done.
-Simulation version v1_6_0+0116-fc17f5a0a5 started with time: 0.00
+Simulation version v1_7_0+0644-c2b60a409c started with time: 0.00
 Simulation ended at time: 1014.40
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 33ms
- Real time factor: 30739.4
- UPS: 1115151.515152
+ Duration: 0.03s
+ Real time factor: 33813.3
+ UPS: 1226666.666667
 Vehicles: 
  Inserted: 400
  Running: 0
@@ -15,7 +15,7 @@ Statistics (avg):
  RouteLength: 242.00
  Speed: 13.18
  Duration: 18.40
- WaitingTime: 0.00
+ WaitingTime: 0.42
  TimeLoss: 0.83
  DepartDelay: 0.00
 
diff --git a/tests/sumo/junction_model/junction_type/zipper/variations_subsecond_IDM/output.sumo.meso b/tests/sumo/junction_model/junction_type/zipper/variations_subsecond_IDM/output.sumo.meso
index 030b263c6a33..1fba373748e7 100644
--- a/tests/sumo/junction_model/junction_type/zipper/variations_subsecond_IDM/output.sumo.meso
+++ b/tests/sumo/junction_model/junction_type/zipper/variations_subsecond_IDM/output.sumo.meso
@@ -1,12 +1,12 @@
-Loading net-file from 'net.net.xml' ... done (1ms).
+Loading net-file from 'net.net.xml' ... done (3ms).
 Loading done.
-Simulation version v1_6_0+0116-fc17f5a0a5 started with time: 0.00
+Simulation version v1_7_0+0644-c2b60a409c started with time: 0.00
 Simulation ended at time: 1014.40
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 40ms
- Real time factor: 25360
- UPS: 920000.000000
+ Duration: 0.03s
+ Real time factor: 37570.4
+ UPS: 1362962.962963
 Vehicles: 
  Inserted: 400
  Running: 0
@@ -15,7 +15,7 @@ Statistics (avg):
  RouteLength: 242.00
  Speed: 13.18
  Duration: 18.40
- WaitingTime: 0.00
+ WaitingTime: 0.42
  TimeLoss: 0.83
  DepartDelay: 0.00
 
diff --git a/tests/sumo/junction_model/opposite_left_turn/small_junction/tripinfos.sumo.meso b/tests/sumo/junction_model/opposite_left_turn/small_junction/tripinfos.sumo.meso
index 072343597d19..0dd110d807cf 100644
--- a/tests/sumo/junction_model/opposite_left_turn/small_junction/tripinfos.sumo.meso
+++ b/tests/sumo/junction_model/opposite_left_turn/small_junction/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Wed May  6 14:41:54 2020 by Eclipse SUMO Version v1_6_0+0116-fc17f5a0a5
+<!-- generated on Mon Oct 19 14:36:55 2020 by Eclipse SUMO sumo Version v1_7_0+0644-c2b60a409c
 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
@@ -30,11 +30,13 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
+        <xml-validation.routes value="never"/>
         <no-step-log value="true"/>
     </report>
 
     <mesoscopic>
         <mesosim value="true"/>
+        <meso-junction-control value="true"/>
     </mesoscopic>
 
     <gui_only>
@@ -45,8 +47,8 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="SW" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="13.80" arrivalLane="" arrivalPos="95.30" arrivalSpeed="13.89" duration="13.80" routeLength="190.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_SW" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
     <tripinfo id="NE" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="13.80" arrivalLane="" arrivalPos="95.30" arrivalSpeed="13.89" duration="13.80" routeLength="190.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_NE" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="WN" depart="100.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="113.80" arrivalLane="" arrivalPos="95.30" arrivalSpeed="13.89" duration="13.80" routeLength="190.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_WN" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="SW" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.80" arrivalLane="" arrivalPos="95.30" arrivalSpeed="13.89" duration="14.80" routeLength="190.60" waitingTime="1.00" waitingCount="0" stopTime="0.00" timeLoss="1.00" rerouteNo="0" devices="tripinfo_SW" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
     <tripinfo id="ES" depart="100.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="113.80" arrivalLane="" arrivalPos="95.30" arrivalSpeed="13.89" duration="13.80" routeLength="190.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_ES" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="WN" depart="100.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="114.80" arrivalLane="" arrivalPos="95.30" arrivalSpeed="13.89" duration="14.80" routeLength="190.60" waitingTime="1.00" waitingCount="0" stopTime="0.00" timeLoss="1.00" rerouteNo="0" devices="tripinfo_WN" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/junction_model/roundabout/no_requests_from_outside/tripinfos.sumo.meso b/tests/sumo/junction_model/roundabout/no_requests_from_outside/tripinfos.sumo.meso
new file mode 100644
index 000000000000..354266d9abad
--- /dev/null
+++ b/tests/sumo/junction_model/roundabout/no_requests_from_outside/tripinfos.sumo.meso
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Mon Oct 19 14:36:56 2020 by Eclipse SUMO sumo Version v1_7_0+0644-c2b60a409c
+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
+http://www.eclipse.org/legal/epl-v20.html
+SPDX-License-Identifier: EPL-2.0
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+    </output>
+
+    <processing>
+        <default.speeddev value="0"/>
+        <pedestrian.model value="nonInteracting"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <xml-validation.routes value="never"/>
+        <no-step-log value="true"/>
+    </report>
+
+    <mesoscopic>
+        <mesosim value="true"/>
+        <meso-junction-control value="true"/>
+    </mesoscopic>
+
+</configuration>
+-->
+
+<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
+    <tripinfo id="v2" depart="0.00" departLane="" departPos="289.73" departSpeed="13.89" departDelay="0.00" arrival="16.00" arrivalLane="" arrivalPos="50.00" arrivalSpeed="13.89" duration="16.00" routeLength="164.58" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="1" devices="tripinfo_v2 routing_v2" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="v0" depart="0.00" departLane="" departPos="289.87" departSpeed="13.89" departDelay="0.00" arrival="17.00" arrivalLane="" arrivalPos="50.00" arrivalSpeed="13.89" duration="17.00" routeLength="164.93" waitingTime="0.01" waitingCount="0" stopTime="0.00" timeLoss="1.01" rerouteNo="1" devices="tripinfo_v0 routing_v0" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="v1" depart="0.00" departLane="" departPos="289.81" departSpeed="13.89" departDelay="0.00" arrival="18.00" arrivalLane="" arrivalPos="50.00" arrivalSpeed="13.89" duration="18.00" routeLength="164.26" waitingTime="1.30" waitingCount="0" stopTime="0.00" timeLoss="2.33" rerouteNo="1" devices="tripinfo_v1 routing_v1" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+</tripinfos>
diff --git a/tests/sumo/junction_model/roundabout/small/output.sumo.meso b/tests/sumo/junction_model/roundabout/small/output.sumo.meso
new file mode 100644
index 000000000000..c8c2b73702c2
--- /dev/null
+++ b/tests/sumo/junction_model/roundabout/small/output.sumo.meso
@@ -0,0 +1,21 @@
+Loading net-file from 'net.net.xml' ... done (4ms).
+Loading done.
+Simulation version v1_7_0+0644-c2b60a409c started with time: 0.00
+Simulation ended at time: 310.00
+Reason: All vehicles have left the simulation.
+Performance: 
+ Duration: 0.01s
+ Real time factor: 23846.2
+ UPS: 768538.461538
+Vehicles: 
+ Inserted: 217
+ Running: 0
+ Waiting: 0
+Statistics (avg):
+ RouteLength: 624.93
+ Speed: 13.58
+ Duration: 46.04
+ WaitingTime: 0.12
+ TimeLoss: 0.49
+ DepartDelay: 14.30
+
diff --git a/tests/sumo/meso/junction_control/network_problem/control.limited.small_roundabout/output.sumo.meso b/tests/sumo/meso/junction_control/network_problem/control.limited.small_roundabout/output.sumo.meso
new file mode 100644
index 000000000000..5af5b1690c33
--- /dev/null
+++ b/tests/sumo/meso/junction_control/network_problem/control.limited.small_roundabout/output.sumo.meso
@@ -0,0 +1,14 @@
+Loading net-file from 'net.net.xml' ... done (3ms).
+Loading done.
+Simulation version v1_7_0+0625-fbb42d88cd started with time: 0.00
+Simulation ended at time: 425.00
+Reason: All vehicles have left the simulation.
+Performance: 
+ Duration: 0.03s
+ Real time factor: 15740.7
+ UPS: 586555.555556
+Vehicles: 
+ Inserted: 300
+ Running: 0
+ Waiting: 0
+
diff --git a/tests/sumo/meso/junction_control/network_problem/control.limited_tlsPenalty/errors.sumo.meso b/tests/sumo/meso/junction_control/network_problem/control.limited_tlsPenalty/errors.sumo.meso
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/sumo/meso/junction_control/network_problem/control.limited_tlsPenalty/output.sumo.meso b/tests/sumo/meso/junction_control/network_problem/control.limited_tlsPenalty/output.sumo.meso
new file mode 100644
index 000000000000..55cc1568ce38
--- /dev/null
+++ b/tests/sumo/meso/junction_control/network_problem/control.limited_tlsPenalty/output.sumo.meso
@@ -0,0 +1,14 @@
+Loading net-file from 'net.net.xml' ... done (3ms).
+Loading done.
+Simulation version v1_7_0+0625-fbb42d88cd started with time: 0.00
+Simulation ended at time: 2687.00
+Reason: All vehicles have left the simulation.
+Performance: 
+ Duration: 0.04s
+ Real time factor: 74638.9
+ UPS: 2642611.111111
+Vehicles: 
+ Inserted: 300
+ Running: 0
+ Waiting: 0
+