diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 3abd495..8565174 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -122,7 +122,7 @@ pub fn assert_single_layer_groundless_autoroute(
     let unionfind = unionfind(autorouter);
 
     for ratline in autorouter.ratsnest().graph().edge_indices() {
-        let (origin_dot, destination_dot) = autorouter.ratline_endpoint_dots(ratline);
+        let (origin_dot, destination_dot) = ratline.ref_(autorouter).endpoint_dots();
 
         let origin_layer = autorouter
             .board()
@@ -220,7 +220,7 @@ fn unionfind(autorouter: &mut Autorouter<impl AccessMesadata>) -> UnionFind<Node
     for ratline in autorouter.ratsnest().graph().edge_indices() {
         // Accessing endpoints may create new dots because apex construction is lazy, so we access
         // tem all before starting unionfind, as it requires a constant index bound.
-        let _ = autorouter.ratline_endpoint_dots(ratline);
+        let _ = ratline.ref_(autorouter).endpoint_dots();
     }
 
     let mut unionfind = UnionFind::new(
diff --git a/tests/single_layer/0603_breakout/autoroute_all.cmd b/tests/single_layer/0603_breakout/autoroute_all.cmd
index c79e451..bd520b4 100644
--- a/tests/single_layer/0603_breakout/autoroute_all.cmd
+++ b/tests/single_layer/0603_breakout/autoroute_all.cmd
@@ -13,7 +13,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "wrap_around_bands": true,
             "squeeze_through_under_bends": true,
@@ -35,7 +35,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "wrap_around_bands": true,
             "squeeze_through_under_bends": true,
diff --git a/tests/single_layer/4x_3rd_order_smd_lc_filters/autoroute_signals.cmd b/tests/single_layer/4x_3rd_order_smd_lc_filters/autoroute_signals.cmd
index 59850db..13e5d84 100644
--- a/tests/single_layer/4x_3rd_order_smd_lc_filters/autoroute_signals.cmd
+++ b/tests/single_layer/4x_3rd_order_smd_lc_filters/autoroute_signals.cmd
@@ -49,7 +49,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "wrap_around_bands": true,
             "squeeze_through_under_bends": true,
@@ -107,7 +107,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "wrap_around_bands": true,
             "squeeze_through_under_bends": true,
@@ -165,7 +165,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "wrap_around_bands": true,
             "squeeze_through_under_bends": true,
@@ -223,7 +223,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "wrap_around_bands": true,
             "squeeze_through_under_bends": true,
diff --git a/tests/single_layer/smd_non_rectangular_buck_converter/route_all.cmd b/tests/single_layer/smd_non_rectangular_buck_converter/route_all.cmd
index f48f407..dd10ae1 100644
--- a/tests/single_layer/smd_non_rectangular_buck_converter/route_all.cmd
+++ b/tests/single_layer/smd_non_rectangular_buck_converter/route_all.cmd
@@ -37,7 +37,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "routed_band_width": 100.0,
             "wrap_around_bands": true,
diff --git a/tests/single_layer/tht_3pin_xlr_to_tht_3pin_xlr/autoroute_all.cmd b/tests/single_layer/tht_3pin_xlr_to_tht_3pin_xlr/autoroute_all.cmd
index 14d7f10..46877e6 100644
--- a/tests/single_layer/tht_3pin_xlr_to_tht_3pin_xlr/autoroute_all.cmd
+++ b/tests/single_layer/tht_3pin_xlr_to_tht_3pin_xlr/autoroute_all.cmd
@@ -29,7 +29,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "wrap_around_bands": true,
             "squeeze_through_under_bends": true,
diff --git a/tests/single_layer/tht_de9_to_tht_de9/autoroute_all_in_an_order.cmd b/tests/single_layer/tht_de9_to_tht_de9/autoroute_all_in_an_order.cmd
index d926434..80d62e3 100644
--- a/tests/single_layer/tht_de9_to_tht_de9/autoroute_all_in_an_order.cmd
+++ b/tests/single_layer/tht_de9_to_tht_de9/autoroute_all_in_an_order.cmd
@@ -13,7 +13,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "routed_band_width": 100.0,
             "wrap_around_bands": true,
@@ -35,7 +35,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "routed_band_width": 100.0,
             "wrap_around_bands": true,
@@ -57,7 +57,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "routed_band_width": 100.0,
             "wrap_around_bands": true,
@@ -79,7 +79,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "routed_band_width": 100.0,
             "wrap_around_bands": true,
@@ -101,7 +101,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "routed_band_width": 100.0,
             "wrap_around_bands": true,
@@ -123,7 +123,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "routed_band_width": 100.0,
             "wrap_around_bands": true,
@@ -145,7 +145,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "routed_band_width": 100.0,
             "wrap_around_bands": true,
@@ -167,7 +167,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "routed_band_width": 100.0,
             "wrap_around_bands": true,
@@ -189,7 +189,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "routed_band_width": 100.0,
             "wrap_around_bands": true,
diff --git a/tests/single_layer/tht_diode_bridge_rectifier/autoroute_all.cmd b/tests/single_layer/tht_diode_bridge_rectifier/autoroute_all.cmd
index 226de3f..68f9a67 100644
--- a/tests/single_layer/tht_diode_bridge_rectifier/autoroute_all.cmd
+++ b/tests/single_layer/tht_diode_bridge_rectifier/autoroute_all.cmd
@@ -49,7 +49,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "wrap_around_bands": true,
             "squeeze_through_under_bends": true,
@@ -71,7 +71,7 @@
           }
         ],
         {
-          "presort_by_pairwise_detours": false,
+          "presort_by": "RatlineIntersectionCountAndLength",
           "router_options": {
             "wrap_around_bands": true,
             "squeeze_through_under_bends": true,