diff --git a/.merlin b/.merlin
index c5bffb8c60a47167371e6b9841b0d02ef2eb4d53..85d3a654aab398a822e7c90a0fc7cfca3ae8a9cd 100644
--- a/.merlin
+++ b/.merlin
@@ -1,28 +1,10 @@
-S src
-S lib/sasacore
-S lib/sasa
-S lib/algo
-S ../rdbg/lib
-S ../rdbg/bin
-S ../lutils/bin
-S ../lutils/lib
-S ../lutin/lib/lutin
-S ../lutin/lib/bddand
-S ../lutin/lib/ezdl
-S ../lutin/lib/polka
-S ../lutin/bin
+PKG lutils rdbg lustre-v6 lutin
 
+S src/
+S lib/sasacore/
+S lib/sasa/
+S lib/algo/
 
-
-
-B $OPAM_SWITCH_PREFIX/lib/lutils
-B $OPAM_SWITCH_PREFIX/lib/lutin
-B $OPAM_SWITCH_PREFIX/lib/lustrev6
-B $OPAM_SWITCH_PREFIX/lib/rdbg
-B $OPAM_SWITCH_PREFIX/lib/ocaml
-B $OPAM_SWITCH_PREFIX/lib/ocamlgraph
-B _build/default/src/.sasaMain.eobjs
-B _build/default/lib/algo/.algo.objs
-B _build/default/lib/sasa/.sasa.objs
-B _build/default/lib/sasacore/.sasacore.objs
-
+B _build/default/lib/algo/.algo.objs/*
+B _build/default/lib/sasa/.sasa.objs/*
+B _build/default/lib/sasacore/.sasacore.objs/*
diff --git a/test/.merlin b/test/.merlin
new file mode 100644
index 0000000000000000000000000000000000000000..900c25452f5486ce95ae9b64e477a5c27992dd9a
--- /dev/null
+++ b/test/.merlin
@@ -0,0 +1,2 @@
+PKG algo sasa sasacore lutils rdbg lustre-v6 lutin
+
diff --git a/test/Makefile.inc b/test/Makefile.inc
index 036c3cb21ee378aefbde20a3f8567dc132f02fec..f3b8a480addb08209d77a578c1e16b4bb9d39342 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -1,11 +1,8 @@
-# Time-stamp: <modified the 12/10/2020 (at 16:31) by Erwan Jahier>
+# Time-stamp: <modified the 10/11/2020 (at 10:48) by Erwan Jahier>
 #
 # Define some default rules that ought to work most of the time
 #
 
-DIR=../../_build/install/default
-
-sasa=$(DIR)/bin/sasa  -l 100
 sasa=sasa
 
 LIB=-package algo
@@ -13,15 +10,30 @@ ifndef DAEMON
 	DAEMON=-dd
 endif
 
+OCAMLOPT=ocamlfind ocamlopt -bin-annot
+
 .PRECIOUS: %.ml
 %.ml: %.dot 
 	sasa -reg $<
 
 %.cmxs: %.ml
-	ocamlfind ocamlopt $(LIB) -shared state.ml $(shell sasa -algo $*.dot) config.ml $< -o $@
+	$(OCAMLOPT) $(LIB) -shared state.ml $(shell sasa -algo $*.dot) config.ml $< -o $@
+
+genclean:
+	rm -f *.cmxs sasa *.cm* *.o *.pdf *.rif *.gp *.log *.dro *.seed *.c *.h sasa-*.dot *.cmt *.annot
+	rm -f rdbg-session*.ml luretteSession* *.lut a.out *.cov read_dot.ml
+	rm -f *.exec *.sh  grid*.ml read_dot.ml rdbg-history
+
+##################################################################################
+# 
+-include Makefile.untracked
+
+g:gnuplot
+s:sim2chrogtk
 
+OCAMLC=ocamlfind ocamlc -bin-annot
 %.cma: %.ml
-	ocamlfind ocamlc -a $(LIB)  state.ml $(shell sasa -algo $*.dot) $< -o $@
+	$(OCAMLC) $(LIB) -a state.ml $(shell sasa -algo $*.dot) $< -o $@
 
 %.lut: %.dot %.cmxs
 	sasa -gld $< || echo "==> ok, I'll use the existing $@ file"
@@ -48,15 +60,3 @@ endif
 %.rdbgui: %.dot %.ml
 	ledit -h rdbg-history -x rdbgui4sasa -sut "sasa $< $(DAEMON)" 
 
-
-
-g:gnuplot
-s:sim2chrogtk
-
-genclean:
-	rm -f *.cmxs sasa *.cm* *.o *.pdf *.rif *.gp *.log *.dro *.seed *.c *.h sasa-*.dot
-	rm -f rdbg-session*.ml luretteSession* *.lut a.out *.cov read_dot.ml
-	rm -f *.exec *.sh  grid*.ml read_dot.ml rdbg-history
-
-##################################################################################
--include Makefile.untracked
diff --git a/test/sasa-rdbg-cmds.ml b/test/sasa-rdbg-cmds.ml
index d33e31ca3b9183de027ca40b00ec86bf9bc4a793..1332ec532a37a0c280cbc8ec3ed8f95e93131e4d 100644
--- a/test/sasa-rdbg-cmds.ml
+++ b/test/sasa-rdbg-cmds.ml
@@ -3,7 +3,7 @@
 It is meant  to be loaded after the (rdbg-generated) "rdbg-cmds.ml" file.
 Look at the sasa/test/*/my-rdbg-commands.ml files for examples
 *)
-
+open RdbgMain
 #require "sasa";;
        
 (**********************************************************************)