--- a/tests/test-exchange-D1.t	Tue Mar 14 14:47:20 2017 -0700
+++ b/tests/test-exchange-D1.t	Fri Mar 31 15:44:10 2017 +0200
@@ -1,7 +1,7 @@
 
 Initial setup
 
-  $ . $TESTDIR/_exc-util.sh
+  $ . $TESTDIR/testlib/exchange-util.sh
 
 === D.1 Pruned changeset based on missing precursor of something not present ===
 
@@ -55,11 +55,11 @@
   $ hg debugobsrelsethashtree
   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 289cb0d058c81c763eca8bb438657dba9a7ba646
-  $ hg debugstablerange --rev 'head()'
-  rev         node index size depth      obshash
-    1 e5ea8f9c7314     0    2     2 289cb0d058c8
-    0 a9bdc8b26820     0    1     1 000000000000
-    1 e5ea8f9c7314     1    1     2 289cb0d058c8
+  $ hg debugobshashrange --subranges --rev 'head()'
+           rev         node        index         size        depth      obshash
+             1 e5ea8f9c7314            0            2            2 289cb0d058c8
+             0 a9bdc8b26820            0            1            1 000000000000
+             1 e5ea8f9c7314            1            1            2 289cb0d058c8
   $ cd ..
   $ cd ..