diff --git a/test/lwt/dune b/test/lwt/dune
index ce00af36..206888ef 100644
--- a/test/lwt/dune
+++ b/test/lwt/dune
@@ -8,7 +8,7 @@
   (enabled_if (>= %{ocaml_version} 5.0))
   (action
     (with-stdout-to %{targets}
-     (run ./run_hash.sh -d ../../src --n-conn=2 -j=4 --ext ".ml"))))
+     (run ./run_hash.sh -d ../../src/core/ --n-conn=2 -j=4 --ext ".ml"))))
 
 (rule
   (alias runtest)
diff --git a/test/lwt/output_hash.expected b/test/lwt/output_hash.expected
index 9f47651f..febc65cc 100644
--- a/test/lwt/output_hash.expected
+++ b/test/lwt/output_hash.expected
@@ -1,5 +1,5 @@
 listening on port 1234
-run hash client -p 1234 -d ../../src --n-conn=2 -j=4 --ext .ml
+run hash client -p 1234 -d ../../src/core/ --n-conn=2 -j=4 --ext .ml
 ../../src/core/background_thread.ml: 6d5c624dac304cf82ffa6f738516ec9a97aba297
 ../../src/core/background_thread.ml: 6d5c624dac304cf82ffa6f738516ec9a97aba297
 ../../src/core/background_thread.pp.ml: 6d5c624dac304cf82ffa6f738516ec9a97aba297
@@ -68,121 +68,5 @@ run hash client -p 1234 -d ../../src --n-conn=2 -j=4 --ext .ml
 ../../src/core/ws_pool.ml: c4b4e64dbcd494fa60d3c3158cc0e0e247269a3d
 ../../src/core/ws_pool.pp.ml: 0074b9c5735e05c6781ee98fb593019771964f5e
 ../../src/core/ws_pool.pp.ml: 0074b9c5735e05c6781ee98fb593019771964f5e
-../../src/cpp/cpp.ml: 95f8df4e79fe7575aff0c126b329d930be82dde9
-../../src/cpp/cpp.ml: 95f8df4e79fe7575aff0c126b329d930be82dde9
-../../src/fib/fiber.ml: 771c014648a6f7e00d93ab3a5c4bb2ec49841c4d
-../../src/fib/fiber.ml: 771c014648a6f7e00d93ab3a5c4bb2ec49841c4d
-../../src/fib/fiber.pp.ml: 771c014648a6f7e00d93ab3a5c4bb2ec49841c4d
-../../src/fib/fiber.pp.ml: 771c014648a6f7e00d93ab3a5c4bb2ec49841c4d
-../../src/fib/fls.ml: 1d2d745c203a03980195471421e4101879d46a31
-../../src/fib/fls.ml: 1d2d745c203a03980195471421e4101879d46a31
-../../src/fib/fls.pp.ml: 1d2d745c203a03980195471421e4101879d46a31
-../../src/fib/fls.pp.ml: 1d2d745c203a03980195471421e4101879d46a31
-../../src/fib/handle.ml: d3c9c3c2c414372e8ce6cd7eb113955292cdda5e
-../../src/fib/handle.ml: d3c9c3c2c414372e8ce6cd7eb113955292cdda5e
-../../src/fib/handle.pp.ml: d3c9c3c2c414372e8ce6cd7eb113955292cdda5e
-../../src/fib/handle.pp.ml: d3c9c3c2c414372e8ce6cd7eb113955292cdda5e
-../../src/lwt/IO.ml: 48fae1816121700314aebbdfcca562979dc3ff06
-../../src/lwt/IO.ml: 48fae1816121700314aebbdfcca562979dc3ff06
-../../src/lwt/IO_in.ml: 6badd5ffb8fbbdb53f729b93a478bb007f2494f8
-../../src/lwt/IO_in.ml: 6badd5ffb8fbbdb53f729b93a478bb007f2494f8
-../../src/lwt/IO_out.ml: 600db42f1fecdd95ab216db85eadac6371db53c2
-../../src/lwt/IO_out.ml: 600db42f1fecdd95ab216db85eadac6371db53c2
-../../src/lwt/base.ml: f04b92ec1f6d9f389b7c5dc26fc17e8bd80c4673
-../../src/lwt/base.ml: f04b92ec1f6d9f389b7c5dc26fc17e8bd80c4673
-../../src/lwt/common_.ml: b3267137b9e0d74d220b090de9fcce051dc2bf93
-../../src/lwt/common_.ml: b3267137b9e0d74d220b090de9fcce051dc2bf93
-../../src/lwt/moonpool_lwt.ml: c71a73fb39bc2be146c7a30528799235c86cfcb8
-../../src/lwt/moonpool_lwt.ml: c71a73fb39bc2be146c7a30528799235c86cfcb8
-../../src/lwt/tcp_client.ml: d9c3f1a80709d2a3160309f00343bd1f561d879d
-../../src/lwt/tcp_client.ml: d9c3f1a80709d2a3160309f00343bd1f561d879d
-../../src/lwt/tcp_server.ml: 8219be881ec5b28a15cf6a5f3fc8cd6242f55091
-../../src/lwt/tcp_server.ml: 8219be881ec5b28a15cf6a5f3fc8cd6242f55091
-../../src/private/atomic_.ml: 59361c33aecdba9500f23520f6d132dc17994403
-../../src/private/atomic_.ml: 59361c33aecdba9500f23520f6d132dc17994403
-../../src/private/atomic_.pp.ml: 0da0702698c2bf4d32e20ba759f049f5c08aed4b
-../../src/private/atomic_.pp.ml: 0da0702698c2bf4d32e20ba759f049f5c08aed4b
-../../src/private/dla_.ml: 0a358d447df534f08fd7200b5b86ef0ecf56c385
-../../src/private/dla_.ml: 0a358d447df534f08fd7200b5b86ef0ecf56c385
-../../src/private/dla_.pp.ml: 0a358d447df534f08fd7200b5b86ef0ecf56c385
-../../src/private/dla_.pp.ml: 0a358d447df534f08fd7200b5b86ef0ecf56c385
-../../src/private/dla_.real.ml: 61f358e9c5dc5e3981257544fb9619c101862072
-../../src/private/dla_.real.ml: 61f358e9c5dc5e3981257544fb9619c101862072
-../../src/private/domain_.ml: f9d3066c0302c7538bba7f3c66373994930e6582
-../../src/private/domain_.ml: f9d3066c0302c7538bba7f3c66373994930e6582
-../../src/private/domain_.pp.ml: 7a49ce3176beda664781d982536a7491b6c7d1e2
-../../src/private/domain_.pp.ml: 7a49ce3176beda664781d982536a7491b6c7d1e2
-../../src/private/thread_local_storage_.ml: 0608b7a6514ff68c5301f2c90fce5bdbfa9b85a9
-../../src/private/thread_local_storage_.ml: 0608b7a6514ff68c5301f2c90fce5bdbfa9b85a9
-../../src/private/thread_local_storage_.pp.ml: 0608b7a6514ff68c5301f2c90fce5bdbfa9b85a9
-../../src/private/thread_local_storage_.pp.ml: 0608b7a6514ff68c5301f2c90fce5bdbfa9b85a9
-../../src/private/thread_local_storage_.stub.ml: 912952a77ec2ff34ee31eb8f91de1b2fe2f2c802
-../../src/private/thread_local_storage_.stub.ml: 912952a77ec2ff34ee31eb8f91de1b2fe2f2c802
-../../src/private/tracing_.ml: cc2edf9a726a4af1b06caa0201c9800884efafba
-../../src/private/tracing_.ml: cc2edf9a726a4af1b06caa0201c9800884efafba
-../../src/private/tracing_.pp.ml: cc2edf9a726a4af1b06caa0201c9800884efafba
-../../src/private/tracing_.pp.ml: cc2edf9a726a4af1b06caa0201c9800884efafba
-../../src/private/tracing_.real.ml: cef5edfa46b0ac7c9d507de73776a3c48c856860
-../../src/private/tracing_.real.ml: cef5edfa46b0ac7c9d507de73776a3c48c856860
-../../src/private/ws_deque_.ml: 03a3764ef4f30673735f08b0e2458afdbb678402
-../../src/private/ws_deque_.ml: 03a3764ef4f30673735f08b0e2458afdbb678402
-../../src/private/ws_deque_.pp.ml: 03a3764ef4f30673735f08b0e2458afdbb678402
-../../src/private/ws_deque_.pp.ml: 03a3764ef4f30673735f08b0e2458afdbb678402
 connecting to port 1234
-explore "../../src"
-explore "../../src"
-explore "../../src/core"
-explore "../../src/core"
-explore "../../src/core/.merlin-conf"
-explore "../../src/core/.merlin-conf"
-explore "../../src/core/.moonpool.objs"
-explore "../../src/core/.moonpool.objs"
-explore "../../src/core/.moonpool.objs/byte"
-explore "../../src/core/.moonpool.objs/byte"
-explore "../../src/core/.moonpool.objs/native"
-explore "../../src/core/.moonpool.objs/native"
-explore "../../src/core/.moonpool.objs/public_cmi"
-explore "../../src/core/.moonpool.objs/public_cmi"
-explore "../../src/cpp"
-explore "../../src/cpp"
-explore "../../src/cpp/.cpp.eobjs"
-explore "../../src/cpp/.cpp.eobjs"
-explore "../../src/cpp/.cpp.eobjs/byte"
-explore "../../src/cpp/.cpp.eobjs/byte"
-explore "../../src/cpp/.cpp.eobjs/native"
-explore "../../src/cpp/.cpp.eobjs/native"
-explore "../../src/cpp/.merlin-conf"
-explore "../../src/cpp/.merlin-conf"
-explore "../../src/fib"
-explore "../../src/fib"
-explore "../../src/fib/.merlin-conf"
-explore "../../src/fib/.merlin-conf"
-explore "../../src/fib/.moonpool_fib.objs"
-explore "../../src/fib/.moonpool_fib.objs"
-explore "../../src/fib/.moonpool_fib.objs/byte"
-explore "../../src/fib/.moonpool_fib.objs/byte"
-explore "../../src/fib/.moonpool_fib.objs/native"
-explore "../../src/fib/.moonpool_fib.objs/native"
-explore "../../src/lwt"
-explore "../../src/lwt"
-explore "../../src/lwt/.merlin-conf"
-explore "../../src/lwt/.merlin-conf"
-explore "../../src/lwt/.moonpool_lwt.objs"
-explore "../../src/lwt/.moonpool_lwt.objs"
-explore "../../src/lwt/.moonpool_lwt.objs/byte"
-explore "../../src/lwt/.moonpool_lwt.objs/byte"
-explore "../../src/lwt/.moonpool_lwt.objs/native"
-explore "../../src/lwt/.moonpool_lwt.objs/native"
-explore "../../src/lwt/.moonpool_lwt.objs/public_cmi"
-explore "../../src/lwt/.moonpool_lwt.objs/public_cmi"
-explore "../../src/private"
-explore "../../src/private"
-explore "../../src/private/.merlin-conf"
-explore "../../src/private/.merlin-conf"
-explore "../../src/private/.moonpool_private.objs"
-explore "../../src/private/.moonpool_private.objs"
-explore "../../src/private/.moonpool_private.objs/byte"
-explore "../../src/private/.moonpool_private.objs/byte"
-explore "../../src/private/.moonpool_private.objs/native"
-explore "../../src/private/.moonpool_private.objs/native"
-hash dir="../../src"
+hash dir="../../src/core/"