diff --git a/tests/test-dirs/locate/context-detection/cd-test.t/run.t b/tests/test-dirs/locate/context-detection/cd-test.t/run.t
index 1dd96f14a8..3e01314838 100644
--- a/tests/test-dirs/locate/context-detection/cd-test.t/run.t
+++ b/tests/test-dirs/locate/context-detection/cd-test.t/run.t
@@ -39,18 +39,12 @@ Trying them all:
     "notifications": []
   }
 
-FIXME this should say "Already at definition point" (we're defining the label):
+This should say "Already at definition point" (we're defining the label):
 
   $ $MERLIN single locate -look-for ml -position 13:12 -filename ./test.ml < ./test.ml
   {
     "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 5,
-        "col": 4
-      }
-    },
+    "value": "Already at definition point",
     "notifications": []
   }
 
diff --git a/tests/test-dirs/locate/functors/f-all_local.t/run.t b/tests/test-dirs/locate/functors/f-all_local.t/run.t
index 33ad905cac..835e9981c5 100644
--- a/tests/test-dirs/locate/functors/f-all_local.t/run.t
+++ b/tests/test-dirs/locate/functors/f-all_local.t/run.t
@@ -38,7 +38,7 @@ Check that we can jump from inside the functor to the (sig of the) parameter:
       "file": "$TESTCASE_ROOT/all_local.ml",
       "pos": {
         "line": 2,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
diff --git a/tests/test-dirs/locate/issue1424.t b/tests/test-dirs/locate/issue1424.t
index 6fdad78cd9..23b3d039c1 100644
--- a/tests/test-dirs/locate/issue1424.t
+++ b/tests/test-dirs/locate/issue1424.t
@@ -39,6 +39,6 @@ FIXME: it should jump to the ml file
     "file": "$TESTCASE_ROOT/test2.mli",
     "pos": {
       "line": 1,
-      "col": 0
+      "col": 4
     }
   }
diff --git a/tests/test-dirs/locate/non-local/ignore-kept-locs.t/run.t b/tests/test-dirs/locate/non-local/ignore-kept-locs.t/run.t
index 218681b389..9c8b42ac1d 100644
--- a/tests/test-dirs/locate/non-local/ignore-kept-locs.t/run.t
+++ b/tests/test-dirs/locate/non-local/ignore-kept-locs.t/run.t
@@ -20,7 +20,7 @@ available:
   }
 
   $ grep -A1 from_uid log | grep -v from_uid | sed '/^--$/d'
-  Loading the shapes for unit "A"
+  Loading the cmt file for unit "A"
   Shapes successfully loaded, looking for A.0
   Found location: File "a.ml", line 1, characters 4-9
 
@@ -41,7 +41,7 @@ available:
   }
 
   $ grep -A1 from_uid log | grep -v from_uid | sed '/^--$/d'
-  Loading the shapes for unit "A"
+  Loading the cmt file for unit "A"
   Shapes successfully loaded, looking for A.0
   Found location: File "a.ml", line 1, characters 4-9
 
@@ -66,6 +66,10 @@ In the absence of cmt though, fallbacking to the cmi loc makes sense:
   }
 
   $ grep -A1 from_uid log | grep -v from_uid
-  No UID found, fallbacking to lookup location.
+  No definition uid, fallbacking to the declaration uid: A.0
+  Loading the cmt file for unit "A"
+  --
+  Failed to load the shapes
+  Uid not found in the cmt table. Fallbacking to the node's location: File "a.ml", line 1, characters 4-9
 
   $ rm log
diff --git a/tests/test-dirs/locate/sig-substs.t/run.t b/tests/test-dirs/locate/sig-substs.t/run.t
index 086533403f..882968144e 100644
--- a/tests/test-dirs/locate/sig-substs.t/run.t
+++ b/tests/test-dirs/locate/sig-substs.t/run.t
@@ -15,7 +15,6 @@ when both are present in the buffer (the struct will always be preferred).
     "notifications": []
   }
 
-TODO SHAPES: it could be more precise by answering 8:21
   $ $MERLIN single locate -look-for ml -position 10:13 -filename ./basic.ml < ./basic.ml
   {
     "class": "return",
@@ -23,7 +22,7 @@ TODO SHAPES: it could be more precise by answering 8:21
       "file": "$TESTCASE_ROOT/basic.ml",
       "pos": {
         "line": 8,
-        "col": 9
+        "col": 25
       }
     },
     "notifications": []
diff --git a/tests/test-dirs/locate/without-implem.t b/tests/test-dirs/locate/without-implem.t
index 44f5b0b153..3028f0f892 100644
--- a/tests/test-dirs/locate/without-implem.t
+++ b/tests/test-dirs/locate/without-implem.t
@@ -18,6 +18,7 @@
 
   $ dune build ./main.exe 2> /dev/null
 
+Definition of t
   $ $MERLIN single locate -look-for ml -position 1:16 \
   > -filename main.ml <main.ml
   {
@@ -26,12 +27,13 @@
       "file": "$TESTCASE_ROOT/noimpl.mli",
       "pos": {
         "line": 1,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
   }
 
+Declaration of t
   $ $MERLIN single locate -look-for mli -position 1:16 \
   > -filename main.ml <main.ml
   {
@@ -46,6 +48,7 @@
     "notifications": []
   }
 
+Definition of module Noimpl
   $ $MERLIN single locate -look-for ml -position 1:13 \
   > -filename main.ml <main.ml
   {
@@ -60,6 +63,7 @@
     "notifications": []
   }
 
+Declaration of module Noimpl
   $ $MERLIN single locate -look-for mli -position 1:13 \
   > -filename main.ml <main.ml
   {
diff --git a/tests/test-dirs/occurrences/issue827.t/run.t b/tests/test-dirs/occurrences/issue827.t/run.t
index f521cec891..43d1bab64f 100644
--- a/tests/test-dirs/occurrences/issue827.t/run.t
+++ b/tests/test-dirs/occurrences/issue827.t/run.t
@@ -35,7 +35,7 @@ Reproduction case:
       {
         "start": {
           "line": 2,
-          "col": 18
+          "col": 16
         },
         "end": {
           "line": 2,