diff --git a/tests/sumo/errors/invalid_insertionChecks/errors.sumo.meso b/tests/sumo/errors/invalid_insertionChecks/errors.sumo.meso
index d3aac0e2270b..5763235b358d 100644
--- a/tests/sumo/errors/invalid_insertionChecks/errors.sumo.meso
+++ b/tests/sumo/errors/invalid_insertionChecks/errors.sumo.meso
@@ -1,2 +1,2 @@
-Error: Sublane dynamics are not supported by mesoscopic simulation
+Error: Sublane dynamics are not supported by mesoscopic simulation.
 Quitting (on error).
diff --git a/tests/sumo/errors/routes/stops/until_order/vehroutes.sumo.meso b/tests/sumo/errors/routes/stops/until_order/vehroutes.sumo.meso
index 23ef22d4a15f..3c195f9a2eef 100644
--- a/tests/sumo/errors/routes/stops/until_order/vehroutes.sumo.meso
+++ b/tests/sumo/errors/routes/stops/until_order/vehroutes.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-03-16 22:13:16 by Eclipse SUMO sumo Version v1_16_0+1369-4e333104ec3
+<!-- generated on 2024-10-31 17:21:03 by Eclipse SUMO sumo Version v1_21_0+0539-52416b729a4
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration 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"/>
@@ -26,6 +26,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <processing>
         <default.speeddev value="0"/>
         <use-stop-ended value="true"/>
+        <use-stop-started value="true"/>
     </processing>
 
     <report>
@@ -38,7 +39,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <mesosim value="true"/>
     </mesoscopic>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
@@ -71,34 +72,54 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <stop lane="beg_0" endPos="6.00" arrival="60.00" until="50.00"/>
     </vehicle>
 
-    <vehicle id="until_before_depart" depart="60.00" arrival="103.00">
+    <vehicle id="until_before_arrival_with_ended" depart="1.00" arrival="106.00">
+        <route edges="beg end"/>
+        <stop lane="beg_0" endPos="6.00" arrival="60.00" until="50.00" ended="74.00"/>
+    </vehicle>
+
+    <vehicle id="ended_before_arrival" depart="1.00" arrival="107.00">
+        <route edges="beg end"/>
+        <stop lane="beg_0" endPos="6.00" arrival="60.00" until="70.00" ended="75.00"/>
+    </vehicle>
+
+    <vehicle id="ended_before_arrival_with_started" depart="1.00" arrival="107.00">
+        <route edges="beg end"/>
+        <stop lane="beg_0" endPos="6.00" arrival="60.00" until="70.00" started="1.00" ended="75.00"/>
+    </vehicle>
+
+    <vehicle id="ended_before_started" depart="54.00" arrival="108.00">
+        <route edges="beg end"/>
+        <stop lane="beg_0" endPos="6.00" arrival="40.00" until="70.00" started="54.00" ended="75.00"/>
+    </vehicle>
+
+    <vehicle id="until_before_depart" depart="64.00" arrival="108.00">
         <route edges="beg end"/>
         <stop lane="beg_0" endPos="6.00" until="50.00"/>
     </vehicle>
 
-    <vehicle id="until_before_depart_with_ended" depart="60.00" arrival="104.00">
+    <vehicle id="until_before_depart_with_ended" depart="65.00" arrival="109.00">
         <route edges="beg end"/>
-        <stop lane="beg_0" endPos="6.00" until="50.00" ended="66.00"/>
+        <stop lane="beg_0" endPos="6.00" until="50.00" ended="76.00"/>
     </vehicle>
 
-    <vehicle id="until_before_depart_with_ended2" depart="60.00" arrival="106.00">
+    <vehicle id="until_before_depart_with_ended2" depart="65.00" arrival="109.00">
         <route edges="beg end"/>
-        <stop lane="beg_0" endPos="6.00" until="50.00" ended="74.00"/>
+        <stop lane="beg_0" endPos="6.00" until="50.00" ended="77.00"/>
     </vehicle>
 
-    <vehicle id="arrival_before_depart" depart="60.00" arrival="107.00">
+    <vehicle id="arrival_before_depart" depart="65.00" arrival="110.00">
         <route edges="beg end"/>
         <stop lane="beg_0" endPos="6.00" arrival="40.00" duration="5.00"/>
     </vehicle>
 
-    <vehicle id="arrival_before_depart_with_started" depart="64.00" arrival="107.00">
+    <vehicle id="arrival_before_depart_with_started" depart="74.00" arrival="115.00">
         <route edges="beg end"/>
-        <stop lane="beg_0" endPos="6.00" arrival="40.00" duration="5.00" started="64.00"/>
+        <stop lane="beg_0" endPos="6.00" arrival="40.00" duration="5.00" started="74.00"/>
     </vehicle>
 
-    <vehicle id="arrival_before_depart_with_started2" depart="65.00" arrival="108.00">
+    <vehicle id="arrival_before_depart_with_started2" depart="75.00" arrival="116.00">
         <route edges="beg end"/>
-        <stop lane="beg_0" endPos="6.00" arrival="40.00" duration="5.00" started="65.00"/>
+        <stop lane="beg_0" endPos="6.00" arrival="40.00" duration="5.00" started="75.00"/>
     </vehicle>
 
 </routes>
diff --git a/tests/sumo/extended/stops/parking/busstop_parkingLength_assignment/stopinfos.sumo.meso b/tests/sumo/extended/stops/parking/busstop_parkingLength_assignment/stopinfos.sumo.meso
index c7063e4727a4..3e296c313b18 100644
--- a/tests/sumo/extended/stops/parking/busstop_parkingLength_assignment/stopinfos.sumo.meso
+++ b/tests/sumo/extended/stops/parking/busstop_parkingLength_assignment/stopinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-04-11 18:35:16 by Eclipse SUMO sumo Version v1_19_0+1793-abaea7a63af
+<!-- generated on 2024-10-31 17:20:59 by Eclipse SUMO sumo Version v1_21_0+0539-52416b729a4
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration 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"/>
@@ -39,11 +39,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <mesosim value="true"/>
     </mesoscopic>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
     <stopinfo id="b0" type="DEFAULT_VEHTYPE" edge="beg" pos="100.00" parking="1" started="3.60" ended="14.00" busStop="bs0" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
-    <stopinfo id="b2" type="DEFAULT_VEHTYPE" edge="beg" pos="100.00" parking="1" started="7.60" ended="18.00" busStop="bs0" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
+    <stopinfo id="b2" type="DEFAULT_VEHTYPE" edge="beg" pos="100.00" parking="1" started="33.60" ended="44.00" busStop="bs0" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
     <stopinfo id="b1" type="DEFAULT_VEHTYPE" edge="beg" pos="100.00" parking="1" started="5.60" ended="106.00" busStop="bs0" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
 </stops>
diff --git a/tests/sumo/extended/stops/parking/busstop_parkingLength_assignment2/stopinfos.sumo.meso b/tests/sumo/extended/stops/parking/busstop_parkingLength_assignment2/stopinfos.sumo.meso
index c7063e4727a4..67b97af55fb6 100644
--- a/tests/sumo/extended/stops/parking/busstop_parkingLength_assignment2/stopinfos.sumo.meso
+++ b/tests/sumo/extended/stops/parking/busstop_parkingLength_assignment2/stopinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-04-11 18:35:16 by Eclipse SUMO sumo Version v1_19_0+1793-abaea7a63af
+<!-- generated on 2024-10-31 17:20:59 by Eclipse SUMO sumo Version v1_21_0+0539-52416b729a4
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration 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"/>
@@ -39,11 +39,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <mesosim value="true"/>
     </mesoscopic>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
     <stopinfo id="b0" type="DEFAULT_VEHTYPE" edge="beg" pos="100.00" parking="1" started="3.60" ended="14.00" busStop="bs0" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
-    <stopinfo id="b2" type="DEFAULT_VEHTYPE" edge="beg" pos="100.00" parking="1" started="7.60" ended="18.00" busStop="bs0" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
+    <stopinfo id="b2" type="longBus" edge="beg" pos="100.00" parking="1" started="33.60" ended="44.00" busStop="bs0" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
     <stopinfo id="b1" type="DEFAULT_VEHTYPE" edge="beg" pos="100.00" parking="1" started="5.60" ended="106.00" busStop="bs0" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
 </stops>
diff --git a/tests/sumo/junction_model/follow_on_junction/default/tripinfos.sumo.meso b/tests/sumo/junction_model/follow_on_junction/default/tripinfos.sumo.meso
index e3d8659b3270..f9e5532e7503 100644
--- a/tests/sumo/junction_model/follow_on_junction/default/tripinfos.sumo.meso
+++ b/tests/sumo/junction_model/follow_on_junction/default/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-26 15:32:31 by Eclipse SUMO sumo Version v1_20_0+1721-016cfd09667
+<!-- generated on 2024-10-31 17:20:59 by Eclipse SUMO sumo Version v1_21_0+0539-52416b729a4
 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
@@ -23,6 +23,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <tripinfo-output value="tripinfos.xml"/>
     </output>
 
+    <time>
+        <step-length value="0.25"/>
+    </time>
+
     <processing>
         <default.speeddev value="0"/>
     </processing>
@@ -42,6 +46,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CS_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CW_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_noprio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="17.50" arrivalLane="CS_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="17.50" routeLength="173.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="t0" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="17.50" arrivalLane="CW_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="17.50" routeLength="173.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_noprio" vType="t0" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/junction_model/follow_on_junction/merge_default/tripinfos.sumo.meso b/tests/sumo/junction_model/follow_on_junction/merge_default/tripinfos.sumo.meso
index e3d8659b3270..3f2791e0b2c9 100644
--- a/tests/sumo/junction_model/follow_on_junction/merge_default/tripinfos.sumo.meso
+++ b/tests/sumo/junction_model/follow_on_junction/merge_default/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-26 15:32:31 by Eclipse SUMO sumo Version v1_20_0+1721-016cfd09667
+<!-- generated on 2024-10-31 17:20:59 by Eclipse SUMO sumo Version v1_21_0+0539-52416b729a4
 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
@@ -23,6 +23,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <tripinfo-output value="tripinfos.xml"/>
     </output>
 
+    <time>
+        <step-length value="0.25"/>
+    </time>
+
     <processing>
         <default.speeddev value="0"/>
     </processing>
@@ -42,6 +46,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CS_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CW_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_noprio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="17.50" arrivalLane="CS_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="17.50" routeLength="173.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="t0" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="19.25" arrivalLane="CS_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="19.25" routeLength="173.60" waitingTime="1.67" waitingCount="0" stopTime="0.00" timeLoss="1.67" rerouteNo="0" devices="tripinfo_noprio" vType="t0" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/junction_model/follow_on_junction/merge_extraGap/tripinfos.sumo.meso b/tests/sumo/junction_model/follow_on_junction/merge_extraGap/tripinfos.sumo.meso
index e3d8659b3270..3f2791e0b2c9 100644
--- a/tests/sumo/junction_model/follow_on_junction/merge_extraGap/tripinfos.sumo.meso
+++ b/tests/sumo/junction_model/follow_on_junction/merge_extraGap/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-26 15:32:31 by Eclipse SUMO sumo Version v1_20_0+1721-016cfd09667
+<!-- generated on 2024-10-31 17:20:59 by Eclipse SUMO sumo Version v1_21_0+0539-52416b729a4
 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
@@ -23,6 +23,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <tripinfo-output value="tripinfos.xml"/>
     </output>
 
+    <time>
+        <step-length value="0.25"/>
+    </time>
+
     <processing>
         <default.speeddev value="0"/>
     </processing>
@@ -42,6 +46,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CS_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CW_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_noprio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="17.50" arrivalLane="CS_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="17.50" routeLength="173.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="t0" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="19.25" arrivalLane="CS_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="19.25" routeLength="173.60" waitingTime="1.67" waitingCount="0" stopTime="0.00" timeLoss="1.67" rerouteNo="0" devices="tripinfo_noprio" vType="t0" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/junction_model/follow_on_junction/merge_extraGap2/tripinfos.sumo.meso b/tests/sumo/junction_model/follow_on_junction/merge_extraGap2/tripinfos.sumo.meso
index e3d8659b3270..3f2791e0b2c9 100644
--- a/tests/sumo/junction_model/follow_on_junction/merge_extraGap2/tripinfos.sumo.meso
+++ b/tests/sumo/junction_model/follow_on_junction/merge_extraGap2/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-26 15:32:31 by Eclipse SUMO sumo Version v1_20_0+1721-016cfd09667
+<!-- generated on 2024-10-31 17:20:59 by Eclipse SUMO sumo Version v1_21_0+0539-52416b729a4
 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
@@ -23,6 +23,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <tripinfo-output value="tripinfos.xml"/>
     </output>
 
+    <time>
+        <step-length value="0.25"/>
+    </time>
+
     <processing>
         <default.speeddev value="0"/>
     </processing>
@@ -42,6 +46,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CS_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CW_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_noprio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="17.50" arrivalLane="CS_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="17.50" routeLength="173.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="t0" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="19.25" arrivalLane="CS_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="19.25" routeLength="173.60" waitingTime="1.67" waitingCount="0" stopTime="0.00" timeLoss="1.67" rerouteNo="0" devices="tripinfo_noprio" vType="t0" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/junction_model/follow_on_junction/noAdvance/tripinfos.sumo.meso b/tests/sumo/junction_model/follow_on_junction/noAdvance/tripinfos.sumo.meso
index e3d8659b3270..f9e5532e7503 100644
--- a/tests/sumo/junction_model/follow_on_junction/noAdvance/tripinfos.sumo.meso
+++ b/tests/sumo/junction_model/follow_on_junction/noAdvance/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-26 15:32:31 by Eclipse SUMO sumo Version v1_20_0+1721-016cfd09667
+<!-- generated on 2024-10-31 17:20:59 by Eclipse SUMO sumo Version v1_21_0+0539-52416b729a4
 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
@@ -23,6 +23,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <tripinfo-output value="tripinfos.xml"/>
     </output>
 
+    <time>
+        <step-length value="0.25"/>
+    </time>
+
     <processing>
         <default.speeddev value="0"/>
     </processing>
@@ -42,6 +46,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CS_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CW_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_noprio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="17.50" arrivalLane="CS_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="17.50" routeLength="173.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="t0" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="17.50" arrivalLane="CW_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="17.50" routeLength="173.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_noprio" vType="t0" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/junction_model/follow_on_junction/noAdvance_extraGap/tripinfos.sumo.meso b/tests/sumo/junction_model/follow_on_junction/noAdvance_extraGap/tripinfos.sumo.meso
index e3d8659b3270..f9e5532e7503 100644
--- a/tests/sumo/junction_model/follow_on_junction/noAdvance_extraGap/tripinfos.sumo.meso
+++ b/tests/sumo/junction_model/follow_on_junction/noAdvance_extraGap/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-26 15:32:31 by Eclipse SUMO sumo Version v1_20_0+1721-016cfd09667
+<!-- generated on 2024-10-31 17:20:59 by Eclipse SUMO sumo Version v1_21_0+0539-52416b729a4
 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
@@ -23,6 +23,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <tripinfo-output value="tripinfos.xml"/>
     </output>
 
+    <time>
+        <step-length value="0.25"/>
+    </time>
+
     <processing>
         <default.speeddev value="0"/>
     </processing>
@@ -42,6 +46,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CS_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CW_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_noprio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="17.50" arrivalLane="CS_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="17.50" routeLength="173.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="t0" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="17.50" arrivalLane="CW_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="17.50" routeLength="173.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_noprio" vType="t0" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/junction_model/follow_on_junction/noAdvance_extraGap2/tripinfos.sumo.meso b/tests/sumo/junction_model/follow_on_junction/noAdvance_extraGap2/tripinfos.sumo.meso
index e3d8659b3270..f9e5532e7503 100644
--- a/tests/sumo/junction_model/follow_on_junction/noAdvance_extraGap2/tripinfos.sumo.meso
+++ b/tests/sumo/junction_model/follow_on_junction/noAdvance_extraGap2/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-26 15:32:31 by Eclipse SUMO sumo Version v1_20_0+1721-016cfd09667
+<!-- generated on 2024-10-31 17:20:59 by Eclipse SUMO sumo Version v1_21_0+0539-52416b729a4
 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
@@ -23,6 +23,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <tripinfo-output value="tripinfos.xml"/>
     </output>
 
+    <time>
+        <step-length value="0.25"/>
+    </time>
+
     <processing>
         <default.speeddev value="0"/>
     </processing>
@@ -42,6 +46,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CS_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="14.00" arrivalLane="CW_0" arrivalPos="95.25" arrivalSpeed="13.89" duration="14.00" routeLength="190.50" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_noprio" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="prio" depart="0.00" departLane="NC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="17.50" arrivalLane="CS_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="17.50" routeLength="173.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_prio" vType="t0" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="noprio" depart="0.00" departLane="EC_0" departPos="0.00" departSpeed="10.00" departDelay="0.00" arrival="17.50" arrivalLane="CW_0" arrivalPos="86.80" arrivalSpeed="10.00" duration="17.50" routeLength="173.60" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_noprio" vType="t0" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/spec/departure/insertionChecks/leaderGap_option/vehroutes.sumo.meso b/tests/sumo/spec/departure/insertionChecks/leaderGap_option/vehroutes.sumo.meso
index 2328a19c7fe5..9aaf12eec435 100644
--- a/tests/sumo/spec/departure/insertionChecks/leaderGap_option/vehroutes.sumo.meso
+++ b/tests/sumo/spec/departure/insertionChecks/leaderGap_option/vehroutes.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-04-05 10:30:22 by Eclipse SUMO sumo Version v1_12_0+1949-1d2ae20f770
+<!-- generated on 2024-10-31 17:20:56 by Eclipse SUMO sumo Version v1_21_0+0539-52416b729a4
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net3.net.xml"/>
@@ -24,13 +24,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </output>
 
     <processing>
+        <insertion-checks value="none"/>
         <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>
 
@@ -38,7 +37,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <mesosim value="true"/>
     </mesoscopic>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
@@ -46,7 +45,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <route edges="WC CE"/>
     </vehicle>
 
-    <vehicle id="ego" type="car" depart="0.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="none" arrival="14.00">
+    <vehicle id="ego" type="car" depart="0.00" departSpeed="13.89" speedFactor="1.0000" arrival="14.00">
         <route edges="WC CE"/>
     </vehicle>