diff --git a/tests/sumo/basic/person/stop_duration/tripinfos.sumo b/tests/sumo/basic/person/stop_duration/tripinfos.sumo
index 973eafad17a..e4de13897cb 100644
--- a/tests/sumo/basic/person/stop_duration/tripinfos.sumo
+++ b/tests/sumo/basic/person/stop_duration/tripinfos.sumo
@@ -1,6 +1,6 @@
-
-
+
+
+
+
+
-
-
-
-
diff --git a/tests/sumo/extended/simulation_routing/personTrip/basic/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/basic/vehroutes.sumo
index a458d69fa83..73218a1baac 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/basic/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/basic/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop/vehroutes.sumo
index edee44b9fd0..823f5e006f9 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/busstop/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/busstop/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop_early/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop_early/vehroutes.sumo
index d9f7435f50b..0de23831bfe 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/busstop_early/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/busstop_early/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late/vehroutes.sumo
index 25b9ee6eefc..bb6c85ba320 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late2/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late2/vehroutes.sumo
index e7fd6fbb598..6cc12072127 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late2/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late2/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop_unmatched/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop_unmatched/vehroutes.sumo
index cb9bd10fc50..2dd582061dc 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/busstop_unmatched/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/busstop_unmatched/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car/vehroutes.sumo
index 9ac5064aef5..1a473852553 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/tripinfos.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/tripinfos.sumo
index 513ac759d53..f235eef3cc1 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/tripinfos.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/tripinfos.sumo
@@ -1,6 +1,6 @@
-
-
+
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_walk/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_walk/vehroutes.sumo
index b7da460ffea..e94985a3fb2 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_walk/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_walk/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
-
+
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_walk_sidewalk/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_walk_sidewalk/vehroutes.sumo
index b7da460ffea..f1d9036a481 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_walk_sidewalk/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_walk_sidewalk/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
-
+
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/early_ending_flow/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/early_ending_flow/vehroutes.sumo
index 5d5b40a84c2..7479ffb24a0 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/early_ending_flow/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/early_ending_flow/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/early_pt/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/early_pt/vehroutes.sumo
index 0082bfc908b..4e3d0f164e6 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/early_pt/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/early_pt/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk/vehroutes.sumo
index ea8575796f0..a06b1303747 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_ptstop/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_ptstop/vehroutes.sumo
index f542d070201..30568b0bea2 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_ptstop/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_ptstop/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/prefer_walking/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/prefer_walking/vehroutes.sumo
index 305346f4194..66db4a0405d 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/prefer_walking/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/prefer_walking/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/prefer_walking2/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/prefer_walking2/vehroutes.sumo
index 5f8f5baabda..f6a37644fee 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/prefer_walking2/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/prefer_walking2/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/ptline_routing/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/ptline_routing/vehroutes.sumo
index 745f29a491c..5e9475d4127 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/ptline_routing/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/ptline_routing/vehroutes.sumo
@@ -1,11 +1,6 @@
-
-
+
-
-
+
+
-
-
+
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/unusable_bus/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/unusable_bus/vehroutes.sumo
index e687d1f2e73..af291b66310 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/unusable_bus/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/unusable_bus/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
-
+
diff --git a/tests/sumo/extended/simulation_routing/personTrip/vtype/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/vtype/vehroutes.sumo
index 333d2560af7..d3bfa16c1ff 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/vtype/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/vtype/vehroutes.sumo
@@ -1,6 +1,6 @@
-
-
+
-
+
diff --git a/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward/tripinfos.sumo b/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward/tripinfos.sumo
index 7e8aa4501d1..06e6c754daa 100644
--- a/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward/tripinfos.sumo
@@ -1,6 +1,6 @@
-
-
-
-
+
+
+
diff --git a/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward_left_turning_vehicle/tripinfos.sumo b/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward_left_turning_vehicle/tripinfos.sumo
index 3c44c9c07ef..5ce3d7c3a4d 100644
--- a/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward_left_turning_vehicle/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward_left_turning_vehicle/tripinfos.sumo
@@ -1,6 +1,6 @@
-
-
-
-
+
+
+
diff --git a/tests/sumo/pedestrian_model/nonInteracting/subsecond/block_vehicles_walking_forward/tripinfos.sumo b/tests/sumo/pedestrian_model/nonInteracting/subsecond/block_vehicles_walking_forward/tripinfos.sumo
index c80911ae5b5..dc35bef2b4c 100644
--- a/tests/sumo/pedestrian_model/nonInteracting/subsecond/block_vehicles_walking_forward/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/nonInteracting/subsecond/block_vehicles_walking_forward/tripinfos.sumo
@@ -1,6 +1,6 @@
-
-
-
-
+
+
+
diff --git a/tests/sumo/pedestrian_model/striping/block_vehicles/ignore_stopped/tripinfos.sumo b/tests/sumo/pedestrian_model/striping/block_vehicles/ignore_stopped/tripinfos.sumo
index ff88a9bd6a6..545aea06c31 100644
--- a/tests/sumo/pedestrian_model/striping/block_vehicles/ignore_stopped/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/striping/block_vehicles/ignore_stopped/tripinfos.sumo
@@ -1,6 +1,6 @@
-
-
-
-
+
+
+
diff --git a/tests/sumo/pedestrian_model/striping/block_vehicles/jaywalking_forward_collision/tripinfos.sumo b/tests/sumo/pedestrian_model/striping/block_vehicles/jaywalking_forward_collision/tripinfos.sumo
index e3efe0ef7d0..3d08258fcb2 100644
--- a/tests/sumo/pedestrian_model/striping/block_vehicles/jaywalking_forward_collision/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/striping/block_vehicles/jaywalking_forward_collision/tripinfos.sumo
@@ -1,6 +1,6 @@
-