diff --git a/java/server/src/test/java/org/softwareheritage/graph/WalkTest.java b/java/server/src/test/java/org/softwareheritage/graph/WalkTest.java
index 0ba9aa4..aa10997 100644
--- a/java/server/src/test/java/org/softwareheritage/graph/WalkTest.java
+++ b/java/server/src/test/java/org/softwareheritage/graph/WalkTest.java
@@ -1,231 +1,232 @@
 package org.softwareheritage.graph;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import org.softwareheritage.graph.Endpoint;
 import org.softwareheritage.graph.Graph;
 import org.softwareheritage.graph.GraphTest;
 import org.softwareheritage.graph.SwhId;
 import org.softwareheritage.graph.SwhPath;
 
 public class WalkTest extends GraphTest {
   @Test
   public void forwardRootToLeaf() {
     Graph graph = getGraph();
     Endpoint endpoint = new Endpoint(graph, "forward", "*");
     SwhId src = new SwhId("swh:1:snp:0000000000000000000000000000000000000020");
     String dstFmt = "swh:1:cnt:0000000000000000000000000000000000000005";
 
     SwhPath solution1 =
       new SwhPath(
           "swh:1:snp:0000000000000000000000000000000000000020",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:dir:0000000000000000000000000000000000000008",
           "swh:1:dir:0000000000000000000000000000000000000006",
           "swh:1:cnt:0000000000000000000000000000000000000005"
       );
     SwhPath solution2 =
       new SwhPath(
           "swh:1:snp:0000000000000000000000000000000000000020",
           "swh:1:rel:0000000000000000000000000000000000000010",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:dir:0000000000000000000000000000000000000008",
           "swh:1:dir:0000000000000000000000000000000000000006",
           "swh:1:cnt:0000000000000000000000000000000000000005"
       );
 
     SwhPath dfsPath = endpoint.walk(src, dstFmt, "dfs");
     SwhPath bfsPath = endpoint.walk(src, dstFmt, "bfs");
 
     List<SwhPath> possibleSolutions = Arrays.asList(solution1, solution2);
     Assert.assertTrue(possibleSolutions.contains(dfsPath));
     Assert.assertTrue(possibleSolutions.contains(bfsPath));
   }
 
   @Test
   public void forwardLeafToLeaf() {
     Graph graph = getGraph();
     Endpoint endpoint = new Endpoint(graph, "forward", "*");
     SwhId src = new SwhId("swh:1:cnt:0000000000000000000000000000000000000007");
     String dstFmt = "cnt";
 
     SwhPath expectedPath =
       new SwhPath(
           "swh:1:cnt:0000000000000000000000000000000000000007"
       );
 
     SwhPath dfsPath = endpoint.walk(src, dstFmt, "dfs");
     SwhPath bfsPath = endpoint.walk(src, dstFmt, "bfs");
 
     Assert.assertEquals(dfsPath, expectedPath);
     Assert.assertEquals(bfsPath, expectedPath);
   }
 
   @Test
   public void forwardRevToRev() {
     Graph graph = getGraph();
     Endpoint endpoint = new Endpoint(graph, "forward", "rev:rev");
     SwhId src = new SwhId("swh:1:rev:0000000000000000000000000000000000000018");
     String dstFmt = "swh:1:rev:0000000000000000000000000000000000000003";
 
     SwhPath expectedPath =
       new SwhPath(
           "swh:1:rev:0000000000000000000000000000000000000018",
           "swh:1:rev:0000000000000000000000000000000000000013",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:rev:0000000000000000000000000000000000000003"
       );
 
     SwhPath dfsPath = endpoint.walk(src, dstFmt, "dfs");
     SwhPath bfsPath = endpoint.walk(src, dstFmt, "bfs");
 
     Assert.assertEquals(dfsPath, expectedPath);
     Assert.assertEquals(bfsPath, expectedPath);
   }
 
   @Test
   public void backwardRevToRev() {
     Graph graph = getGraph();
     Endpoint endpoint = new Endpoint(graph, "backward", "rev:rev");
     SwhId src = new SwhId("swh:1:rev:0000000000000000000000000000000000000003");
     String dstFmt = "swh:1:rev:0000000000000000000000000000000000000018";
 
     SwhPath expectedPath =
       new SwhPath(
           "swh:1:rev:0000000000000000000000000000000000000003",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:rev:0000000000000000000000000000000000000013",
           "swh:1:rev:0000000000000000000000000000000000000018"
       );
 
     SwhPath dfsPath = endpoint.walk(src, dstFmt, "dfs");
     SwhPath bfsPath = endpoint.walk(src, dstFmt, "bfs");
 
     Assert.assertEquals(dfsPath, expectedPath);
     Assert.assertEquals(bfsPath, expectedPath);
   }
 
   @Test
   public void backwardCntToFirstSnp() {
     Graph graph = getGraph();
     Endpoint endpoint = new Endpoint(graph, "backward", "*");
     SwhId src = new SwhId("swh:1:cnt:0000000000000000000000000000000000000001");
     String dstFmt = "snp";
 
     SwhPath solution1 =
       new SwhPath(
           "swh:1:cnt:0000000000000000000000000000000000000001",
           "swh:1:dir:0000000000000000000000000000000000000002",
           "swh:1:rev:0000000000000000000000000000000000000003",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:snp:0000000000000000000000000000000000000020"
       );
     SwhPath solution2 =
       new SwhPath(
           "swh:1:cnt:0000000000000000000000000000000000000001",
           "swh:1:dir:0000000000000000000000000000000000000002",
           "swh:1:rev:0000000000000000000000000000000000000003",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:rel:0000000000000000000000000000000000000010",
           "swh:1:snp:0000000000000000000000000000000000000020"
       );
     SwhPath solution3 =
       new SwhPath(
           "swh:1:cnt:0000000000000000000000000000000000000001",
           "swh:1:dir:0000000000000000000000000000000000000008",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:snp:0000000000000000000000000000000000000020"
       );
     SwhPath solution4 =
       new SwhPath(
           "swh:1:cnt:0000000000000000000000000000000000000001",
           "swh:1:dir:0000000000000000000000000000000000000008",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:rel:0000000000000000000000000000000000000010",
           "swh:1:snp:0000000000000000000000000000000000000020"
       );
 
     SwhPath dfsPath = endpoint.walk(src, dstFmt, "dfs");
     SwhPath bfsPath = endpoint.walk(src, dstFmt, "bfs");
 
     List<SwhPath> possibleSolutions = Arrays.asList(solution1, solution2, solution3, solution4);
     Assert.assertTrue(possibleSolutions.contains(dfsPath));
     Assert.assertTrue(possibleSolutions.contains(bfsPath));
   }
 
   @Test
   public void forwardRevToFirstCnt() {
     Graph graph = getGraph();
     Endpoint endpoint = new Endpoint(graph, "forward", "rev:*,dir:*");
-    SwhId src = new SwhId("swh:1:rev:0000000000000000000000000000000000000013");
+    SwhId src = new SwhId("swh:1:rev:0000000000000000000000000000000000000009");
     String dstFmt = "cnt";
 
     SwhPath solution1 =
       new SwhPath(
-          "swh:1:rev:0000000000000000000000000000000000000013",
-          "swh:1:dir:0000000000000000000000000000000000000012",
-          "swh:1:cnt:0000000000000000000000000000000000000011"
+          "swh:1:rev:0000000000000000000000000000000000000009",
+          "swh:1:dir:0000000000000000000000000000000000000008",
+          "swh:1:cnt:0000000000000000000000000000000000000007"
       );
     SwhPath solution2 =
       new SwhPath(
-          "swh:1:rev:0000000000000000000000000000000000000013",
+          "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:dir:0000000000000000000000000000000000000008",
-          "swh:1:cnt:0000000000000000000000000000000000000007"
+          "swh:1:dir:0000000000000000000000000000000000000006",
+          "swh:1:cnt:0000000000000000000000000000000000000005"
       );
     SwhPath solution3 =
       new SwhPath(
-          "swh:1:rev:0000000000000000000000000000000000000013",
+          "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:dir:0000000000000000000000000000000000000008",
-          "swh:1:cnt:0000000000000000000000000000000000000001"
+          "swh:1:dir:0000000000000000000000000000000000000006",
+          "swh:1:cnt:0000000000000000000000000000000000000004"
       );
     SwhPath solution4 =
       new SwhPath(
-          "swh:1:rev:0000000000000000000000000000000000000013",
+          "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:dir:0000000000000000000000000000000000000008",
-          "swh:1:dir:0000000000000000000000000000000000000006",
-          "swh:1:cnt:0000000000000000000000000000000000000004"
+          "swh:1:cnt:0000000000000000000000000000000000000001"
       );
     SwhPath solution5 =
       new SwhPath(
-          "swh:1:rev:0000000000000000000000000000000000000013",
-          "swh:1:dir:0000000000000000000000000000000000000008",
-          "swh:1:dir:0000000000000000000000000000000000000006",
-          "swh:1:cnt:0000000000000000000000000000000000000005"
+          "swh:1:rev:0000000000000000000000000000000000000009",
+          "swh:1:rev:0000000000000000000000000000000000000003",
+          "swh:1:dir:0000000000000000000000000000000000000002",
+          "swh:1:cnt:0000000000000000000000000000000000000001"
       );
 
     SwhPath dfsPath = endpoint.walk(src, dstFmt, "dfs");
     SwhPath bfsPath = endpoint.walk(src, dstFmt, "bfs");
 
     List<SwhPath> possibleSolutions =
       Arrays.asList(solution1, solution2, solution3, solution4, solution5);
     Assert.assertTrue(possibleSolutions.contains(dfsPath));
     Assert.assertTrue(possibleSolutions.contains(bfsPath));
   }
 
   @Test
   public void backwardDirToFirstRel() {
     Graph graph = getGraph();
     Endpoint endpoint = new Endpoint(graph, "backward", "dir:dir,dir:rev,rev:*");
     SwhId src = new SwhId("swh:1:dir:0000000000000000000000000000000000000016");
     String dstFmt = "rel";
 
     SwhPath expectedPath =
       new SwhPath(
           "swh:1:dir:0000000000000000000000000000000000000016",
           "swh:1:dir:0000000000000000000000000000000000000017",
           "swh:1:rev:0000000000000000000000000000000000000018",
           "swh:1:rel:0000000000000000000000000000000000000019"
       );
 
     SwhPath dfsPath = endpoint.walk(src, dstFmt, "dfs");
     SwhPath bfsPath = endpoint.walk(src, dstFmt, "bfs");
 
     Assert.assertEquals(dfsPath, expectedPath);
     Assert.assertEquals(bfsPath, expectedPath);
   }
 }