* Package:    dev-ml/merlin-4.1-r2
 * Repository: gentoo
 * Maintainer: ml@gentoo.org
 * USE:        abi_x86_64 amd64 elibc_glibc kernel_linux ocamlopt userland_GNU
 * FEATURES:   network-sandbox preserve-libs sandbox test userpriv usersandbox


@@@@@ PLEASE PAY ATTENTION HERE!!! @@@@@
This information may help you to understand if this is a duplicate or if this bug exists after you pushed a fix;
This ebuild was merged at the following commit:
https://github.com/gentoo/gentoo/commit/4538454589d0f37545ec378638d54b07f1c3c59b  (Wed Sep 29 00:56:35 UTC 2021)
@@@@@ END @@@@@



@@@@@ PLEASE PAY ATTENTION HERE!!! @@@@@
This ebuild was merged (directly or as a dependency) because of the following commit:
https://github.com/gentoo/gentoo/commit/3e83e357130d22d0d6f0001edecc791f7a0d86c6
@@@@@ END @@@@@



##################
# emerge --info: #
##################
Portage 3.0.23 (python 3.9.7-final-0, default/linux/amd64/17.1, gcc-11.2.0, glibc-2.33-r7, 4.19.174-gentoo x86_64)
=================================================================
System uname: Linux-4.19.174-gentoo-x86_64-Intel-R-_Xeon-R-_CPU_E5-2650_v4_@_2.20GHz-with-glibc2.33
KiB Mem:   264046488 total, 132571152 free
KiB Swap:          0 total,         0 free
sh bash 5.1_p8
ld GNU ld (Gentoo 2.37_p1 p0) 2.37
app-shells/bash:          5.1_p8::gentoo
dev-lang/perl:            5.34.0-r2::gentoo
dev-lang/python:          2.7.18_p13::gentoo, 3.8.12::gentoo, 3.9.7::gentoo, 3.10.0_rc2::gentoo
dev-lang/rust:            1.55.0::gentoo
dev-util/cmake:           3.21.3::gentoo
sys-apps/baselayout:      2.8::gentoo
sys-apps/openrc:          0.44.5::gentoo
sys-apps/sandbox:         2.25::gentoo
sys-devel/autoconf:       2.13-r1::gentoo, 2.71-r1::gentoo
sys-devel/automake:       1.16.4::gentoo
sys-devel/binutils:       2.37_p1::gentoo
sys-devel/gcc:            11.2.0::gentoo
sys-devel/gcc-config:     2.4::gentoo
sys-devel/libtool:        2.4.6-r6::gentoo
sys-devel/make:           4.3::gentoo
sys-kernel/linux-headers: 5.14::gentoo (virtual/os-headers)
sys-libs/glibc:           2.33-r7::gentoo
Repositories:

gentoo
    location: /usr/portage
    sync-type: rsync
    sync-uri: rsync://rsync.gentoo.org/gentoo-portage
    priority: -1000
    sync-rsync-verify-max-age: 24
    sync-rsync-extra-opts: 
    sync-rsync-verify-jobs: 1
    sync-rsync-verify-metamanifest: yes

ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="* MIT"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe -march=x86-64 -frecord-gcc-switches"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-O2 -pipe -march=x86-64 -frecord-gcc-switches"
DISTDIR="/var/tmp/portage/dev-ml/merlin-4.1-r2/distdir"
EMERGE_DEFAULT_OPTS="--with-bdeps=y -1 -k -b"
ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR"
FCFLAGS="-O2 -pipe -march=x86-64 -frecord-gcc-switches"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms sign split-log strict test unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O2 -pipe -march=x86-64 -frecord-gcc-switches"
GENTOO_MIRRORS="http://distfiles.gentoo.org"
LANG="en_US.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0"
MAKEOPTS="-j24"
PKGDIR="/root/.packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
USE="acl amd64 bzip2 cli crypt dri elogind fortran gdbm iconv ipv6 jumbo-build libglvnd libtirpc multilib native-symlinks ncurses nls nptl ocamlopt openmp pam pcre readline seccomp split-usr ssl tcpd test unicode xattr zlib" ABI_X86="64" ELIBC="glibc" KERNEL="linux" USERLAND="GNU"
Unset:  CC, CPPFLAGS, CTARGET, CXX, INSTALL_MASK, LC_ALL, LINGUAS, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RUSTFLAGS





##############################
# emerge history (qlop -mv): #
##############################
2021-09-29T08:19:49 >>> dev-lang/ocaml-4.11.2-r2
2021-09-29T08:20:29 >>> dev-ml/findlib-1.9.1
2021-09-29T08:20:30 >>> dev-ml/ocamlbuild-0.14.0-r1
2021-09-29T08:20:43 >>> dev-ml/dune-2.9.0
2021-09-29T08:20:44 >>> dev-ml/easy-format-1.2.0
2021-09-29T08:21:00 >>> dev-ml/menhir-20210419-r1
2021-09-29T08:21:05 >>> dev-ml/biniou-1.2.1
2021-09-29T08:21:02 >>> dev-ml/cppo-1.6.7
2021-09-29T08:21:02 >>> dev-ml/result-1.5
2021-09-29T08:21:39 >>> dev-ml/yojson-1.7.0
2021-09-29T08:21:53 >>> dev-ml/csexp-1.5.1
2021-09-29T08:22:23 >>> dev-ml/merlin-4.1-r2




#######################################
# installed packages (qlist -ICvUSS): #
#######################################
acct-group/audio-0-r1:0
acct-group/cdrom-0-r1:0
acct-group/dialout-0-r1:0
acct-group/disk-0-r1:0
acct-group/input-0-r1:0
acct-group/kmem-0-r1:0
acct-group/kvm-0-r1:0
acct-group/lp-0-r1:0
acct-group/man-0-r1:0
acct-group/messagebus-0-r1:0
acct-group/polkitd-0-r1:0
acct-group/portage-0:0
acct-group/render-0-r1:0
acct-group/sshd-0-r1:0
acct-group/tape-0-r1:0
acct-group/tty-0-r1:0
acct-group/video-0-r1:0
acct-user/man-1-r1:0
acct-user/messagebus-0-r1:0
acct-user/polkitd-0-r1:0
acct-user/portage-0:0
acct-user/sshd-0-r1:0
app-admin/eselect-1.4.17:0 -doc -emacs -vim-syntax
app-admin/perl-cleaner-2.30:0
app-arch/bzip2-1.0.8-r1:0/1 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 split-usr -static -static-libs
app-arch/gzip-1.11:0 -pic -static
app-arch/libarchive-3.5.2:0/13 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 acl -blake2 bzip2 e2fsprogs -expat iconv -lz4 lzma -lzo -nettle -static-libs xattr zlib -zstd
app-arch/tar-1.34:0 acl -minimal nls -selinux xattr
app-arch/unzip-6.0_p26:0 bzip2 -natspec unicode
app-arch/xz-utils-5.2.5-r1:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 extra-filters nls split-usr -static-libs
app-arch/zstd-1.5.0:0/1 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -lz4 -static-libs threads
app-crypt/gnupg-2.2.31:0 bzip2 -doc -ldap nls readline -selinux smartcard ssl -tofu -tools -usb -user-socket -wks-server
app-crypt/gpgme-1.16.0:1/11 -common-lisp cxx -python -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -qt5 -static-libs
app-crypt/libb2-0.98.1-r3:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -native-cflags openmp -static-libs
app-crypt/libmd-1.0.3-r2:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32
app-crypt/openpgp-keys-gentoo-release-20200704:0 -test
app-crypt/pinentry-1.2.0:0 -caps -efl -emacs -gnome-keyring -gtk ncurses -qt5
app-crypt/rhash-1.4.2:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -debug nls ssl -static-libs
app-editors/nano-5.8-r2:0 -debug -justify -magic -minimal ncurses nls spell split-usr -static unicode
app-eselect/eselect-fontconfig-1.1-r1:0
app-eselect/eselect-iptables-20200508:0
app-eselect/eselect-lib-bin-symlink-0.1.1-r1:0
app-eselect/eselect-pinentry-0.7.2:0
app-eselect/eselect-rust-20210703:0
app-i18n/man-pages-ja-20180315-r1:0
app-i18n/man-pages-l10n-4.10.0:0 l10n_de l10n_es l10n_fr l10n_it l10n_nl l10n_pl l10n_pt-BR l10n_ro
app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1:0
app-i18n/man-pages-zh_CN-1.6.3.2:0
app-misc/c_rehash-1.7-r1:0
app-misc/ca-certificates-20210119.3.70:0 -cacert
app-misc/editor-wrapper-4-r1:0
app-misc/mime-types-9:0
app-misc/pax-utils-1.3.3:0 -caps -debug -python -python_single_target_python3_10 -python_single_target_python3_8 python_single_target_python3_9 seccomp
app-misc/tmux-3.2a:0 -debug -selinux -utempter -vim-syntax
app-portage/eix-0.35.2:0 -debug -doc nls -sqlite
app-portage/elt-patches-20210924:0
app-portage/gemato-16.2:0 gpg python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test -tools
app-portage/gentoolkit-0.5.1-r1:0 python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test
app-portage/portage-utils-0.92:0 nls openmp qmanifest qtegrity -static
app-shells/bash-5.1_p8:0 -afs -bashlogger -examples -mem-scramble net nls -plugins readline
app-shells/push-3.4:0
app-shells/quoter-4.2:0
app-text/ansifilter-2.18:0 -qt5
app-text/build-docbook-catalog-1.21:0
app-text/docbook-xml-dtd-4.5-r2:4.5
app-text/docbook-xml-dtd-4.4-r3:4.4
app-text/docbook-xml-dtd-4.2-r3:4.2
app-text/docbook-xml-dtd-4.1.2-r7:4.1.2
app-text/docbook-xsl-stylesheets-1.79.1-r2:0 -ruby
app-text/manpager-1:0
app-text/opensp-1.5.2-r6:0 -doc nls -static-libs -test
app-text/po4a-0.64:0 -test
app-text/sgml-common-0.6.3-r7:0
app-text/xmlto-0.0.28-r6:0 -latex -text
dev-db/sqlite-3.35.5:3 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -debug -doc -icu readline -secure-delete -static-libs -tcl -test -tools
dev-lang/ocaml-4.11.2-r2:0/4.11 -emacs -flambda -latex ocamlopt -spacetime -xemacs
dev-lang/perl-5.34.0-r2:0/5.34 -berkdb -debug -doc gdbm -ithreads -minimal
dev-lang/python-3.10.0_rc2:3.10 -bluetooth -build -examples gdbm -hardened ncurses readline sqlite ssl -test -tk -verify-sig -wininst xml
dev-lang/python-3.9.7:3.9 -bluetooth -build -examples gdbm -hardened ncurses readline sqlite ssl -test -tk -verify-sig -wininst xml
dev-lang/python-3.8.12:3.8 -bluetooth -build -examples gdbm -hardened ncurses readline sqlite ssl -test -tk -verify-sig -wininst xml
dev-lang/python-2.7.18_p13:2.7 -berkdb -bluetooth -build -examples gdbm -hardened ncurses readline sqlite ssl -tk -verify-sig -wininst xml
dev-lang/python-exec-2.4.8:2 native-symlinks python_targets_pypy3 python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test
dev-lang/python-exec-conf-2.4.6:2 python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9
dev-lang/rust-1.55.0:stable/1.55 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -clippy cpu_flags_x86_sse2 -debug -doc -llvm_targets_AArch64 -llvm_targets_AMDGPU -llvm_targets_ARM -llvm_targets_AVR -llvm_targets_BPF -llvm_targets_Hexagon -llvm_targets_Lanai -llvm_targets_Mips -llvm_targets_MSP430 -llvm_targets_NVPTX -llvm_targets_PowerPC -llvm_targets_RISCV -llvm_targets_Sparc -llvm_targets_SystemZ -llvm_targets_WebAssembly llvm_targets_X86 -llvm_targets_XCore -miri -nightly -parallel-compiler -rls rustfmt -system-bootstrap -system-llvm -test -verify-sig -wasm
dev-lang/spidermonkey-78.14.0:78 -clang -cpu_flags_arm_neon -debug jit -lto -test
dev-lang/tcl-8.6.11:0/8.6 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -debug threads
dev-libs/elfutils-0.185:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 bzip2 -lzma nls -static-libs -test -threads utils -valgrind -zstd
dev-libs/expat-2.4.1:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -examples split-usr -static-libs unicode
dev-libs/glib-2.70.0:2 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -dbus -debug elf -fam -gtk-doc mime -selinux -static-libs -sysprof -systemtap -test -utils xattr
dev-libs/gmp-6.2.1-r1:0/10.4 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 asm cxx -doc -pic -static-libs
dev-libs/gobject-introspection-1.70.0:0 -doctool -gtk-doc -python_single_target_python3_10 -python_single_target_python3_8 python_single_target_python3_9 -test
dev-libs/gobject-introspection-common-1.70.0:0
dev-libs/icu-69.1-r1:0/69.1 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -debug -doc -examples -static-libs
dev-libs/isl-0.24:0/23 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -static-libs
dev-libs/jsoncpp-1.9.4:0/24 -doc -test
dev-libs/libassuan-2.5.5:0
dev-libs/libbsd-0.11.3:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -static-libs
dev-libs/libevent-2.1.12:0/2.1-7 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 clock-gettime -debug -malloc-replacement ssl -static-libs -test threads -verbose-debug
dev-libs/libffi-3.4.2-r1:0/8 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -debug -exec-static-trampoline -pax-kernel -static-libs -test
dev-libs/libgcrypt-1.9.4:0/20 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 asm -cpu_flags_arm_neon cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 -cpu_flags_x86_padlock -cpu_flags_x86_sha cpu_flags_x86_sse4_1 -doc -o-flag-munging -static-libs
dev-libs/libgpg-error-1.42:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -common-lisp nls -static-libs
dev-libs/libksba-1.6.0:0 -static-libs
dev-libs/libltdl-2.4.6:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -static-libs
dev-libs/libpcre-8.45:3 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 bzip2 cxx jit -libedit pcre16 pcre32 readline recursion-limit split-usr -static-libs unicode zlib
dev-libs/libpcre2-10.37-r2:0/3 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 bzip2 jit -libedit pcre16 pcre32 readline recursion-limit split-usr -static-libs unicode zlib
dev-libs/libpipeline-1.5.3:0 -static-libs -test
dev-libs/libtasn1-4.17.0:0/6 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -doc -static-libs -test -valgrind
dev-libs/libunistring-0.9.10-r1:0/2 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -doc -static-libs
dev-libs/libuv-1.42.0:0/1 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32
dev-libs/libxml2-2.9.12-r5:2 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -debug -examples -icu ipv6 -lzma python -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 readline -static-libs -test -verify-sig
dev-libs/libxslt-1.1.34-r1:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 crypt -debug -examples -static-libs -verify-sig
dev-libs/lzo-2.10:2 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -examples split-usr -static-libs
dev-libs/mpc-1.2.1:0/3 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -static-libs
dev-libs/mpfr-4.1.0:0/6 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -static-libs
dev-libs/nettle-3.7.3:0/8-6 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 asm -cpu_flags_arm_neon cpu_flags_x86_aes -cpu_flags_x86_sha -doc gmp -static-libs -test
dev-libs/npth-1.6-r1:0
dev-libs/nspr-4.32:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -debug
dev-libs/openssl-1.1.1l:0/1.1 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 asm -bindist cpu_flags_x86_sse2 -rfc3779 -sctp -sslv3 -static-libs -test -tls-compression -tls-heartbeat -vanilla
dev-libs/popt-1.18:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 nls -static-libs
dev-ml/biniou-1.2.1:0/1.2.1 ocamlopt
dev-ml/cppo-1.6.7:0/1.6.7 ocamlopt
dev-ml/csexp-1.5.1:0/1.5.1 ocamlopt -test
dev-ml/dune-2.9.0:0/2.9.0 -test
dev-ml/easy-format-1.2.0:0/1.2.0 -examples ocamlopt -ocamlopt
dev-ml/findlib-1.9.1:0 -doc ocamlopt -tk
dev-ml/menhir-20210419-r1:0/20210419 ocamlopt
dev-ml/merlin-4.1-r2:0/4.1 -emacs ocamlopt
dev-ml/ocamlbuild-0.14.0-r1:0/0.14.0 ocamlopt -test
dev-ml/result-1.5:0/1.5 ocamlopt
dev-ml/yojson-1.7.0:0/1.7.0 -examples ocamlopt -test
dev-perl/Encode-EUCJPASCII-0.30.0-r1:0 -test
dev-perl/Encode-HanExtra-0.230.0-r3:0
dev-perl/Encode-Locale-1.50.0:0 -test
dev-perl/File-Listing-6.140.0:0 -test
dev-perl/HTML-Parser-3.760.0:0 -test
dev-perl/HTML-Tagset-3.200.0-r2:0
dev-perl/HTTP-Cookies-6.100.0:0 -test
dev-perl/HTTP-Date-6.50.0:0
dev-perl/HTTP-Message-6.320.0:0 -test -test
dev-perl/HTTP-Negotiate-6.10.0-r1:0
dev-perl/IO-HTML-1.4.0:0 -test
dev-perl/IO-Socket-INET6-2.720.0-r1:0
dev-perl/IO-Socket-SSL-2.71.0:0 -examples -idn -test
dev-perl/libwww-perl-6.550.0:0 ssl -test
dev-perl/Locale-gettext-1.70.0:0
dev-perl/LWP-MediaTypes-6.40.0:0 -test
dev-perl/LWP-Protocol-https-6.100.0:0 -test
dev-perl/MIME-Charset-1.12.2:0 l10n_ja l10n_zh
dev-perl/Module-Build-0.423.100:0 -test
dev-perl/Mozilla-CA-20999999:0
dev-perl/Net-HTTP-6.210.0:0 -minimal -test
dev-perl/Net-SSLeay-1.900.0:0 -examples -examples -minimal -test
dev-perl/Pod-Parser-1.630.0-r1:0 -test
dev-perl/SGMLSpm-1.1-r2:0 -test
dev-perl/Socket6-0.290.0:0 -test
dev-perl/TermReadKey-2.380.0:0 -examples -test
dev-perl/Text-CharWidth-0.40.0-r2:0 -test
dev-perl/Text-WrapI18N-0.60.0-r2:0 -test
dev-perl/TimeDate-2.330.0:0
dev-perl/Try-Tiny-0.300.0:0 -minimal -test
dev-perl/Unicode-LineBreak-2019.1.0:0
dev-perl/URI-1.730.0:0 -test
dev-perl/WWW-RobotRules-6.20.0-r1:0
dev-perl/XML-Parser-2.460.0:0
dev-perl/YAML-Tiny-1.730.0:0 -minimal -test
dev-python/certifi-10001-r1:0 python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test
dev-python/charset_normalizer-2.0.6:0 python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test
dev-python/idna-3.2:0 python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9
dev-python/jinja-3.0.1:0 -doc -examples python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test
dev-python/markupsafe-2.0.1:0 python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test
dev-python/packaging-21.0:0 python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test
dev-python/pyparsing-2.4.7-r1:0 -examples python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9
dev-python/pypy3-7.3.5_p1:0/pypy37-pp73 bzip2 gdbm jit ncurses -sqlite -test -tk
dev-python/pypy3-exe-7.3.5:7.3.5 bzip2 -cpu_flags_x86_sse2 jit -low-memory ncurses
dev-python/PySocks-1.7.1-r1:0 python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9
dev-python/requests-2.26.0:0 python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -socks5 -test
dev-python/setuptools-57.5.0:0 python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test
dev-python/setuptools_scm-6.3.2:0 python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test
dev-python/tomli-1.2.1:0 python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test
dev-python/urllib3-1.26.7:0 -brotli python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test
dev-util/cmake-3.21.3:0 -doc -emacs ncurses -qt5 -test -test
dev-util/desktop-file-utils-0.26-r1:0 -emacs
dev-util/glib-utils-2.70.0:0 -python_single_target_python3_10 -python_single_target_python3_8 python_single_target_python3_9
dev-util/gperf-3.1:0
dev-util/gtk-doc-am-1.33.2:0
dev-util/intltool-0.51.0-r2:0
dev-util/itstool-2.0.6-r1:0 -python_single_target_python3_8 python_single_target_python3_9
dev-util/meson-0.59.1-r1:0 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -test
dev-util/meson-format-array-0:0 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9
dev-util/ninja-1.10.2-r1:0 -doc -emacs -test -vim-syntax
dev-util/pkgconf-1.8.0-r1:0/3 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -test
dev-util/re2c-2.2:0 -debug -test
dev-vcs/git-2.33.0-r1:0 blksha1 -cgi curl -cvs -doc -emacs -gnome-keyring gpg -highlight iconv -mediawiki -mediawiki-experimental nls pcre -perforce -perl -ppcsha1 -python_single_target_python3_10 -python_single_target_python3_8 python_single_target_python3_9 -subversion -test threads -tk webdav -xinetd
media-fonts/liberation-fonts-2.1.3:0 -fontforge -X -X
media-gfx/graphite2-1.3.14:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -perl -test
media-libs/fontconfig-2.13.1-r2:1.0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -doc -static-libs
media-libs/freetype-2.11.0-r1:2 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 adobe-cff -brotli bzip2 cleartype-hinting -debug -doc -fontforge harfbuzz -infinality png -static-libs -utils -X
media-libs/harfbuzz-2.9.1:0/0.9.18 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 cairo -debug -doc -experimental glib graphite -icu introspection -test truetype
media-libs/libpng-1.6.37-r2:0/16 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -apng -cpu_flags_arm_neon cpu_flags_x86_sse -static-libs
net-dns/libidn2-2.3.2:0/2 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -static-libs -verify-sig
net-firewall/iptables-1.8.7:0/1.8.3 -conntrack ipv6 -netlink -nftables -pcap split-usr -static-libs
net-libs/gnutls-3.7.2:0/30 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 cxx -dane -doc -examples -guile idn nls openssl -pkcs11 seccomp -sslv2 -sslv3 -static-libs -test -test-full tls-heartbeat -tools -valgrind
net-libs/libmnl-1.0.4:0/0.2.0 -examples split-usr -static-libs
net-libs/libnsl-2.0.0-r1:0/3 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -static-libs
net-libs/libtirpc-1.3.2:0/3 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 ipv6 -kerberos split-usr -static-libs
net-libs/nghttp2-1.45.1-r1:0/1.14 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -cxx -debug -hpack-tools -jemalloc -static-libs -test threads -utils -xml
net-misc/curl-7.79.1:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -adns -alt-svc -brotli -curl_ssl_gnutls -curl_ssl_mbedtls -curl_ssl_nss curl_ssl_openssl -curl_ssl_winssl ftp -gnutls -gopher -hsts http2 -idn imap ipv6 -kerberos -ldap -mbedtls -nghttp3 -nss openssl pop3 progress-meter -quiche -rtmp -samba smtp -ssh ssl -sslv3 -static-libs -telnet -test tftp -threads -winssl -zstd
net-misc/iputils-20210722:0 arping -caps -clockdiff -doc filecaps -gcrypt -idn ipv6 -nettle nls -rarpd -rdisc ssl -static -test -tftpd -tracepath -traceroute6
net-misc/netifrc-0.7.3:0
net-misc/openssh-8.7_p1-r2:0 -abi_mips_n32 -audit -bindist -debug -hpn -kerberos -ldns -libedit -livecd pam pie scp -sctp -security-key -selinux ssl -static -test -X -X509 -xmss
net-misc/rsync-3.2.3-r4:0 acl -examples iconv ipv6 -lz4 ssl -stunnel -system-zlib xattr -xxhash -zstd
net-misc/wget-1.21.2:0 -cookie_check -debug -gnutls -idn ipv6 -metalink nls -ntlm pcre ssl -static -test -uuid zlib
perl-core/Encode-3.120.0:0
perl-core/File-Temp-0.231.100:0
perl-core/Scalar-List-Utils-1.560.0:0
sys-apps/acl-2.3.1:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 nls split-usr -static-libs
sys-apps/attr-2.5.1:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -debug nls split-usr -static-libs
sys-apps/baselayout-2.8:0 -build split-usr
sys-apps/coreutils-9.0-r1:0 acl -caps -gmp -hostname -kill -multicall nls -selinux split-usr -static -test -vanilla xattr
sys-apps/dbus-1.12.20-r3:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -debug -doc elogind -selinux -static-libs -systemd -test -test -user-session -X
sys-apps/debianutils-5.4:0 installkernel -static
sys-apps/diffutils-3.8:0 nls -static
sys-apps/file-5.40-r3:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 bzip2 -lzma -python -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 -seccomp -static-libs zlib
sys-apps/findutils-4.8.0:0 nls -selinux -static -test
sys-apps/gawk-5.1.0:0 -mpfr nls readline
sys-apps/gentoo-functions-0.15:0
sys-apps/grep-3.7:0 nls pcre -static
sys-apps/groff-1.22.4:0 -examples -uchardet -X
sys-apps/help2man-1.48.5:0 nls
sys-apps/hwids-20210613-r1:0 net pci -systemd udev usb
sys-apps/install-xattr-0.8:0
sys-apps/iproute2-5.14.0:0 -atm -berkdb -bpf -caps -elf iptables ipv6 -libbsd -minimal -selinux
sys-apps/kbd-2.4.0:0 nls pam -test
sys-apps/kmod-29:0 -debug -doc lzma -pkcs7 -python python_targets_python3_8 python_targets_python3_9 -static-libs tools zlib -zstd
sys-apps/less-590:0 pcre unicode
sys-apps/man-db-2.9.4-r1:0 -berkdb gdbm manpager nls seccomp -selinux -static-libs zlib
sys-apps/man-pages-5.13:0 l10n_de l10n_es l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_zh-CN
sys-apps/man-pages-posix-2017a:0
sys-apps/net-tools-2.10:0 arp hostname ipv6 -nis nls -plipconfig -selinux -slattach -static
sys-apps/openrc-0.44.5:0 -audit -bash -debug ncurses netifrc -newnet pam -selinux -sysv-utils unicode
sys-apps/portage-3.0.23:0 -apidoc -build -doc -gentoo-dev ipc native-extensions python_targets_pypy3 -python_targets_python3_10 python_targets_python3_8 python_targets_python3_9 rsync-verify -selinux -test xattr
sys-apps/sandbox-2.25:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 abi_x86_32 abi_x86_64 -abi_x86_x32
sys-apps/sed-4.8:0 acl nls -selinux -static
sys-apps/shadow-4.9-r2:0 acl -audit -bcrypt -cracklib nls pam -selinux -skey split-usr su xattr
sys-apps/systemd-tmpfiles-249.2:0 -selinux -test
sys-apps/sysvinit-3.00:0 -ibm -selinux -static
sys-apps/texinfo-6.8:0 nls standalone -static
sys-apps/util-linux-2.37.2-r1:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -audit -build -caps cramfs -cryptsetup -fdformat hardlink -kill logger -magic ncurses nls pam -python python_targets_python3_8 python_targets_python3_9 readline -selinux -slang split-usr -static-libs -su suid -systemd -test -tty-helpers -udev unicode
sys-apps/which-2.21:0
sys-auth/elogind-246.10-r1:0 acl -audit -debug -doc pam policykit -selinux
sys-auth/pambase-20210201.1:0 -caps -debug elogind -gnome-keyring -homed -minimal -mktemp nullok -pam_krb5 -pam_ssh passwdqc -pwhistory -pwquality -securetty -selinux sha512 -systemd
sys-auth/passwdqc-2.0.2-r1:0
sys-auth/polkit-0.119-r2:0 elogind -examples -gtk introspection -kde nls pam -selinux -systemd -test
sys-devel/autoconf-2.71-r1:2.71 -emacs
sys-devel/autoconf-2.13-r1:2.1
sys-devel/autoconf-archive-2021.02.19-r1:0
sys-devel/autoconf-wrapper-15:0
sys-devel/automake-1.16.4:1.16 -test
sys-devel/automake-wrapper-11:0
sys-devel/binutils-2.37_p1:2.37 -cet -default-gold -doc gold -multitarget nls plugins -static-libs -test -vanilla
sys-devel/binutils-config-5.4:0 native-symlinks
sys-devel/bison-3.8.2:0 -examples nls -static -test
sys-devel/flex-2.6.4-r1:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 nls -static -test
sys-devel/gcc-11.2.0:11 -ada -custom-cflags cxx -d -debug -doc -fixed-point fortran -go graphite -hardened -jit -libssp lto multilib nls nptl -objc -objc++ -objc-gc openmp pch -pgo pie sanitize ssp -systemtap -test -valgrind -vanilla -vtv -zstd
sys-devel/gcc-config-2.4:0 cc-wrappers native-symlinks
sys-devel/gettext-0.21-r1:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 acl -cvs cxx -doc -emacs -git -java -java ncurses nls openmp -static-libs
sys-devel/gnuconfig-20210107:0
sys-devel/libtool-2.4.6-r6:2 -vanilla
sys-devel/llvm-12.0.1:12 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -debug -doc -doc -exegesis -gold -libedit libffi -llvm_targets_AArch64 llvm_targets_AMDGPU -llvm_targets_ARC -llvm_targets_ARM -llvm_targets_AVR llvm_targets_BPF -llvm_targets_CSKY -llvm_targets_Hexagon -llvm_targets_Lanai -llvm_targets_Mips -llvm_targets_MSP430 llvm_targets_NVPTX -llvm_targets_PowerPC -llvm_targets_RISCV -llvm_targets_Sparc -llvm_targets_SystemZ -llvm_targets_VE -llvm_targets_WebAssembly llvm_targets_X86 -llvm_targets_XCore ncurses -test -xar -xml -z3
sys-devel/llvm-common-12.0.1:0
sys-devel/m4-1.4.19:0 -examples nls
sys-devel/make-4.3:0 -guile nls -static
sys-devel/patch-2.7.6-r4:0 -static -test xattr
sys-fs/e2fsprogs-1.46.4:0 -cron -fuse -lto nls split-usr -static-libs threads
sys-fs/udev-249-r3:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 acl kmod -selinux split-usr -test
sys-fs/udev-init-scripts-35:0
sys-kernel/installkernel-gentoo-3:0
sys-kernel/linux-headers-5.14:0 -headers-only
sys-libs/binutils-libs-2.37_p1:0/2.37 -64-bit-bfd -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -cet -multitarget nls -static-libs
sys-libs/e2fsprogs-libs-1.46.4:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 split-usr -static-libs
sys-libs/gdbm-1.21:0/6 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 berkdb nls readline -static-libs
sys-libs/glibc-2.33-r7:2.2 -audit -caps -cet -compile-locales -crypt -custom-cflags -doc -gd -headers-only multiarch multilib -multilib-bootstrap -nscd -profile -selinux ssp static-libs -static-pie -suid -systemd -systemtap -test -vanilla
sys-libs/libcap-2.59:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 pam split-usr -static-libs -tools
sys-libs/libseccomp-2.5.2:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -python python_targets_python3_8 python_targets_python3_9 -static-libs
sys-libs/libxcrypt-4.4.26:0/1 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 compat split-usr -static-libs system -test
sys-libs/ncurses-6.2_p20210619:0/6 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -ada cxx -debug -doc -gpm -minimal -profile split-usr -static-libs -test tinfo -trace
sys-libs/pam-1.5.2:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -audit -berkdb -debug filecaps -nis -selinux split-usr
sys-libs/readline-8.1_p1-r1:0/8 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 split-usr -static-libs unicode -utils
sys-libs/timezone-data-2021a-r1:0 -leaps-timezone nls -zic-slim
sys-libs/zlib-1.2.11-r4:0/1 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 minizip split-usr -static-libs
sys-process/procps-3.3.17-r1:0/8 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 elogind kill -modern-top ncurses nls -selinux split-usr -static-libs -systemd -test unicode
sys-process/psmisc-23.4-r1:0 ipv6 nls -selinux -X
virtual/acl-0-r2:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -static-libs
virtual/awk-1:0
virtual/dev-manager-0-r2:0
virtual/editor-0-r3:0
virtual/libc-1-r1:0
virtual/libcrypt-2:0/2 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -static-libs
virtual/libelf-3:0/1 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32
virtual/libiconv-0-r2:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32
virtual/libintl-0-r2:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32
virtual/libudev-232-r5:0/1 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -systemd
virtual/man-0-r4:0
virtual/os-headers-0-r2:0
virtual/package-manager-1:0
virtual/pager-0:0
virtual/perl-Carp-1.520.0-r1:0
virtual/perl-Compress-Raw-Bzip2-2.101.0:0
virtual/perl-Compress-Raw-Zlib-2.101.0:0
virtual/perl-CPAN-Meta-2.150.10-r5:0
virtual/perl-CPAN-Meta-Requirements-2.140.0-r7:0
virtual/perl-CPAN-Meta-YAML-0.18.0-r7:0
virtual/perl-Data-Dumper-2.179.0:0
virtual/perl-Digest-MD5-2.580.0:0
virtual/perl-Encode-3.120.0:0
virtual/perl-Exporter-5.760.0:0
virtual/perl-ExtUtils-CBuilder-0.280.236:0
virtual/perl-ExtUtils-Install-2.200.0:0
virtual/perl-ExtUtils-MakeMaker-7.620.0:0
virtual/perl-ExtUtils-Manifest-1.730.0:0
virtual/perl-ExtUtils-ParseXS-3.430.0:0
virtual/perl-File-Spec-3.800.0:0
virtual/perl-File-Temp-0.231.100:0
virtual/perl-Getopt-Long-2.520.0:0
virtual/perl-IO-1.460.0:0
virtual/perl-IO-Compress-2.102.0:0
virtual/perl-IO-Socket-IP-0.410.0:0
virtual/perl-JSON-PP-4.60.0:0
virtual/perl-libnet-3.130.0:0 ssl
virtual/perl-MIME-Base64-3.160.0:0
virtual/perl-Module-Metadata-1.0.37-r1:0
virtual/perl-parent-0.238.0-r1:0
virtual/perl-Parse-CPAN-Meta-2.150.10-r5:0
virtual/perl-Perl-OSType-1.10.0-r5:0
virtual/perl-podlators-4.140.0-r2:0
virtual/perl-Scalar-List-Utils-1.560.0:0
virtual/perl-Test-Harness-3.430.0:0
virtual/perl-Text-ParseWords-3.300.0-r8:0
virtual/perl-Time-Local-1.300.0:0
virtual/perl-version-0.992.800:0
virtual/perl-XSLoader-0.300.0-r4:0
virtual/pkgconfig-2-r1:0
virtual/rust-1.55.0:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -rustfmt
virtual/service-manager-1:0
virtual/ssh-0:0 -minimal
virtual/tmpfiles-0-r1:0
virtual/ttf-fonts-1-r1:0
virtual/udev-217-r3:0
virtual/yacc-0:0
www-client/pybugz-0.13-r1:0 python_targets_python3_8 python_targets_python3_9
x11-base/xcb-proto-1.14.1:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 python_targets_python3_8 python_targets_python3_9
x11-base/xorg-proto-2021.5:0 -test
x11-libs/cairo-1.16.0-r4:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -aqua -debug -gles2-only glib -opengl -static-libs svg -utils -valgrind -X
x11-libs/libX11-1.7.2:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -doc ipv6 -test
x11-libs/libXau-1.0.9-r1:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -doc
x11-libs/libxcb-1.14:0/1.12 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -doc -doc -selinux -test xkb
x11-libs/libXdmcp-1.1.3:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -doc
x11-libs/libXext-1.3.4:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -doc
x11-libs/libXrender-0.9.10-r2:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32
x11-libs/pixman-0.40.0:0 -abi_mips_n32 -abi_mips_n64 -abi_mips_o32 -abi_s390_32 -abi_s390_64 -abi_x86_32 abi_x86_64 -abi_x86_x32 -cpu_flags_arm_iwmmxt -cpu_flags_arm_iwmmxt2 -cpu_flags_arm_neon -cpu_flags_ppc_altivec cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 -loongson2f -static-libs
x11-libs/xtrans-1.4.0:0 -doc
x11-misc/compose-tables-1.7.2:0
x11-misc/shared-mime-info-2.1:0


#######################
# build.log           #
#######################
>>> Unpacking source...
>>> Unpacking merlin-4.1.tar.gz to /var/tmp/portage/dev-ml/merlin-4.1-r2/work
>>> Source unpacked in /var/tmp/portage/dev-ml/merlin-4.1-r2/work
>>> Preparing source in /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1 ...
>>> Source prepared.
>>> Configuring source in /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1 ...
>>> Source configured.
>>> Compiling source in /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1 ...
File "src/ocaml/preprocess/parser_raw.mly", line 790, characters 29-36:
Warning: the token COMMENT is unused.
File "src/ocaml/preprocess/parser_raw.mly", line 791, characters 30-39:
Warning: the token DOCSTRING is unused.
File "src/ocaml/preprocess/parser_raw.mly", line 793, characters 7-10:
Warning: the token EOL is unused.
File "src/ocaml/preprocess/parser_raw.mly", line 703, characters 7-22:
Warning: the token GREATERRBRACKET is unused.
File "src/ocaml/preprocess/parser_raw.mly", line 869, characters 0-9:
Warning: the precedence level assigned to GREATERDOT is never useful.
>>> Source compiled.      
>>> Test phase: dev-ml/merlin-4.1-r2
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/completion/parenthesize.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/completion/application_context.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/completion/infix.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/config/check/check-config.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/completion/expansion.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/config/dot-merlin-reader/quoting.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/config/flags/invalid.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/destruct/issue596.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/config/flags/nolabels.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/config/dot-merlin-reader/erroneous-config.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/errors/error-in-constrained-env.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/errors/issue1222.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/config/path-expansion.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/ambiguity/not-in-env.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/completion/kind.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/functors/f-generative.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/ambiguity/rebinding.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/errors/typing-after-parsing.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/context-detection/cd-from_a_pattern.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/context-detection/cd-label.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/config/flags/unsafe.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/functors/f-included.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/local-definitions/issue798.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/local-definitions/issue806.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/functors/f-missed_shadowing.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/context-detection/cd-field.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/functors/f-all_local.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/destruct/from_val.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/functors/f-from_application.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/reconstruct-identifier/off_by_one.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/issue949.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/sig-substs.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/reconstruct-identifier/newlines.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/non-local/ignore-kept-locs.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/includes.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/functors/f-nested_applications.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/mutually-recursive.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/destruct/create.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/looping-substitution.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/misc/load_path.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/issue845.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/destruct/refine.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/partial-cmt.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/destruct/errors.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/non-local/preference.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/issue802.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/misc/external-arity.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/destruct/complete.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/motion/phrase.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/alerts.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/motion/jump.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/deprecation.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate-type.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/occurrences/issue827.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/locate/context-detection/cd-test.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/pp/simple-pp.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/polarity-search.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/outline.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/issue1109.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/environment_on_open.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/let.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/short-paths.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/hole.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/github1003.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/occurrences/basic.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/issue1226.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/issue864.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/mod-not-in-env.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/recovery.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/mod-alias.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/mod-type.t/run.t", line 1, characters 0-0:
         git (internal) (exit 1)
(cd _build/.sandbox/b7b73f74dae83fcc529b71aa6101272b/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/config/check/check-config.t tests/test-dirs/config/check/check-config.t.corrected)
diff --git a/../../../default/tests/test-dirs/config/check/check-config.t b/tests/test-dirs/config/check/check-config.t.corrected
index 12c6fe4..2af6753 100644
--- a/../../../default/tests/test-dirs/config/check/check-config.t
+++ b/tests/test-dirs/config/check/check-config.t.corrected
@@ -5,13 +5,4 @@ Create a .merlin:
   > EOF
 
   $ echo | $MERLIN single check-configuration -filename test.ml
-  {
-    "class": "return",
-    "value": {
-      "dot_merlins": [
-        "$TESTCASE_ROOT/.merlin"
-      ],
-      "failures": []
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/typer-cache.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/inconsistent-assumptions.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/type-alias.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/gadt_wrong.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/warnings/backtrack.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/types.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/letop.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/objects.t/run.t", line 1, characters 0-0:
         git (internal) (exit 1)
(cd _build/.sandbox/1856b37d9df3768b50c679a51c96f586/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/config/dot-merlin-reader/erroneous-config.t tests/test-dirs/config/dot-merlin-reader/erroneous-config.t.corrected)
diff --git a/../../../default/tests/test-dirs/config/dot-merlin-reader/erroneous-config.t b/tests/test-dirs/config/dot-merlin-reader/erroneous-config.t.corrected
index 300ff5f..b988ee5 100644
--- a/../../../default/tests/test-dirs/config/dot-merlin-reader/erroneous-config.t
+++ b/tests/test-dirs/config/dot-merlin-reader/erroneous-config.t.corrected
@@ -10,34 +10,13 @@ And look at merlin's config:
 
   $ echo | $MERLIN single dump-configuration -filename test.ml | \
   > jq ".value.merlin | {flags_applied: .flags_applied, failures: .failures}"
-  {
-    "flags_applied": [
-      {
-        "workdir": "$TESTCASE_ROOT",
-        "workval": [
-          "-principal"
-        ]
-      }
-    ],
-    "failures": [
-      "Failed to load packages: does-not-exist"
-    ]
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Also, see that the failure is reported to the user:
 
   $ echo | $MERLIN single errors -filename test.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "type": "config",
-        "sub": [],
-        "valid": true,
-        "message": "Failed to load packages: does-not-exist"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ rm .merlin
         git (internal) (exit 1)
(cd _build/.sandbox/b28678cc68a19cf4ad3a18e6f81a1acd/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/config/dot-merlin-reader/quoting.t tests/test-dirs/config/dot-merlin-reader/quoting.t.corrected)
diff --git a/../../../default/tests/test-dirs/config/dot-merlin-reader/quoting.t b/tests/test-dirs/config/dot-merlin-reader/quoting.t.corrected
index a936308..15ac887 100644
--- a/../../../default/tests/test-dirs/config/dot-merlin-reader/quoting.t
+++ b/tests/test-dirs/config/dot-merlin-reader/quoting.t.corrected
@@ -11,62 +11,7 @@
   ((?:EXCLUDE_QUERY_DIR)(?:FLG(?:-pp?:I/definitly/need/quoting.exe -nothing))(?:FLG(?:-ppx?:/path/to/ppx.exe --as-ppx --cookie 'library-name="model"'))(?:FLG(?:-w?:@3)))
 
   $ echo | $MERLIN single dump-configuration -filename test.ml 2> /dev/null | jq '.value.merlin'
-  {
-    "build_path": [],
-    "source_path": [],
-    "cmi_path": [],
-    "cmt_path": [],
-    "flags_applied": [
-      {
-        "workdir": "$TESTCASE_ROOT",
-        "workval": [
-          "-pp",
-          "I/definitly/need/quoting.exe -nothing"
-        ]
-      },
-      {
-        "workdir": "$TESTCASE_ROOT",
-        "workval": [
-          "-ppx",
-          "/path/to/ppx.exe --as-ppx --cookie 'library-name=\"model\"'"
-        ]
-      },
-      {
-        "workdir": "$TESTCASE_ROOT",
-        "workval": [
-          "-w",
-          "@3"
-        ]
-      }
-    ],
-    "extensions": [],
-    "suffixes": [
-      {
-        "impl": ".ml",
-        "intf": ".mli"
-      },
-      {
-        "impl": ".re",
-        "intf": ".rei"
-      }
-    ],
-    "stdlib": null,
-    "reader": [],
-    "protocol": "json",
-    "log_file": null,
-    "log_sections": [],
-    "flags_to_apply": [],
-    "failures": [],
-    "assoc_suffixes": [
-      {
-        "extension": ".re",
-        "reader": "reason"
-      },
-      {
-        "extension": ".rei",
-        "reader": "reason"
-      }
-    ]
-  }
+  jq: command not found
+  [127]
 
   $ rm .merlin
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/variants.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/constructors_and_paths.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-expr.t/run.t", line 1, characters 0-0:
         git (internal) (exit 1)
(cd _build/.sandbox/2f8c3193e159acb4105fbf448e1ef54b/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/config/path-expansion.t/run.t tests/test-dirs/config/path-expansion.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/config/path-expansion.t/run.t b/tests/test-dirs/config/path-expansion.t/run.t.corrected
index f78c967..a28e8cf 100644
--- a/../../../default/tests/test-dirs/config/path-expansion.t/run.t
+++ b/tests/test-dirs/config/path-expansion.t/run.t.corrected
@@ -3,33 +3,21 @@ A simple name is not expanded
   $ echo | $MERLIN single dump-configuration -filename relative_path.ml -ppx test1 \
   > 2> /dev/null | \
   > jq '.value.ocaml.ppx'
-  [
-    {
-      "workdir": "$TESTCASE_ROOT",
-      "workval": "test1"
-    }
-  ]
+  jq: command not found
+  [127]
 
 Neither is an absolute path
 
   $ echo | $MERLIN single dump-configuration -filename relative_path.ml -ppx /test2 \
   > 2> /dev/null | \
   > jq '.value.ocaml.ppx'
-  [
-    {
-      "workdir": "$TESTCASE_ROOT",
-      "workval": "/test2"
-    }
-  ]
+  jq: command not found
+  [127]
 
 But relative names are
 
   $ echo | $MERLIN single dump-configuration -filename relative_path.ml -ppx ./test3 \
   > 2> /dev/null | \
   > jq '.value.ocaml.ppx'
-  [
-    {
-      "workdir": "$TESTCASE_ROOT",
-      "workval": "./test3"
-    }
-  ]
+  jq: command not found
+  [127]
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/type-enclosing/record.t/run.t", line 1, characters 0-0:
Done: 1477/1582 (jobs: 48)File "tests/test-dirs/no-escape.t/run.t", line 1, characters 0-0:
         git (internal) (exit 1)
(cd _build/.sandbox/293fdda294f75007fa03c79e2deb8d3b/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/completion/parenthesize.t/run.t tests/test-dirs/completion/parenthesize.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/completion/parenthesize.t/run.t b/tests/test-dirs/completion/parenthesize.t/run.t.corrected
index ddb30c0..724608e 100644
--- a/../../../default/tests/test-dirs/completion/parenthesize.t/run.t
+++ b/tests/test-dirs/completion/parenthesize.t/run.t.corrected
@@ -1,53 +1,5 @@
   $ $MERLIN single complete-prefix -position 11:15 -prefix MyList. \
   > -filename parenthesize.ml < parenthesize.ml | jq ".value.entries | sort_by(.name)"
-  [
-    {
-      "name": "(())",
-      "kind": "Constructor",
-      "desc": "MyList.u",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "(::)",
-      "kind": "Constructor",
-      "desc": "'a * 'a MyList.t -> 'a MyList.t",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "([])",
-      "kind": "Constructor",
-      "desc": "'a MyList.t",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "(mod)",
-      "kind": "Value",
-      "desc": "MyList.u",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "random",
-      "kind": "Value",
-      "desc": "int",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "t",
-      "kind": "Type",
-      "desc": "type 'a t = (::) of 'a * 'a MyList.t | []",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "u",
-      "kind": "Type",
-      "desc": "type u = ()",
-      "info": "",
-      "deprecated": false
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/40651f14b7bef051798acf6f7ccef9f9/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/completion/infix.t/run.t tests/test-dirs/completion/infix.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/completion/infix.t/run.t b/tests/test-dirs/completion/infix.t/run.t.corrected
index da3941a..99cc48b 100644
--- a/../../../default/tests/test-dirs/completion/infix.t/run.t
+++ b/tests/test-dirs/completion/infix.t/run.t.corrected
@@ -1,39 +1,5 @@
   $ $MERLIN single complete-prefix -position 11:10 -prefix "Z." \
   > -filename infix.ml < infix.ml | jq ".value.entries | sort_by(.name)"
-  [
-    {
-      "name": "(>>)",
-      "kind": "Value",
-      "desc": "int",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "(>>=)",
-      "kind": "Value",
-      "desc": "int",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "(>>|)",
-      "kind": "Value",
-      "desc": "int",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "(|+)",
-      "kind": "Value",
-      "desc": "int",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "(|-)",
-      "kind": "Value",
-      "desc": "int",
-      "info": "",
-      "deprecated": false
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/67f9517351644b4cd4176929442e3fba/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/completion/application_context.t/run.t tests/test-dirs/completion/application_context.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/completion/application_context.t/run.t b/tests/test-dirs/completion/application_context.t/run.t.corrected
index b0f41cc..39d7acb 100644
--- a/../../../default/tests/test-dirs/completion/application_context.t/run.t
+++ b/tests/test-dirs/completion/application_context.t/run.t.corrected
@@ -1,15 +1,6 @@
   $ $MERLIN single complete-prefix -position 3:17 \
   > -filename application_context < application_context.ml \
   > | tr '\n' ' ' | jq ".value.context"
-  [
-    "application",
-    {
-      "argument_type": "'_weak1",
-      "labels": [
-        {
-          "name": "~j",
-          "type": "int"
-        }
-      ]
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/80d29573e43a1696da56c2dd97a90371/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/completion/kind.t/run.t tests/test-dirs/completion/kind.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/completion/kind.t/run.t b/tests/test-dirs/completion/kind.t/run.t.corrected
index d6aefec..47a6c17 100644
--- a/../../../default/tests/test-dirs/completion/kind.t/run.t
+++ b/tests/test-dirs/completion/kind.t/run.t.corrected
@@ -2,59 +2,45 @@ Default completion:
 
   $ $MERLIN single complete-prefix -position 3:10 -filename test.ml \
   > -prefix fu < test.ml| jq ".value.entries[].name"
-  "funnyny"
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Keywords only:
 
   $ $MERLIN single complete-prefix -position 3:10 -filename test.ml \
   > -kind k -prefix fu < test.ml| jq ".value.entries[].name"
-  "function"
-  "fun"
-  "functor"
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Keywords and values:
 
   $ $MERLIN single complete-prefix -position 3:10 -filename test.ml \
   > -kind keyword -kind value -prefix fu < test.ml| jq ".value.entries[].name"
-  "funnyny"
-  "function"
-  "fun"
-  "functor"
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Keywords only including extension:
 
   $ echo "f" | $MERLIN single complete-prefix -position 1:2 -filename test.ml \
   > -kind k -prefix f -extension lwt | jq ".value.entries[].name"
-  "finally"
-  "for_lwt"
-  "function"
-  "false"
-  "fun"
-  "for"
-  "functor"
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 And let's also make sure we don't offer keywords when we completing under a
 certain path
 
   $ $MERLIN single complete-prefix -position 5:14 -filename test.ml \
   > -prefix List.f < test.ml| jq ".value.entries[].name"
-  "fast_sort"
-  "filter"
-  "filter_map"
-  "filteri"
-  "find"
-  "find_all"
-  "find_map"
-  "find_opt"
-  "flatten"
-  "fold_left"
-  "fold_left2"
-  "fold_left_map"
-  "fold_right"
-  "fold_right2"
-  "for_all"
-  "for_all2"
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single complete-prefix -position 5:14 -filename test.ml \
   > -kind k -prefix List.f < test.ml| jq ".value.entries"
-  []
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/e878ae3781b9ff387fc221645bc7e0f1/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/completion/expansion.t/run.t tests/test-dirs/completion/expansion.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/completion/expansion.t/run.t b/tests/test-dirs/completion/expansion.t/run.t.corrected
index 10db683..248eb11 100644
--- a/../../../default/tests/test-dirs/completion/expansion.t/run.t
+++ b/tests/test-dirs/completion/expansion.t/run.t.corrected
@@ -1,234 +1,12 @@
   $ $MERLIN single expand-prefix -position 1:11 -prefix L.m \
   > -filename expansion.ml < expansion1.ml | jq ".value.entries | sort_by(.name)"
-  [
-    {
-      "name": "List.map",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.map2",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.mapi",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.mem",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.mem_assoc",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.mem_assq",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.memq",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.merge",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.map",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.map2",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.mapi",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.mem",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.mem_assoc",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.mem_assq",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.memq",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.merge",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single expand-prefix -position 1:13 -prefix Lsi.m \
   > -filename expansion.ml < expansion2.ml | jq ".value.entries | sort_by(.name)"
-  [
-    {
-      "name": "List.map",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.map2",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.mapi",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.mem",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.mem_assoc",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.mem_assq",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.memq",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "List.merge",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.map",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.map2",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.mapi",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.mem",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.mem_assoc",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.mem_assq",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.memq",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    },
-    {
-      "name": "ListLabels.merge",
-      "kind": "Value",
-      "desc": "",
-      "info": "",
-      "deprecated": false
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
         git (internal) (exit 1)
(cd _build/.sandbox/75396988a6d8c3d5396111ae86bcf4e4/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/ambiguity/rebinding.t/run.t tests/test-dirs/locate/ambiguity/rebinding.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/ambiguity/rebinding.t/run.t b/tests/test-dirs/locate/ambiguity/rebinding.t/run.t.corrected
index 534f1f0..57d296d 100644
--- a/../../../default/tests/test-dirs/locate/ambiguity/rebinding.t/run.t
+++ b/tests/test-dirs/locate/ambiguity/rebinding.t/run.t.corrected
@@ -1,30 +1,10 @@
 Jumping to Z.foo before the rebinding of X:
 
   $ $MERLIN single locate -look-for ml -position 11:13 -filename ./rebinding.ml < ./rebinding.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/rebinding.ml",
-      "pos": {
-        "line": 4,
-        "col": 10
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Jumping to Z.foo after the rebinding of X:
 
   $ $MERLIN single locate -look-for ml -position 15:13 -filename ./rebinding.ml < ./rebinding.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/rebinding.ml",
-      "pos": {
-        "line": 4,
-        "col": 10
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
         git (internal) (exit 1)
(cd _build/.sandbox/d2938928ddbbd7f85a420b585052eeb3/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/ambiguity/not-in-env.t tests/test-dirs/locate/ambiguity/not-in-env.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/ambiguity/not-in-env.t b/tests/test-dirs/locate/ambiguity/not-in-env.t.corrected
index aa75640..de9e56d 100644
--- a/../../../default/tests/test-dirs/locate/ambiguity/not-in-env.t
+++ b/tests/test-dirs/locate/ambiguity/not-in-env.t.corrected
@@ -2,8 +2,4 @@
   > let b = 10
   > let x = { b = 9 }
   > EOF
-  {
-    "class": "return",
-    "value": "Not in environment 'b'",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/7eaba80f3a6f78c5dc470b1f247c3a9c/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/errors/issue1222.t tests/test-dirs/errors/issue1222.t.corrected)
diff --git a/../../../default/tests/test-dirs/errors/issue1222.t b/tests/test-dirs/errors/issue1222.t.corrected
index 277ced5..6c28052 100644
--- a/../../../default/tests/test-dirs/errors/issue1222.t
+++ b/tests/test-dirs/errors/issue1222.t.corrected
@@ -1,26 +1,7 @@
   $ $MERLIN single errors -filename issue1222.ml <<EOF
   > let minimal : type a. 'a t
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 22
-        },
-        "end": {
-          "line": 1,
-          "col": 24
-        },
-        "type": "parser",
-        "sub": [],
-        "valid": true,
-        "message": "In this scoped type, variable 'a is reserved for the local type a."
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Merlin would fail to catch this new exception:
 "In this scoped type, variable 'a is reserved for the local type a.",
         git (internal) (exit 1)
(cd _build/.sandbox/9c1b3a55edb5c8744223b52c05bf51bf/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/errors/typing-after-parsing.t/run.t tests/test-dirs/errors/typing-after-parsing.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/errors/typing-after-parsing.t/run.t b/tests/test-dirs/errors/typing-after-parsing.t/run.t.corrected
index 521ab96..bd35805 100644
--- a/../../../default/tests/test-dirs/errors/typing-after-parsing.t/run.t
+++ b/tests/test-dirs/errors/typing-after-parsing.t/run.t.corrected
@@ -1,40 +1,7 @@
 First ask for all the errors:
 
   $ $MERLIN single errors -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 9
-        },
-        "end": {
-          "line": 3,
-          "col": 10
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This expression has type int but an expression was expected of type unit"
-      },
-      {
-        "start": {
-          "line": 7,
-          "col": 9
-        },
-        "end": {
-          "line": 7,
-          "col": 10
-        },
-        "type": "parser",
-        "sub": [],
-        "valid": true,
-        "message": "Syntax error, expecting expr"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Notice that the second type error is not returned, as it happens after the first
 syntax error.
@@ -42,47 +9,9 @@ syntax error.
 Now let's just ask for typing errors:
 
   $ $MERLIN single errors -lexing false -parsing false -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 9
-        },
-        "end": {
-          "line": 3,
-          "col": 10
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This expression has type int but an expression was expected of type unit"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 And let's also try filtering out type errors:
 
   $ $MERLIN single errors -typing false -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 7,
-          "col": 9
-        },
-        "end": {
-          "line": 7,
-          "col": 10
-        },
-        "type": "parser",
-        "sub": [],
-        "valid": true,
-        "message": "Syntax error, expecting expr"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/c6476e2ccc9fa8c29ec4532ed3b8afb2/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/errors/error-in-constrained-env.t/run.t tests/test-dirs/errors/error-in-constrained-env.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/errors/error-in-constrained-env.t/run.t b/tests/test-dirs/errors/error-in-constrained-env.t/run.t.corrected
index caf1d6b..def5891 100644
--- a/../../../default/tests/test-dirs/errors/error-in-constrained-env.t/run.t
+++ b/tests/test-dirs/errors/error-in-constrained-env.t/run.t.corrected
@@ -5,24 +5,4 @@ Thus the error recovery will happen at the wrong level.
 The fix is to save and restore levels when attempting a recoverable typing.
 
   $ $MERLIN single errors -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 7,
-          "col": 9
-        },
-        "end": {
-          "line": 7,
-          "col": 13
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This expression has type 'a option but an expression was expected of type
-    a -> string"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/28412df0f7454a5348e0263d82db7c62/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/config/flags/nolabels.t tests/test-dirs/config/flags/nolabels.t.corrected)
diff --git a/../../../default/tests/test-dirs/config/flags/nolabels.t b/tests/test-dirs/config/flags/nolabels.t.corrected
index fb9a5eb..30f9805 100644
--- a/../../../default/tests/test-dirs/config/flags/nolabels.t
+++ b/tests/test-dirs/config/flags/nolabels.t.corrected
@@ -3,17 +3,9 @@ classic and labels
   $ $MERLIN single errors -filename labels_ok_1.ml <<EOF
   > let f ~x = () in f ~x:(); f ()
   > EOF
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single errors -filename labels_ko_1.ml -nolabels <<EOF
   > let f ~x = () in f ~x:(); f ()
   > EOF
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/5776f3e04b09fed542907e9b5a066fe5/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/config/flags/unsafe.t tests/test-dirs/config/flags/unsafe.t.corrected)
diff --git a/../../../default/tests/test-dirs/config/flags/unsafe.t b/tests/test-dirs/config/flags/unsafe.t.corrected
index 60579f5..d6bc8cb 100644
--- a/../../../default/tests/test-dirs/config/flags/unsafe.t
+++ b/tests/test-dirs/config/flags/unsafe.t.corrected
@@ -3,87 +3,33 @@ Testing array desugaring
   $ $MERLIN single errors -filename array_good.ml <<EOF
   > let x = [|0|].(0)
   > EOF
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single errors -filename array_bad.ml <<EOF
   > module Array = struct end
   > let x = [|0|].(0)
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 8
-        },
-        "end": {
-          "line": 2,
-          "col": 17
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound value Array.get"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single errors -filename array_fake_good.ml <<EOF
   > module Array = struct let get _ _ = () end
   > let x = [|0|].(0)
   > EOF
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single errors -filename unsafe_array_good.ml -unsafe <<EOF
   > let x = [|0|].(0)
   > EOF
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single errors -filename unsafe_array_bad.ml -unsafe <<EOF
   > module Array = struct end
   > let x = [|0|].(0)
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 8
-        },
-        "end": {
-          "line": 2,
-          "col": 17
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound value Array.unsafe_get"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single errors -filename unsafe_array_fake_good.ml -unsafe <<EOF
   > module Array = struct let unsafe_get _ _ = () end
   > let x = [|0|].(0)
   > EOF
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/86314fec5b45689c69fd8e7c854728f1/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/config/flags/invalid.t tests/test-dirs/config/flags/invalid.t.corrected)
diff --git a/../../../default/tests/test-dirs/config/flags/invalid.t b/tests/test-dirs/config/flags/invalid.t.corrected
index f7a7bd6..db2f959 100644
--- a/../../../default/tests/test-dirs/config/flags/invalid.t
+++ b/tests/test-dirs/config/flags/invalid.t.corrected
@@ -1,13 +1,2 @@
   $ echo | $MERLIN single check-configuration -filename invalid_flag.ml -lalala
-  {
-    "class": "return",
-    "value": {
-      "dot_merlins": [
-        "$TESTCASE_ROOT/.merlin"
-      ],
-      "failures": [
-        "unknown flag -lalala"
-      ]
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/46d9dbe6a3502b70711688bd1c33a456/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/local-definitions/issue798.t/run.t tests/test-dirs/locate/local-definitions/issue798.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/local-definitions/issue798.t/run.t b/tests/test-dirs/locate/local-definitions/issue798.t/run.t.corrected
index 26bae71..73986cc 100644
--- a/../../../default/tests/test-dirs/locate/local-definitions/issue798.t/run.t
+++ b/tests/test-dirs/locate/local-definitions/issue798.t/run.t.corrected
@@ -1,13 +1,3 @@
 
   $ $MERLIN single locate -look-for ml -position 7:17 -filename ./issue798.ml < ./issue798.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/issue798.ml",
-      "pos": {
-        "line": 6,
-        "col": 8
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/cf0c31010bddfe27ca5f008dcd94392b/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/local-definitions/issue806.t/run.t tests/test-dirs/locate/local-definitions/issue806.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/local-definitions/issue806.t/run.t b/tests/test-dirs/locate/local-definitions/issue806.t/run.t.corrected
index 3b0213f..e70db7c 100644
--- a/../../../default/tests/test-dirs/locate/local-definitions/issue806.t/run.t
+++ b/tests/test-dirs/locate/local-definitions/issue806.t/run.t.corrected
@@ -1,13 +1,3 @@
 
   $ $MERLIN single locate -look-for ml -position 5:3 -filename ./issue806.ml < ./issue806.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/issue806.ml",
-      "pos": {
-        "line": 4,
-        "col": 6
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/985bd906307ebd48c8522e8a5fc7fe0a/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/reconstruct-identifier/off_by_one.t/run.t tests/test-dirs/locate/reconstruct-identifier/off_by_one.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/reconstruct-identifier/off_by_one.t/run.t b/tests/test-dirs/locate/reconstruct-identifier/off_by_one.t/run.t.corrected
index c73c509..1cd63bb 100644
--- a/../../../default/tests/test-dirs/locate/reconstruct-identifier/off_by_one.t/run.t
+++ b/tests/test-dirs/locate/reconstruct-identifier/off_by_one.t/run.t.corrected
@@ -1,14 +1,4 @@
 Regression test for #624
 
   $ $MERLIN single locate -look-for ml -position 4:13 -filename ./off_by_one.ml < ./off_by_one.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/off_by_one.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/c0f0b89bfb1fcf28b401085326cfaef7/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/reconstruct-identifier/newlines.t/run.t tests/test-dirs/locate/reconstruct-identifier/newlines.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/reconstruct-identifier/newlines.t/run.t b/tests/test-dirs/locate/reconstruct-identifier/newlines.t/run.t.corrected
index 3b35452..38f62a7 100644
--- a/../../../default/tests/test-dirs/locate/reconstruct-identifier/newlines.t/run.t
+++ b/tests/test-dirs/locate/reconstruct-identifier/newlines.t/run.t.corrected
@@ -2,28 +2,8 @@ We need to be careful about newlines in Lexer_ident:
 
   $ $MERLIN single locate -look-for ml -position 7:20 \
   > -filename ./newline_in_quotes.ml < ./newline_in_quotes.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/newline_in_quotes.ml",
-      "pos": {
-        "line": 1,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 6:20 \
   > -filename ./escaped_newline.ml < ./escaped_newline.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/escaped_newline.ml",
-      "pos": {
-        "line": 1,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/1bf6f831257ca9f07ee892075f9ce899/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/functors/f-all_local.t/run.t tests/test-dirs/locate/functors/f-all_local.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/functors/f-all_local.t/run.t b/tests/test-dirs/locate/functors/f-all_local.t/run.t.corrected
index 8f12de3..20803e5 100644
--- a/../../../default/tests/test-dirs/locate/functors/f-all_local.t/run.t
+++ b/tests/test-dirs/locate/functors/f-all_local.t/run.t.corrected
@@ -1,44 +1,14 @@
 Check that we can jump locally inside the functor:
 
   $ $MERLIN single locate -look-for ml -position 14:12 -filename ./all_local.ml < ./all_local.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/all_local.ml",
-      "pos": {
-        "line": 12,
-        "col": 2
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Check that we can jump from inside the functor to the (sig of the) parameter:
 
   $ $MERLIN single locate -look-for ml -position 12:11 -filename ./all_local.ml < ./all_local.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/all_local.ml",
-      "pos": {
-        "line": 9,
-        "col": 12
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Check the argument is substituted for the parameter
 
   $ $MERLIN single locate -look-for ml -position 20:13 -filename ./all_local.ml < ./all_local.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/all_local.ml",
-      "pos": {
-        "line": 6,
-        "col": 2
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/2b72b3bdc963532551db76c7dd4e3de3/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/functors/f-nested_applications.t/run.t tests/test-dirs/locate/functors/f-nested_applications.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/functors/f-nested_applications.t/run.t b/tests/test-dirs/locate/functors/f-nested_applications.t/run.t.corrected
index 7effdf2..0cdef16 100644
--- a/../../../default/tests/test-dirs/locate/functors/f-nested_applications.t/run.t
+++ b/tests/test-dirs/locate/functors/f-nested_applications.t/run.t.corrected
@@ -1,71 +1,21 @@
 
   $ $MERLIN single locate -look-for ml -position 17:14 \
   > -filename ./nested_applications.ml < ./nested_applications.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/nested_applications.ml",
-      "pos": {
-        "line": 5,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 19:14 \
   > -filename ./nested_applications.ml < ./nested_applications.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/nested_applications.ml",
-      "pos": {
-        "line": 10,
-        "col": 2
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 25:14 \
   > -filename ./nested_applications.ml < ./nested_applications.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/nested_applications.ml",
-      "pos": {
-        "line": 10,
-        "col": 2
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 29:14 \
   > -filename ./nested_applications.ml < ./nested_applications.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/nested_applications.ml",
-      "pos": {
-        "line": 21,
-        "col": 54
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 33:14 \
   > -filename ./nested_applications.ml < ./nested_applications.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/nested_applications.ml",
-      "pos": {
-        "line": 5,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
         git (internal) (exit 1)
(cd _build/.sandbox/339f3330aa47ef8994268aa09b04763c/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/functors/f-missed_shadowing.t/run.t tests/test-dirs/locate/functors/f-missed_shadowing.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/functors/f-missed_shadowing.t/run.t b/tests/test-dirs/locate/functors/f-missed_shadowing.t/run.t.corrected
index 99b2260..039b9b5 100644
--- a/../../../default/tests/test-dirs/locate/functors/f-missed_shadowing.t/run.t
+++ b/tests/test-dirs/locate/functors/f-missed_shadowing.t/run.t.corrected
@@ -2,28 +2,8 @@ Reproduce bug described (and fixed) in commit e558d203334fd06f7653a6388b46dba895
 
   $ $MERLIN single locate -look-for ml -position 4:10 \
   > -filename ./missed_shadowing.ml < ./missed_shadowing.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/missed_shadowing.ml",
-      "pos": {
-        "line": 3,
-        "col": 10
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 9:15 \
   > -filename ./missed_shadowing.ml < ./missed_shadowing.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/missed_shadowing.ml",
-      "pos": {
-        "line": 7,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/379256149422e1d9ef8fdb4f1da2204c/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/functors/f-from_application.t/run.t tests/test-dirs/locate/functors/f-from_application.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/functors/f-from_application.t/run.t b/tests/test-dirs/locate/functors/f-from_application.t/run.t.corrected
index 37624db..db4ff3a 100644
--- a/../../../default/tests/test-dirs/locate/functors/f-from_application.t/run.t
+++ b/tests/test-dirs/locate/functors/f-from_application.t/run.t.corrected
@@ -2,45 +2,15 @@ Jump on the argument passed to the functor:
 FIXME: we confuse the module for the constructor and jump to the wrong place
 
   $ $MERLIN single locate -look-for ml -position 11:18 -filename ./from_application.ml < ./from_application.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/from_application.ml",
-      "pos": {
-        "line": 5,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Jump from inside the functor application to inside the functor application:
 
   $ $MERLIN single locate -look-for ml -position 18:16 -filename ./from_application.ml < ./from_application.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/from_application.ml",
-      "pos": {
-        "line": 14,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Jump from inside the functor application to the outer scope:
 
   $ $MERLIN single locate -look-for ml -position 14:18 -filename ./from_application.ml < ./from_application.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/from_application.ml",
-      "pos": {
-        "line": 9,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
         git (internal) (exit 1)
(cd _build/.sandbox/68e251fe3988c6dedb0b882f69c460a6/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/functors/f-generative.t/run.t tests/test-dirs/locate/functors/f-generative.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/functors/f-generative.t/run.t b/tests/test-dirs/locate/functors/f-generative.t/run.t.corrected
index ba6c75e..0c18a4e 100644
--- a/../../../default/tests/test-dirs/locate/functors/f-generative.t/run.t
+++ b/tests/test-dirs/locate/functors/f-generative.t/run.t.corrected
@@ -1,14 +1,4 @@
 Check that we handle generative functors properly:
 
   $ $MERLIN single locate -position 13:12 -filename generative.ml < generative.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/generative.ml",
-      "pos": {
-        "line": 8,
-        "col": 6
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/a1f1ae4b8054fadae5c64426a9764193/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/functors/f-included.t/run.t tests/test-dirs/locate/functors/f-included.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/functors/f-included.t/run.t b/tests/test-dirs/locate/functors/f-included.t/run.t.corrected
index faea416..f73ca8b 100644
--- a/../../../default/tests/test-dirs/locate/functors/f-included.t/run.t
+++ b/tests/test-dirs/locate/functors/f-included.t/run.t.corrected
@@ -1,14 +1,4 @@
 
   $ $MERLIN single locate -look-for ml -position 22:15 \
   > -filename ./included.ml < ./included.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/included.ml",
-      "pos": {
-        "line": 14,
-        "col": 6
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/00c0f44030efaf4b66ae127c56d9f083/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/non-local/preference.t/run.t tests/test-dirs/locate/non-local/preference.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/non-local/preference.t/run.t b/tests/test-dirs/locate/non-local/preference.t/run.t.corrected
index 181bcda..e8c6059 100644
--- a/../../../default/tests/test-dirs/locate/non-local/preference.t/run.t
+++ b/tests/test-dirs/locate/non-local/preference.t/run.t.corrected
@@ -6,80 +6,20 @@ Setup the context:
 Test that Locate.locate and Locate.from_path do their job properly:
 
   $ $MERLIN single locate -look-for ml -position 1:11 -filename ./b.ml < ./b.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/a.ml",
-      "pos": {
-        "line": 1,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 5:15 -filename ./b.ml < ./b.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/a.ml",
-      "pos": {
-        "line": 1,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 9:9 -filename ./b.ml < ./b.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/a.ml",
-      "pos": {
-        "line": 1,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for mli -position 1:11 -filename ./b.ml < ./b.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/a.mli",
-      "pos": {
-        "line": 3,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for mli -position 5:15 -filename ./b.ml < ./b.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/a.mli",
-      "pos": {
-        "line": 3,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for mli -position 9:9 -filename ./b.ml < ./b.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/a.mli",
-      "pos": {
-        "line": 3,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
         git (internal) (exit 1)
(cd _build/.sandbox/b09a0220c2ea18a9e4654fac9bfc679b/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/non-local/ignore-kept-locs.t/run.t tests/test-dirs/locate/non-local/ignore-kept-locs.t/run.t.corrected)
diff --git a/../../../default/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.corrected
index 897428d..e886e0d 100644
--- a/../../../default/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.corrected
@@ -6,17 +6,7 @@ Make sure that we do not use locations coming from the cmi:
 
   $ $MERLIN single locate -look-for ml -log-section locate -log-file log \
   > -position 1:12 -filename ./b.ml < ./b.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/a.ml",
-      "pos": {
-        "line": 1,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ grep -A1 Fallback log | grep -v Fallback
   [1]
@@ -25,22 +15,12 @@ Make sure that we do not use locations coming from the cmi:
 
   $ $MERLIN single locate -look-for ml -log-section locate -log-file log \
   > -position 5:12 -filename ./b.ml < ./b.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/a.ml",
-      "pos": {
-        "line": 1,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 The fallback here is ok, it points to the local buffer (to the include line
 actually), not to a.ml
 
   $ grep -A1 Fallback log | grep -v Fallback
-  File "b.ml", line 3, characters 0-9
+  [1]
 
   $ rm log
         git (internal) (exit 1)
(cd _build/.sandbox/11a9edc7bd7f24a7f811d3b8164da2c8/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/mutually-recursive.t/run.t tests/test-dirs/locate/mutually-recursive.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/mutually-recursive.t/run.t b/tests/test-dirs/locate/mutually-recursive.t/run.t.corrected
index 25e2351..dbe2418 100644
--- a/../../../default/tests/test-dirs/locate/mutually-recursive.t/run.t
+++ b/tests/test-dirs/locate/mutually-recursive.t/run.t.corrected
@@ -1,29 +1,9 @@
 Searching foo from bar works:
 
   $ $MERLIN single locate -look-for ml -position 8:6 -filename ./issue973.ml < ./issue973.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/issue973.ml",
-      "pos": {
-        "line": 1,
-        "col": 8
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 And so does bar from foo:
 
   $ $MERLIN single locate -look-for ml -position 2:7 -filename ./issue973.ml < ./issue973.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/issue973.ml",
-      "pos": {
-        "line": 4,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/11f9cefa27cf9ff38fb8ec2c4ef32ee6/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/partial-cmt.t/run.t tests/test-dirs/locate/partial-cmt.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/partial-cmt.t/run.t b/tests/test-dirs/locate/partial-cmt.t/run.t.corrected
index 272a0e7..692b3a6 100644
--- a/../../../default/tests/test-dirs/locate/partial-cmt.t/run.t
+++ b/tests/test-dirs/locate/partial-cmt.t/run.t.corrected
@@ -10,17 +10,7 @@ Create a well typed a.ml and a.mli and compile them
 Jump:
 
   $ $MERLIN single locate -look-for ml -position 1:11 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/a.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Remove the cmt:
 
@@ -42,15 +32,5 @@ the environment (as we explicitly asked locate to jump to the .ml).
 That is: if the file is a.mli then the test is broken:
 
   $ $MERLIN single locate -look-for ml -position 1:11 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/a.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
         git (internal) (exit 1)
(cd _build/.sandbox/1d8c6b820f7cc94c573a152b9fe78ddf/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/sig-substs.t/run.t tests/test-dirs/locate/sig-substs.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/sig-substs.t/run.t b/tests/test-dirs/locate/sig-substs.t/run.t.corrected
index 150ae6c..34592c6 100644
--- a/../../../default/tests/test-dirs/locate/sig-substs.t/run.t
+++ b/tests/test-dirs/locate/sig-substs.t/run.t.corrected
@@ -3,14 +3,4 @@ On a similar note we currently have no way to decide between a sig and a struct
 when both are present in the buffer (the struct will always be preferred).
 
   $ $MERLIN single locate -look-for ml -position 10:12 -filename ./basic.ml < ./basic.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/basic.ml",
-      "pos": {
-        "line": 3,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/2408b8e7dc68846048ca0d86b9f417a1/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/issue845.t/run.t tests/test-dirs/locate/issue845.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/issue845.t/run.t b/tests/test-dirs/locate/issue845.t/run.t.corrected
index 3dafe6f..76e7a3e 100644
--- a/../../../default/tests/test-dirs/locate/issue845.t/run.t
+++ b/tests/test-dirs/locate/issue845.t/run.t.corrected
@@ -16,32 +16,12 @@ FIXME: this jumps to the .mli...
   $ $MERLIN single locate -look-for ml -position 1:24 -filename test.ml <<EOF
   > module SM = Local_map.Make(String)
   > EOF
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/local_map.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test jumping to intf:
 
   $ $MERLIN single locate -look-for mli -position 1:24 -filename test.ml <<EOF
   > module SM = Local_map.Make(String)
   > EOF
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/local_map.mli",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
         git (internal) (exit 1)
(cd _build/.sandbox/3d0e1659d05bbc5b44b814328c04ccc6/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/looping-substitution.t/run.t tests/test-dirs/locate/looping-substitution.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/looping-substitution.t/run.t b/tests/test-dirs/locate/looping-substitution.t/run.t.corrected
index c3c9bde..c823bf3 100644
--- a/../../../default/tests/test-dirs/locate/looping-substitution.t/run.t
+++ b/tests/test-dirs/locate/looping-substitution.t/run.t.corrected
@@ -8,14 +8,4 @@ Do the thing:
 
   $ echo "let () = Bar.the_function ()" | \
   > $MERLIN single locate -look-for ml -position 1:15 -filename ./example.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 5,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/7aae9f55724aeb51e83514196461c68a/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/issue949.t/run.t tests/test-dirs/locate/issue949.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/issue949.t/run.t b/tests/test-dirs/locate/issue949.t/run.t.corrected
index fa80cce..30e0884 100644
--- a/../../../default/tests/test-dirs/locate/issue949.t/run.t
+++ b/tests/test-dirs/locate/issue949.t/run.t.corrected
@@ -1,8 +1,4 @@
 This test is for testing the behavior of identifiers with a . in them:
 
   $ $MERLIN single locate -look-for ml -position 2:16 ./issue949.ml < ./issue949.ml
-  {
-    "class": "return",
-    "value": "Not in environment ''",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/90bfc04b233d163e1dc8d5fb35b0590a/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/includes.t/run.t tests/test-dirs/locate/includes.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/includes.t/run.t b/tests/test-dirs/locate/includes.t/run.t.corrected
index 6ffd20e..9bc82bf 100644
--- a/../../../default/tests/test-dirs/locate/includes.t/run.t
+++ b/tests/test-dirs/locate/includes.t/run.t.corrected
@@ -7,31 +7,11 @@ Test when the include is a name, this should directly redirect us to the right
 thing.
 
   $ $MERLIN single locate -look-for mli -position 4:17 -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/foo.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test including a structure: there we will want to look up the ident again inside
 the structure, but the stamp will have changed:
 
   $ $MERLIN single locate -look-for mli -position 10:17 -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/foo.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
         git (internal) (exit 1)
(cd _build/.sandbox/a0f623be3ea63ec0042592d888e85ec1/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/issue802.t/run.t tests/test-dirs/locate/issue802.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/issue802.t/run.t b/tests/test-dirs/locate/issue802.t/run.t.corrected
index 73505e9..43b9bf7 100644
--- a/../../../default/tests/test-dirs/locate/issue802.t/run.t
+++ b/tests/test-dirs/locate/issue802.t/run.t.corrected
@@ -9,59 +9,19 @@ Compile the various units as dune would:
 Test jumping from a normal constructor:
 
   $ $MERLIN single locate -look-for ml -position 5:21 -filename ./a.ml < ./a.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/error.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 From an exception:
 
   $ $MERLIN single locate -look-for ml -position 3:21 -filename ./a.ml < ./a.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/error.ml",
-      "pos": {
-        "line": 3,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 From an extension constructor:
 
   $ $MERLIN single locate -look-for ml -position 7:16 -filename ./a.ml < ./a.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/error.ml",
-      "pos": {
-        "line": 7,
-        "col": 12
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 And from the extensible type name itself:
 
   $ $MERLIN single locate -look-for ml -position 7:10 -filename ./a.ml < ./a.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/error.ml",
-      "pos": {
-        "line": 5,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/17555d97409817f0ca23c03e8a829b73/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/misc/load_path.t tests/test-dirs/misc/load_path.t.corrected)
diff --git a/../../../default/tests/test-dirs/misc/load_path.t b/tests/test-dirs/misc/load_path.t.corrected
index 3e5dbc2..79c15e4 100644
--- a/../../../default/tests/test-dirs/misc/load_path.t
+++ b/tests/test-dirs/misc/load_path.t.corrected
@@ -13,33 +13,4 @@ Here is what the compiler sees:
 Here is what merlin sees:
 
   $ $MERLIN single type-enclosing -position 1:14 -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 8
-        },
-        "end": {
-          "line": 1,
-          "col": 16
-        },
-        "type": "int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 1,
-          "col": 8
-        },
-        "end": {
-          "line": 1,
-          "col": 16
-        },
-        "type": "int",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/f8e4bc9400ee4685a05745011b59efb1/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/misc/external-arity.t tests/test-dirs/misc/external-arity.t.corrected)
diff --git a/../../../default/tests/test-dirs/misc/external-arity.t b/tests/test-dirs/misc/external-arity.t.corrected
index b62ece3..dbf62b0 100644
--- a/../../../default/tests/test-dirs/misc/external-arity.t
+++ b/tests/test-dirs/misc/external-arity.t.corrected
@@ -5,8 +5,4 @@ problematic for normal  OCaml users.
   $ $MERLIN single errors -filename external_arity.ml -w +A <<EOF
   > external foo : unit list = "foo"
   > EOF
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/20044aecd80450feaa9885fa74bfa369/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/destruct/issue596.t tests/test-dirs/destruct/issue596.t.corrected)
diff --git a/../../../default/tests/test-dirs/destruct/issue596.t b/tests/test-dirs/destruct/issue596.t.corrected
index f28c307..fabad6e 100644
--- a/../../../default/tests/test-dirs/destruct/issue596.t
+++ b/tests/test-dirs/destruct/issue596.t.corrected
@@ -1,8 +1,4 @@
   $ $MERLIN single case-analysis -start 1:5 -end 1:5 -filename bug.ml <<EOF | sed -e 's/,_)/, _)/g'
   > let a = 1 in a + 1 ;;
   > EOF
-  {
-    "class": "error",
-    "value": "Destruct not allowed on value_binding",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/316f2628fb54b24ca21a5aa474e1f915/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/destruct/from_val.t tests/test-dirs/destruct/from_val.t.corrected)
diff --git a/../../../default/tests/test-dirs/destruct/from_val.t b/tests/test-dirs/destruct/from_val.t.corrected
index f884a66..74baaca 100644
--- a/../../../default/tests/test-dirs/destruct/from_val.t
+++ b/tests/test-dirs/destruct/from_val.t.corrected
@@ -4,46 +4,14 @@
   > let f x : my_list =
   >   x
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 2
-        },
-        "end": {
-          "line": 3,
-          "col": 3
-        }
-      },
-      "match (x : my_list) with | Atom -> (??) | Elt (_, _) -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single case-analysis -start 3:2 -end 3:3 -filename typ.ml <<EOF
   > type my_rec = { atom: string; elt: string * my_rec }
   > let f x : my_rec =
   >   x
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 2
-        },
-        "end": {
-          "line": 3,
-          "col": 3
-        }
-      },
-      "match (x : my_rec) with | { atom; elt } -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 FIXME
   $ $MERLIN single case-analysis -start 4:18 -end 4:21 -filename typ.ml <<EOF
@@ -52,34 +20,14 @@ FIXME
   >   match (x : my_rec) with
   >   | { atom; elt = _ } -> ()
   > EOF
-  {
-    "class": "error",
-    "value": "Nothing to do",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single case-analysis -start 3:2 -end 3:3 -filename typ.ml <<EOF
   > type basic_color = [ \`Blue | \`Red | \`Yellow ]
   > let f x : basic_color =
   >   x
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 2
-        },
-        "end": {
-          "line": 3,
-          "col": 3
-        }
-      },
-      "match (x : basic_color) with | `Blue -> (??) | `Yellow -> (??) | `Red -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ cat >typ.ml <<EOF
   > type my_list = Atom | Elt of string * my_list
@@ -91,23 +39,9 @@ FIXME
 
   $ $MERLIN single case-analysis -start 5:12 -end 5:13 -filename typ.ml <typ.ml | \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 5,
-          "col": 4
-        },
-        "end": {
-          "line": 5,
-          "col": 14
-        }
-      },
-      "Elt (_,Atom)|Elt (_,Elt (_,_))"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ cat >typ2.ml <<EOF
   > type _ term =
@@ -120,11 +54,9 @@ FIXME
 
   $ $MERLIN single case-analysis -start 6:10 -end 6:10 -filename typ2.ml <typ2.ml | \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "error",
-    "value": "Destruct not allowed on core_type",
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ cat >typ3.ml <<EOF
   > type _ term =
@@ -137,20 +69,6 @@ FIXME
 
   $ $MERLIN single case-analysis -start 6:20 -end 6:20 -filename typ3.ml <typ3.ml | \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 6,
-          "col": 20
-        },
-        "end": {
-          "line": 6,
-          "col": 21
-        }
-      },
-      "match (x : a term) with|Int _ -> (??)|Add -> (??)|App (_,_) -> (??)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/7639b3c82c99f0bd64f729648fcb8e18/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/destruct/create.t tests/test-dirs/destruct/create.t.corrected)
diff --git a/../../../default/tests/test-dirs/destruct/create.t b/tests/test-dirs/destruct/create.t.corrected
index f29e327..01a6030 100644
--- a/../../../default/tests/test-dirs/destruct/create.t
+++ b/tests/test-dirs/destruct/create.t.corrected
@@ -9,23 +9,7 @@ pprintast).
   > let f (x : int option) =
   >   x
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 2
-        },
-        "end": {
-          "line": 2,
-          "col": 3
-        }
-      },
-      "match x with | None -> (??) | Some _ -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 #############
 ## RECORDS ##
@@ -37,23 +21,7 @@ Test 2.1
   > let f (x : int ref) =
   >   x
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 2
-        },
-        "end": {
-          "line": 2,
-          "col": 3
-        }
-      },
-      "match x with | { contents } -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 ##########################
 ## POLYMORPHIC VARIANTS ##
@@ -69,23 +37,9 @@ Test 3.1
 
   $ $MERLIN single case-analysis -start 3:2 -end 3:2 -filename typv2.ml <typv2.ml | \
   > sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 2
-        },
-        "end": {
-          "line": 3,
-          "col": 3
-        }
-      },
-      "match x with|`Blue -> (??)|`Yellow -> (??)|`Red -> (??)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Test 3.1
 
@@ -98,23 +52,9 @@ Test 3.1
 
   $ $MERLIN single case-analysis -start 4:2 -end 4:2 -filename typv3.ml <typv3.ml | \
   > sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 2
-        },
-        "end": {
-          "line": 4,
-          "col": 3
-        }
-      },
-      "match x with|`Blue -> (??)|`Yellow -> (??)|`Red -> (??)|`Gold -> (??)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 ##########
 ## GADT ##
@@ -132,23 +72,9 @@ Test 4.1
 
   $ $MERLIN single case-analysis -start 5:2 -end 5:2 -filename typ4b.ml <typ4b.ml | \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 5,
-          "col": 2
-        },
-        "end": {
-          "line": 5,
-          "col": 3
-        }
-      },
-      "(match x with|I _ -> (??))"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Test 4.2
 
@@ -163,23 +89,9 @@ Test 4.2
 
   $ $MERLIN single case-analysis -start 6:2 -end 6:2 -filename typ4.ml <typ4.ml | \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 6,
-          "col": 2
-        },
-        "end": {
-          "line": 6,
-          "col": 3
-        }
-      },
-      "match x with|Int _ -> (??)|Add -> (??)|App (_,_) -> (??)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 ############
 ## MODULE ##
@@ -192,23 +104,7 @@ Test 5.1
   > let g (x : (module S)) =
   >   x
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 2
-        },
-        "end": {
-          "line": 3,
-          "col": 3
-        }
-      },
-      "let module M = (val x) in (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 5.2 : Module path
 
@@ -217,23 +113,7 @@ Test 5.2 : Module path
   > let g (x : T.t) =
   >   x
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 2
-        },
-        "end": {
-          "line": 3,
-          "col": 3
-        }
-      },
-      "match x with | T.A -> (??) | T.B _ -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 test 5.3 : Abstract type
 
@@ -243,8 +123,4 @@ test 5.3 : Abstract type
   > let g (x : T.t) =
   >   x
   > EOF
-  {
-    "class": "error",
-    "value": "Destruct not allowed on non-destructible type: t",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/9baa90def613bf02300c73a7fe560bab/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/destruct/refine.t tests/test-dirs/destruct/refine.t.corrected)
diff --git a/../../../default/tests/test-dirs/destruct/refine.t b/tests/test-dirs/destruct/refine.t.corrected
index 9b08cb4..a70855c 100644
--- a/../../../default/tests/test-dirs/destruct/refine.t
+++ b/tests/test-dirs/destruct/refine.t.corrected
@@ -10,23 +10,7 @@ Test 1.1 : option refine
   >   | None -> ()
   >   | Some _ -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 9
-        },
-        "end": {
-          "line": 4,
-          "col": 10
-        }
-      },
-      "()"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 1.2 : option refine
 
@@ -40,23 +24,9 @@ Test 1.2 : option refine
 
   $ $MERLIN single case-analysis -start 5:9 -end 5:10 -filename typ12.ml < typ12.ml \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 5,
-          "col": 4
-        },
-        "end": {
-          "line": 5,
-          "col": 10
-        }
-      },
-      "Some (A)|Some (B _)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Test 1.3 : FIXME ? int option
 
@@ -69,23 +39,9 @@ Test 1.3 : FIXME ? int option
 
   $ $MERLIN single case-analysis -start 4:9 -end 4:10 -filename typ13.ml < typ13.ml \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 4
-        },
-        "end": {
-          "line": 4,
-          "col": 10
-        }
-      },
-      "Some 0|Some _"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 #############
 ## RECORDS ##
@@ -105,23 +61,9 @@ Test 2.1
 
   $ $MERLIN single case-analysis -start 7:12 -end 7:12 -filename typ4.ml <typ4.ml | \
   > sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 7,
-          "col": 4
-        },
-        "end": {
-          "line": 7,
-          "col": 15
-        }
-      },
-      "{ a = B (C) }|{ a = B (D _) }"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Test 2.2
 
@@ -135,23 +77,9 @@ Test 2.2
 
   $ $MERLIN single case-analysis -start 5:11 -end 5:11 -filename typ4b.ml <typ4b.ml | \
   > sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 5,
-          "col": 4
-        },
-        "end": {
-          "line": 5,
-          "col": 21
-        }
-      },
-      "{ x = A; y;_}|{ x = B; y;_}"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 ##########################
 ## POLYMORPHIC VARIANTS ##
@@ -169,23 +97,9 @@ Test 3.1
 
   $ $MERLIN single case-analysis -start 5:11 -end 5:11 -filename typ2.ml <typ2.ml | \
   > sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 5,
-          "col": 4
-        },
-        "end": {
-          "line": 5,
-          "col": 11
-        }
-      },
-      "`Blue `Methyl|`Blue `Cyan"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 ##########
 ## GADT ##
@@ -206,23 +120,9 @@ Test 4.1 : Fixme: missing space and ()
 
   $ $MERLIN single case-analysis -start 8:8 -end 8:8 -filename typ3.ml <typ3.ml | \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 8,
-          "col": 8
-        },
-        "end": {
-          "line": 8,
-          "col": 9
-        }
-      },
-      "A_"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Test 4.2
 
@@ -239,23 +139,9 @@ Test 4.2
 
   $ $MERLIN single case-analysis -start 8:8 -end 8:8 -filename typ3b.ml <typ3b.ml | \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 8,
-          "col": 4
-        },
-        "end": {
-          "line": 8,
-          "col": 9
-        }
-      },
-      "Int (A _)|Int (B _)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 ############
 ## ERRORS ##
@@ -269,8 +155,4 @@ Test 5.1 : Nothing to do
   >   | None -> ()
   >   | Some () -> ()
   > EOF
-  {
-    "class": "error",
-    "value": "Nothing to do",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/aecbfb9fdbe767018ff9e0d43564641c/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/destruct/errors.t tests/test-dirs/destruct/errors.t.corrected)
diff --git a/../../../default/tests/test-dirs/destruct/errors.t b/tests/test-dirs/destruct/errors.t.corrected
index 08f97ed..27f5a7a 100644
--- a/../../../default/tests/test-dirs/destruct/errors.t
+++ b/tests/test-dirs/destruct/errors.t.corrected
@@ -1,11 +1,8 @@
 Test 1
 
   $ echo "let () = ()" | $MERLIN single case-analysis -start 1:4 -end 1:4 -filename stacktrace.ml | grep -E -v "Raised|Called|Re-raised"
-  {
-    "class": "error",
-    "value": "Destruct not allowed on value_binding",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [1]
 
 Test 2
 
@@ -14,8 +11,8 @@ Test 2
   >   match w with
   >  | _ -> ()
   > EOF
-    "class": "exception",
-    "value": "Query_commands.No_nodes
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [1]
 
 Test 3
 
@@ -25,24 +22,7 @@ Test 3
   >   | exception _ -> ()
   >   | Some 3 -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 16
-        },
-        "end": {
-          "line": 4,
-          "col": 16
-        }
-      },
-      " | Some 0 -> (??)
-  | None -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 4
 
@@ -52,24 +32,7 @@ Test 4
   >   | exception _ -> ()
   >   | Some _ -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 16
-        },
-        "end": {
-          "line": 4,
-          "col": 16
-        }
-      },
-      "
-  | None -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 5
 
@@ -79,24 +42,7 @@ Test 5
   >   | exception _ -> ()
   >   | None -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 14
-        },
-        "end": {
-          "line": 4,
-          "col": 14
-        }
-      },
-      "
-  | Some _ -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 6
 FIXME: `Some 0` certainly is a missing case but we can do better:
@@ -107,24 +53,7 @@ FIXME: `Some 0` certainly is a missing case but we can do better:
   >   | exception _ -> ()
   >   | Some 3 -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 16
-        },
-        "end": {
-          "line": 4,
-          "col": 16
-        }
-      },
-      " | Some 0 -> (??)
-  | None -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 7
 Same two tests but with the exception pattern at the end
@@ -135,24 +64,7 @@ Same two tests but with the exception pattern at the end
   >   | None -> ()
   >   | exception _ -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 21
-        },
-        "end": {
-          "line": 4,
-          "col": 21
-        }
-      },
-      "
-  | Some _ -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 8
 FIXME: `Some 0` certainly is a missing case but we can do better
@@ -163,24 +75,7 @@ FIXME: `Some 0` certainly is a missing case but we can do better
   >   | Some 3 -> ()
   >   | exception _ -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 21
-        },
-        "end": {
-          "line": 4,
-          "col": 21
-        }
-      },
-      " | Some 0 -> (??)
-  | None -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 9
 Tests with exception in or-pattern
@@ -190,24 +85,7 @@ Tests with exception in or-pattern
   >   match (None : unit option) with
   >   | None | exception _ -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 28
-        },
-        "end": {
-          "line": 3,
-          "col": 28
-        }
-      },
-      "
-  | Some _ -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 10
 
@@ -216,24 +94,7 @@ Test 10
   >   match (None : unit option) with
   >   | None | exception _ -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 28
-        },
-        "end": {
-          "line": 3,
-          "col": 28
-        }
-      },
-      "
-  | Some _ -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 11
 
@@ -242,24 +103,7 @@ Test 11
   >   match (None : unit option) with
   >   | exception _ | None -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 28
-        },
-        "end": {
-          "line": 3,
-          "col": 28
-        }
-      },
-      "
-  | Some _ -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 12
 
@@ -268,21 +112,4 @@ Test 12
   >   match (None : unit option) with
   >   | exception Not_found | None | exception _ -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 50
-        },
-        "end": {
-          "line": 3,
-          "col": 50
-        }
-      },
-      "
-  | Some _ -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/bf737807212ff5f9817b2b165542f32c/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/destruct/complete.t tests/test-dirs/destruct/complete.t.corrected)
diff --git a/../../../default/tests/test-dirs/destruct/complete.t b/tests/test-dirs/destruct/complete.t.corrected
index a6adaaa..bc77b34 100644
--- a/../../../default/tests/test-dirs/destruct/complete.t
+++ b/tests/test-dirs/destruct/complete.t.corrected
@@ -13,23 +13,9 @@ Test 1.1 : FIXME (void type no Some)
 
   $ $MERLIN single case-analysis -start 4:4 -end 4:4 -filename typ5.ml <typ5.ml | \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 14
-        },
-        "end": {
-          "line": 4,
-          "col": 14
-        }
-      },
-      "|Some _ -> (??)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Test 1.2 : FIXME ?
 
@@ -41,23 +27,9 @@ Test 1.2 : FIXME ?
 
   $ $MERLIN single case-analysis -start 3:4 -end 3:8 -filename typ12.ml < typ12.ml \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 23
-        },
-        "end": {
-          "line": 3,
-          "col": 23
-        }
-      },
-      "|Some (Some 0) -> (??)|Some (None) -> (??)|None -> (??)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Test 1.3 : with type constructor
 
@@ -66,24 +38,7 @@ Test 1.3 : with type constructor
   > let v : funny = function
   >   | None -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 14
-        },
-        "end": {
-          "line": 3,
-          "col": 14
-        }
-      },
-      "
-  | Some _ -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 #############
 ## RECORDS ##
@@ -101,23 +56,9 @@ Test 2.1
 
   $ $MERLIN single case-analysis -start 5:4 -end 5:4 -filename typ.ml < typ.ml | \
   > sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 5,
-          "col": 19
-        },
-        "end": {
-          "line": 5,
-          "col": 19
-        }
-      },
-      "|{ a = B _ } -> (??)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Test 2.2 : FIXME ?
 
@@ -132,23 +73,9 @@ Test 2.2 : FIXME ?
 
   $ $MERLIN single case-analysis -start 6:12 -end 6:12 -filename typ3.ml <typ3.ml | \
   > sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 6,
-          "col": 4
-        },
-        "end": {
-          "line": 6,
-          "col": 15
-        }
-      },
-      "{ a = B \"\" }|{ a = B _ }"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 ##########################
 ## POLYMORPHIC VARIANTS ##
@@ -165,23 +92,9 @@ Test 3.1
 
   $ $MERLIN single case-analysis -start 4:5 -end 4:5 -filename typ2.ml <typ2.ml | \
   > sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 15
-        },
-        "end": {
-          "line": 4,
-          "col": 15
-        }
-      },
-      "|`Yellow|`Red -> (??)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Test 3.1
 
@@ -195,23 +108,9 @@ Test 3.1
 
   $ $MERLIN single case-analysis -start 5:5 -end 5:5 -filename typv3.ml <typv3.ml | \
   > sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 5,
-          "col": 22
-        },
-        "end": {
-          "line": 5,
-          "col": 22
-        }
-      },
-      "|`Gold -> (??)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 ##########
 ## GADT ##
@@ -232,23 +131,9 @@ Test 4.1
 
   $ $MERLIN single case-analysis -start 8:4 -end 8:4 -filename typ3.ml <typ3.ml | \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 8,
-          "col": 13
-        },
-        "end": {
-          "line": 8,
-          "col": 13
-        }
-      },
-      "|App (_,_) -> (??)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Test 4.2
 
@@ -265,23 +150,9 @@ Test 4.2
 
   $ $MERLIN single case-analysis -start 8:4 -end 8:4 -filename typ4.ml <typ4.ml | \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 8,
-          "col": 13
-        },
-        "end": {
-          "line": 8,
-          "col": 13
-        }
-      },
-      "|App (_,_) -> (??)"
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Test 4.3 : this match IS exhaustive
 
@@ -296,11 +167,9 @@ Test 4.3 : this match IS exhaustive
 
   $ $MERLIN single case-analysis -start 6:4 -end 6:4 -filename typ4b.ml <typ4b.ml | \
   > sed -e 's/, /,/g' | sed -e 's/ *| */|/g' | tr -d '\n' | jq '.'
-  {
-    "class": "error",
-    "value": "Nothing to do",
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 ############
 ## MODULE ##
@@ -314,24 +183,7 @@ Test 5.1 : Module path
   >   match x with
   >   | T.A -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 13
-        },
-        "end": {
-          "line": 4,
-          "col": 13
-        }
-      },
-      "
-  | T.B _ -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 
 Test 5.1 : Module path (with function)
@@ -341,21 +193,4 @@ Test 5.1 : Module path (with function)
   > let g = function
   >   | T.A -> ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 13
-        },
-        "end": {
-          "line": 3,
-          "col": 13
-        }
-      },
-      "
-  | T.B _ -> (??)"
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/0b9ad0b9f12a8542f3ba31d116375ad9/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/motion/jump.t tests/test-dirs/motion/jump.t.corrected)
diff --git a/../../../default/tests/test-dirs/motion/jump.t b/tests/test-dirs/motion/jump.t.corrected
index fc32437..6671872 100644
--- a/../../../default/tests/test-dirs/motion/jump.t
+++ b/tests/test-dirs/motion/jump.t.corrected
@@ -2,35 +2,18 @@
   > let x =
   >   5
   > EOF
-  {
-    "class": "return",
-    "value": {
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Same line should fail:
 
   $ $MERLIN single jump -target let -position 1:8 -filename test.ml <<EOF
   > let x = 5
   > EOF
-  {
-    "class": "return",
-    "value": "No matching target",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single jump -target module -position 2:2 -filename test.ml <<EOF
   > let x =
   >   5
   > EOF
-  {
-    "class": "return",
-    "value": "No matching target",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
         git (internal) (exit 1)
(cd _build/.sandbox/5fafabf07e3f774b590159cf0bb969e7/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/motion/phrase.t tests/test-dirs/motion/phrase.t.corrected)
diff --git a/../../../default/tests/test-dirs/motion/phrase.t b/tests/test-dirs/motion/phrase.t.corrected
index ef7ef9e..8c1efd5 100644
--- a/../../../default/tests/test-dirs/motion/phrase.t
+++ b/tests/test-dirs/motion/phrase.t.corrected
@@ -2,16 +2,7 @@
   > let x = 5
   > let y = 2
   > EOF
-  {
-    "class": "return",
-    "value": {
-      "pos": {
-        "line": 2,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 FIXME: ??
 
@@ -19,13 +10,4 @@ FIXME: ??
   > let x = 5
   > let y = 2
   > EOF
-  {
-    "class": "return",
-    "value": {
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/0aac523ef881a9ff85106af6919d50b4/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/context-detection/cd-field.t/run.t tests/test-dirs/locate/context-detection/cd-field.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/context-detection/cd-field.t/run.t b/tests/test-dirs/locate/context-detection/cd-field.t/run.t.corrected
index 20ae655..5cf7a64 100644
--- a/../../../default/tests/test-dirs/locate/context-detection/cd-field.t/run.t
+++ b/tests/test-dirs/locate/context-detection/cd-field.t/run.t.corrected
@@ -1,55 +1,15 @@
 
   $ $MERLIN single locate -look-for ml -position 3:14 -filename ./field.ml < ./field.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/field.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 7:14 -filename ./field.ml < ./field.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/field.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Merlin is confused by punned fields prefixed by the module. { X.bar } goes to
 the field bar rather than the identifier.
   $ $MERLIN single locate -look-for ml -position 15:14 -filename ./field.ml < ./field.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/field.ml",
-      "pos": {
-        "line": 10,
-        "col": 2
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Normal punning works as expected:
   $ $MERLIN single locate -look-for ml -position 15:19 -filename ./field.ml < ./field.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/field.ml",
-      "pos": {
-        "line": 14,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/c53d7ddbe9b00c208a3e9d5d81a041e3/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/context-detection/cd-test.t/run.t tests/test-dirs/locate/context-detection/cd-test.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/context-detection/cd-test.t/run.t b/tests/test-dirs/locate/context-detection/cd-test.t/run.t.corrected
index aaafdc1..631879c 100644
--- a/../../../default/tests/test-dirs/locate/context-detection/cd-test.t/run.t
+++ b/tests/test-dirs/locate/context-detection/cd-test.t/run.t.corrected
@@ -1,184 +1,52 @@
 Trying them all:
 
   $ $MERLIN single locate -look-for ml -position 5:9 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 7:17 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 3,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 9:12 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 3,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 FIXME 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
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 13:16 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 16:12 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 5,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 FIXME we failed to parse/reconstruct the ident, that's interesting
 
   $ $MERLIN single locate -look-for ml -position 16:16 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": "Not a valid identifier",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 16:20 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 17:5 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 18:15 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 11,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 FIXME this should jump to line 11:
 
   $ $MERLIN single locate -look-for ml -position 20:15 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": "Already at definition point",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 23:7 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": "Already at definition point",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 23:13 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 13,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 24:3 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 23,
-        "col": 6
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 24:5 -filename ./test.ml < ./test.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/test.ml",
-      "pos": {
-        "line": 13,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/d74bf703b3fcabd891425c212c8d579f/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/context-detection/cd-label.t/run.t tests/test-dirs/locate/context-detection/cd-label.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/context-detection/cd-label.t/run.t b/tests/test-dirs/locate/context-detection/cd-label.t/run.t.corrected
index feac97a..7749951 100644
--- a/../../../default/tests/test-dirs/locate/context-detection/cd-label.t/run.t
+++ b/tests/test-dirs/locate/context-detection/cd-label.t/run.t.corrected
@@ -1,27 +1,7 @@
 
   $ $MERLIN single locate -look-for ml -position 4:11 -filename ./label.ml < ./label.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/label.ml",
-      "pos": {
-        "line": 3,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single locate -look-for ml -position 9:11 -filename ./label.ml < ./label.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/label.ml",
-      "pos": {
-        "line": 8,
-        "col": 4
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
         git (internal) (exit 1)
(cd _build/.sandbox/f63f64473d094dbc44eb3b7b10b0f3cb/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate/context-detection/cd-from_a_pattern.t/run.t tests/test-dirs/locate/context-detection/cd-from_a_pattern.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate/context-detection/cd-from_a_pattern.t/run.t b/tests/test-dirs/locate/context-detection/cd-from_a_pattern.t/run.t.corrected
index 882936c..0b23798 100644
--- a/../../../default/tests/test-dirs/locate/context-detection/cd-from_a_pattern.t/run.t
+++ b/tests/test-dirs/locate/context-detection/cd-from_a_pattern.t/run.t.corrected
@@ -1,38 +1,9 @@
 Confirm there is a type error:
 
   $ $MERLIN single errors -filename ./from_a_pattern.ml < ./from_a_pattern.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 8,
-          "col": 4
-        },
-        "end": {
-          "line": 8,
-          "col": 10
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound constructor Blah.Q"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 We call locate from the broken pattern:
 
   $ $MERLIN single locate -look-for ml -position 8:7 -filename ./from_a_pattern.ml < ./from_a_pattern.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/from_a_pattern.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/b09147a523a26074d6c3eae4555b913b/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/pp/simple-pp.t tests/test-dirs/pp/simple-pp.t.corrected)
diff --git a/../../../default/tests/test-dirs/pp/simple-pp.t b/tests/test-dirs/pp/simple-pp.t.corrected
index edc96a2..304e1d4 100644
--- a/../../../default/tests/test-dirs/pp/simple-pp.t
+++ b/tests/test-dirs/pp/simple-pp.t.corrected
@@ -1,26 +1,7 @@
   $ $MERLIN single errors -pp cat -filename test.ml <<EOF
   > let x : int = "hello"
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 14
-        },
-        "end": {
-          "line": 1,
-          "col": 21
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This expression has type string but an expression was expected of type int"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
   $ $MERLIN single errors -pp 'cpp -Wno-everything -E' -filename test.ml <<EOF
   > #ifndef FOO
   > let x : int = "hello"
@@ -28,26 +9,7 @@
   > let x : int = 42
   > #endif
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 14
-        },
-        "end": {
-          "line": 2,
-          "col": 21
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This expression has type string but an expression was expected of type int"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
   $ $MERLIN single errors -pp 'cpp -Wno-everything -E' -filename test.ml <<EOF
   > #ifdef FOO
   > let x : int = "hello"
@@ -55,8 +17,4 @@
   > let x : int = 42
   > #endif
   > EOF
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/0bdde40737012447f7240ea4374d3b53/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/occurrences/issue827.t/run.t tests/test-dirs/occurrences/issue827.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/occurrences/issue827.t/run.t b/tests/test-dirs/occurrences/issue827.t/run.t.corrected
index 922bd79..fe5cac5 100644
--- a/../../../default/tests/test-dirs/occurrences/issue827.t/run.t
+++ b/tests/test-dirs/occurrences/issue827.t/run.t.corrected
@@ -1,116 +1,16 @@
 Reproduction case:
 
   $ $MERLIN single occurrences -identifier-at 2:14 -filename ./issue827.ml < ./issue827.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 13
-        },
-        "end": {
-          "line": 2,
-          "col": 15
-        }
-      },
-      {
-        "start": {
-          "line": 4,
-          "col": 8
-        },
-        "end": {
-          "line": 4,
-          "col": 12
-        }
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single occurrences -identifier-at 2:19 -filename ./issue827.ml < ./issue827.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 18
-        },
-        "end": {
-          "line": 2,
-          "col": 20
-        }
-      },
-      {
-        "start": {
-          "line": 5,
-          "col": 22
-        },
-        "end": {
-          "line": 5,
-          "col": 24
-        }
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Interestingly if you start from a use instead of the definition, it seems to
 work:
 
   $ $MERLIN single occurrences -identifier-at 4:12 -filename ./issue827.ml < ./issue827.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 13
-        },
-        "end": {
-          "line": 2,
-          "col": 15
-        }
-      },
-      {
-        "start": {
-          "line": 4,
-          "col": 8
-        },
-        "end": {
-          "line": 4,
-          "col": 12
-        }
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single occurrences -identifier-at 5:23 -filename ./issue827.ml < ./issue827.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 18
-        },
-        "end": {
-          "line": 2,
-          "col": 20
-        }
-      },
-      {
-        "start": {
-          "line": 5,
-          "col": 22
-        },
-        "end": {
-          "line": 5,
-          "col": 24
-        }
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/ca50c5b801ba68d9f3c7bc28f29a28ed/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/occurrences/basic.t/run.t tests/test-dirs/occurrences/basic.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/occurrences/basic.t/run.t b/tests/test-dirs/occurrences/basic.t/run.t.corrected
index 6c8ea9e..c35b7f0 100644
--- a/../../../default/tests/test-dirs/occurrences/basic.t/run.t
+++ b/tests/test-dirs/occurrences/basic.t/run.t.corrected
@@ -1,219 +1,29 @@
 Test getting occurrences of a function arg:
 
   $ $MERLIN single occurrences -identifier-at 1:11 -filename ./basic.ml < ./basic.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 11
-        },
-        "end": {
-          "line": 1,
-          "col": 15
-        }
-      },
-      {
-        "start": {
-          "line": 2,
-          "col": 2
-        },
-        "end": {
-          "line": 2,
-          "col": 6
-        }
-      },
-      {
-        "start": {
-          "line": 2,
-          "col": 9
-        },
-        "end": {
-          "line": 2,
-          "col": 13
-        }
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test getting occurrences of a function arg annotated with a type:
 
   $ $MERLIN single occurrences -identifier-at 4:19 -filename ./basic.ml < ./basic.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 19
-        },
-        "end": {
-          "line": 4,
-          "col": 23
-        }
-      },
-      {
-        "start": {
-          "line": 5,
-          "col": 2
-        },
-        "end": {
-          "line": 5,
-          "col": 6
-        }
-      },
-      {
-        "start": {
-          "line": 5,
-          "col": 9
-        },
-        "end": {
-          "line": 5,
-          "col": 13
-        }
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test getting occurrences of a record pattern in a function arg:
 
   $ $MERLIN single occurrences -identifier-at 9:24 -filename ./basic.ml < ./basic.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 9,
-          "col": 23
-        },
-        "end": {
-          "line": 9,
-          "col": 28
-        }
-      },
-      {
-        "start": {
-          "line": 10,
-          "col": 2
-        },
-        "end": {
-          "line": 10,
-          "col": 7
-        }
-      },
-      {
-        "start": {
-          "line": 10,
-          "col": 10
-        },
-        "end": {
-          "line": 10,
-          "col": 15
-        }
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test getting occurrences of a function arg then used in record literal:
 
   $ $MERLIN single occurrences -identifier-at 12:23 -filename ./basic.ml < ./basic.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 12,
-          "col": 22
-        },
-        "end": {
-          "line": 12,
-          "col": 25
-        }
-      },
-      {
-        "start": {
-          "line": 13,
-          "col": 11
-        },
-        "end": {
-          "line": 13,
-          "col": 14
-        }
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test getting occurrences of a function arg then used in record literal punned:
 
   $ $MERLIN single occurrences -identifier-at 15:29 -filename ./basic.ml < ./basic.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 15,
-          "col": 28
-        },
-        "end": {
-          "line": 15,
-          "col": 33
-        }
-      },
-      {
-        "start": {
-          "line": 16,
-          "col": 3
-        },
-        "end": {
-          "line": 16,
-          "col": 8
-        }
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test getting occurrences of a function arg alias then used in record literal:
 
   $ $MERLIN single occurrences -identifier-at 18:25 -filename ./basic.ml < ./basic.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 18,
-          "col": 24
-        },
-        "end": {
-          "line": 18,
-          "col": 27
-        }
-      },
-      {
-        "start": {
-          "line": 19,
-          "col": 2
-        },
-        "end": {
-          "line": 19,
-          "col": 5
-        }
-      },
-      {
-        "start": {
-          "line": 19,
-          "col": 8
-        },
-        "end": {
-          "line": 19,
-          "col": 11
-        }
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/e9fb2828b9c92280f4e909f4807bba9b/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/warnings/backtrack.t tests/test-dirs/warnings/backtrack.t.corrected)
diff --git a/../../../default/tests/test-dirs/warnings/backtrack.t b/tests/test-dirs/warnings/backtrack.t.corrected
index 6f1b722..2aeb457 100644
--- a/../../../default/tests/test-dirs/warnings/backtrack.t
+++ b/tests/test-dirs/warnings/backtrack.t.corrected
@@ -2,78 +2,32 @@ If warnings are not backtracked properly, when reusing the same type checking
 environment in different queries, some warnings will be reported only once.
 
   $ $MERLIN server stop-server
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN server errors -filename backtrack.ml -w +A <<EOF
   > let f x = ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 6
-        },
-        "end": {
-          "line": 1,
-          "col": 7
-        },
-        "type": "warning",
-        "sub": [],
-        "valid": true,
-        "message": "Warning 27: unused variable x."
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  abnormal termination
+  merlin path: /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/src/frontend/ocamlmerlin/ocamlmerlin_server.exe
+  socket path: /var/tmp/portage/dev-ml/merlin-4.1-r2/temp/build99a3c5.dune/ocamlmerlin_250_31_1455949110.socket
 
   $ $MERLIN server errors -filename backtrack.ml -w +A <<EOF
   > 
   > let f x = ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 6
-        },
-        "end": {
-          "line": 2,
-          "col": 7
-        },
-        "type": "warning",
-        "sub": [],
-        "valid": true,
-        "message": "Warning 27: unused variable x."
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  abnormal termination
+  merlin path: /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/src/frontend/ocamlmerlin/ocamlmerlin_server.exe
+  socket path: /var/tmp/portage/dev-ml/merlin-4.1-r2/temp/build99a3c5.dune/ocamlmerlin_250_31_1455949110.socket
 
   $ $MERLIN server errors -filename backtrack.ml -w +A <<EOF
   > let f x = ()
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 6
-        },
-        "end": {
-          "line": 1,
-          "col": 7
-        },
-        "type": "warning",
-        "sub": [],
-        "valid": true,
-        "message": "Warning 27: unused variable x."
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  abnormal termination
+  merlin path: /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/src/frontend/ocamlmerlin/ocamlmerlin_server.exe
+  socket path: /var/tmp/portage/dev-ml/merlin-4.1-r2/temp/build99a3c5.dune/ocamlmerlin_250_31_1455949110.socket
 
   $ $MERLIN server stop-server
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/05bc916b0d9cf33ec7752effca313df6/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/github1003.t/run.t tests/test-dirs/type-enclosing/github1003.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/github1003.t/run.t b/tests/test-dirs/type-enclosing/github1003.t/run.t.corrected
index 6b79d9f..b999373 100644
--- a/../../../default/tests/test-dirs/type-enclosing/github1003.t/run.t
+++ b/tests/test-dirs/type-enclosing/github1003.t/run.t.corrected
@@ -1,57 +1,11 @@
   $ $MERLIN single type-enclosing -position 5:14 -verbosity 0 \
   > -filename ./issue1003.ml < ./issue1003.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 16
-      },
-      "type": "int",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 16
-      },
-      "type": "int",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 5:11 -verbosity 0 \
   > -filename ./issue1003.ml < ./issue1003.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 12
-      },
-      "type": "sig val foo : int end",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 16
-      },
-      "type": "int",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/150bbfed9944811855473b26d96eb24e/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/mod-alias.t/run.t tests/test-dirs/type-enclosing/mod-alias.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/mod-alias.t/run.t b/tests/test-dirs/type-enclosing/mod-alias.t/run.t.corrected
index c6e9d54..93d43db 100644
--- a/../../../default/tests/test-dirs/type-enclosing/mod-alias.t/run.t
+++ b/tests/test-dirs/type-enclosing/mod-alias.t/run.t.corrected
@@ -1,163 +1,17 @@
   $ $MERLIN single type-enclosing -position 3:9 -verbosity 0 \
   > -filename ./alias.ml < ./alias.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 3,
-        "col": 8
-      },
-      "end": {
-        "line": 3,
-        "col": 9
-      },
-      "type": "(module List)",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 3,
-        "col": 8
-      },
-      "end": {
-        "line": 3,
-        "col": 12
-      },
-      "type": "int list -> int",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 3:11 -verbosity 0 \
   > -filename ./alias.ml < ./alias.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 8
-        },
-        "end": {
-          "line": 3,
-          "col": 12
-        },
-        "type": "'a list -> 'a",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 3,
-          "col": 8
-        },
-        "end": {
-          "line": 3,
-          "col": 12
-        },
-        "type": "int list -> int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 3,
-          "col": 8
-        },
-        "end": {
-          "line": 3,
-          "col": 16
-        },
-        "type": "int",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single type-enclosing -position 3:14 -verbosity 0 \
   > -filename ./alias.ml < ./alias.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 14
-        },
-        "end": {
-          "line": 3,
-          "col": 15
-        },
-        "type": "int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 3,
-          "col": 13
-        },
-        "end": {
-          "line": 3,
-          "col": 16
-        },
-        "type": "int list",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 3,
-          "col": 8
-        },
-        "end": {
-          "line": 3,
-          "col": 16
-        },
-        "type": "int",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single type-enclosing -position 3:15 -verbosity 0 \
   > -filename ./alias.ml < ./alias.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 3,
-          "col": 14
-        },
-        "end": {
-          "line": 3,
-          "col": 15
-        },
-        "type": "int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 3,
-          "col": 13
-        },
-        "end": {
-          "line": 3,
-          "col": 16
-        },
-        "type": "int list",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 3,
-          "col": 8
-        },
-        "end": {
-          "line": 3,
-          "col": 16
-        },
-        "type": "int",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/1b495bc5555d25acf32c3523b5ef01fb/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/variants.t/run.t tests/test-dirs/type-enclosing/variants.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/variants.t/run.t b/tests/test-dirs/type-enclosing/variants.t/run.t.corrected
index 93df670..bd1b36e 100644
--- a/../../../default/tests/test-dirs/type-enclosing/variants.t/run.t
+++ b/tests/test-dirs/type-enclosing/variants.t/run.t.corrected
@@ -1,213 +1,54 @@
   $ $MERLIN single type-enclosing -position 2:15 -verbosity 0 \
   > -filename ./variants.ml < ./variants.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 2,
-        "col": 14
-      },
-      "end": {
-        "line": 2,
-        "col": 18
-      },
-      "type": "type core = [ `A | `B ]",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 2,
-        "col": 14
-      },
-      "end": {
-        "line": 2,
-        "col": 18
-      },
-      "type": "core",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 2:13 -verbosity 0 \
   > -filename ./variants.ml < ./variants.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 2,
-        "col": 12
-      },
-      "end": {
-        "line": 2,
-        "col": 25
-      },
-      "type": "[ `A | `B | `C ]",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 2,
-        "col": 0
-      },
-      "end": {
-        "line": 2,
-        "col": 25
-      },
-      "type": "type more = [ `A | `B | `C ]",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 4:5 -verbosity 0 \
   > -filename ./variants.ml < ./variants.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 4,
-        "col": 4
-      },
-      "end": {
-        "line": 4,
-        "col": 5
-      },
-      "type": "more",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 4:5 -verbosity 1 \
   > -filename ./variants.ml < ./variants.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 4,
-        "col": 4
-      },
-      "end": {
-        "line": 4,
-        "col": 5
-      },
-      "type": "[ `A | `B | `C ]",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 4:5 -verbosity 0 \
   > -filename ./variants.ml < ./variants.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 4,
-        "col": 4
-      },
-      "end": {
-        "line": 4,
-        "col": 5
-      },
-      "type": "more",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 5:9 -verbosity 0 \
   > -filename ./variants.ml < ./variants.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 12
-      },
-      "type": "type core = [ `A | `B ]",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 12
-      },
-      "type": "core",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 5:17 -verbosity 0 \
   > -filename ./variants.ml < ./variants.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 5,
-        "col": 15
-      },
-      "end": {
-        "line": 5,
-        "col": 17
-      },
-      "type": "core",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 FIXME: Not satisfying, expected core not more
   $ $MERLIN single type-enclosing -position 9:3 -verbosity 0 \
   > -filename ./variants.ml < ./variants.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 9,
-        "col": 2
-      },
-      "end": {
-        "line": 9,
-        "col": 7
-      },
-      "type": "more",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 7,
-        "col": 9
-      },
-      "end": {
-        "line": 9,
-        "col": 13
-      },
-      "type": "unit",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 9:3 -verbosity 1 \
   > -filename ./variants.ml < ./variants.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 9,
-        "col": 2
-      },
-      "end": {
-        "line": 9,
-        "col": 7
-      },
-      "type": "[ `A | `B | `C ]",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 7,
-        "col": 9
-      },
-      "end": {
-        "line": 9,
-        "col": 13
-      },
-      "type": "type unit = ()",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/28f7b1c5ca69ba47d3e1137841d8dc80/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/type-alias.t tests/test-dirs/type-enclosing/type-alias.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/type-alias.t b/tests/test-dirs/type-enclosing/type-alias.t.corrected
index e7e5bda..b37b06a 100644
--- a/../../../default/tests/test-dirs/type-enclosing/type-alias.t
+++ b/tests/test-dirs/type-enclosing/type-alias.t.corrected
@@ -4,24 +4,7 @@ Test 1.1
   > type foo = int
   > let x : foo = 1
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 4
-        },
-        "end": {
-          "line": 2,
-          "col": 5
-        },
-        "type": "foo",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 1.2 with short paths
 
@@ -29,24 +12,7 @@ Test 1.2 with short paths
   > type foo = int
   > let x : foo = 1
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 4
-        },
-        "end": {
-          "line": 2,
-          "col": 5
-        },
-        "type": "foo",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 
 Test 2.1
@@ -55,24 +21,7 @@ Test 2.1
   > type foo = int
   > let x = 1
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 4
-        },
-        "end": {
-          "line": 2,
-          "col": 5
-        },
-        "type": "int",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Test 2.2 with shortpaths
 
@@ -80,21 +29,4 @@ Test 2.2 with shortpaths
   > type foo = int
   > let x = 1
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 4
-        },
-        "end": {
-          "line": 2,
-          "col": 5
-        },
-        "type": "foo",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/32d6bb707ef36c46e9520ebfe9b5297b/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/issue1226.t tests/test-dirs/type-enclosing/issue1226.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/issue1226.t b/tests/test-dirs/type-enclosing/issue1226.t.corrected
index d023551..55bec6d 100644
--- a/../../../default/tests/test-dirs/type-enclosing/issue1226.t
+++ b/tests/test-dirs/type-enclosing/issue1226.t.corrected
@@ -7,33 +7,4 @@ Fixed.
   > type t = Foo of int
   > let a = Foo 3
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 5,
-          "col": 8
-        },
-        "end": {
-          "line": 5,
-          "col": 11
-        },
-        "type": "int -> t",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 5,
-          "col": 8
-        },
-        "end": {
-          "line": 5,
-          "col": 13
-        },
-        "type": "t",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/3bff646a36978d8935b30474fc8cfa6d/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/issue864.t/run.t tests/test-dirs/type-enclosing/issue864.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/issue864.t/run.t b/tests/test-dirs/type-enclosing/issue864.t/run.t.corrected
index 75b887d..12f08f5 100644
--- a/../../../default/tests/test-dirs/type-enclosing/issue864.t/run.t
+++ b/tests/test-dirs/type-enclosing/issue864.t/run.t.corrected
@@ -1,170 +1,11 @@
   $ $MERLIN single type-enclosing -position 5:24 -verbosity 0 \
   > -filename ./issue864.ml < ./issue864.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 5,
-          "col": 23
-        },
-        "end": {
-          "line": 5,
-          "col": 24
-        },
-        "type": "int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 5,
-          "col": 21
-        },
-        "end": {
-          "line": 5,
-          "col": 24
-        },
-        "type": "int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 5,
-          "col": 9
-        },
-        "end": {
-          "line": 5,
-          "col": 24
-        },
-        "type": "X.t -> int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 5,
-          "col": 7
-        },
-        "end": {
-          "line": 5,
-          "col": 24
-        },
-        "type": "'a -> X.t -> int",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single type-enclosing -position 7:37 -verbosity 0 \
   > -filename ./issue864.ml < ./issue864.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 7,
-          "col": 34
-        },
-        "end": {
-          "line": 7,
-          "col": 37
-        },
-        "type": "int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 7,
-          "col": 32
-        },
-        "end": {
-          "line": 7,
-          "col": 37
-        },
-        "type": "int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 7,
-          "col": 20
-        },
-        "end": {
-          "line": 7,
-          "col": 37
-        },
-        "type": "X.t -> int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 7,
-          "col": 7
-        },
-        "end": {
-          "line": 7,
-          "col": 37
-        },
-        "type": "string -> X.t -> int",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single type-enclosing -position 9:35 -verbosity 0 \
   > -filename ./issue864.ml < ./issue864.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 9,
-          "col": 34
-        },
-        "end": {
-          "line": 9,
-          "col": 35
-        },
-        "type": "int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 9,
-          "col": 32
-        },
-        "end": {
-          "line": 9,
-          "col": 35
-        },
-        "type": "int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 9,
-          "col": 20
-        },
-        "end": {
-          "line": 9,
-          "col": 35
-        },
-        "type": "X.t -> int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 9,
-          "col": 7
-        },
-        "end": {
-          "line": 9,
-          "col": 35
-        },
-        "type": "string -> X.t -> int",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/41e3b15965e0fe7f29032581d3643147/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/constructors_and_paths.t/run.t tests/test-dirs/type-enclosing/constructors_and_paths.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/constructors_and_paths.t/run.t b/tests/test-dirs/type-enclosing/constructors_and_paths.t/run.t.corrected
index 580bde9..a02906b 100644
--- a/../../../default/tests/test-dirs/type-enclosing/constructors_and_paths.t/run.t
+++ b/tests/test-dirs/type-enclosing/constructors_and_paths.t/run.t.corrected
@@ -3,32 +3,9 @@ Various parts of the cons.ml:
 - The expression:
   $ $MERLIN single type-enclosing -position 4:14 -verbosity 0 \
   > -filename ./cons.ml < ./cons.ml| jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 4,
-        "col": 13
-      },
-      "end": {
-        "line": 4,
-        "col": 14
-      },
-      "type": "t",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 4,
-        "col": 13
-      },
-      "end": {
-        "line": 4,
-        "col": 14
-      },
-      "type": "t",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Note: the output is duplicated because it is the result of the concatenation
 of both the ast-based and the small_enclosings (source based) heuristics.
@@ -38,121 +15,29 @@ We aim to fix that in the future.
 
   $ $MERLIN single type-enclosing -position 8:5 -verbosity 0 \
   > -filename ./cons.ml < ./cons.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 8,
-        "col": 4
-      },
-      "end": {
-        "line": 8,
-        "col": 5
-      },
-      "type": "t",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 8,
-        "col": 4
-      },
-      "end": {
-        "line": 8,
-        "col": 5
-      },
-      "type": "t",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 - Non-regression tests:
 
   $ $MERLIN single type-enclosing -position 17:9 -verbosity 0 \
   > -filename ./cons.ml < ./cons.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 17,
-        "col": 8
-      },
-      "end": {
-        "line": 17,
-        "col": 9
-      },
-      "type": "sig type t = A type u = A | B end",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 17,
-        "col": 8
-      },
-      "end": {
-        "line": 17,
-        "col": 11
-      },
-      "type": "M.u",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 15:13 -verbosity 0 \
   > -filename ./cons.ml < ./cons.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 15,
-        "col": 12
-      },
-      "end": {
-        "line": 15,
-        "col": 13
-      },
-      "type": "sig type t = A type u = A | B end",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 15,
-        "col": 12
-      },
-      "end": {
-        "line": 15,
-        "col": 15
-      },
-      "type": "M.t",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 15:15 -verbosity 0 \
   > -filename ./cons.ml < ./cons.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 15,
-        "col": 12
-      },
-      "end": {
-        "line": 15,
-        "col": 15
-      },
-      "type": "M.t",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 15,
-        "col": 12
-      },
-      "end": {
-        "line": 15,
-        "col": 15
-      },
-      "type": "M.t",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 FIXME: the following two tests works only because of
 the fallbacks implemented in type_utils. Context is
@@ -161,116 +46,24 @@ being "Texp_constant" and not "Texp_construct". in
 the expression (M.A x).
   $ $MERLIN single type-enclosing -position 24:15 -verbosity 0 \
   > -filename ./cons.ml < ./cons.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 24,
-        "col": 14
-      },
-      "end": {
-        "line": 24,
-        "col": 15
-      },
-      "type": "sig type t = A of int val x : int end",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 24,
-        "col": 13
-      },
-      "end": {
-        "line": 24,
-        "col": 20
-      },
-      "type": "N.t",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 24:17 -verbosity 0 \
   > -filename ./cons.ml < ./cons.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 24,
-        "col": 14
-      },
-      "end": {
-        "line": 24,
-        "col": 17
-      },
-      "type": "int -> N.t",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 24,
-        "col": 13
-      },
-      "end": {
-        "line": 24,
-        "col": 20
-      },
-      "type": "N.t",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 26:9 -verbosity 0 \
   >  -filename ./cons.ml < ./cons.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 26,
-        "col": 8
-      },
-      "end": {
-        "line": 26,
-        "col": 9
-      },
-      "type": "sig type t = A of int val x : int end",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 26,
-        "col": 8
-      },
-      "end": {
-        "line": 26,
-        "col": 11
-      },
-      "type": "int",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 26:11 -verbosity 0 \
   > -filename ./cons.ml < ./cons.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 26,
-        "col": 8
-      },
-      "end": {
-        "line": 26,
-        "col": 11
-      },
-      "type": "int",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 26,
-        "col": 8
-      },
-      "end": {
-        "line": 26,
-        "col": 11
-      },
-      "type": "int",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/42fb8244d327420aee6620c9bd0e60b7/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/hole.t tests/test-dirs/type-enclosing/hole.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/hole.t b/tests/test-dirs/type-enclosing/hole.t.corrected
index 93dc8e4..524416f 100644
--- a/../../../default/tests/test-dirs/type-enclosing/hole.t
+++ b/tests/test-dirs/type-enclosing/hole.t.corrected
@@ -4,45 +4,4 @@ Check that we can access the expected type of a hole: (BROKEN)
   > let f () : int =
   >   (??)
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 3
-        },
-        "end": {
-          "line": 2,
-          "col": 5
-        },
-        "type": "'a",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 2,
-          "col": 2
-        },
-        "end": {
-          "line": 2,
-          "col": 6
-        },
-        "type": "int",
-        "tail": "no"
-      },
-      {
-        "start": {
-          "line": 1,
-          "col": 6
-        },
-        "end": {
-          "line": 2,
-          "col": 6
-        },
-        "type": "unit -> int",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/4d6c63b9f0d17040b428f50afc60f9fb/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/mod-not-in-env.t/run.t tests/test-dirs/type-enclosing/mod-not-in-env.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/mod-not-in-env.t/run.t b/tests/test-dirs/type-enclosing/mod-not-in-env.t/run.t.corrected
index fe950ca..680ef0c 100644
--- a/../../../default/tests/test-dirs/type-enclosing/mod-not-in-env.t/run.t
+++ b/tests/test-dirs/type-enclosing/mod-not-in-env.t/run.t.corrected
@@ -1,62 +1,17 @@
   $ $MERLIN single type-enclosing -position 5:9 -verbosity 0 \
   > -filename ./not-in-env.ml < ./not-in-env.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 9
-      },
-      "type": "sig val y : int end",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 11
-      },
-      "type": "'a",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 5:11 -verbosity 0 \
   > -filename ./not-in-env.ml < ./not-in-env.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 11
-      },
-      "type": "'a",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 7:11 -verbosity 0 \
   > -filename ./not-in-env.ml < ./not-in-env.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 7,
-        "col": 8
-      },
-      "end": {
-        "line": 7,
-        "col": 11
-      },
-      "type": "'a",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/74bf6ddcb6322c56ee5722a4f33f7d20/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/objects.t/run.t tests/test-dirs/type-enclosing/objects.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/objects.t/run.t b/tests/test-dirs/type-enclosing/objects.t/run.t.corrected
index 436c065..b27c157 100644
--- a/../../../default/tests/test-dirs/type-enclosing/objects.t/run.t
+++ b/tests/test-dirs/type-enclosing/objects.t/run.t.corrected
@@ -1,197 +1,49 @@
   $ $MERLIN single type-enclosing -position 1:5 -verbosity 1 \
   > -filename ./test.ml < ./test.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 1,
-        "col": 4
-      },
-      "end": {
-        "line": 1,
-        "col": 5
-      },
-      "type": "< pop : int option; push : int -> unit >",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 FIXME: not a very satisfying answer, we expect the type of the method
   $ $MERLIN single type-enclosing -position 11:10 -verbosity 1 \
   > -filename ./test.ml < ./test.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 1,
-        "col": 8
-      },
-      "end": {
-        "line": 12,
-        "col": 3
-      },
-      "type": "< pop : int option; push : int -> unit >",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 14:5 -verbosity 1 \
   > -filename ./test.ml < ./test.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 14,
-        "col": 4
-      },
-      "end": {
-        "line": 14,
-        "col": 5
-      },
-      "type": "type unit = ()",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 14:9 -verbosity 1 \
   > -filename ./test.ml < ./test.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 14,
-        "col": 8
-      },
-      "end": {
-        "line": 14,
-        "col": 9
-      },
-      "type": "< pop : int option; push : int -> unit >",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 14,
-        "col": 8
-      },
-      "end": {
-        "line": 14,
-        "col": 9
-      },
-      "type": "< pop : int option; push : int -> unit >",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 14:11 -verbosity 1 \
   > -filename ./test.ml < ./test.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 14,
-        "col": 8
-      },
-      "end": {
-        "line": 14,
-        "col": 14
-      },
-      "type": "int -> unit",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 14,
-        "col": 8
-      },
-      "end": {
-        "line": 14,
-        "col": 16
-      },
-      "type": "type unit = ()",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 16:10 -verbosity 1 \
   > -filename ./test.ml < ./test.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 16,
-        "col": 9
-      },
-      "end": {
-        "line": 16,
-        "col": 12
-      },
-      "type": "< pouet : string -> 'a; .. >",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 16,
-        "col": 9
-      },
-      "end": {
-        "line": 16,
-        "col": 28
-      },
-      "type": "< pouet : string -> 'a; .. > -> 'a",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 18:13 -verbosity 1 \
   > -filename ./test.ml < ./test.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 18,
-        "col": 12
-      },
-      "end": {
-        "line": 18,
-        "col": 15
-      },
-      "type": "< pouet : string -> 'a >",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 18,
-        "col": 12
-      },
-      "end": {
-        "line": 18,
-        "col": 15
-      },
-      "type": "< pouet : string -> 'a >",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 FIXME: same as before
   $ $MERLIN single type-enclosing -position 18:21 -verbosity 1 \
   > -filename ./test.ml < ./test.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 18,
-        "col": 18
-      },
-      "end": {
-        "line": 18,
-        "col": 41
-      },
-      "type": "< pouet : string -> 'a >",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 18,
-        "col": 11
-      },
-      "end": {
-        "line": 18,
-        "col": 58
-      },
-      "type": "< pouet : string -> 'a > -> 'a",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/8dafb4164c772fc721f59c174c2b6619/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/let.t/run.t tests/test-dirs/type-enclosing/let.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/let.t/run.t b/tests/test-dirs/type-enclosing/let.t/run.t.corrected
index ace16c6..6dd6e13 100644
--- a/../../../default/tests/test-dirs/type-enclosing/let.t/run.t
+++ b/tests/test-dirs/type-enclosing/let.t/run.t.corrected
@@ -2,17 +2,6 @@ Get type of a shadowing let binding:
 
   $ $MERLIN single type-enclosing -position 4:4 -verbosity 0 \
   > -filename ./let.ml < ./let.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 4,
-        "col": 4
-      },
-      "end": {
-        "line": 4,
-        "col": 7
-      },
-      "type": "float",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/95604f339a7a7e9be41dea796c315749/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/letop.t/run.t tests/test-dirs/type-enclosing/letop.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/letop.t/run.t b/tests/test-dirs/type-enclosing/letop.t/run.t.corrected
index a1d4cfd..d3dc169 100644
--- a/../../../default/tests/test-dirs/type-enclosing/letop.t/run.t
+++ b/tests/test-dirs/type-enclosing/letop.t/run.t.corrected
@@ -4,181 +4,43 @@ Various parts of the letop:
 
   $ $MERLIN single type-enclosing -position 4:3 -verbosity 0 \
   > -filename ./letop.ml < ./letop.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 4,
-        "col": 2
-      },
-      "end": {
-        "line": 5,
-        "col": 9
-      },
-      "type": "('a -> 'b) -> 'a option -> 'b option",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 3,
-        "col": 17
-      },
-      "end": {
-        "line": 5,
-        "col": 9
-      },
-      "type": "'a -> ('b -> 'c) -> 'b option -> 'c option",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 - The pattern:
 
   $ $MERLIN single type-enclosing -position 4:8 -verbosity 0 \
   > -filename ./letop.ml < ./letop.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 4,
-        "col": 7
-      },
-      "end": {
-        "line": 4,
-        "col": 10
-      },
-      "type": "int",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 4,
-        "col": 2
-      },
-      "end": {
-        "line": 5,
-        "col": 9
-      },
-      "type": "('a -> 'b) -> 'a option -> 'b option",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 - The rhs:
 
   $ $MERLIN single type-enclosing -position 4:22 -verbosity 0 \
   > -filename ./letop.ml < ./letop.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 4,
-        "col": 13
-      },
-      "end": {
-        "line": 4,
-        "col": 29
-      },
-      "type": "('a, 'b) Hashtbl.t -> 'a -> 'b option",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 4,
-        "col": 13
-      },
-      "end": {
-        "line": 4,
-        "col": 29
-      },
-      "type": "('a, 'b) Hashtbl.t -> 'a -> 'b option",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 4:31 -verbosity 0 \
   > -filename ./letop.ml < ./letop.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 4,
-        "col": 30
-      },
-      "end": {
-        "line": 4,
-        "col": 33
-      },
-      "type": "('a, 'b) Hashtbl.t",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 4,
-        "col": 30
-      },
-      "end": {
-        "line": 4,
-        "col": 33
-      },
-      "type": "('a, 'b) Hashtbl.t",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 4:35 -verbosity 0 \
   > -filename ./letop.ml < ./letop.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 4,
-        "col": 34
-      },
-      "end": {
-        "line": 4,
-        "col": 37
-      },
-      "type": "'a",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 4,
-        "col": 34
-      },
-      "end": {
-        "line": 4,
-        "col": 37
-      },
-      "type": "'a",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 - After the in:
 
   $ $MERLIN single type-enclosing -position 5:3 -verbosity 0 \
   > -filename ./letop.ml < ./letop.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 5,
-        "col": 2
-      },
-      "end": {
-        "line": 5,
-        "col": 5
-      },
-      "type": "int",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 5,
-        "col": 2
-      },
-      "end": {
-        "line": 5,
-        "col": 5
-      },
-      "type": "int",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
         git (internal) (exit 1)
(cd _build/.sandbox/9f7a5001a00b87d8aa237aa5cdd94ecb/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/record.t/run.t tests/test-dirs/type-enclosing/record.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/record.t/run.t b/tests/test-dirs/type-enclosing/record.t/run.t.corrected
index dda46b3..c98a15f 100644
--- a/../../../default/tests/test-dirs/type-enclosing/record.t/run.t
+++ b/tests/test-dirs/type-enclosing/record.t/run.t.corrected
@@ -1,249 +1,54 @@
   $ $MERLIN single type-enclosing -position 4:11 -verbosity 0 \
   > -filename ./record.ml < ./record.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 4,
-        "col": 10
-      },
-      "end": {
-        "line": 4,
-        "col": 11
-      },
-      "type": "float",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 4,
-        "col": 8
-      },
-      "end": {
-        "line": 4,
-        "col": 18
-      },
-      "type": "t",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 6:11 -verbosity 0 \
   > -filename ./record.ml < ./record.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 6,
-        "col": 8
-      },
-      "end": {
-        "line": 6,
-        "col": 18
-      },
-      "type": "'a",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 8:11 -verbosity 0 \
   > -filename ./record.ml < ./record.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 8,
-        "col": 10
-      },
-      "end": {
-        "line": 8,
-        "col": 11
-      },
-      "type": "float",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 8,
-        "col": 8
-      },
-      "end": {
-        "line": 8,
-        "col": 17
-      },
-      "type": "unit",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 8:9 -verbosity 0 \
   > -filename ./record.ml < ./record.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 8,
-        "col": 8
-      },
-      "end": {
-        "line": 8,
-        "col": 9
-      },
-      "type": "t",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 8,
-        "col": 8
-      },
-      "end": {
-        "line": 8,
-        "col": 9
-      },
-      "type": "t",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 8:9 -verbosity 1 \
   > -filename ./record.ml < ./record.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 8,
-        "col": 8
-      },
-      "end": {
-        "line": 8,
-        "col": 9
-      },
-      "type": "type t = { mutable b : float; }",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 8,
-        "col": 8
-      },
-      "end": {
-        "line": 8,
-        "col": 9
-      },
-      "type": "type t = { mutable b : float; }",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 FIXME: The following results are not entirely satisfying (`foo.Bar -> foo` could be expanded to `{ baz : unit } -> foo`)
   $ $MERLIN single type-enclosing -position 12:9 -verbosity 0 \
   > -filename ./record.ml < ./record.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 12,
-        "col": 8
-      },
-      "end": {
-        "line": 12,
-        "col": 11
-      },
-      "type": "foo.Bar -> foo",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 12,
-        "col": 8
-      },
-      "end": {
-        "line": 12,
-        "col": 26
-      },
-      "type": "foo",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 12:9 -verbosity 1 \
   > -filename ./record.ml < ./record.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 12,
-        "col": 8
-      },
-      "end": {
-        "line": 12,
-        "col": 11
-      },
-      "type": "foo.Bar -> foo",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 12,
-        "col": 8
-      },
-      "end": {
-        "line": 12,
-        "col": 26
-      },
-      "type": "type foo = Bar of { baz : unit; }",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 12:16 -verbosity 0 \
   > -filename ./record.ml < ./record.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 12,
-        "col": 15
-      },
-      "end": {
-        "line": 12,
-        "col": 18
-      },
-      "type": "unit",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 12,
-        "col": 12
-      },
-      "end": {
-        "line": 12,
-        "col": 26
-      },
-      "type": "foo.Bar",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 12:16 -verbosity 1 \
   > -filename ./record.ml < ./record.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 12,
-        "col": 15
-      },
-      "end": {
-        "line": 12,
-        "col": 18
-      },
-      "type": "unit",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 12,
-        "col": 12
-      },
-      "end": {
-        "line": 12,
-        "col": 26
-      },
-      "type": "type Bar = { baz : unit; }",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/acde02cd5523bc4d840af3c527fa5b08/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/mod-type.t/run.t tests/test-dirs/type-enclosing/mod-type.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/mod-type.t/run.t b/tests/test-dirs/type-enclosing/mod-type.t/run.t.corrected
index 41013d0..3e2156c 100644
--- a/../../../default/tests/test-dirs/type-enclosing/mod-type.t/run.t
+++ b/tests/test-dirs/type-enclosing/mod-type.t/run.t.corrected
@@ -2,116 +2,24 @@ Get the type of a module type with the same name as a module:
 
   $ $MERLIN single type-enclosing -position 5:9 -verbosity 0 \
   > -filename ./module_type.mli < ./module_type.mli | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 9
-      },
-      "type": "sig type a end",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 9
-      },
-      "type": "T",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 5:9 -verbosity 2 \
   > -filename ./module_type.mli < ./module_type.mli | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 9
-      },
-      "type": "sig type a end",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 5,
-        "col": 8
-      },
-      "end": {
-        "line": 5,
-        "col": 9
-      },
-      "type": "sig type a end",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 7:24 -verbosity 0 \
   > -filename ./module_type.mli < ./module_type.mli | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 7,
-        "col": 23
-      },
-      "end": {
-        "line": 7,
-        "col": 24
-      },
-      "type": "sig type b end",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 7,
-        "col": 23
-      },
-      "end": {
-        "line": 7,
-        "col": 24
-      },
-      "type": "sig type b end",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 7:24 -verbosity 1 \
   > -filename ./module_type.mli < ./module_type.mli | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 7,
-        "col": 23
-      },
-      "end": {
-        "line": 7,
-        "col": 24
-      },
-      "type": "sig type b end",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 7,
-        "col": 23
-      },
-      "end": {
-        "line": 7,
-        "col": 24
-      },
-      "type": "sig type b end",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/c1e05686eed9a2c6797dcdb3d171a7c4/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/types.t/run.t tests/test-dirs/type-enclosing/types.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/types.t/run.t b/tests/test-dirs/type-enclosing/types.t/run.t.corrected
index cf9d717..31ef8f9 100644
--- a/../../../default/tests/test-dirs/type-enclosing/types.t/run.t
+++ b/tests/test-dirs/type-enclosing/types.t/run.t.corrected
@@ -1,174 +1,62 @@
   $ $MERLIN single type-enclosing -position 5:11 -verbosity 0 \
   > -filename ./types.ml < ./types.ml | jq ".value"
-  [
-    {
-      "start": {
-        "line": 5,
-        "col": 10
-      },
-      "end": {
-        "line": 5,
-        "col": 11
-      },
-      "type": "type x = Foo",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 5,
-        "col": 10
-      },
-      "end": {
-        "line": 5,
-        "col": 11
-      },
-      "type": "x",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 5:11 -verbosity 1 \
   > -filename ./types.ml < ./types.ml | jq ".value"
-  [
-    {
-      "start": {
-        "line": 5,
-        "col": 10
-      },
-      "end": {
-        "line": 5,
-        "col": 11
-      },
-      "type": "type x = Foo",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 5,
-        "col": 10
-      },
-      "end": {
-        "line": 5,
-        "col": 11
-      },
-      "type": "type x = Foo",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 FIXED: small enclosing was incorrect?
 
   $ $MERLIN single type-enclosing -position 7:9 -verbosity 0 \
   > -filename ./types.ml < ./types.ml | jq ".value"
-  [
-    {
-      "start": {
-        "line": 7,
-        "col": 0
-      },
-      "end": {
-        "line": 7,
-        "col": 14
-      },
-      "type": "type 'a t = 'a",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 FIXED: small enclosing was incorrect?
 
   $ $MERLIN single type-enclosing -position 9:9 -verbosity 0 \
   > -filename ./types.ml < ./types.ml | jq ".value"
-  [
-    {
-      "start": {
-        "line": 9,
-        "col": 0
-      },
-      "end": {
-        "line": 9,
-        "col": 16
-      },
-      "type": "type 'a s = 'a t",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 FIXME: A type with a type param shouldn't equal itself - aliasing a list type
 
   $ $MERLIN single type-enclosing -short-paths -position 11:9 -verbosity 0 \
   > -filename ./types.ml < ./types.ml | jq ".value"
-  [
-    {
-      "start": {
-        "line": 11,
-        "col": 0
-      },
-      "end": {
-        "line": 11,
-        "col": 19
-      },
-      "type": "type 'a l = 'a l",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 Same result regardless of verbosity:
 
   $ $MERLIN single type-enclosing -short-paths -position 11:9 -verbosity 1 \
   > -filename ./types.ml < ./types.ml | jq ".value"
-  [
-    {
-      "start": {
-        "line": 11,
-        "col": 0
-      },
-      "end": {
-        "line": 11,
-        "col": 19
-      },
-      "type": "type 'a l = 'a l",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 OK without -short-paths
 
   $ $MERLIN single type-enclosing -position 11:9 -verbosity 0 \
   > -filename ./types.ml < ./types.ml | jq ".value"
-  [
-    {
-      "start": {
-        "line": 11,
-        "col": 0
-      },
-      "end": {
-        "line": 11,
-        "col": 19
-      },
-      "type": "type 'a l = 'a list",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 
 FIXED: small enclosing at EOF was incorrect?
 
   $ $MERLIN single type-enclosing -short-paths -position 17:9 -verbosity 0 \
   > -filename ./types.ml < ./types.ml | jq ".value"
-  [
-    {
-      "start": {
-        "line": 17,
-        "col": 0
-      },
-      "end": {
-        "line": 17,
-        "col": 21
-      },
-      "type": "type 'a v = Foo of 'a",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 
         git (internal) (exit 1)
(cd _build/.sandbox/fb4c5af3b9bb268d2a644ef672113b84/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-enclosing/gadt_wrong.t tests/test-dirs/type-enclosing/gadt_wrong.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-enclosing/gadt_wrong.t b/tests/test-dirs/type-enclosing/gadt_wrong.t.corrected
index 4ed2863..9eeeccd 100644
--- a/../../../default/tests/test-dirs/type-enclosing/gadt_wrong.t
+++ b/tests/test-dirs/type-enclosing/gadt_wrong.t.corrected
@@ -17,92 +17,24 @@ Initially from issue https://github.com/ocaml/merlin/issues/1125
 
   $ $MERLIN single type-enclosing -position 3:5 -verbosity 0 \
   > -filename ./gadt.ml < ./gadt.ml | tr '\r\n' ' ' | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 3,
-        "col": 4
-      },
-      "end": {
-        "line": 3,
-        "col": 7
-      },
-      "type": "(module Stdlib__int)",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 2,
-        "col": 0
-      },
-      "end": {
-        "line": 6,
-        "col": 35
-      },
-      "type": "type _ term =     Int : int -> int term   | Pair : 'a term * 'b term -> ('a * 'b) term   | Fst : ('a * 'b) term -> 'a term   | Snd : ('a * 'b) term -> 'b term",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 9:5 -verbosity 0 \
   > -filename ./gadt.ml < ./gadt.ml | tr '\r\n' ' ' | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 9,
-        "col": 4
-      },
-      "end": {
-        "line": 9,
-        "col": 7
-      },
-      "type": "int -> int term",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 9,
-        "col": 4
-      },
-      "end": {
-        "line": 9,
-        "col": 9
-      },
-      "type": "a term",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 8:21 -verbosity 0 \
   > -filename ./gadt.ml < ./gadt.ml | tr '\r\n' ' ' | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 8,
-        "col": 8
-      },
-      "end": {
-        "line": 12,
-        "col": 25
-      },
-      "type": "'a term -> 'a",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single type-enclosing -position 8:9 -verbosity 0 \
   > -filename ./gadt.ml < ./gadt.ml | tr '\r\n' ' ' | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 8,
-        "col": 8
-      },
-      "end": {
-        "line": 8,
-        "col": 12
-      },
-      "type": "'a. 'a term -> 'a",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/05345ccc920a5d74297a3e8ca405a5a7/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/deprecation.t/run.t tests/test-dirs/deprecation.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/deprecation.t/run.t b/tests/test-dirs/deprecation.t/run.t.corrected
index ffca8a4..20dcb57 100644
--- a/../../../default/tests/test-dirs/deprecation.t/run.t
+++ b/tests/test-dirs/deprecation.t/run.t.corrected
@@ -1,26 +1,4 @@
   $ echo "S .\nB .\nFLG -nopervasives" > .merlin
   $ $OCAMLC -nopervasives -c -bin-annot foo.mli
   $ $MERLIN single complete-prefix -position 2:14 -prefix Foo.ba -kind val -filename x.ml < x.ml
-  {
-    "class": "return",
-    "value": {
-      "entries": [
-        {
-          "name": "bar",
-          "kind": "Value",
-          "desc": "unit -> int",
-          "info": "",
-          "deprecated": true
-        },
-        {
-          "name": "baz",
-          "kind": "Value",
-          "desc": "unit -> unit",
-          "info": "",
-          "deprecated": false
-        }
-      ],
-      "context": null
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/0a7692c018b902f16e2e0334a04e7017/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/inconsistent-assumptions.t tests/test-dirs/inconsistent-assumptions.t.corrected)
diff --git a/../../../default/tests/test-dirs/inconsistent-assumptions.t b/tests/test-dirs/inconsistent-assumptions.t.corrected
index a8f402a..adf8cb4 100644
--- a/../../../default/tests/test-dirs/inconsistent-assumptions.t
+++ b/tests/test-dirs/inconsistent-assumptions.t.corrected
@@ -53,11 +53,7 @@ And assume it is being built with dune:
 Make sure merlin is happy:
 
   $ $MERLIN single errors -filename foo.ml < foo.ml
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Do an update that breaks the build:
 
@@ -78,25 +74,6 @@ Do an update that breaks the build:
 Go to the file, and ask merlin to move you to the error:
 
   $ $MERLIN single errors -filename foo.ml < foo.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 11
-        },
-        "end": {
-          "line": 4,
-          "col": 12
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This expression has type char but an expression was expected of type int"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 `Foo` does not depend on `My_lib`, but merlin tries to load it regardless.
         git (internal) (exit 1)
(cd _build/.sandbox/2030074f779291f7dc1429e7dfe7b0aa/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/recovery.t tests/test-dirs/recovery.t.corrected)
diff --git a/../../../default/tests/test-dirs/recovery.t b/tests/test-dirs/recovery.t.corrected
index c46295f..0170a3f 100644
--- a/../../../default/tests/test-dirs/recovery.t
+++ b/tests/test-dirs/recovery.t.corrected
@@ -3,68 +3,28 @@ type error.
 
   $ echo "let () = ??" | \
   > $MERLIN single errors -filename hole_0.ml
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 This incomplete expression should generate only a parser error.
 The hole is filled with merlin.hole.
 
   $ echo "let _ =" | \
   > $MERLIN single errors -filename hole_1.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 0
-        },
-        "end": {
-          "line": 2,
-          "col": 0
-        },
-        "type": "parser",
-        "sub": [],
-        "valid": true,
-        "message": "Syntax error, expecting expr"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ echo "let _ =" | \
   > $MERLIN single dump -what source -filename hole_1.ml | \
   > tr -d '\n' | jq '.value'
-  "let _ = [%merlin.hole ]"
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 A bit trickier: the recovery is tempted to put a ->. (unreachable), but the
 penalty should prevent it.
 
   $ echo "let f = function _ ->" | \
   > $MERLIN single errors -filename  "hole_2.ml"
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 0
-        },
-        "end": {
-          "line": 2,
-          "col": 0
-        },
-        "type": "parser",
-        "sub": [],
-        "valid": true,
-        "message": "Syntax error, expecting expr"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Issue #713: merlin would error when it cannot recover, but in some files there
 really is nothing to recover.
@@ -77,36 +37,8 @@ FIXME: the syntax error message is off the mark.
   $ echo "let" | \
   > $MERLIN single errors -filename  "two_constr.ml" | \
   > sed 's/expecting.*/<unstable suggestion>/'
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 0
-        },
-        "end": {
-          "line": 2,
-          "col": 0
-        },
-        "type": "parser",
-        "sub": [],
-        "valid": true,
-        "message": "Syntax error, <unstable suggestion>
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ echo "let test x = match x with | None -> exit 1 | Some pkg -> pkg end" | \
   > $MERLIN single dump -what source -filename "lessminus.ml"
-  {
-    "class": "return",
-    "value": "let test x =
-    match x with
-    | None -> ((exit 1)[@merlin.loc ])
-    | Some pkg -> ((pkg)[@merlin.loc ])
-  
-  ",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/478987ad6a7996bfdae8629952ada95a/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/typer-cache.t/run.t tests/test-dirs/typer-cache.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/typer-cache.t/run.t b/tests/test-dirs/typer-cache.t/run.t.corrected
index d720ca4..e22efc3 100644
--- a/../../../default/tests/test-dirs/typer-cache.t/run.t
+++ b/tests/test-dirs/typer-cache.t/run.t.corrected
@@ -13,6 +13,7 @@ The server might already be running, we kill it to make sure we start from a
 clean slate:
 
   $ $MERLIN server stop-server
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 We build a dep which we will be revealed to Merlin later:
 
@@ -21,70 +22,30 @@ We build a dep which we will be revealed to Merlin later:
 First try with dep hidden:
 
   $ $MERLIN server errors -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 5
-        },
-        "end": {
-          "line": 1,
-          "col": 8
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound module Dep"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  abnormal termination
+  merlin path: /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/src/frontend/ocamlmerlin/ocamlmerlin_server.exe
+  socket path: /var/tmp/portage/dev-ml/merlin-4.1-r2/temp/build99a3c5.dune/ocamlmerlin_250_31_1455949110.socket
 
 For reference, the answer in single mode:
 
   $ $MERLIN single errors -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 5
-        },
-        "end": {
-          "line": 1,
-          "col": 8
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound module Dep"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 
 We try again after revealing the dependency:
 
   $ $MERLIN server errors -filename test.ml -cmi-path sub < test.ml
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  abnormal termination
+  merlin path: /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/src/frontend/ocamlmerlin/ocamlmerlin_server.exe
+  socket path: /var/tmp/portage/dev-ml/merlin-4.1-r2/temp/build99a3c5.dune/ocamlmerlin_250_31_1455949110.socket
 
 
 Reference:
 
   $ $MERLIN single errors -filename test.ml -cmi-path sub < test.ml
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 
 Well behaving versions of Merlin (>= 3.3.4) of should return the same answer as
@@ -96,76 +57,37 @@ would accumulate dependencies and forget to flush the cache when a dependency
 disappeared.
 
   $ $MERLIN server stop-server
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 
 Visible:
 
   $ $MERLIN server errors -filename test.ml -cmi-path sub < test.ml
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  abnormal termination
+  merlin path: /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/src/frontend/ocamlmerlin/ocamlmerlin_server.exe
+  socket path: /var/tmp/portage/dev-ml/merlin-4.1-r2/temp/build99a3c5.dune/ocamlmerlin_250_31_1455949110.socket
 
 
 Reference:
 
   $ $MERLIN single errors -filename test.ml -cmi-path sub < test.ml
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 
 Hidden:
 
   $ $MERLIN server errors -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 5
-        },
-        "end": {
-          "line": 1,
-          "col": 8
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound module Dep"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  abnormal termination
+  merlin path: /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/src/frontend/ocamlmerlin/ocamlmerlin_server.exe
+  socket path: /var/tmp/portage/dev-ml/merlin-4.1-r2/temp/build99a3c5.dune/ocamlmerlin_250_31_1455949110.socket
 
 
 Reference:
 
   $ $MERLIN single errors -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 5
-        },
-        "end": {
-          "line": 1,
-          "col": 8
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound module Dep"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 
 Now some cleanup.
         git (internal) (exit 1)
(cd _build/.sandbox/5431e0ca1e838725203dfa3cd1df1cd0/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/locate-type.t/run.t tests/test-dirs/locate-type.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/locate-type.t/run.t b/tests/test-dirs/locate-type.t/run.t.corrected
index b501ec8..5dd012d 100644
--- a/../../../default/tests/test-dirs/locate-type.t/run.t
+++ b/tests/test-dirs/locate-type.t/run.t.corrected
@@ -1,13 +1,3 @@
 
   $ $MERLIN single locate-type -position 6:6 -filename ./a.ml < ./a.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/a.ml",
-      "pos": {
-        "line": 2,
-        "col": 2
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/7c01c2e9c5cdaa9386707fc6975a54e3/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/alerts.t/run.t tests/test-dirs/alerts.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/alerts.t/run.t b/tests/test-dirs/alerts.t/run.t.corrected
index 7859c37..a9594dc 100644
--- a/../../../default/tests/test-dirs/alerts.t/run.t
+++ b/tests/test-dirs/alerts.t/run.t.corrected
@@ -1,24 +1,4 @@
   $ echo "S .\nB .\nFLG -nopervasives" > .merlin
   $ $OCAMLC -nopervasives -c -bin-annot lib.mli
   $ $MERLIN single errors -filename main.ml < main.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 2,
-          "col": 8
-        },
-        "end": {
-          "line": 2,
-          "col": 12
-        },
-        "type": "warning",
-        "sub": [],
-        "valid": true,
-        "message": "Alert deprecated: Lib.sqrt
-  I am deprecated"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/b1642673bcef3f63ca7e46b56b6271aa/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/type-expr.t/run.t tests/test-dirs/type-expr.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/type-expr.t/run.t b/tests/test-dirs/type-expr.t/run.t.corrected
index 65f1fff..c8613e5 100644
--- a/../../../default/tests/test-dirs/type-expr.t/run.t
+++ b/tests/test-dirs/type-expr.t/run.t.corrected
@@ -1,152 +1,35 @@
   $ $MERLIN single type-expression -expression "y" -position start -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": "Unbound value y",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
   $ $MERLIN single type-expression -expression "y" -position end -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": "int",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single type-expression -expression "t" -position start -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": "Unbound value t",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
   $ $MERLIN single type-expression -expression "t" -position end -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": "Unbound value t",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single type-expression -expression "x + y" -position start -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": "Unbound value x",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
   $ $MERLIN single type-expression -expression "x + y" -position end -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": "int",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single type-expression -expression "T" -position start -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": "Unbound constructor T",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
   $ $MERLIN single type-expression -expression "T" -position end -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": "t",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single type-expression -expression "M" -position start -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": "Unbound constructor M",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
   $ $MERLIN single type-expression -expression "M" -position end -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": "(module List)",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single type-expression -expression "MT" -position start -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": "Unbound constructor MT",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single type-expression -expression "MT" -position end -filename test.ml < test.ml 
-  {
-    "class": "return",
-    "value": "sig
-    type 'a t = 'a list = [] | (::) of 'a * 'a list
-    val length : 'a list -> int
-    val compare_lengths : 'a list -> 'b list -> int
-    val compare_length_with : 'a list -> int -> int
-    val cons : 'a -> 'a list -> 'a list
-    val hd : 'a list -> 'a
-    val tl : 'a list -> 'a list
-    val nth : 'a list -> int -> 'a
-    val nth_opt : 'a list -> int -> 'a option
-    val rev : 'a list -> 'a list
-    val init : int -> (int -> 'a) -> 'a list
-    val append : 'a list -> 'a list -> 'a list
-    val rev_append : 'a list -> 'a list -> 'a list
-    val concat : 'a list list -> 'a list
-    val flatten : 'a list list -> 'a list
-    val equal : ('a -> 'a -> bool) -> 'a list -> 'a list -> bool
-    val compare : ('a -> 'a -> int) -> 'a list -> 'a list -> int
-    val iter : ('a -> unit) -> 'a list -> unit
-    val iteri : (int -> 'a -> unit) -> 'a list -> unit
-    val map : ('a -> 'b) -> 'a list -> 'b list
-    val mapi : (int -> 'a -> 'b) -> 'a list -> 'b list
-    val rev_map : ('a -> 'b) -> 'a list -> 'b list
-    val filter_map : ('a -> 'b option) -> 'a list -> 'b list
-    val concat_map : ('a -> 'b list) -> 'a list -> 'b list
-    val fold_left_map : ('a -> 'b -> 'a * 'c) -> 'a -> 'b list -> 'a * 'c list
-    val fold_left : ('a -> 'b -> 'a) -> 'a -> 'b list -> 'a
-    val fold_right : ('a -> 'b -> 'b) -> 'a list -> 'b -> 'b
-    val iter2 : ('a -> 'b -> unit) -> 'a list -> 'b list -> unit
-    val map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
-    val rev_map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
-    val fold_left2 : ('a -> 'b -> 'c -> 'a) -> 'a -> 'b list -> 'c list -> 'a
-    val fold_right2 : ('a -> 'b -> 'c -> 'c) -> 'a list -> 'b list -> 'c -> 'c
-    val for_all : ('a -> bool) -> 'a list -> bool
-    val exists : ('a -> bool) -> 'a list -> bool
-    val for_all2 : ('a -> 'b -> bool) -> 'a list -> 'b list -> bool
-    val exists2 : ('a -> 'b -> bool) -> 'a list -> 'b list -> bool
-    val mem : 'a -> 'a list -> bool
-    val memq : 'a -> 'a list -> bool
-    val find : ('a -> bool) -> 'a list -> 'a
-    val find_opt : ('a -> bool) -> 'a list -> 'a option
-    val find_map : ('a -> 'b option) -> 'a list -> 'b option
-    val filter : ('a -> bool) -> 'a list -> 'a list
-    val find_all : ('a -> bool) -> 'a list -> 'a list
-    val filteri : (int -> 'a -> bool) -> 'a list -> 'a list
-    val partition : ('a -> bool) -> 'a list -> 'a list * 'a list
-    val partition_map :
-      ('a -> ('b, 'c) Either.t) -> 'a list -> 'b list * 'c list
-    val assoc : 'a -> ('a * 'b) list -> 'b
-    val assoc_opt : 'a -> ('a * 'b) list -> 'b option
-    val assq : 'a -> ('a * 'b) list -> 'b
-    val assq_opt : 'a -> ('a * 'b) list -> 'b option
-    val mem_assoc : 'a -> ('a * 'b) list -> bool
-    val mem_assq : 'a -> ('a * 'b) list -> bool
-    val remove_assoc : 'a -> ('a * 'b) list -> ('a * 'b) list
-    val remove_assq : 'a -> ('a * 'b) list -> ('a * 'b) list
-    val split : ('a * 'b) list -> 'a list * 'b list
-    val combine : 'a list -> 'b list -> ('a * 'b) list
-    val sort : ('a -> 'a -> int) -> 'a list -> 'a list
-    val stable_sort : ('a -> 'a -> int) -> 'a list -> 'a list
-    val fast_sort : ('a -> 'a -> int) -> 'a list -> 'a list
-    val sort_uniq : ('a -> 'a -> int) -> 'a list -> 'a list
-    val merge : ('a -> 'a -> int) -> 'a list -> 'a list -> 'a list
-    val to_seq : 'a list -> 'a Seq.t
-    val of_seq : 'a Seq.t -> 'a list
-  end",
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single type-expression -expression "f (" -position start \
   > -filename test.ml < test.ml | \
   > sed 's/\("value": \)".*\.Error.*",/\1<syntax error>,/'
-  {
-    "class": "return",
-    "value": <syntax error>,
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/b5ec59bf770c0a6952616c70a4d260b4/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/environment_on_open.t/run.t tests/test-dirs/environment_on_open.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/environment_on_open.t/run.t b/tests/test-dirs/environment_on_open.t/run.t.corrected
index f8f1705..372c170 100644
--- a/../../../default/tests/test-dirs/environment_on_open.t/run.t
+++ b/tests/test-dirs/environment_on_open.t/run.t.corrected
@@ -1,13 +1,3 @@
   $ $MERLIN single locate -look-for ml -position 6:6 \
   > -filename ./environment_on_open.ml < ./environment_on_open.ml
-  {
-    "class": "return",
-    "value": {
-      "file": "$TESTCASE_ROOT/environment_on_open.ml",
-      "pos": {
-        "line": 1,
-        "col": 0
-      }
-    },
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/ccccf2472ddc9d170dba9048b6594efd/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/polarity-search.t tests/test-dirs/polarity-search.t.corrected)
diff --git a/../../../default/tests/test-dirs/polarity-search.t b/tests/test-dirs/polarity-search.t.corrected
index f1b6b77..40920fe 100644
--- a/../../../default/tests/test-dirs/polarity-search.t
+++ b/tests/test-dirs/polarity-search.t.corrected
@@ -7,41 +7,18 @@ A few simple tests that show all the things we want to preserve or improve:
   $ echo "" | $MERLIN single search-by-polarity -query "-float +int64" \
   > -position 1:0 -filename test.ml | \
   > jq '.value.entries[] | del(.info) | del(.kind) | del(.deprecated)'
-  {
-    "name": "Stdlib__int64.bits_of_float",
-    "desc": "float -> int64"
-  }
-  {
-    "name": "Stdlib__int64.of_float",
-    "desc": "float -> int64"
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 - Duplicated elements
 
   $ echo "" | $MERLIN single search-by-polarity -safe-string \
   > -query "-int +string" -position 1:0 -filename test.ml | \
   > tr '\n' ' ' | jq '.value.entries |= (map(del(.deprecated)) | .[:2])'
-  {
-    "class": "return",
-    "value": {
-      "entries": [
-        {
-          "name": "string_of_int",
-          "kind": "Value",
-          "desc": "int -> string",
-          "info": ""
-        },
-        {
-          "name": "string_of_int",
-          "kind": "Value",
-          "desc": "int -> string",
-          "info": ""
-        }
-      ],
-      "context": null
-    },
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 # To keep
 
@@ -50,56 +27,6 @@ A few simple tests that show all the things we want to preserve or improve:
   $ echo "" | $MERLIN single search-by-polarity \
   > -query "-float +fun +fun +float" -position 1:0 -filename test.ml | \
   > tr '\n' ' ' | jq '.value.entries |= (map(del(.info) | del(.kind) | del (.deprecated)) | .[0:11])'
-  {
-    "class": "return",
-    "value": {
-      "entries": [
-        {
-          "name": "**",
-          "desc": "float -> float -> float"
-        },
-        {
-          "name": "**",
-          "desc": "float -> float -> float"
-        },
-        {
-          "name": "*.",
-          "desc": "float -> float -> float"
-        },
-        {
-          "name": "*.",
-          "desc": "float -> float -> float"
-        },
-        {
-          "name": "+.",
-          "desc": "float -> float -> float"
-        },
-        {
-          "name": "+.",
-          "desc": "float -> float -> float"
-        },
-        {
-          "name": "-.",
-          "desc": "float -> float -> float"
-        },
-        {
-          "name": "-.",
-          "desc": "float -> float -> float"
-        },
-        {
-          "name": "/.",
-          "desc": "float -> float -> float"
-        },
-        {
-          "name": "/.",
-          "desc": "float -> float -> float"
-        },
-        {
-          "name": "atan2",
-          "desc": "float -> float -> float"
-        }
-      ],
-      "context": null
-    },
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/d084eda90f9d554ca981493acd8d4f57/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/no-escape.t/run.t tests/test-dirs/no-escape.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/no-escape.t/run.t b/tests/test-dirs/no-escape.t/run.t.corrected
index 2b6a957..70acca8 100644
--- a/../../../default/tests/test-dirs/no-escape.t/run.t
+++ b/tests/test-dirs/no-escape.t/run.t.corrected
@@ -3,181 +3,33 @@ should reach top-level
 
   $ echo "type p = P : 'a -> 'a -> p" |
   > $MERLIN single errors -filename ./incorrect_gadt.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 19
-        },
-        "end": {
-          "line": 1,
-          "col": 26
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "The type constructor p expects 0 argument(s),
-  but is here applied to 1 argument(s)"
-      },
-      {
-        "start": {
-          "line": 1,
-          "col": 22
-        },
-        "end": {
-          "line": 1,
-          "col": 24
-        },
-        "type": "parser",
-        "sub": [],
-        "valid": true,
-        "message": "Syntax error"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ echo "let error : unknown_type_constructor = assert false" |
   > $MERLIN single errors -filename  "unkown_constr.ml"
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 12
-        },
-        "end": {
-          "line": 1,
-          "col": 36
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound type constructor unknown_type_constructor"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ echo "val error : unknown_type_constructor" |
   > $MERLIN single errors -filename  "unkown_constr.mli"
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 12
-        },
-        "end": {
-          "line": 1,
-          "col": 36
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound type constructor unknown_type_constructor"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ echo "type t = A | A" |
   > $MERLIN single errors -filename  "two_constr.ml"
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 0
-        },
-        "end": {
-          "line": 1,
-          "col": 14
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Two constructors are named A"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ echo "type t = A | A" |
   > $MERLIN single errors -filename  "two_constr.mli"
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 0
-        },
-        "end": {
-          "line": 1,
-          "col": 14
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Two constructors are named A"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ echo "let x = 4 val x : int" |
   > $MERLIN single errors -filename  "ml_in_mli.mli"
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 0
-        },
-        "end": {
-          "line": 1,
-          "col": 3
-        },
-        "type": "parser",
-        "sub": [],
-        "valid": true,
-        "message": "Syntax error"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 vals are no allowed in ml files and detected during semantic analysis
 
   $ echo "val x : int" |
   > $MERLIN single errors -filename  "mli_in_ml.ml"
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 0
-        },
-        "end": {
-          "line": 1,
-          "col": 11
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Value declarations are only allowed in signatures"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 The code should raise a single error (for Bb typo), but shouldn't report the
 unused case after
@@ -189,124 +41,35 @@ unused case after
   >   | Bb -> 1
   >   | C -> 1
   > EOF
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 4,
-          "col": 4
-        },
-        "end": {
-          "line": 4,
-          "col": 6
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This variant pattern is expected to have type t
-  The constructor Bb does not belong to type t"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Syntax errors also shouldn't escape:
 
   $ echo "let f (_ : (module S with type 'a t = int)) = ()" |
   > $MERLIN single errors -filename "invalid_package_type.ml"
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": 11
-        },
-        "end": {
-          "line": 1,
-          "col": 42
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound module type S"
-      },
-      {
-        "start": {
-          "line": 1,
-          "col": 26
-        },
-        "end": {
-          "line": 1,
-          "col": 41
-        },
-        "type": "parser",
-        "sub": [],
-        "valid": true,
-        "message": "invalid package type: parametrized types are not supported"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 Env initialization errors should also be caught, though it is currently
 difficult to report them if the buffer is empty, therefore there should be
 a different behavior between:
 
   $ echo "" | $MERLIN single errors -open Absent_unit -filename "env_init.ml"
-  {
-    "class": "return",
-    "value": [],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 And:
 
   $ echo "let x = 3" | \
   > $MERLIN single errors -open Absent_unit -filename "env_init.ml" |
   > jq ".value |= (map(del(.start.line) | del(.end.line)))"
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "col": -1
-        },
-        "end": {
-          "col": -1
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound module Absent_unit"
-      }
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
 And of course, it should never leak for other requests:
 
   $ echo "" | $MERLIN single type-enclosing -position 1:0 -expression "3" \
   > -open Absent_unit -filename "env_init.ml"
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 1,
-          "col": -1
-        },
-        "end": {
-          "line": 1,
-          "col": 0
-        },
-        "type": "int",
-        "tail": "no"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
 When typing the Test module, Merlin will try to load the Foo dependency.
 However foo.cmi is not a valid cmi file, we must make sure Merlin handle this
@@ -314,42 +77,12 @@ properly (this should also cover the "wrong magic number" case).
 
   $ $MERLIN single errors -filename test_use.ml < test_use.ml |
   > tr '\r\n' ' ' | jq ".value |= (map(del(.start.line) | del(.end.line)))"
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "col": -1
-        },
-        "end": {
-          "col": -1
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Corrupted compiled interface $TESTCASE_ROOT/foo.cmi"
-      }
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 
   $ $MERLIN single errors -filename test_open.ml -open Foo < test_open.ml |
   > tr '\r\n' ' ' | jq ".value |= (map(del(.start.line) | del(.end.line)))"
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "col": -1
-        },
-        "end": {
-          "col": -1
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Corrupted compiled interface $TESTCASE_ROOT/foo.cmi"
-      }
-    ],
-    "notifications": []
-  }
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/e575c2766821e79a5e66bbf5cb15513e/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/issue1109.t/run.t tests/test-dirs/issue1109.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/issue1109.t/run.t b/tests/test-dirs/issue1109.t/run.t.corrected
index 964a8fa..26619eb 100644
--- a/../../../default/tests/test-dirs/issue1109.t/run.t
+++ b/tests/test-dirs/issue1109.t/run.t.corrected
@@ -2,29 +2,6 @@ FIXME: expected 'a -> 'a
 
   $ $MERLIN single type-enclosing -position 5:11 -verbosity 0 \
   > -filename ./issue1109.ml < ./issue1109.ml | jq ".value[0:2]"
-  [
-    {
-      "start": {
-        "line": 5,
-        "col": 10
-      },
-      "end": {
-        "line": 5,
-        "col": 14
-      },
-      "type": "'a -> 'b",
-      "tail": "no"
-    },
-    {
-      "start": {
-        "line": 5,
-        "col": 10
-      },
-      "end": {
-        "line": 5,
-        "col": 16
-      },
-      "type": "'a",
-      "tail": "no"
-    }
-  ]
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
         git (internal) (exit 1)
(cd _build/.sandbox/f701624770a4688fd352251a6abba9b9/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/short-paths.t/run.t tests/test-dirs/short-paths.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/short-paths.t/run.t b/tests/test-dirs/short-paths.t/run.t.corrected
index 9e3117b..daae4e4 100644
--- a/../../../default/tests/test-dirs/short-paths.t/run.t
+++ b/tests/test-dirs/short-paths.t/run.t.corrected
@@ -1,355 +1,7 @@
   $ $OCAMLC -c dep.mli
 
   $ $MERLIN single errors -filename test.ml < test.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 21,
-          "col": 36
-        },
-        "end": {
-          "line": 21,
-          "col": 49
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Some type variables are unbound in this type: class b : 'a -> a
-  The method x has type 'a where 'a is unbound"
-      },
-      {
-        "start": {
-          "line": 23,
-          "col": 46
-        },
-        "end": {
-          "line": 23,
-          "col": 47
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This class expression is not a class structure; it has type 'a -> a"
-      },
-      {
-        "start": {
-          "line": 27,
-          "col": 0
-        },
-        "end": {
-          "line": 30,
-          "col": 3
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Some type variables are unbound in this type:
-    class test : ?a:'a -> object method b : 'b end
-  The method b has type 'b where 'b is unbound"
-      },
-      {
-        "start": {
-          "line": 27,
-          "col": 12
-        },
-        "end": {
-          "line": 27,
-          "col": 13
-        },
-        "type": "warning",
-        "sub": [],
-        "valid": true,
-        "message": "Warning 16: this optional argument cannot be erased."
-      },
-      {
-        "start": {
-          "line": 29,
-          "col": 13
-        },
-        "end": {
-          "line": 29,
-          "col": 14
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound value c"
-      },
-      {
-        "start": {
-          "line": 34,
-          "col": 0
-        },
-        "end": {
-          "line": 37,
-          "col": 3
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Some type variables are unbound in this type:
-    class test : 'a -> object method b : 'b end
-  The method b has type 'b where 'b is unbound"
-      },
-      {
-        "start": {
-          "line": 36,
-          "col": 13
-        },
-        "end": {
-          "line": 36,
-          "col": 14
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound value c"
-      },
-      {
-        "start": {
-          "line": 39,
-          "col": 12
-        },
-        "end": {
-          "line": 39,
-          "col": 13
-        },
-        "type": "warning",
-        "sub": [],
-        "valid": true,
-        "message": "Warning 16: this optional argument cannot be erased."
-      },
-      {
-        "start": {
-          "line": 63,
-          "col": 25
-        },
-        "end": {
-          "line": 63,
-          "col": 26
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This expression has type t = M.t but an expression was expected of type unit"
-      },
-      {
-        "start": {
-          "line": 82,
-          "col": 22
-        },
-        "end": {
-          "line": 86,
-          "col": 5
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Signature mismatch:
-  Modules do not match:
-    sig type t = int val foo : 'a -> string end
-  is not included in
-    S
-  Values do not match:
-    val foo : 'a -> string
-  is not included in
-    val foo : int -> t
-  File \"test.ml\", line 72, characters 2-20: Expected declaration
-  File \"test.ml\", line 85, characters 8-11: Actual declaration"
-      },
-      {
-        "start": {
-          "line": 90,
-          "col": 18
-        },
-        "end": {
-          "line": 90,
-          "col": 19
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This expression has type int but an expression was expected of type Dep.M.t"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
 
   $ $MERLIN single errors -filename test.ml -short-paths < test.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 21,
-          "col": 36
-        },
-        "end": {
-          "line": 21,
-          "col": 49
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Some type variables are unbound in this type: class b : 'a -> a
-  The method x has type 'a where 'a is unbound"
-      },
-      {
-        "start": {
-          "line": 23,
-          "col": 46
-        },
-        "end": {
-          "line": 23,
-          "col": 47
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This class expression is not a class structure; it has type 'a -> a"
-      },
-      {
-        "start": {
-          "line": 27,
-          "col": 0
-        },
-        "end": {
-          "line": 30,
-          "col": 3
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Some type variables are unbound in this type:
-    class test : ?a:'a -> object method b : 'b end
-  The method b has type 'b where 'b is unbound"
-      },
-      {
-        "start": {
-          "line": 27,
-          "col": 12
-        },
-        "end": {
-          "line": 27,
-          "col": 13
-        },
-        "type": "warning",
-        "sub": [],
-        "valid": true,
-        "message": "Warning 16: this optional argument cannot be erased."
-      },
-      {
-        "start": {
-          "line": 29,
-          "col": 13
-        },
-        "end": {
-          "line": 29,
-          "col": 14
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound value c"
-      },
-      {
-        "start": {
-          "line": 34,
-          "col": 0
-        },
-        "end": {
-          "line": 37,
-          "col": 3
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Some type variables are unbound in this type:
-    class test : 'a -> object method b : 'b end
-  The method b has type 'b where 'b is unbound"
-      },
-      {
-        "start": {
-          "line": 36,
-          "col": 13
-        },
-        "end": {
-          "line": 36,
-          "col": 14
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Unbound value c"
-      },
-      {
-        "start": {
-          "line": 39,
-          "col": 12
-        },
-        "end": {
-          "line": 39,
-          "col": 13
-        },
-        "type": "warning",
-        "sub": [],
-        "valid": true,
-        "message": "Warning 16: this optional argument cannot be erased."
-      },
-      {
-        "start": {
-          "line": 63,
-          "col": 25
-        },
-        "end": {
-          "line": 63,
-          "col": 26
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This expression has type N.O.t but an expression was expected of type unit"
-      },
-      {
-        "start": {
-          "line": 82,
-          "col": 22
-        },
-        "end": {
-          "line": 86,
-          "col": 5
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "Signature mismatch:
-  Modules do not match:
-    sig type t = int val foo : 'a -> string end
-  is not included in
-    S
-  Values do not match:
-    val foo : 'a -> string
-  is not included in
-    val foo : t -> t
-  File \"test.ml\", line 72, characters 2-20: Expected declaration
-  File \"test.ml\", line 85, characters 8-11: Actual declaration"
-      },
-      {
-        "start": {
-          "line": 90,
-          "col": 18
-        },
-        "end": {
-          "line": 90,
-          "col": 19
-        },
-        "type": "typer",
-        "sub": [],
-        "valid": true,
-        "message": "This expression has type int but an expression was expected of type Dep.t"
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
         git (internal) (exit 1)
(cd _build/.sandbox/fcf5237e650d476e1d8a76a6e2387062/default && /usr/bin/git --no-pager diff --no-index --color=always -u ../../../default/tests/test-dirs/outline.t/run.t tests/test-dirs/outline.t/run.t.corrected)
diff --git a/../../../default/tests/test-dirs/outline.t/run.t b/tests/test-dirs/outline.t/run.t.corrected
index e74affc..7b6f525 100644
--- a/../../../default/tests/test-dirs/outline.t/run.t
+++ b/tests/test-dirs/outline.t/run.t.corrected
@@ -1,244 +1,11 @@
   $ echo "S .\nB .\nFLG -nopervasives" > .merlin
   $ $MERLIN single outline < foo.ml
-  {
-    "class": "return",
-    "value": [
-      {
-        "start": {
-          "line": 24,
-          "col": 0
-        },
-        "end": {
-          "line": 28,
-          "col": 3
-        },
-        "name": "point",
-        "kind": "Type",
-        "type": null,
-        "children": [
-          {
-            "start": {
-              "line": 27,
-              "col": 4
-            },
-            "end": {
-              "line": 27,
-              "col": 10
-            },
-            "name": "z",
-            "kind": "Label",
-            "type": null,
-            "children": [],
-            "deprecated": false
-          },
-          {
-            "start": {
-              "line": 26,
-              "col": 4
-            },
-            "end": {
-              "line": 27,
-              "col": 3
-            },
-            "name": "y",
-            "kind": "Label",
-            "type": null,
-            "children": [],
-            "deprecated": false
-          },
-          {
-            "start": {
-              "line": 25,
-              "col": 4
-            },
-            "end": {
-              "line": 26,
-              "col": 3
-            },
-            "name": "x",
-            "kind": "Label",
-            "type": null,
-            "children": [],
-            "deprecated": false
-          }
-        ],
-        "deprecated": false
-      },
-      {
-        "start": {
-          "line": 20,
-          "col": 0
-        },
-        "end": {
-          "line": 22,
-          "col": 16
-        },
-        "name": "eithery",
-        "kind": "Type",
-        "type": null,
-        "children": [
-          {
-            "start": {
-              "line": 22,
-              "col": 2
-            },
-            "end": {
-              "line": 22,
-              "col": 16
-            },
-            "name": "Righty",
-            "kind": "Constructor",
-            "type": null,
-            "children": [],
-            "deprecated": false
-          },
-          {
-            "start": {
-              "line": 21,
-              "col": 2
-            },
-            "end": {
-              "line": 21,
-              "col": 15
-            },
-            "name": "Lefty",
-            "kind": "Constructor",
-            "type": null,
-            "children": [],
-            "deprecated": false
-          }
-        ],
-        "deprecated": false
-      },
-      {
-        "start": {
-          "line": 18,
-          "col": 0
-        },
-        "end": {
-          "line": 18,
-          "col": 20
-        },
-        "name": "Ex",
-        "kind": "Exn",
-        "type": null,
-        "children": [],
-        "deprecated": false
-      },
-      {
-        "start": {
-          "line": 14,
-          "col": 0
-        },
-        "end": {
-          "line": 16,
-          "col": 3
-        },
-        "name": "class_b",
-        "kind": "Class",
-        "type": null,
-        "children": [
-          {
-            "start": {
-              "line": 15,
-              "col": 9
-            },
-            "end": {
-              "line": 15,
-              "col": 10
-            },
-            "name": "b",
-            "kind": "Method",
-            "type": null,
-            "children": [],
-            "deprecated": false
-          }
-        ],
-        "deprecated": false
-      },
-      {
-        "start": {
-          "line": 1,
-          "col": 0
-        },
-        "end": {
-          "line": 8,
-          "col": 3
-        },
-        "name": "Bar",
-        "kind": "Module",
-        "type": null,
-        "children": [
-          {
-            "start": {
-              "line": 3,
-              "col": 1
-            },
-            "end": {
-              "line": 7,
-              "col": 4
-            },
-            "name": "S1",
-            "kind": "Signature",
-            "type": null,
-            "children": [
-              {
-                "start": {
-                  "line": 6,
-                  "col": 3
-                },
-                "end": {
-                  "line": 6,
-                  "col": 21
-                },
-                "name": "foo",
-                "kind": "Value",
-                "type": "t -> int",
-                "children": [],
-                "deprecated": false
-              },
-              {
-                "start": {
-                  "line": 4,
-                  "col": 3
-                },
-                "end": {
-                  "line": 4,
-                  "col": 9
-                },
-                "name": "t",
-                "kind": "Type",
-                "type": null,
-                "children": [],
-                "deprecated": false
-              }
-            ],
-            "deprecated": false
-          },
-          {
-            "start": {
-              "line": 2,
-              "col": 1
-            },
-            "end": {
-              "line": 2,
-              "col": 13
-            },
-            "name": "t",
-            "kind": "Type",
-            "type": null,
-            "children": [],
-            "deprecated": false
-          }
-        ],
-        "deprecated": false
-      }
-    ],
-    "notifications": []
-  }
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
   $ $MERLIN single outline < path.ml | jq '.value[].type'
-  "A.a"
-  null
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
   $ $MERLIN single outline -short-paths < path.ml | jq '.value[].type'
-  "a"
-  null
+  jq: command not found
+  /var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1/_build/default/tests/.bin/merlin-wrapper: line 6: jq: command not found
+  [127]
 * ERROR: dev-ml/merlin-4.1-r2::gentoo failed (test phase):
 *   (no error message)
 * 
 * Call stack:
 *     ebuild.sh, line 127:  Called src_test
 *   environment, line 837:  Called dune_src_test
 *   environment, line 392:  Called die
 * The specific snippet of code:
 *       dune runtest || die
 * 
 * If you need support, post the output of `emerge --info '=dev-ml/merlin-4.1-r2::gentoo'`,
 * the complete build log and the output of `emerge -pqv '=dev-ml/merlin-4.1-r2::gentoo'`.
 * The complete build log is located at '/var/log/emerge-log/build/dev-ml/merlin-4.1-r2:20210929-062302.log'.
 * For convenience, a symlink to the build log is located at '/var/tmp/portage/dev-ml/merlin-4.1-r2/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/dev-ml/merlin-4.1-r2/temp/environment'.
 * Working directory: '/var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1'
 * S: '/var/tmp/portage/dev-ml/merlin-4.1-r2/work/merlin-4.1'