diff --git a/tests/tools/turndefs/routeSampler/intervals/optimize_verbose/routes.tools b/tests/tools/turndefs/routeSampler/intervals/optimize_verbose/routes.tools
index 1f1314e936f..846f394ada6 100644
--- a/tests/tools/turndefs/routeSampler/intervals/optimize_verbose/routes.tools
+++ b/tests/tools/turndefs/routeSampler/intervals/optimize_verbose/routes.tools
@@ -1,6 +1,6 @@
-
-
+
-
+
diff --git a/tests/tools/turndefs/routeSampler/min_count_optimize/output.tools b/tests/tools/turndefs/routeSampler/min_count_optimize/output.tools
index 4675d05a6cb..f9a376ab8b7 100644
--- a/tests/tools/turndefs/routeSampler/min_count_optimize/output.tools
+++ b/tests/tools/turndefs/routeSampler/min_count_optimize/output.tools
@@ -10,17 +10,18 @@ Primal Feasibility Dual Feasibility Duality Gap Step Pat
0.2530364874168 0.2530364874168 0.2530364874168 0.7557774493876 0.2530364874168 48.14587142316
0.0789831936971 0.0789831936971 0.0789831936971 0.7017129866465 0.0789831936971 32.10400223723
0.02016485547474 0.02016485547474 0.02016485547474 0.7530111173195 0.02016485547474 25.71737848317
-0.002368302573093 0.002368302573095 0.002368302573095 0.8954710687492 0.002368302573096 23.32298291189
-8.541601996942e-06 8.54160197789e-06 8.541601977878e-06 0.9966151190339 8.541601977924e-06 23.00106253171
-4.271955643889e-10 4.271955736582e-10 4.271956718719e-10 0.9999499864781 4.271955097241e-10 23.00000005314
+0.002368302573094 0.002368302573095 0.002368302573095 0.8954710687492 0.002368302573095 23.32298291189
+8.541601974607e-06 8.541601985382e-06 8.54160198558e-06 0.9966151190307 8.541601985852e-06 23.00106253171
+4.271971523193e-10 4.271978344538e-10 4.271977133567e-10 0.9999499862171 4.271979385405e-10 23.00000005314
Optimization terminated successfully.
Current function value: 23.000000
Iterations: 6
Optimization succeeded
-Wrote 88 routes (74 distinct) achieving total count 728 (96.94%) at 138 locations. GEH<5 for 95.65%
-result route edge count: count 88, min 5.00 (32), max 16.00 (68), mean 9.27, Q1 7.00, median 9.00, Q3 11.00
- histogram: [(5, 8), (6, 10), (7, 8), (8, 14), (9, 11), (10, 12), (11, 6), (12, 2), (13, 7), (14, 4), (15, 4), (16, 2)]
-result route detector count: count 88, min 4.00 (32), max 15.00 (68), mean 8.27, Q1 6.00, median 8.00, Q3 10.00
- histogram: [(4, 8), (5, 10), (6, 8), (7, 14), (8, 11), (9, 12), (10, 6), (11, 2), (12, 7), (13, 4), (14, 4), (15, 2)]
-GEH: count 138, min 0.00 ([-58.121.42 64] 36 36), max 12.06 ([-123.121.42 131] 72 0), mean 0.71, Q1 0.00, median 0.00, Q3 0.00
-Warning: underflow locations: count 22, min 1.00 (('-152.80.00', '-131')), max 2.00 (('-123.121.42', '131')), mean 1.05, Q1 1.00, median 1.00, Q3 1.00 (total 23)
+Wrote 89 routes (74 distinct) achieving total count 741 (98.67%) at 138 locations. GEH<5 for 95.65%
+result route edge count: count 89, min 5.00 (0), max 16.00 (41), mean 9.33, Q1 7.00, median 9.00, Q3 11.00
+ histogram: [(5, 8), (6, 10), (7, 8), (8, 14), (9, 11), (10, 12), (11, 6), (12, 2), (13, 7), (14, 5), (15, 4), (16, 2)]
+result route detector count: count 89, min 4.00 (0), max 15.00 (41), mean 8.33, Q1 6.00, median 8.00, Q3 10.00
+ histogram: [(4, 8), (5, 10), (6, 8), (7, 14), (8, 11), (9, 12), (10, 6), (11, 2), (12, 7), (13, 5), (14, 4), (15, 2)]
+GEH: count 138, min 0.00 ([-58.121.42 64] 36 36), max 12.06 ([-123.121.42 131] 72 0), mean 0.76, Q1 0.00, median 0.00, Q3 0.00
+Warning: underflow locations: count 18, min 1.00 (('-152.80.00', '-131')), max 2.00 (('-123.121.42', '131')), mean 1.06, Q1 1.00, median 1.00, Q3 1.00 (total 19)
+Warning: overflow locations: count 9, min -1.00 (('-55.80.00', '-27')), max -1.00 (('-55.80.00', '-27')), mean -1.00, Q1 -1.00, median -1.00, Q3 -1.00 (total -9)
diff --git a/tests/tools/turndefs/routeSampler/min_count_optimize/routes.tools b/tests/tools/turndefs/routeSampler/min_count_optimize/routes.tools
index 7e0a0990623..388b6ff7609 100644
--- a/tests/tools/turndefs/routeSampler/min_count_optimize/routes.tools
+++ b/tests/tools/turndefs/routeSampler/min_count_optimize/routes.tools
@@ -1,6 +1,6 @@
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
diff --git a/tests/tools/turndefs/routeSampler/optimize_1/routes.tools b/tests/tools/turndefs/routeSampler/optimize_1/routes.tools
index 4ce967f2861..37932144b1c 100644
--- a/tests/tools/turndefs/routeSampler/optimize_1/routes.tools
+++ b/tests/tools/turndefs/routeSampler/optimize_1/routes.tools
@@ -1,6 +1,6 @@
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/tests/tools/turndefs/routeSampler/optimize_2/routes.tools b/tests/tools/turndefs/routeSampler/optimize_2/routes.tools
index e4f309602b1..943bdecef0a 100644
--- a/tests/tools/turndefs/routeSampler/optimize_2/routes.tools
+++ b/tests/tools/turndefs/routeSampler/optimize_2/routes.tools
@@ -1,6 +1,6 @@
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+