diff --git a/tests/test-dirs/config/dot-merlin-reader/quoting.t b/tests/test-dirs/config/dot-merlin-reader/quoting.t
index a9363083d5..b7ac9857e8 100644
--- a/tests/test-dirs/config/dot-merlin-reader/quoting.t
+++ b/tests/test-dirs/config/dot-merlin-reader/quoting.t
@@ -51,6 +51,7 @@
       }
     ],
     "stdlib": null,
+    "index_file": null,
     "reader": [],
     "protocol": "json",
     "log_file": null,
diff --git a/tests/test-dirs/locate/in-implicit-trans-dep.t/run.t b/tests/test-dirs/locate/in-implicit-trans-dep.t/run.t
index d844c52eb1..7427839f88 100644
--- a/tests/test-dirs/locate/in-implicit-trans-dep.t/run.t
+++ b/tests/test-dirs/locate/in-implicit-trans-dep.t/run.t
@@ -1,12 +1,18 @@
   $ dune build @check
 
-FIXME: When the deifinition is in one of the implicit transitive dependencies
-Merlin does not found the file in the source path provided by Dune. One possible
-fix would be for Dune to provide additional source path for "externatl" deps.
+When the definition is in one of the implicit transitive dependencies
+Merlin does not find the file in the source path provided by Dune. One possible
+fix would be for Dune to provide additional source path for "external" deps.
   $ $MERLIN single locate -look-for ml -position 1:15 \
   > -filename bin/main.ml <bin/main.ml
   {
     "class": "return",
-    "value": "'Lib1.t' seems to originate from 'Lib2' whose ML file could not be found",
+    "value": {
+      "file": "$TESTCASE_ROOT/src/lib2/lib2.ml",
+      "pos": {
+        "line": 1,
+        "col": 5
+      }
+    },
     "notifications": []
   }
diff --git a/tests/test-dirs/locate/locate-constrs-decl-def.t b/tests/test-dirs/locate/locate-constrs-decl-def.t
index d39a3790e5..8ec3fbaaa1 100644
--- a/tests/test-dirs/locate/locate-constrs-decl-def.t
+++ b/tests/test-dirs/locate/locate-constrs-decl-def.t
@@ -4,16 +4,18 @@
 
   $ cat >constr.mli <<EOF
   > type t = A of int |  B
+  > type u = { label_a : int }
   > EOF
 
   $ cat >constr.ml <<EOF
-  > type u = C of int
+  > type u = { label_a : int }
   > type t = A of int |  B
   > let foo : t = A 42
   > EOF
 
   $ cat >main.ml <<EOF
   > let foo : Constr.t = Constr.A 42
+  > let bar : Constr.u = { Constr.label_a = 42 }
   > EOF
 
   $ $OCAMLC -c -bin-annot -store-usage-index constr.mli constr.ml
@@ -38,6 +40,26 @@
     }
   }
 
+  $ $MERLIN single locate -look-for mli -position 2:30 \
+  > -filename ./main.ml < ./main.ml | jq '.value'
+  {
+    "file": "$TESTCASE_ROOT/constr.mli",
+    "pos": {
+      "line": 2,
+      "col": 11
+    }
+  }
+
+  $ $MERLIN single locate -look-for ml -position 2:30 \
+  > -filename ./main.ml < ./main.ml | jq '.value'
+  {
+    "file": "$TESTCASE_ROOT/constr.ml",
+    "pos": {
+      "line": 1,
+      "col": 11
+    }
+  }
+
   $ cat >main.ml <<EOF
   > module Constr : sig
   >   type t = A of int |  B
diff --git a/tests/test-dirs/occurrences/constrs-decl-def.t b/tests/test-dirs/occurrences/constrs-decl-def.t
new file mode 100644
index 0000000000..06a0343b53
--- /dev/null
+++ b/tests/test-dirs/occurrences/constrs-decl-def.t
@@ -0,0 +1,189 @@
+  $ cat >main.ml <<'EOF'
+  > module M : sig
+  >   type t = A of { label_a : int }
+  > end = struct
+  >   type t = A of { label_a : int }
+  >   let _ = A { label_a = 1 }
+  > end
+  > 
+  > let _ = M.A { label_a = 1 }
+  > 
+  > open M
+  > 
+  > let _ = A { label_a = 1 }
+  > EOF
+
+Constructor declaration:
+  $ $MERLIN single locate -look-for mli -position 12:8 \
+  > -filename main.ml <main.ml | jq '.value.pos'
+  {
+    "line": 2,
+    "col": 11
+  }
+
+Constructor definition:
+  $ $MERLIN single locate -look-for ml -position 12:8 \
+  > -filename main.ml <main.ml | jq '.value.pos'
+  {
+    "line": 4,
+    "col": 11
+  }
+
+Label declaration:
+  $ $MERLIN single locate -look-for mli -position 12:13 \
+  > -filename main.ml <main.ml | jq '.value.pos'
+  {
+    "line": 2,
+    "col": 18
+  }
+
+Label definition:
+  $ $MERLIN single locate -look-for ml -position 12:13 \
+  > -filename main.ml <main.ml | jq '.value.pos'
+  {
+    "line": 4,
+    "col": 18
+  }
+
+Constructor occurrences:
+  $ $MERLIN single occurrences -identifier-at 12:8 \
+  > -filename main.ml <main.ml | grep line | uniq
+          "line": 4,
+          "line": 5,
+          "line": 8,
+          "line": 12,
+
+Label occurrences:
+  $ $MERLIN single occurrences -identifier-at 12:13 \
+  > -filename main.ml <main.ml | jq '.value'
+  [
+    {
+      "start": {
+        "line": 4,
+        "col": 18
+      },
+      "end": {
+        "line": 4,
+        "col": 25
+      }
+    },
+    {
+      "start": {
+        "line": 5,
+        "col": 14
+      },
+      "end": {
+        "line": 5,
+        "col": 21
+      }
+    },
+    {
+      "start": {
+        "line": 8,
+        "col": 14
+      },
+      "end": {
+        "line": 8,
+        "col": 21
+      }
+    },
+    {
+      "start": {
+        "line": 12,
+        "col": 12
+      },
+      "end": {
+        "line": 12,
+        "col": 19
+      }
+    }
+  ]
+
+  $ cat >main.ml <<'EOF'
+  > type t = { a : int; b : float }
+  > let _ = { a = 4; b = 2.0 }
+  > let a = 4
+  > let r = { a; b = 2.0 }
+  > let _ = { r with b = 2.0 }
+  > let { a; b } = r
+  > EOF
+
+  $ $MERLIN single occurrences -identifier-at 6:15 \
+  > -filename main.ml <main.ml | jq '.value'
+  [
+    {
+      "start": {
+        "line": 4,
+        "col": 4
+      },
+      "end": {
+        "line": 4,
+        "col": 5
+      }
+    },
+    {
+      "start": {
+        "line": 5,
+        "col": 10
+      },
+      "end": {
+        "line": 5,
+        "col": 11
+      }
+    },
+    {
+      "start": {
+        "line": 6,
+        "col": 15
+      },
+      "end": {
+        "line": 6,
+        "col": 16
+      }
+    }
+  ]
+
+  $ $MERLIN single occurrences -identifier-at 2:10 \
+  > -filename main.ml <main.ml | jq '.value'
+  [
+    {
+      "start": {
+        "line": 1,
+        "col": 11
+      },
+      "end": {
+        "line": 1,
+        "col": 12
+      }
+    },
+    {
+      "start": {
+        "line": 2,
+        "col": 10
+      },
+      "end": {
+        "line": 2,
+        "col": 11
+      }
+    },
+    {
+      "start": {
+        "line": 4,
+        "col": 10
+      },
+      "end": {
+        "line": 4,
+        "col": 11
+      }
+    },
+    {
+      "start": {
+        "line": 6,
+        "col": 6
+      },
+      "end": {
+        "line": 6,
+        "col": 7
+      }
+    }
+  ]
diff --git a/tests/test-dirs/occurrences/issue1398.t/run.t b/tests/test-dirs/occurrences/issue1398.t/run.t
index 5bb9740d7d..93541666b7 100644
--- a/tests/test-dirs/occurrences/issue1398.t/run.t
+++ b/tests/test-dirs/occurrences/issue1398.t/run.t
@@ -17,7 +17,7 @@ Test finding occurrences of let-based binding operator, from reified syntax:
       {
         "start": {
           "line": 3,
-          "col": 10
+          "col": 12
         },
         "end": {
           "line": 3,
@@ -57,7 +57,7 @@ Test finding occurrences of and-based binding operator, from reified syntax:
       {
         "start": {
           "line": 3,
-          "col": 19
+          "col": 21
         },
         "end": {
           "line": 3,
diff --git a/tests/test-dirs/occurrences/project-wide/simple.t b/tests/test-dirs/occurrences/project-wide/simple.t
index 6d2c47d163..c212c89d84 100644
--- a/tests/test-dirs/occurrences/project-wide/simple.t
+++ b/tests/test-dirs/occurrences/project-wide/simple.t
@@ -30,10 +30,6 @@
   > EOF
 
   $ dune build @all
-  ld: warning: -undefined suppress is deprecated
-  ld: warning: -undefined suppress is deprecated
-  ld: warning: -undefined suppress is deprecated
-  ld: warning: -undefined suppress is deprecated
 
   $ ocaml-index dump _build/default/project.ocaml-index
   3 uids: