diff --git a/Makefile b/Makefile
index 0dd9b6b7e0efe2a068038f5e0a9239a9b19e48f2..a001d3f0bc972c1d78583701114cc92e812740ea 100644
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,7 @@ TESTS=builtins callgraph cil constant_propagation dynamic float idct impact jcdb
 # todo: adds aorai (2 configs + Aorai_test library)
 # todo: no test found for studia ?
 # todo: adds wp (at least 2 configs)
-PLUGIN_TESTS= dive instantiate loop_analysis markdown-report nonterm report server variadic
+PLUGIN_TESTS= dive instantiate loop_analysis markdown-report nonterm report server variadic wp
 
 tests: config.sed
 	find tests $(addprefix src/plugins/,$(addsuffix /tests,$(PLUGIN_TESTS))) -name dune | grep -e "oracle.*/\|result.*/" | xargs --no-run-if-empty rm
diff --git a/ptests/ptests.ml b/ptests/ptests.ml
index ce24ba7a4dbadcdf27854fac30628c4e8ffc9f8f..239a64d6656adf59366ee061f35c1d046968ca01 100644
--- a/ptests/ptests.ml
+++ b/ptests/ptests.ml
@@ -357,13 +357,14 @@ let () =
       (*Parse the plugin configuration file for tests. Format is 'Key=value' *)
       let ch = open_in config in
       let regexp = Str.regexp "\\([^=]+\\)=\\(.*\\)" in
+      let regexp_comment = Str.regexp " *#" in
       while true do
         let line = input_line ch in
         if Str.string_match regexp line 0 then
           let key = Str.matched_group 1 line in
           let value = Str.matched_group 2 line in
           parse_config_line (key, value)
-        else begin
+        else if not (Str.string_match regexp_comment line 0) then begin
           Format.eprintf "Cannot interpret line '%s' in file %s. Aborting (CWD=%s).@." line config (Sys.getcwd());
           exit 1
         end
@@ -643,16 +644,17 @@ let config_exec ~once dir s current =
     dc_execnow =
       scan_execnow ~once dir current.dc_timeout s :: current.dc_execnow }
 
+let split_list s = Str.split (Str.regexp "[ ,]+") s
 let config_cmxs _dir s current =
-  let l = split_blank s in
+  let l = split_list s in
   { current with dc_cmxs = l @ current.dc_cmxs }
 
 let config_deps _dir s current =
-  { current with dc_deps = (split_blank s) @ current.dc_deps }
+  { current with dc_deps = (split_list s) @ current.dc_deps }
 
 let config_plugin _dir s current =
   let s = Macros.expand current.dc_macros s in
-  { current with dc_plugins = split_blank s ;
+  { current with dc_plugins = split_list s ;
                  dc_macros = Macros.add_list ["PLUGIN", s] current.dc_macros }
 
 let config_macro _dir s current =
diff --git a/src/plugins/wp/.gitignore b/src/plugins/wp/.gitignore
index cef13bf8888bf028592d12d57dfdaea19175c379..baf16ae83ffec9265fefa372a36536575bc15b60 100644
--- a/src/plugins/wp/.gitignore
+++ b/src/plugins/wp/.gitignore
@@ -8,7 +8,7 @@
 
 
 
-/tests/ptests_config
+/tests/*/oracle/dune
 /tests/*/result
 /tests/*/result_*
 /tests/*/*.sav
diff --git a/src/plugins/wp/tests/ptests_config b/src/plugins/wp/tests/ptests_config
new file mode 100644
index 0000000000000000000000000000000000000000..b95db38056cd77d86b9ceef8c3fef72f154be981
--- /dev/null
+++ b/src/plugins/wp/tests/ptests_config
@@ -0,0 +1,2 @@
+DEFAULT_SUITES= wp wp_plugin wp_acsl wp_bts wp_store wp_hoare wp_typed wp_usage wp_gallery wp_manual wp_tip
+#wp_region
diff --git a/src/plugins/wp/tests/test_config b/src/plugins/wp/tests/test_config
index ebf3f27c26f9ec910cfdb25e281a6141d841198d..af58095c66525f1e8d0f737cfb43a205463f9f1d 100644
--- a/src/plugins/wp/tests/test_config
+++ b/src/plugins/wp/tests/test_config
@@ -1,2 +1,3 @@
-CMD: @frama-c@ -no-autoload-plugins -load-module wp -wp -wp-prover none -wp-print -wp-share ./share -wp-msg-key shell
+PLUGIN: wp,rtegen
+CMD: @frama-c@ -wp -wp-prover none -wp-print -wp-share ../../../share -wp-msg-key shell
 OPT:
diff --git a/src/plugins/wp/tests/test_config_qualif b/src/plugins/wp/tests/test_config_qualif
index 82ac23797226aae576338c46106f95e16f40b717..025eebf2ff9f9230609a965d32a27e8251c72d77 100644
--- a/src/plugins/wp/tests/test_config_qualif
+++ b/src/plugins/wp/tests/test_config_qualif
@@ -1,2 +1,2 @@
-CMD: @frama-c@ -no-autoload-plugins -load-module wp -wp -wp-par 1 -wp-share ./share -wp-msg-key shell -wp-report tests/qualif.report -wp-session @PTEST_DIR@/oracle@PTEST_CONFIG@/@PTEST_NAME@.@PTEST_NUMBER@.session -wp-cache-env -wp-cache replay @PTEST_FILE@ -wp-coq-timeout 120
+CMD: @frama-c@ -wp -wp-par 1 -wp-share %{dep:%{read:../../../share}} -wp-msg-key shell -wp-report  %{dep:../../qualif.report} -wp-session @PTEST_NAME@.@PTEST_NUMBER@.session -wp-cache-env -wp-cache replay @PTEST_FILE@ -wp-coq-timeout 120
 OPT:
diff --git a/src/plugins/wp/tests/wp/oracle/bug_rte.res.oracle b/src/plugins/wp/tests/wp/oracle/bug_rte.res.oracle
index 8e96b463d843796406c704b871a801fd6fbf776e..0de7045f16641d2abf817964791b1e6fa77ad86f 100644
--- a/src/plugins/wp/tests/wp/oracle/bug_rte.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/bug_rte.res.oracle
@@ -1,18 +1,18 @@
 # frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp/bug_rte.i (no preprocessing)
+[kernel] Parsing bug_rte.i (no preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function bug
 ------------------------------------------------------------
   Function bug
 ------------------------------------------------------------
 
-Goal Assertion 'rte,signed_overflow' (file tests/wp/bug_rte.i, line 7):
+Goal Assertion 'rte,signed_overflow' (file bug_rte.i, line 7):
 Assume { Type: is_sint32(i) /\ is_sint32(j). }
 Prove: if (j = 1) then ((-2147483647) <= i) else ((-2147483648) <= i).
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,signed_overflow' (file tests/wp/bug_rte.i, line 7):
+Goal Assertion 'rte,signed_overflow' (file bug_rte.i, line 7):
 Assume { Type: is_sint32(i) /\ is_sint32(j). }
 Prove: i <= (2147483647 + (if (j = 1) then 1 else 0)).
 
diff --git a/src/plugins/wp/tests/wp/oracle/cfg_loop.res.oracle b/src/plugins/wp/tests/wp/oracle/cfg_loop.res.oracle
index e3e370f250f473cb8875e20f101e9b47b6cfa02e..f6c3c4040046fd09ca329c7da4aa857e26317b70 100644
--- a/src/plugins/wp/tests/wp/oracle/cfg_loop.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/cfg_loop.res.oracle
@@ -1,22 +1,22 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp/cfg_loop.i (no preprocessing)
+[kernel] Parsing cfg_loop.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function loop_continue
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp/cfg_loop.i, line 40):
+Goal Preservation of Invariant (file cfg_loop.i, line 40):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp/cfg_loop.i, line 40):
+Goal Establishment of Invariant (file cfg_loop.i, line 40):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp/cfg_loop.i, line 41):
+Goal Loop assigns (file cfg_loop.i, line 41):
 Prove: true.
 
 ------------------------------------------------------------
@@ -24,72 +24,72 @@ Prove: true.
   Function loop_switch
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp/cfg_loop.i, line 12) (1/3):
+Goal Preservation of Invariant (file cfg_loop.i, line 12) (1/3):
 Tags: Default.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp/cfg_loop.i, line 12) (2/3):
+Goal Preservation of Invariant (file cfg_loop.i, line 12) (2/3):
 Tags: Case 2.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp/cfg_loop.i, line 12) (3/3):
+Goal Preservation of Invariant (file cfg_loop.i, line 12) (3/3):
 Tags: Case 1.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp/cfg_loop.i, line 12):
+Goal Establishment of Invariant (file cfg_loop.i, line 12):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp/cfg_loop.i, line 13) (1/3):
+Goal Preservation of Invariant (file cfg_loop.i, line 13) (1/3):
 Tags: Default.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp/cfg_loop.i, line 13) (2/3):
+Goal Preservation of Invariant (file cfg_loop.i, line 13) (2/3):
 Tags: Case 2.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp/cfg_loop.i, line 13) (3/3):
+Goal Preservation of Invariant (file cfg_loop.i, line 13) (3/3):
 Tags: Case 1.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp/cfg_loop.i, line 13):
+Goal Establishment of Invariant (file cfg_loop.i, line 13):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp/cfg_loop.i, line 14) (1/4):
+Goal Loop assigns (file cfg_loop.i, line 14) (1/4):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp/cfg_loop.i, line 14) (2/4):
+Goal Loop assigns (file cfg_loop.i, line 14) (2/4):
 Effect at line 16
 Tags: Default.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp/cfg_loop.i, line 14) (3/4):
+Goal Loop assigns (file cfg_loop.i, line 14) (3/4):
 Effect at line 16
 Tags: Case 2.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp/cfg_loop.i, line 14) (4/4):
+Goal Loop assigns (file cfg_loop.i, line 14) (4/4):
 Effect at line 16
 Tags: Case 1.
 Prove: true.
diff --git a/src/plugins/wp/tests/wp/oracle/sharing.res.oracle b/src/plugins/wp/tests/wp/oracle/sharing.res.oracle
index 1a343c630528b7e9168bb0126b3d7d389f3a8413..155088dfce72eeabdc802c59ed44fe55421fad6e 100644
--- a/src/plugins/wp/tests/wp/oracle/sharing.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/sharing.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp/sharing.c (with preprocessing)
+[kernel] Parsing sharing.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 [wp] 1 goal scheduled
@@ -71,7 +71,7 @@ end
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp/sharing.c, line 8) in 'f':
+Goal Post-condition (file sharing.c, line 8) in 'f':
 Let a = shift_sint32(t, 0).
 Let a_1 = shift_sint32(t, x).
 Let m = Mint_0[a <- Mint_0[a_1]].
diff --git a/src/plugins/wp/tests/wp/oracle/stmtcompiler_test.res.oracle b/src/plugins/wp/tests/wp/oracle/stmtcompiler_test.res.oracle
index d7c91e8c587cda072659f627edf1409be880ede6..6ccbb994cfcee29d9dfe8f05a0405b0b2a9951ea 100644
--- a/src/plugins/wp/tests/wp/oracle/stmtcompiler_test.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/stmtcompiler_test.res.oracle
@@ -1,18 +1,18 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp/stmtcompiler_test.i (no preprocessing)
-[kernel] tests/wp/stmtcompiler_test.i:136: Warning: 
+[kernel] Parsing stmtcompiler_test.i (no preprocessing)
+[kernel] stmtcompiler_test.i:136: Warning: 
   Body of function if_assert falls-through. Adding a return statement
 [wp] Running WP plugin...
-[kernel] tests/wp/stmtcompiler_test.i:145: Warning: 
+[kernel] stmtcompiler_test.i:145: Warning: 
   No code nor implicit assigns clause for function behavior1, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
-[wp] tests/wp/stmtcompiler_test.i:81: Warning: 
+[wp] stmtcompiler_test.i:81: Warning: 
   Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function behavior2
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 109):
+Goal Assertion (file stmtcompiler_test.i, line 109):
 Prove: true.
 
 ------------------------------------------------------------
@@ -20,7 +20,7 @@ Prove: true.
   Function behavior3
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 116):
+Goal Assertion (file stmtcompiler_test.i, line 116):
 Prove: true.
 
 ------------------------------------------------------------
@@ -28,7 +28,7 @@ Prove: true.
   Function behavior4
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 123):
+Goal Assertion (file stmtcompiler_test.i, line 123):
 Prove: true.
 
 ------------------------------------------------------------
@@ -36,7 +36,7 @@ Prove: true.
   Function behavior5
 ------------------------------------------------------------
 
-Goal Assertion 'bad' (file tests/wp/stmtcompiler_test.i, line 131):
+Goal Assertion 'bad' (file stmtcompiler_test.i, line 131):
 Assume { Type: is_sint32(x). (* Call 'behavior1' *) Have: 0 <= x. }
 Prove: false.
 
@@ -45,7 +45,7 @@ Prove: false.
   Function compare
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 154):
+Goal Assertion (file stmtcompiler_test.i, line 154):
 Prove: true.
 
 ------------------------------------------------------------
@@ -53,7 +53,7 @@ Prove: true.
   Function empty
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 6):
+Goal Assertion (file stmtcompiler_test.i, line 6):
 Prove: true.
 
 ------------------------------------------------------------
@@ -61,13 +61,13 @@ Prove: true.
   Function if_assert
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 137):
+Goal Assertion (file stmtcompiler_test.i, line 137):
 Assume { Type: is_sint32(x) /\ is_sint32(y). (* Then *) Have: x < 0. }
 Prove: x < (y * y).
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 140):
+Goal Assertion (file stmtcompiler_test.i, line 140):
 Assume {
   Type: is_sint32(x) /\ is_sint32(y) /\ is_sint32(-x).
   (* Else *)
@@ -77,12 +77,12 @@ Prove: 0 < (x + (y * y)).
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 142):
+Goal Assertion (file stmtcompiler_test.i, line 142):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'missing_return' (file tests/wp/stmtcompiler_test.i, line 143):
+Goal Assertion 'missing_return' (file stmtcompiler_test.i, line 143):
 Assume {
   Type: is_sint32(x) /\ is_sint32(x_1) /\ is_sint32(x_2) /\ is_sint32(y).
   If x_2 < 0
@@ -98,7 +98,7 @@ Prove: false.
   Function main
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 50):
+Goal Assertion (file stmtcompiler_test.i, line 50):
 Prove: true.
 
 ------------------------------------------------------------
@@ -106,17 +106,17 @@ Prove: true.
   Function main_assigns_global
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 67):
+Goal Assertion (file stmtcompiler_test.i, line 67):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 68):
+Goal Assertion (file stmtcompiler_test.i, line 68):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'bad' (file tests/wp/stmtcompiler_test.i, line 69):
+Goal Assertion 'bad' (file stmtcompiler_test.i, line 69):
 Assume { Type: is_sint32(foo_0). }
 Prove: foo_0 = 1.
 
@@ -125,7 +125,7 @@ Prove: foo_0 = 1.
   Function main_ensures_result
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 43):
+Goal Assertion (file stmtcompiler_test.i, line 43):
 Prove: true.
 
 ------------------------------------------------------------
@@ -133,7 +133,7 @@ Prove: true.
   Function not_main
 ------------------------------------------------------------
 
-Goal Assertion 'bad' (file tests/wp/stmtcompiler_test.i, line 54):
+Goal Assertion 'bad' (file stmtcompiler_test.i, line 54):
 Assume { Type: is_sint32(foo_0). }
 Prove: foo_0 = 42.
 
@@ -142,7 +142,7 @@ Prove: foo_0 = 42.
   Function one_assign
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 13):
+Goal Assertion (file stmtcompiler_test.i, line 13):
 Prove: true.
 
 ------------------------------------------------------------
@@ -150,7 +150,7 @@ Prove: true.
   Function one_if
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 18):
+Goal Assertion (file stmtcompiler_test.i, line 18):
 Prove: true.
 
 ------------------------------------------------------------
@@ -158,12 +158,12 @@ Prove: true.
   Function some_seq
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 28):
+Goal Assertion (file stmtcompiler_test.i, line 28):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 29):
+Goal Assertion (file stmtcompiler_test.i, line 29):
 Prove: true.
 
 ------------------------------------------------------------
@@ -171,12 +171,12 @@ Prove: true.
   Function zloop
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp/stmtcompiler_test.i, line 74) in 'zloop':
+Goal Post-condition (file stmtcompiler_test.i, line 74) in 'zloop':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp/stmtcompiler_test.i, line 80):
+Goal Preservation of Invariant (file stmtcompiler_test.i, line 80):
 Assume {
   Type: is_sint32(i) /\ is_sint32(x) /\ is_sint32(1 + i) /\ is_sint32(2 + i).
   (* Pre-condition *)
@@ -190,22 +190,22 @@ Prove: i <= 8.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp/stmtcompiler_test.i, line 80):
+Goal Establishment of Invariant (file stmtcompiler_test.i, line 80):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 84):
+Goal Assertion (file stmtcompiler_test.i, line 84):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 85):
+Goal Assertion (file stmtcompiler_test.i, line 85):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 86):
+Goal Assertion (file stmtcompiler_test.i, line 86):
 Assume {
   Type: is_sint32(x) /\ is_sint32(x_1).
   (* Pre-condition *)
@@ -215,7 +215,7 @@ Prove: 0 <= x.
 
 ------------------------------------------------------------
 
-Goal Assertion 'bad' (file tests/wp/stmtcompiler_test.i, line 87):
+Goal Assertion 'bad' (file stmtcompiler_test.i, line 87):
 Assume {
   Type: is_sint32(x) /\ is_sint32(x_1).
   (* Pre-condition *)
@@ -230,7 +230,7 @@ new way
 empty sequent: Assume { Have: foo_0 = 42. }
 Prove: true.
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 6):
+Goal Assertion (file stmtcompiler_test.i, line 6):
 Prove: true.
 [Qed] Valid
 
@@ -244,7 +244,7 @@ one_assign sequent:
    }
 Prove: d = c.
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 13):
+Goal Assertion (file stmtcompiler_test.i, line 13):
 Prove: true.
 [Qed] Valid
 
@@ -258,7 +258,7 @@ one_if sequent:
    }
 Prove: true.
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 18):
+Goal Assertion (file stmtcompiler_test.i, line 18):
 Prove: true.
 [Qed] Valid
 
@@ -283,7 +283,7 @@ some_seq sequent:
    }
 Prove: ((c = 0) -> (d = 2)).
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 29):
+Goal Assertion (file stmtcompiler_test.i, line 29):
 Prove: true.
 [Qed] Valid
 
@@ -306,7 +306,7 @@ some_seq sequent:
    }
 Prove: ((c != 0) -> (d = 1)).
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 28):
+Goal Assertion (file stmtcompiler_test.i, line 28):
 Prove: true.
 [Qed] Valid
 
@@ -322,32 +322,32 @@ main_ensures_result sequent:
    }
 Prove: x = 0.
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 43):
+Goal Assertion (file stmtcompiler_test.i, line 43):
 Prove: true.
 [Qed] Valid
 
 ------------------------------------------------------------
-[wp] tests/wp/stmtcompiler_test.i:145: Warning: void object
+[wp] stmtcompiler_test.i:145: Warning: void object
 new way
 main sequent: Assume { Have: foo_0 = 42. }
 Prove: foo_0 = 42.
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 50):
+Goal Assertion (file stmtcompiler_test.i, line 50):
 Prove: true.
 [Qed] Valid
 
 ------------------------------------------------------------
-[wp] tests/wp/stmtcompiler_test.i:145: Warning: void object
+[wp] stmtcompiler_test.i:145: Warning: void object
 new way
 not_main sequent: Assume { Have: foo_1 = 42. }
 Prove: foo_0 = 42.
 
-Goal Assertion 'bad' (file tests/wp/stmtcompiler_test.i, line 54):
+Goal Assertion 'bad' (file stmtcompiler_test.i, line 54):
 Prove: foo_0 = 42.
 [Qed] No Result
 
 ------------------------------------------------------------
-[wp] tests/wp/stmtcompiler_test.i:145: Warning: void object
+[wp] stmtcompiler_test.i:145: Warning: void object
 new way
 main_assigns_global sequent:
    Assume {
@@ -362,7 +362,7 @@ main_assigns_global sequent:
    }
 Prove: foo_0 = 1.
 
-Goal Assertion 'bad' (file tests/wp/stmtcompiler_test.i, line 69):
+Goal Assertion 'bad' (file stmtcompiler_test.i, line 69):
 Prove: foo_0 = 1.
 [Qed] No Result
 
@@ -379,7 +379,7 @@ main_assigns_global sequent:
    }
 Prove: r = foo_0.
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 68):
+Goal Assertion (file stmtcompiler_test.i, line 68):
 Prove: true.
 [Qed] Valid
 
@@ -395,7 +395,7 @@ main_assigns_global sequent:
    }
 Prove: ((x = 2) -> (foo_0 = 2)).
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 67):
+Goal Assertion (file stmtcompiler_test.i, line 67):
 Prove: true.
 [Qed] Valid
 
@@ -418,7 +418,7 @@ zloop sequent:
    }
 Prove: i = 1.
 
-Goal Assertion 'bad' (file tests/wp/stmtcompiler_test.i, line 87):
+Goal Assertion 'bad' (file stmtcompiler_test.i, line 87):
 Assume { Have: 0 <= x. }
 Prove: false.
 [Qed] No Result
@@ -439,7 +439,7 @@ zloop sequent:
    }
 Prove: 0 <= x.
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 86):
+Goal Assertion (file stmtcompiler_test.i, line 86):
 Prove: true.
 [Qed] Valid
 
@@ -458,7 +458,7 @@ zloop sequent:
    }
 Prove: i = 10.
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 85):
+Goal Assertion (file stmtcompiler_test.i, line 85):
 Prove: true.
 [Qed] Valid
 
@@ -476,7 +476,7 @@ zloop sequent:
    }
 Prove: 10 <= i.
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 84):
+Goal Assertion (file stmtcompiler_test.i, line 84):
 Prove: true.
 [Qed] Valid
 
@@ -491,7 +491,7 @@ zloop sequent:
    }
 Prove: i <= 10.
 
-Goal Invariant (file tests/wp/stmtcompiler_test.i, line 80):
+Goal Invariant (file stmtcompiler_test.i, line 80):
 Prove: true.
 [Qed] Valid
 
@@ -511,7 +511,7 @@ zloop sequent:
    }
 Prove: i <= 10.
 
-Goal Invariant (file tests/wp/stmtcompiler_test.i, line 80):
+Goal Invariant (file stmtcompiler_test.i, line 80):
 Assume { Have: 0 <= x. Have: i <= 10. Have: i <= 9. }
 Prove: i <= 8.
 Prover Qed returns Valid
@@ -536,7 +536,7 @@ zloop sequent:
    }
 Prove: 0 <= result_0.
 
-Goal Post-condition (file tests/wp/stmtcompiler_test.i, line 74) in 'zloop':
+Goal Post-condition (file stmtcompiler_test.i, line 74) in 'zloop':
 Prove: true.
 [Qed] Valid
 
@@ -552,7 +552,7 @@ behavior2 sequent:
    }
 Prove: x < 0.
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 109):
+Goal Assertion (file stmtcompiler_test.i, line 109):
 Prove: true.
 [Qed] Valid
 
@@ -568,7 +568,7 @@ behavior3 sequent:
    }
 Prove: 0 <= x.
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 116):
+Goal Assertion (file stmtcompiler_test.i, line 116):
 Prove: true.
 [Qed] Valid
 
@@ -585,7 +585,7 @@ behavior4 sequent:
    }
 Prove: x = 0.
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 123):
+Goal Assertion (file stmtcompiler_test.i, line 123):
 Prove: true.
 [Qed] Valid
 
@@ -601,7 +601,7 @@ behavior5 sequent:
    }
 Prove: x < 0.
 
-Goal Assertion 'bad' (file tests/wp/stmtcompiler_test.i, line 131):
+Goal Assertion 'bad' (file stmtcompiler_test.i, line 131):
 Assume { Have: 0 <= x. }
 Prove: false.
 [Qed] No Result
@@ -625,7 +625,7 @@ if_assert sequent:
    }
 Prove: false.
 
-Goal Assertion 'missing_return' (file tests/wp/stmtcompiler_test.i, line 143):
+Goal Assertion 'missing_return' (file stmtcompiler_test.i, line 143):
 Assume {
   If x < 0
   Then { Have: x = x_1. }
@@ -653,7 +653,7 @@ if_assert sequent:
    }
 Prove: x < (y * y).
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 142):
+Goal Assertion (file stmtcompiler_test.i, line 142):
 Prove: true.
 [Qed] Valid
 
@@ -668,7 +668,7 @@ if_assert sequent:
    }
 Prove: x < (y * y).
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 140):
+Goal Assertion (file stmtcompiler_test.i, line 140):
 Assume { Have: 0 <= x. }
 Prove: 0 < (x + (y * y)).
 [Qed] No Result
@@ -683,7 +683,7 @@ if_assert sequent:
    }
 Prove: x < (y * y).
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 137):
+Goal Assertion (file stmtcompiler_test.i, line 137):
 Assume { Have: x < 0. }
 Prove: x < (y * y).
 [Qed] No Result
@@ -754,7 +754,7 @@ compare sequent:
    }
 Prove: ((a < b) -> (r = 1)).
 
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 154):
+Goal Assertion (file stmtcompiler_test.i, line 154):
 Prove: true.
 [Qed] Valid
 
diff --git a/src/plugins/wp/tests/wp/oracle/stmtcompiler_test_rela.res.oracle b/src/plugins/wp/tests/wp/oracle/stmtcompiler_test_rela.res.oracle
index 06fb66f8e03c9eb736c46bff3d8295dc7674e8ca..071e544e7a3485075ff881b85cc678b010791912 100644
--- a/src/plugins/wp/tests/wp/oracle/stmtcompiler_test_rela.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/stmtcompiler_test_rela.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp/stmtcompiler_test_rela.i (no preprocessing)
+[kernel] Parsing stmtcompiler_test_rela.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function empty
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/stmtcompiler_test_rela.i, line 9):
+Goal Assertion (file stmtcompiler_test_rela.i, line 9):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp/oracle/wp_behav.res.oracle b/src/plugins/wp/tests/wp/oracle/wp_behav.res.oracle
index 1482e87b434d9c3b0567abedd3464113b9cda5b2..4a7a65114d7ccc6bf53c82b4045c4c7702b0f99e 100644
--- a/src/plugins/wp/tests/wp/oracle/wp_behav.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/wp_behav.res.oracle
@@ -1,28 +1,28 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp/wp_behav.c (with preprocessing)
+[kernel] Parsing wp_behav.c (with preprocessing)
 [wp] Running WP plugin...
-[wp] tests/wp/wp_behav.c:172: Warning: 
+[wp] wp_behav.c:172: Warning: 
   Ignored specification 'for b1' (generalize to all behavior)
 [wp] Warning: Missing RTE guards
-[wp] tests/wp/wp_behav.c:69: Warning: 
+[wp] wp_behav.c:69: Warning: 
   Missing assigns clause (assigns 'everything' instead)
-[wp] tests/wp/wp_behav.c:81: Warning: 
+[wp] wp_behav.c:81: Warning: 
   Missing assigns clause (assigns 'everything' instead)
-[wp] tests/wp/wp_behav.c:154: Warning: 
+[wp] wp_behav.c:154: Warning: 
   Missing assigns clause (assigns 'everything' instead)
-[wp] tests/wp/wp_behav.c:176: Warning: 
+[wp] wp_behav.c:176: Warning: 
   Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function assert_needed
 ------------------------------------------------------------
 
-Goal Assertion 'ko' (file tests/wp/wp_behav.c, line 117):
+Goal Assertion 'ko' (file wp_behav.c, line 117):
 Assume { Type: is_sint32(x). }
 Prove: 0 < x.
 
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ok,ok_with_hyp' (file tests/wp/wp_behav.c, line 120):
+Goal Assertion 'qed_ok,ok_with_hyp' (file wp_behav.c, line 120):
 Prove: true.
 
 ------------------------------------------------------------
@@ -92,7 +92,7 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Assertion for 'x1' 'qed_ok' (file tests/wp/wp_behav.c, line 23):
+Goal Assertion for 'x1' 'qed_ok' (file wp_behav.c, line 23):
 Prove: true.
 
 ------------------------------------------------------------
@@ -110,7 +110,7 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Assertion for 'x2' 'qed_ok' (file tests/wp/wp_behav.c, line 24):
+Goal Assertion for 'x2' 'qed_ok' (file wp_behav.c, line 24):
 Prove: true.
 
 ------------------------------------------------------------
@@ -118,12 +118,12 @@ Prove: true.
   Function local_named_behavior with behavior xpos_stmt_53
 ------------------------------------------------------------
 
-Goal Post-condition for 'xpos' 'qed_ok' at instruction (file tests/wp/wp_behav.c, line 112):
+Goal Post-condition for 'xpos' 'qed_ok' at instruction (file wp_behav.c, line 112):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition for 'xpos' 'qed_ok' at instruction (file tests/wp/wp_behav.c, line 112):
+Goal Post-condition for 'xpos' 'qed_ok' at instruction (file wp_behav.c, line 112):
 Prove: true.
 
 ------------------------------------------------------------
@@ -210,7 +210,7 @@ Prove: true.
   Function part_stmt_bhv with behavior bs_stmt_93_b1
 ------------------------------------------------------------
 
-Goal Post-condition for 'bs' (file tests/wp/wp_behav.c, line 175) at block:
+Goal Post-condition for 'bs' (file wp_behav.c, line 175) at block:
 Assume { Type: is_sint32(x). (* Residual *) When: x <= 0. }
 Prove: false.
 
@@ -219,7 +219,7 @@ Prove: false.
   Function razT
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'qed_ok' (file tests/wp/wp_behav.c, line 153):
+Goal Preservation of Invariant 'qed_ok' (file wp_behav.c, line 153):
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(n_1).
   (* Goal *)
@@ -235,7 +235,7 @@ Prove: T[i <- 0][i_1] = 0.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'qed_ok' (file tests/wp/wp_behav.c, line 153):
+Goal Establishment of Invariant 'qed_ok' (file wp_behav.c, line 153):
 Prove: true.
 
 ------------------------------------------------------------
@@ -263,7 +263,7 @@ Prove: x = 0.
   Function stmt_assigns
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp/wp_behav.c, line 134) in 'stmt_assigns':
+Goal Post-condition (file wp_behav.c, line 134) in 'stmt_assigns':
 Prove: true.
 
 ------------------------------------------------------------
@@ -271,7 +271,7 @@ Prove: true.
   Function stmt_assigns with behavior default_for_stmt_70
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp/wp_behav.c, line 139) at call 'unknown' (file tests/wp/wp_behav.c, line 140):
+Goal Assigns (file wp_behav.c, line 139) at call 'unknown' (file wp_behav.c, line 140):
 Call Effect at line 140
 Prove: false.
 
diff --git a/src/plugins/wp/tests/wp/oracle/wp_behavior.0.res.oracle b/src/plugins/wp/tests/wp/oracle/wp_behavior.0.res.oracle
index c377eb93bf7fa1a03983b67f6950c86b1e851748..e14587bb4397d4514dee159b5a4a268e3e4d8660 100644
--- a/src/plugins/wp/tests/wp/oracle/wp_behavior.0.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/wp_behavior.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp/wp_behavior.i (no preprocessing)
+[kernel] Parsing wp_behavior.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -32,7 +32,7 @@ Prove: (!P_CX) \/ (!P_CY).
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp/wp_behavior.i, line 24) in 'behaviors':
+Goal Post-condition (file wp_behavior.i, line 24) in 'behaviors':
 Assume {
   (* Pre-condition *)
   Have: P_R.
@@ -47,7 +47,7 @@ Prove: P_P.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/wp_behavior.i, line 39):
+Goal Assertion (file wp_behavior.i, line 39):
 Assume {
   (* Pre-condition *)
   Have: P_R.
@@ -63,7 +63,7 @@ Prove: P_Q.
   Function behaviors with behavior X
 ------------------------------------------------------------
 
-Goal Post-condition for 'X' (file tests/wp/wp_behavior.i, line 28) in 'behaviors':
+Goal Post-condition for 'X' (file wp_behavior.i, line 28) in 'behaviors':
 Assume {
   (* Pre-condition *)
   Have: P_R.
@@ -80,7 +80,7 @@ Prove: P_PX.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'X' (file tests/wp/wp_behavior.i, line 29) in 'behaviors' (1/2):
+Goal Assigns for 'X' (file wp_behavior.i, line 29) in 'behaviors' (1/2):
 Effect at line 40
 Assume {
   Type: is_sint32(c).
@@ -106,7 +106,7 @@ Prove: qx_0 = px_0.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'X' (file tests/wp/wp_behavior.i, line 29) in 'behaviors' (2/2):
+Goal Assigns for 'X' (file wp_behavior.i, line 29) in 'behaviors' (2/2):
 Effect at line 41
 Assume {
   (* Heap *)
@@ -132,7 +132,7 @@ Prove: qx_0 = py_0.
   Function behaviors with behavior Y
 ------------------------------------------------------------
 
-Goal Post-condition for 'Y' (file tests/wp/wp_behavior.i, line 33) in 'behaviors':
+Goal Post-condition for 'Y' (file wp_behavior.i, line 33) in 'behaviors':
 Assume {
   (* Pre-condition *)
   Have: P_R.
@@ -149,7 +149,7 @@ Prove: P_PY.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'Y' (file tests/wp/wp_behavior.i, line 34) in 'behaviors' (1/2):
+Goal Assigns for 'Y' (file wp_behavior.i, line 34) in 'behaviors' (1/2):
 Effect at line 40
 Assume {
   Type: is_sint32(c).
@@ -175,7 +175,7 @@ Prove: qy_0 = px_0.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'Y' (file tests/wp/wp_behavior.i, line 34) in 'behaviors' (2/2):
+Goal Assigns for 'Y' (file wp_behavior.i, line 34) in 'behaviors' (2/2):
 Effect at line 41
 Assume {
   (* Heap *)
@@ -201,7 +201,7 @@ Prove: qy_0 = py_0.
   Function call
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp/wp_behavior.i, line 66) in 'call':
+Goal Post-condition (file wp_behavior.i, line 66) in 'call':
 Assume {
   (* Pre-condition *)
   Have: P_RQ.
@@ -213,7 +213,7 @@ Prove: P_Q.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp/wp_behavior.i, line 65) in 'call':
+Goal Assigns (file wp_behavior.i, line 65) in 'call':
 Effect at line 69
 Assume {
   (* Pre-condition *)
@@ -225,7 +225,7 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp/wp_behavior.i, line 65) in 'call':
+Goal Assigns (file wp_behavior.i, line 65) in 'call':
 Effect at line 69
 Assume {
   (* Pre-condition *)
@@ -238,21 +238,21 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp/wp_behavior.i, line 23) in 'behaviors'' in 'call' at call 'behaviors' (file tests/wp/wp_behavior.i, line 69)
+Goal Instance of 'Pre-condition (file wp_behavior.i, line 23) in 'behaviors'' in 'call' at call 'behaviors' (file wp_behavior.i, line 69)
 :
 Assume { (* Pre-condition *) Have: P_RQ. }
 Prove: P_R.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition for 'X' (file tests/wp/wp_behavior.i, line 27) in 'behaviors'' in 'call' at call 'behaviors' (file tests/wp/wp_behavior.i, line 69)
+Goal Instance of 'Pre-condition for 'X' (file wp_behavior.i, line 27) in 'behaviors'' in 'call' at call 'behaviors' (file wp_behavior.i, line 69)
 :
 Assume { (* Goal *) When: P_CX. (* Pre-condition *) Have: P_RQ. }
 Prove: P_RX.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition for 'Y' (file tests/wp/wp_behavior.i, line 32) in 'behaviors'' in 'call' at call 'behaviors' (file tests/wp/wp_behavior.i, line 69)
+Goal Instance of 'Pre-condition for 'Y' (file wp_behavior.i, line 32) in 'behaviors'' in 'call' at call 'behaviors' (file wp_behavior.i, line 69)
 :
 Assume { (* Goal *) When: P_CY. (* Pre-condition *) Have: P_RQ. }
 Prove: P_RY.
@@ -262,12 +262,12 @@ Prove: P_RY.
   Function main
 ------------------------------------------------------------
 
-Goal Pre-condition (file tests/wp/wp_behavior.i, line 45) in 'main':
+Goal Pre-condition (file wp_behavior.i, line 45) in 'main':
 Prove: P_R.
 
 ------------------------------------------------------------
 
-Goal Pre-condition (file tests/wp/wp_behavior.i, line 46) in 'main':
+Goal Pre-condition (file wp_behavior.i, line 46) in 'main':
 Prove: P_R1.
 
 ------------------------------------------------------------
@@ -275,7 +275,7 @@ Prove: P_R1.
   Function main with behavior X
 ------------------------------------------------------------
 
-Goal Pre-condition for 'X' (file tests/wp/wp_behavior.i, line 49) in 'main':
+Goal Pre-condition for 'X' (file wp_behavior.i, line 49) in 'main':
 Assume {
   (* Pre-condition *)
   Have: P_R.
@@ -288,7 +288,7 @@ Prove: P_RX.
 
 ------------------------------------------------------------
 
-Goal Pre-condition for 'X' (file tests/wp/wp_behavior.i, line 50) in 'main':
+Goal Pre-condition for 'X' (file wp_behavior.i, line 50) in 'main':
 Assume {
   (* Pre-condition *)
   Have: P_R.
@@ -301,13 +301,13 @@ Prove: P_RX1.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'X' (file tests/wp/wp_behavior.i, line 51) in 'main' (1/2):
+Goal Assigns for 'X' (file wp_behavior.i, line 51) in 'main' (1/2):
 Effect at line 58
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'X' (file tests/wp/wp_behavior.i, line 51) in 'main' (2/2):
+Goal Assigns for 'X' (file wp_behavior.i, line 51) in 'main' (2/2):
 Effect at line 59
 Assume {
   (* Heap *)
@@ -332,7 +332,7 @@ Prove: q = p.
   Function main with behavior Y
 ------------------------------------------------------------
 
-Goal Pre-condition for 'Y' (file tests/wp/wp_behavior.i, line 54) in 'main':
+Goal Pre-condition for 'Y' (file wp_behavior.i, line 54) in 'main':
 Assume {
   (* Pre-condition *)
   Have: P_R.
@@ -345,7 +345,7 @@ Prove: P_RY.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'Y' (file tests/wp/wp_behavior.i, line 55) in 'main' (1/2):
+Goal Assigns for 'Y' (file wp_behavior.i, line 55) in 'main' (1/2):
 Effect at line 58
 Assume {
   Type: is_sint32(c).
@@ -368,7 +368,7 @@ Prove: q = p.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'Y' (file tests/wp/wp_behavior.i, line 55) in 'main' (2/2):
+Goal Assigns for 'Y' (file wp_behavior.i, line 55) in 'main' (2/2):
 Effect at line 59
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp/oracle/wp_behavior.1.res.oracle b/src/plugins/wp/tests/wp/oracle/wp_behavior.1.res.oracle
index 8d98a45587a8418840253e104b34f8591534e2d9..57e5b8c0616361f3521856472c4798e1637b790d 100644
--- a/src/plugins/wp/tests/wp/oracle/wp_behavior.1.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/wp_behavior.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp/wp_behavior.i (no preprocessing)
+[kernel] Parsing wp_behavior.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -18,13 +18,13 @@ Prove: (!P_CX) \/ (!P_CY).
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp/wp_behavior.i, line 24) in 'behaviors':
+Goal Post-condition (file wp_behavior.i, line 24) in 'behaviors':
 Assume { (* Pre-condition *) Have: P_R. (* Assertion *) Have: P_Q. }
 Prove: P_P.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp/wp_behavior.i, line 39):
+Goal Assertion (file wp_behavior.i, line 39):
 Assume { (* Pre-condition *) Have: P_R. }
 Prove: P_Q.
 
@@ -33,7 +33,7 @@ Prove: P_Q.
   Function behaviors with behavior X
 ------------------------------------------------------------
 
-Goal Post-condition for 'X' (file tests/wp/wp_behavior.i, line 28) in 'behaviors':
+Goal Post-condition for 'X' (file wp_behavior.i, line 28) in 'behaviors':
 Assume {
   (* Pre-condition *)
   Have: P_R.
@@ -48,7 +48,7 @@ Prove: P_PX.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'X' (file tests/wp/wp_behavior.i, line 29) in 'behaviors' (1/2):
+Goal Assigns for 'X' (file wp_behavior.i, line 29) in 'behaviors' (1/2):
 Effect at line 40
 Assume {
   Type: is_sint32(c).
@@ -72,7 +72,7 @@ Prove: qx_0 = px_0.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'X' (file tests/wp/wp_behavior.i, line 29) in 'behaviors' (2/2):
+Goal Assigns for 'X' (file wp_behavior.i, line 29) in 'behaviors' (2/2):
 Effect at line 41
 Assume {
   (* Heap *)
@@ -96,7 +96,7 @@ Prove: qx_0 = py_0.
   Function behaviors with behavior Y
 ------------------------------------------------------------
 
-Goal Post-condition for 'Y' (file tests/wp/wp_behavior.i, line 33) in 'behaviors':
+Goal Post-condition for 'Y' (file wp_behavior.i, line 33) in 'behaviors':
 Assume {
   (* Pre-condition *)
   Have: P_R.
@@ -111,7 +111,7 @@ Prove: P_PY.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'Y' (file tests/wp/wp_behavior.i, line 34) in 'behaviors' (1/2):
+Goal Assigns for 'Y' (file wp_behavior.i, line 34) in 'behaviors' (1/2):
 Effect at line 40
 Assume {
   Type: is_sint32(c).
@@ -135,7 +135,7 @@ Prove: qy_0 = px_0.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'Y' (file tests/wp/wp_behavior.i, line 34) in 'behaviors' (2/2):
+Goal Assigns for 'Y' (file wp_behavior.i, line 34) in 'behaviors' (2/2):
 Effect at line 41
 Assume {
   (* Heap *)
@@ -159,7 +159,7 @@ Prove: qy_0 = py_0.
   Function call
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp/wp_behavior.i, line 66) in 'call':
+Goal Post-condition (file wp_behavior.i, line 66) in 'call':
 Assume {
   (* Pre-condition *)
   Have: P_RQ.
@@ -171,7 +171,7 @@ Prove: P_Q.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp/wp_behavior.i, line 65) in 'call':
+Goal Assigns (file wp_behavior.i, line 65) in 'call':
 Effect at line 69
 Assume {
   (* Pre-condition *)
@@ -183,7 +183,7 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp/wp_behavior.i, line 65) in 'call':
+Goal Assigns (file wp_behavior.i, line 65) in 'call':
 Effect at line 69
 Assume {
   (* Pre-condition *)
@@ -196,21 +196,21 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp/wp_behavior.i, line 23) in 'behaviors'' in 'call' at call 'behaviors' (file tests/wp/wp_behavior.i, line 69)
+Goal Instance of 'Pre-condition (file wp_behavior.i, line 23) in 'behaviors'' in 'call' at call 'behaviors' (file wp_behavior.i, line 69)
 :
 Assume { (* Pre-condition *) Have: P_RQ. }
 Prove: P_R.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition for 'X' (file tests/wp/wp_behavior.i, line 27) in 'behaviors'' in 'call' at call 'behaviors' (file tests/wp/wp_behavior.i, line 69)
+Goal Instance of 'Pre-condition for 'X' (file wp_behavior.i, line 27) in 'behaviors'' in 'call' at call 'behaviors' (file wp_behavior.i, line 69)
 :
 Assume { (* Goal *) When: P_CX. (* Pre-condition *) Have: P_RQ. }
 Prove: P_RX.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition for 'Y' (file tests/wp/wp_behavior.i, line 32) in 'behaviors'' in 'call' at call 'behaviors' (file tests/wp/wp_behavior.i, line 69)
+Goal Instance of 'Pre-condition for 'Y' (file wp_behavior.i, line 32) in 'behaviors'' in 'call' at call 'behaviors' (file wp_behavior.i, line 69)
 :
 Assume { (* Goal *) When: P_CY. (* Pre-condition *) Have: P_RQ. }
 Prove: P_RY.
@@ -220,12 +220,12 @@ Prove: P_RY.
   Function main
 ------------------------------------------------------------
 
-Goal Pre-condition (file tests/wp/wp_behavior.i, line 45) in 'main':
+Goal Pre-condition (file wp_behavior.i, line 45) in 'main':
 Prove: P_R.
 
 ------------------------------------------------------------
 
-Goal Pre-condition (file tests/wp/wp_behavior.i, line 46) in 'main':
+Goal Pre-condition (file wp_behavior.i, line 46) in 'main':
 Prove: P_R1.
 
 ------------------------------------------------------------
@@ -233,7 +233,7 @@ Prove: P_R1.
   Function main with behavior X
 ------------------------------------------------------------
 
-Goal Pre-condition for 'X' (file tests/wp/wp_behavior.i, line 49) in 'main':
+Goal Pre-condition for 'X' (file wp_behavior.i, line 49) in 'main':
 Assume {
   (* Pre-condition *)
   Have: P_R.
@@ -246,7 +246,7 @@ Prove: P_RX.
 
 ------------------------------------------------------------
 
-Goal Pre-condition for 'X' (file tests/wp/wp_behavior.i, line 50) in 'main':
+Goal Pre-condition for 'X' (file wp_behavior.i, line 50) in 'main':
 Assume {
   (* Pre-condition *)
   Have: P_R.
@@ -259,13 +259,13 @@ Prove: P_RX1.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'X' (file tests/wp/wp_behavior.i, line 51) in 'main' (1/2):
+Goal Assigns for 'X' (file wp_behavior.i, line 51) in 'main' (1/2):
 Effect at line 58
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'X' (file tests/wp/wp_behavior.i, line 51) in 'main' (2/2):
+Goal Assigns for 'X' (file wp_behavior.i, line 51) in 'main' (2/2):
 Effect at line 59
 Assume {
   (* Heap *)
@@ -290,7 +290,7 @@ Prove: q = p.
   Function main with behavior Y
 ------------------------------------------------------------
 
-Goal Pre-condition for 'Y' (file tests/wp/wp_behavior.i, line 54) in 'main':
+Goal Pre-condition for 'Y' (file wp_behavior.i, line 54) in 'main':
 Assume {
   (* Pre-condition *)
   Have: P_R.
@@ -303,7 +303,7 @@ Prove: P_RY.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'Y' (file tests/wp/wp_behavior.i, line 55) in 'main' (1/2):
+Goal Assigns for 'Y' (file wp_behavior.i, line 55) in 'main' (1/2):
 Effect at line 58
 Assume {
   Type: is_sint32(c).
@@ -326,7 +326,7 @@ Prove: q = p.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'Y' (file tests/wp/wp_behavior.i, line 55) in 'main' (2/2):
+Goal Assigns for 'Y' (file wp_behavior.i, line 55) in 'main' (2/2):
 Effect at line 59
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp/oracle/wp_call_pre.0.res.oracle b/src/plugins/wp/tests/wp/oracle/wp_call_pre.0.res.oracle
index 308fadbaa3174eed5309c7908a2c3c04383345eb..6500a29c86f35072531cf3385cb42846bc210de0 100644
--- a/src/plugins/wp/tests/wp/oracle/wp_call_pre.0.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/wp_call_pre.0.res.oracle
@@ -1,16 +1,16 @@
 # frama-c -wp -wp-model 'Hoare' [...]
-[kernel] Parsing tests/wp/wp_call_pre.c (with preprocessing)
+[kernel] Parsing wp_call_pre.c (with preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp/wp_call_pre.c:53: Warning: 
+[kernel] wp_call_pre.c:53: Warning: 
   No code nor implicit assigns clause for function g, generating default assigns from the prototype
-[kernel] tests/wp/wp_call_pre.c:53: Warning: 
+[kernel] wp_call_pre.c:53: Warning: 
   No code nor implicit assigns clause for function f, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function call_main
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'qed_ok,Rmain' in 'main'' in 'call_main' at call 'main' (file tests/wp/wp_call_pre.c, line 40)
+Goal Instance of 'Pre-condition 'qed_ok,Rmain' in 'main'' in 'call_main' at call 'main' (file wp_call_pre.c, line 40)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp/oracle/wp_call_pre.1.res.oracle b/src/plugins/wp/tests/wp/oracle/wp_call_pre.1.res.oracle
index c8d77c934815cd6db79395b4ab9616605d187395..b187c2c5e33fd0463dc82f565443618ffd52e878 100644
--- a/src/plugins/wp/tests/wp/oracle/wp_call_pre.1.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/wp_call_pre.1.res.oracle
@@ -1,7 +1,7 @@
 # frama-c -wp -wp-model 'Hoare' [...]
-[kernel] Parsing tests/wp/wp_call_pre.c (with preprocessing)
+[kernel] Parsing wp_call_pre.c (with preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp/wp_call_pre.c:53: Warning: 
+[kernel] wp_call_pre.c:53: Warning: 
   No code nor implicit assigns clause for function f, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 
@@ -15,7 +15,7 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'qed_ok,Rf' in 'f'' in 'main' at initialization of 'x' (file tests/wp/wp_call_pre.c, line 33)
+Goal Instance of 'Pre-condition 'qed_ok,Rf' in 'f'' in 'main' at initialization of 'x' (file wp_call_pre.c, line 33)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp/oracle/wp_call_pre.2.res.oracle b/src/plugins/wp/tests/wp/oracle/wp_call_pre.2.res.oracle
index 330ae3ce02fdefc65332fe4ef2477b65bc20f885..81ffda8ebc5c3b6edff861bd7b113964d6e4e29a 100644
--- a/src/plugins/wp/tests/wp/oracle/wp_call_pre.2.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/wp_call_pre.2.res.oracle
@@ -1,22 +1,22 @@
 # frama-c -wp -wp-model 'Hoare' [...]
-[kernel] Parsing tests/wp/wp_call_pre.c (with preprocessing)
+[kernel] Parsing wp_call_pre.c (with preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp/wp_call_pre.c:53: Warning: 
+[kernel] wp_call_pre.c:53: Warning: 
   No code nor implicit assigns clause for function g, generating default assigns from the prototype
-[kernel] tests/wp/wp_call_pre.c:53: Warning: 
+[kernel] wp_call_pre.c:53: Warning: 
   No code nor implicit assigns clause for function f, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function double_call
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'qed_ok,Rf' in 'f'' in 'double_call' at initialization of 'x1' (file tests/wp/wp_call_pre.c, line 26)
+Goal Instance of 'Pre-condition 'qed_ok,Rf' in 'f'' in 'double_call' at initialization of 'x1' (file wp_call_pre.c, line 26)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'qed_ok,Rf' in 'f'' in 'double_call' at initialization of 'x2' (file tests/wp/wp_call_pre.c, line 27)
+Goal Instance of 'Pre-condition 'qed_ok,Rf' in 'f'' in 'double_call' at initialization of 'x2' (file wp_call_pre.c, line 27)
 :
 Assume {
   Type: is_sint32(f) /\ is_sint32(x).
@@ -32,7 +32,7 @@ Prove: (-1) <= x.
   Function main
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'qed_ok,Rf' in 'f'' in 'main' at initialization of 'x' (file tests/wp/wp_call_pre.c, line 33)
+Goal Instance of 'Pre-condition 'qed_ok,Rf' in 'f'' in 'main' at initialization of 'x' (file wp_call_pre.c, line 33)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp/oracle/wp_call_pre.3.res.oracle b/src/plugins/wp/tests/wp/oracle/wp_call_pre.3.res.oracle
index 29adcc554a584024d6373d1168abfae012ab848a..a0047c55bbb153bd2246bd514481996c3a5b9660 100644
--- a/src/plugins/wp/tests/wp/oracle/wp_call_pre.3.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/wp_call_pre.3.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp -wp-model 'Hoare' [...]
-[kernel] Parsing tests/wp/wp_call_pre.c (with preprocessing)
+[kernel] Parsing wp_call_pre.c (with preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp/wp_call_pre.c:53: Warning: 
+[kernel] wp_call_pre.c:53: Warning: 
   No code nor implicit assigns clause for function f, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 
-Goal Instance of 'Pre-condition 'qed_ok,Rf' in 'f'' in 'double_call' at initialization of 'x1' (file tests/wp/wp_call_pre.c, line 26)
+Goal Instance of 'Pre-condition 'qed_ok,Rf' in 'f'' in 'double_call' at initialization of 'x1' (file wp_call_pre.c, line 26)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'qed_ok,Rf' in 'f'' in 'double_call' at initialization of 'x2' (file tests/wp/wp_call_pre.c, line 27)
+Goal Instance of 'Pre-condition 'qed_ok,Rf' in 'f'' in 'double_call' at initialization of 'x2' (file wp_call_pre.c, line 27)
 :
 Assume {
   Type: is_sint32(f) /\ is_sint32(x).
diff --git a/src/plugins/wp/tests/wp/oracle/wp_call_pre.4.res.oracle b/src/plugins/wp/tests/wp/oracle/wp_call_pre.4.res.oracle
index 2b2fcb498fc51449dccece6ee703b7d4185276d5..9f092860709e9815c67b0c57d0eb3351fe9444bc 100644
--- a/src/plugins/wp/tests/wp/oracle/wp_call_pre.4.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/wp_call_pre.4.res.oracle
@@ -1,9 +1,9 @@
 # frama-c -wp -wp-model 'Hoare' [...]
-[kernel] Parsing tests/wp/wp_call_pre.c (with preprocessing)
+[kernel] Parsing wp_call_pre.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 
-Goal Pre-condition 'qed_ok,Rstmt' at instruction (file tests/wp/wp_call_pre.c, line 47):
+Goal Pre-condition 'qed_ok,Rstmt' at instruction (file wp_call_pre.c, line 47):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp/oracle/wp_eqb.res.oracle b/src/plugins/wp/tests/wp/oracle/wp_eqb.res.oracle
index 2ab50ab1a473720ca44010c93006af5f69074bba..84be4da2f23e9ea4b7afba39ac0300e12100dc85 100644
--- a/src/plugins/wp/tests/wp/oracle/wp_eqb.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/wp_eqb.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp/wp_eqb.i (no preprocessing)
+[kernel] Parsing wp_eqb.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 [wp] 1 goal scheduled
@@ -32,7 +32,7 @@
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp/wp_eqb.i, line 8) in 'f':
+Goal Post-condition (file wp_eqb.i, line 8) in 'f':
 Assume {
   Type: is_sint32(a) /\ is_sint32(b) /\ is_sint32(c) /\ is_sint32(d).
   Have: (if (d = c) then 1 else 0) = (if (b = a) then 1 else 0).
diff --git a/src/plugins/wp/tests/wp/oracle/wp_strategy.0.res.oracle b/src/plugins/wp/tests/wp/oracle/wp_strategy.0.res.oracle
index db0e3c425b6e087e9635be7eab73370ce9e72e7b..21b96a248527605ad528de78488904723e6cd642 100644
--- a/src/plugins/wp/tests/wp/oracle/wp_strategy.0.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/wp_strategy.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Hoare' [...]
-[kernel] Parsing tests/wp/wp_strategy.c (with preprocessing)
+[kernel] Parsing wp_strategy.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -19,13 +19,13 @@ Prove: false.
   Function bts0513_bis
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ko,ko1' (file tests/wp/wp_strategy.c, line 27):
+Goal Assertion 'qed_ko,ko1' (file wp_strategy.c, line 27):
 Assume { Type: is_sint32(x). }
 Prove: 0 < x.
 
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ok,ok' (file tests/wp/wp_strategy.c, line 28):
+Goal Assertion 'qed_ok,ok' (file wp_strategy.c, line 28):
 Prove: true.
 
 ------------------------------------------------------------
@@ -38,7 +38,7 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ok' (file tests/wp/wp_strategy.c, line 98):
+Goal Assertion 'qed_ok' (file wp_strategy.c, line 98):
 Prove: true.
 
 ------------------------------------------------------------
@@ -51,7 +51,7 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ok' (file tests/wp/wp_strategy.c, line 94):
+Goal Assertion 'qed_ok' (file wp_strategy.c, line 94):
 Prove: true.
 
 ------------------------------------------------------------
@@ -64,7 +64,7 @@ Prove: true.
   Function dpd1
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ok,A' (file tests/wp/wp_strategy.c, line 38):
+Goal Assertion 'qed_ok,A' (file wp_strategy.c, line 38):
 Prove: true.
 
 ------------------------------------------------------------
@@ -72,13 +72,13 @@ Prove: true.
   Function dpd1 with behavior default_for_stmt_10
 ------------------------------------------------------------
 
-Goal Post-condition 'qed_ko,Eko' at program point (file tests/wp/wp_strategy.c, line 37):
+Goal Post-condition 'qed_ko,Eko' at program point (file wp_strategy.c, line 37):
 Assume { Type: is_sint32(x). }
 Prove: 0 < x.
 
 ------------------------------------------------------------
 
-Goal Assigns 'qed_ok' at program point (file tests/wp/wp_strategy.c, line 37):
+Goal Assigns 'qed_ok' at program point (file wp_strategy.c, line 37):
 Prove: true.
 
 ------------------------------------------------------------
@@ -86,7 +86,7 @@ Prove: true.
   Function dpd2 with behavior P
 ------------------------------------------------------------
 
-Goal Assertion for 'P' 'qed_ok,A' (file tests/wp/wp_strategy.c, line 46):
+Goal Assertion for 'P' 'qed_ok,A' (file wp_strategy.c, line 46):
 Prove: true.
 
 ------------------------------------------------------------
@@ -94,13 +94,13 @@ Prove: true.
   Function dpd2 with behavior default_for_stmt_15
 ------------------------------------------------------------
 
-Goal Post-condition 'qed_ko,Eko' at program point (file tests/wp/wp_strategy.c, line 45):
+Goal Post-condition 'qed_ko,Eko' at program point (file wp_strategy.c, line 45):
 Assume { Type: is_sint32(x). }
 Prove: 0 < x.
 
 ------------------------------------------------------------
 
-Goal Assigns 'qed_ok' at program point (file tests/wp/wp_strategy.c, line 45):
+Goal Assigns 'qed_ok' at program point (file wp_strategy.c, line 45):
 Prove: true.
 
 ------------------------------------------------------------
@@ -153,7 +153,7 @@ Prove: true.
   Function spec_if_not_cond with behavior default_for_stmt_48
 ------------------------------------------------------------
 
-Goal Post-condition 'qed_ok' at if-then-else (file tests/wp/wp_strategy.c, line 80):
+Goal Post-condition 'qed_ok' at if-then-else (file wp_strategy.c, line 80):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp/oracle/wp_strategy.1.res.oracle b/src/plugins/wp/tests/wp/oracle/wp_strategy.1.res.oracle
index b3d21c9f32f1cee3d6159fdaacaea1e22e053ffb..483783dc34daca6ce2722d7925f9418e5d990884 100644
--- a/src/plugins/wp/tests/wp/oracle/wp_strategy.1.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/wp_strategy.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp/wp_strategy.c (with preprocessing)
+[kernel] Parsing wp_strategy.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -14,7 +14,7 @@ Prove: true.
   Function dpd1 with behavior default_for_stmt_10
 ------------------------------------------------------------
 
-Goal Assigns 'qed_ok' at program point (file tests/wp/wp_strategy.c, line 37):
+Goal Assigns 'qed_ok' at program point (file wp_strategy.c, line 37):
 Prove: true.
 
 ------------------------------------------------------------
@@ -22,7 +22,7 @@ Prove: true.
   Function dpd2 with behavior default_for_stmt_15
 ------------------------------------------------------------
 
-Goal Assigns 'qed_ok' at program point (file tests/wp/wp_strategy.c, line 45):
+Goal Assigns 'qed_ok' at program point (file wp_strategy.c, line 45):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp/stmtcompiler_test.i b/src/plugins/wp/tests/wp/stmtcompiler_test.i
index c610d54549272ce23c3610a5e58846880fcd5b00..cf388ba1780ebde9934f88e8571fe5495a0f228c 100644
--- a/src/plugins/wp/tests/wp/stmtcompiler_test.i
+++ b/src/plugins/wp/tests/wp/stmtcompiler_test.i
@@ -1,7 +1,7 @@
 /* run.config
-   OPT: -load-script tests/wp/stmtcompiler_test.ml -wp-msg-key shell
+   MODULE: stmtcompiler_test.cmxs
+   OPT: -wp-msg-key shell
 */
-
 int empty (int c){
   /*@ assert \true; */
   return c;
diff --git a/src/plugins/wp/tests/wp_acsl/checks.i b/src/plugins/wp/tests/wp_acsl/checks.i
index f3fdcbfcab8f623e1c5393ae7e7b4b977300a6c2..bb10113689f1a7c399f52c558286030289033050 100644
--- a/src/plugins/wp/tests/wp_acsl/checks.i
+++ b/src/plugins/wp/tests/wp_acsl/checks.i
@@ -1,14 +1,14 @@
 /* run.config
-   OPT: -eva -load-module scope,eva,report -then -report
+   PLUGIN: @PLUGIN@ report from,inout,eva,scope,variadic
+   OPT: -eva -then -report
    OPT: -wp-prop=@check
    OPT: -wp-prop=-@check
 */
 /* run.config_qualif
-   OPT: -load-module report -wp-steps 5 -then -report
+   PLUGIN: @PLUGIN@ report
+   OPT: -wp-steps 5 -then -report
 */
-
 // note: eva and wp gives the same reporting
-
 //@ axiomatic A { predicate P reads \nothing ; }
 void main() {
   //@check  c1: P;
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/arith.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/arith.res.oracle
index 219463ff468295f11b65a46be3f09de1cbf859a8..9e0b53a7ea00e802ab646ce680706f403492eed3 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/arith.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/arith.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/arith.i (no preprocessing)
+[kernel] Parsing arith.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -157,13 +157,13 @@ Prove: true.
   Function uchar_range
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ok,A1' (file tests/wp_acsl/arith.i, line 16):
+Goal Assertion 'qed_ok,A1' (file arith.i, line 16):
 Assume { Type: is_uint8(i). }
 Prove: 0 <= i.
 
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ok,A2' (file tests/wp_acsl/arith.i, line 17):
+Goal Assertion 'qed_ok,A2' (file arith.i, line 17):
 Assume { Type: is_uint8(i). (* Assertion 'qed_ok,A1' *) Have: 0 <= i. }
 Prove: i <= 255.
 
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/assign_array.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/assign_array.res.oracle
index c7024e87f063a7ffc614d93f8758bd9dd31e52f6..188efd62c92e59505969f76ed02eb1b6f5e24fe9 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/assign_array.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/assign_array.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/assign_array.i (no preprocessing)
+[kernel] Parsing assign_array.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function jobA
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_acsl/assign_array.i, line 11) in 'jobA':
+Goal Assigns (file assign_array.i, line 11) in 'jobA':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_acsl/assign_array.i, line 11) in 'jobA':
+Goal Assigns (file assign_array.i, line 11) in 'jobA':
 Prove: true.
 
 ------------------------------------------------------------
@@ -19,12 +19,12 @@ Prove: true.
   Function jobG
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_acsl/assign_array.i, line 19) in 'jobG':
+Goal Assigns (file assign_array.i, line 19) in 'jobG':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_acsl/assign_array.i, line 19) in 'jobG':
+Goal Assigns (file assign_array.i, line 19) in 'jobG':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/assigned_initialized_memtyped.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/assigned_initialized_memtyped.res.oracle
index 97405e3f05094dc1e00ff8b5ea4a0116d4336bc0..a6b4e329efc30a3e4852a8c0b6abd125e4257bd0 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/assigned_initialized_memtyped.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/assigned_initialized_memtyped.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/assigned_initialized_memtyped.i (no preprocessing)
+[kernel] Parsing assigned_initialized_memtyped.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function array
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 69):
+Goal Check 'CHECK' (file assigned_initialized_memtyped.i, line 69):
 Let m = Init_0[shiftfield_F1_S_i(s) <- true].
 Let a = shiftfield_F1_S_a(s).
 Let a_1 = shift_sint32(a, 0).
@@ -55,13 +55,13 @@ Prove: true.
   Function assigned_glob
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 126):
+Goal Check 'CHECK' (file assigned_initialized_memtyped.i, line 126):
 Assume { (* Heap *) Type: cinits(Init_0). }
 Prove: IsInit_S1_S(global(G_glob_82), Init_0).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 129):
+Goal Preservation of Invariant 'CHECK' (file assigned_initialized_memtyped.i, line 129):
 Let m = Init_0[shiftfield_F1_S_i(pg_0) <- true].
 Let a = shiftfield_F1_S_a(pg_0).
 Let a_1 = havoc(Init_undef_0, m, shift_sint32(a, 0), 10).
@@ -84,12 +84,12 @@ Prove: ((-1) <= i) /\
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 129):
+Goal Establishment of Invariant 'CHECK' (file assigned_initialized_memtyped.i, line 129):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 142):
+Goal Check 'CHECK' (file assigned_initialized_memtyped.i, line 142):
 Let m = Init_0[shiftfield_F1_S_i(pg_0) <- true].
 Let a = shiftfield_F1_S_a(pg_0).
 Let a_1 = havoc(Init_undef_1, m, shift_sint32(a, 0), 10).
@@ -117,7 +117,7 @@ Prove: IsInit_S1_S(pg_0, a_2).
 
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 143):
+Goal Check 'CHECK' (file assigned_initialized_memtyped.i, line 143):
 Let m = Init_0[shiftfield_F1_S_i(pg_0) <- true].
 Let a = shiftfield_F1_S_a(pg_0).
 Let a_1 = havoc(Init_undef_1, m, shift_sint32(a, 0), 10).
@@ -197,7 +197,7 @@ Prove: (-1) <= i.
   Function comp
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 118):
+Goal Check 'CHECK' (file assigned_initialized_memtyped.i, line 118):
 Let m = Init_0[shiftfield_F1_S_i(s) <- true].
 Let a = shiftfield_F1_S_a(s).
 Let a_1 = havoc(Init_undef_1, m, shift_sint32(a, 0), 10).
@@ -260,7 +260,7 @@ Prove: (-1) <= i.
   Function descr
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 99):
+Goal Check 'CHECK' (file assigned_initialized_memtyped.i, line 99):
 Let a = shiftfield_F1_S_i(s).
 Let m = Init_1[a <- true].
 Let a_1 = shiftfield_F1_S_a(s).
@@ -350,7 +350,7 @@ Prove: true.
   Function field
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 51):
+Goal Check 'CHECK' (file assigned_initialized_memtyped.i, line 51):
 Let a = shiftfield_F1_S_i(s).
 Let m = Init_0[a <- true].
 Let a_1 = shiftfield_F1_S_a(s).
@@ -391,7 +391,7 @@ Prove: true.
   Function index
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 84):
+Goal Check 'CHECK' (file assigned_initialized_memtyped.i, line 84):
 Let m = Init_0[shiftfield_F1_S_i(s) <- true].
 Let a = shiftfield_F1_S_a(s).
 Let a_1 = havoc(Init_undef_0, m, shift_sint32(a, 0), 10).
@@ -438,7 +438,7 @@ Prove: true.
   Function initialize
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 16):
+Goal Preservation of Invariant 'CHECK' (file assigned_initialized_memtyped.i, line 16):
 Let m = Init_0[shiftfield_F1_S_i(s) <- true].
 Let a = shiftfield_F1_S_a(s).
 Let a_1 = havoc(Init_undef_0, m, shift_sint32(a, 0), 10).
@@ -461,12 +461,12 @@ Prove: ((-1) <= i) /\
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 16):
+Goal Establishment of Invariant 'CHECK' (file assigned_initialized_memtyped.i, line 16):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 21):
+Goal Check 'CHECK' (file assigned_initialized_memtyped.i, line 21):
 Let m = Init_0[shiftfield_F1_S_i(s) <- true].
 Let a = shiftfield_F1_S_a(s).
 Let a_1 = havoc(Init_undef_0, m, shift_sint32(a, 0), 10).
@@ -507,7 +507,7 @@ Prove: true.
   Function range
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memtyped.i, line 36):
+Goal Check 'CHECK' (file assigned_initialized_memtyped.i, line 36):
 Let m = Init_0[shiftfield_F1_S_i(s) <- true].
 Let a = shiftfield_F1_S_a(s).
 Let a_1 = havoc(Init_undef_1, m, shift_sint32(a, 0), 10).
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/assigned_initialized_memvar.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/assigned_initialized_memvar.res.oracle
index a4e3a95a8411e0fad2073413b324aa2485515e56..44affcf64f12f5e8188e8d0e449f4da1dbeeac30 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/assigned_initialized_memvar.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/assigned_initialized_memvar.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/assigned_initialized_memvar.i (no preprocessing)
+[kernel] Parsing assigned_initialized_memvar.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function array
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memvar.i, line 73):
+Goal Check 'CHECK' (file assigned_initialized_memvar.i, line 73):
 Assume {
   Have: 0 <= i.
   Have: i <= 9.
@@ -37,7 +37,7 @@ Prove: true.
   Function comp
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memvar.i, line 125):
+Goal Check 'CHECK' (file assigned_initialized_memvar.i, line 125):
 Let a = Init_s_0.Init_F1_S_a.
 Assume {
   Have: 0 <= i.
@@ -70,7 +70,7 @@ Prove: true.
   Function descr
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memvar.i, line 105):
+Goal Check 'CHECK' (file assigned_initialized_memvar.i, line 105):
 Let a = Init_s_0.Init_F1_S_a.
 Assume {
   Have: 0 <= i.
@@ -149,7 +149,7 @@ Prove: true.
   Function field
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memvar.i, line 54):
+Goal Check 'CHECK' (file assigned_initialized_memvar.i, line 54):
 Assume {
   Have: 0 <= i.
   Have: i <= 9.
@@ -175,7 +175,7 @@ Prove: true.
   Function index
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memvar.i, line 89):
+Goal Check 'CHECK' (file assigned_initialized_memvar.i, line 89):
 Assume {
   Have: 0 <= i.
   Have: i <= 9.
@@ -209,7 +209,7 @@ Prove: true.
   Function initialize
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'CHECK' (file tests/wp_acsl/assigned_initialized_memvar.i, line 17):
+Goal Preservation of Invariant 'CHECK' (file assigned_initialized_memvar.i, line 17):
 Assume {
   Type: is_sint32(i) /\ is_sint32(1 + i).
   (* Invariant 'CHECK' *)
@@ -225,12 +225,12 @@ Prove: ((-1) <= i) /\
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'CHECK' (file tests/wp_acsl/assigned_initialized_memvar.i, line 17):
+Goal Establishment of Invariant 'CHECK' (file assigned_initialized_memvar.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memvar.i, line 22):
+Goal Check 'CHECK' (file assigned_initialized_memvar.i, line 22):
 Assume {
   Have: 0 <= i.
   Have: i <= 9.
@@ -254,7 +254,7 @@ Prove: true.
   Function range
 ------------------------------------------------------------
 
-Goal Check 'CHECK' (file tests/wp_acsl/assigned_initialized_memvar.i, line 38):
+Goal Check 'CHECK' (file assigned_initialized_memvar.i, line 38):
 Let a = Init_s_0.Init_F1_S_a.
 Assume {
   Have: 0 <= i.
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/assigned_not_initialized_memtyped.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/assigned_not_initialized_memtyped.res.oracle
index ebcccafc2c730d44c51a8a748fb7a42c124f2c07..ebb140fe82bf4b365a6f6e112171998d29f86122 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/assigned_not_initialized_memtyped.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/assigned_not_initialized_memtyped.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/assigned_not_initialized_memtyped.i (no preprocessing)
+[kernel] Parsing assigned_not_initialized_memtyped.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function array
 ------------------------------------------------------------
 
-Goal Check 'FAIL' (file tests/wp_acsl/assigned_not_initialized_memtyped.i, line 28):
+Goal Check 'FAIL' (file assigned_not_initialized_memtyped.i, line 28):
 Let a = havoc(Init_undef_0, Init_0, shift_sint32(array_0, 0), 10).
 Assume {
   Type: is_sint32(i).
@@ -24,7 +24,7 @@ Prove: IsInitArray1_int(array_0, 10, a).
   Function assigned_glob_array
 ------------------------------------------------------------
 
-Goal Check 'FAIL' (file tests/wp_acsl/assigned_not_initialized_memtyped.i, line 60):
+Goal Check 'FAIL' (file assigned_not_initialized_memtyped.i, line 60):
 Let a = havoc(Init_undef_1, Init_0, shift_sint32(global(G_glob_array_51), 0),
           10).
 Let a_1 = havoc(Init_undef_0, a, shift_sint32(pg_array_0, 0), 10).
@@ -41,7 +41,7 @@ Prove: IsInitArray1_int(pg_array_0, 10, a_1).
 
 ------------------------------------------------------------
 
-Goal Check 'OK' (file tests/wp_acsl/assigned_not_initialized_memtyped.i, line 61):
+Goal Check 'OK' (file assigned_not_initialized_memtyped.i, line 61):
 Let a = global(G_glob_array_51).
 Let a_1 = havoc(Init_undef_1, Init_0, shift_sint32(a, 0), 10).
 Let a_2 = havoc(Init_undef_0, a_1, shift_sint32(pg_array_0, 0), 10).
@@ -61,7 +61,7 @@ Prove: IsInitArray1_int(a, 10, a_2).
   Function assigned_glob_atomic
 ------------------------------------------------------------
 
-Goal Check 'FAIL' (file tests/wp_acsl/assigned_not_initialized_memtyped.i, line 38):
+Goal Check 'FAIL' (file assigned_not_initialized_memtyped.i, line 38):
 Let a = global(G_glob_atomic_39).
 Let m = Init_0[a <- i_1 | Init_0[a]].
 Let P = m[pg_atomic_0].
@@ -79,7 +79,7 @@ Prove: (i=true) \/ (P=true).
 
 ------------------------------------------------------------
 
-Goal Check 'OK' (file tests/wp_acsl/assigned_not_initialized_memtyped.i, line 39):
+Goal Check 'OK' (file assigned_not_initialized_memtyped.i, line 39):
 Let a = global(G_glob_atomic_39).
 Let m = Init_0[a <- i | Init_0[a]].
 Let m_1 = m[pg_atomic_0 <- i_1 | m[pg_atomic_0]].
@@ -99,7 +99,7 @@ Prove: (m_1[a]=true).
   Function assigned_glob_comp
 ------------------------------------------------------------
 
-Goal Check 'FAIL' (file tests/wp_acsl/assigned_not_initialized_memtyped.i, line 49):
+Goal Check 'FAIL' (file assigned_not_initialized_memtyped.i, line 49):
 Let a = havoc(Init_undef_1, Init_0, global(G_glob_comp_45), 11).
 Let a_1 = havoc(Init_undef_0, a, pg_comp_0, 11).
 Assume {
@@ -115,7 +115,7 @@ Prove: IsInit_S1_S(pg_comp_0, a_1).
 
 ------------------------------------------------------------
 
-Goal Check 'OK' (file tests/wp_acsl/assigned_not_initialized_memtyped.i, line 50):
+Goal Check 'OK' (file assigned_not_initialized_memtyped.i, line 50):
 Let a = global(G_glob_comp_45).
 Let a_1 = havoc(Init_undef_1, Init_0, a, 11).
 Let a_2 = havoc(Init_undef_0, a_1, pg_comp_0, 11).
@@ -135,7 +135,7 @@ Prove: IsInit_S1_S(a, a_2).
   Function atomic
 ------------------------------------------------------------
 
-Goal Check 'FAIL' (file tests/wp_acsl/assigned_not_initialized_memtyped.i, line 16):
+Goal Check 'FAIL' (file assigned_not_initialized_memtyped.i, line 16):
 Let P = Init_0[ptr_0].
 Assume {
   Type: is_sint32(i_1).
@@ -153,7 +153,7 @@ Prove: (i=true) \/ (P=true).
   Function comp
 ------------------------------------------------------------
 
-Goal Check 'FAIL' (file tests/wp_acsl/assigned_not_initialized_memtyped.i, line 22):
+Goal Check 'FAIL' (file assigned_not_initialized_memtyped.i, line 22):
 Let a = havoc(Init_undef_0, Init_0, s, 11).
 Assume {
   Type: is_sint32(i).
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/assigned_not_initialized_memvar.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/assigned_not_initialized_memvar.res.oracle
index ac2da1bad2c19bb1e74f8aca0043bea66021bdf5..4d1811cbd771e7824dd7d000e9f67adc6ccf6d60 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/assigned_not_initialized_memvar.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/assigned_not_initialized_memvar.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/assigned_not_initialized_memvar.i (no preprocessing)
+[kernel] Parsing assigned_not_initialized_memvar.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function array
 ------------------------------------------------------------
 
-Goal Check 'FAIL' (file tests/wp_acsl/assigned_not_initialized_memvar.i, line 31):
+Goal Check 'FAIL' (file assigned_not_initialized_memvar.i, line 31):
 Assume {
   Type: is_sint32(i_1).
   (* Goal *)
@@ -21,7 +21,7 @@ Prove: (Init_array_0[i]=true).
   Function atomic
 ------------------------------------------------------------
 
-Goal Check 'FAIL' (file tests/wp_acsl/assigned_not_initialized_memvar.i, line 17):
+Goal Check 'FAIL' (file assigned_not_initialized_memvar.i, line 17):
 Assume { Type: is_sint32(i). (* Else *) Have: 10 <= i. }
 Prove: (Init_x_0=true).
 
@@ -30,7 +30,7 @@ Prove: (Init_x_0=true).
   Function comp
 ------------------------------------------------------------
 
-Goal Check 'FAIL' (file tests/wp_acsl/assigned_not_initialized_memvar.i, line 24):
+Goal Check 'FAIL' (file assigned_not_initialized_memvar.i, line 24):
 Assume { Type: is_sint32(i). (* Else *) Have: 10 <= i. }
 Prove: ((Init_s_0.Init_F1_S_i)=true) /\
     (forall i_1 : Z. ((0 <= i_1) -> ((i_1 <= 9) ->
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/assigns_path.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/assigns_path.res.oracle
index b8ebbadea5ebd5ac1be8e37f157226b201709da2..d8c07c96939fba09fe173ff7b690274e35b66ac2 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/assigns_path.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/assigns_path.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/assigns_path.i (no preprocessing)
+[kernel] Parsing assigns_path.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -32,7 +32,7 @@ Prove: Mint_0[shift_sint32(b, i)] = v[i].
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/assigns_path.i, line 16):
+Goal Preservation of Invariant (file assigns_path.i, line 16):
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(1 + i).
   (* Heap *)
@@ -51,12 +51,12 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/assigns_path.i, line 16):
+Goal Establishment of Invariant (file assigns_path.i, line 16):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/assigns_path.i, line 17):
+Goal Preservation of Invariant (file assigns_path.i, line 17):
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(1 + i).
   (* Heap *)
@@ -77,22 +77,22 @@ Prove: v[i <- Mint_0[shift_sint32(b, i)]][i_1] = Mint_0[shift_sint32(b, i_1)].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/assigns_path.i, line 17):
+Goal Establishment of Invariant (file assigns_path.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/assigns_path.i, line 18):
+Goal Loop assigns (file assigns_path.i, line 18):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_acsl/assigns_path.i, line 9) in 'job' (1/2):
+Goal Assigns (file assigns_path.i, line 9) in 'job' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_acsl/assigns_path.i, line 9) in 'job' (2/2):
+Goal Assigns (file assigns_path.i, line 9) in 'job' (2/2):
 Effect at line 20
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/assigns_range.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/assigns_range.res.oracle
index 47e610fd2656f2c5ea36eb0cf51ac486776d7645..3f1a76b4e7c2cdafd0b00bd618409f66d1bbfe43 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/assigns_range.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/assigns_range.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/assigns_range.i (no preprocessing)
+[kernel] Parsing assigns_range.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -64,7 +64,7 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_acsl/assigns_range.i, line 8) in 'assigns_t1_an_element'' in 'call_assigns_all' at call 'assigns_t1_an_element' (file tests/wp_acsl/assigns_range.i, line 37)
+Goal Instance of 'Pre-condition (file assigns_range.i, line 8) in 'assigns_t1_an_element'' in 'call_assigns_all' at call 'assigns_t1_an_element' (file assigns_range.i, line 37)
 :
 Assume {
   Type: is_sint32(i) /\ is_sint32(j).
@@ -75,19 +75,19 @@ Prove: i <= 19.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_acsl/assigns_range.i, line 13) in 'assigns_t2_bound'' in 'call_assigns_all' at call 'assigns_t2_bound' (file tests/wp_acsl/assigns_range.i, line 38)
+Goal Instance of 'Pre-condition (file assigns_range.i, line 13) in 'assigns_t2_bound'' in 'call_assigns_all' at call 'assigns_t2_bound' (file assigns_range.i, line 38)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_acsl/assigns_range.i, line 18) in 'assigns_t3_inf_bound'' in 'call_assigns_all' at call 'assigns_t3_inf_bound' (file tests/wp_acsl/assigns_range.i, line 39)
+Goal Instance of 'Pre-condition (file assigns_range.i, line 18) in 'assigns_t3_inf_bound'' in 'call_assigns_all' at call 'assigns_t3_inf_bound' (file assigns_range.i, line 39)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_acsl/assigns_range.i, line 23) in 'assigns_t4_sup_bound'' in 'call_assigns_all' at call 'assigns_t4_sup_bound' (file tests/wp_acsl/assigns_range.i, line 40)
+Goal Instance of 'Pre-condition (file assigns_range.i, line 23) in 'assigns_t4_sup_bound'' in 'call_assigns_all' at call 'assigns_t4_sup_bound' (file assigns_range.i, line 40)
 :
 Assume {
   Type: is_sint32(i) /\ is_sint32(j).
@@ -137,7 +137,7 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_acsl/assigns_range.i, line 8) in 'assigns_t1_an_element'' in 'call_assigns_t1' at call 'assigns_t1_an_element' (file tests/wp_acsl/assigns_range.i, line 49)
+Goal Instance of 'Pre-condition (file assigns_range.i, line 8) in 'assigns_t1_an_element'' in 'call_assigns_t1' at call 'assigns_t1_an_element' (file assigns_range.i, line 49)
 :
 Assume { Type: is_sint32(i). (* Pre-condition *) Have: (5 <= i) /\ (i <= 7).
 }
@@ -188,7 +188,7 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_acsl/assigns_range.i, line 13) in 'assigns_t2_bound'' in 'call_assigns_t2' at call 'assigns_t2_bound' (file tests/wp_acsl/assigns_range.i, line 57)
+Goal Instance of 'Pre-condition (file assigns_range.i, line 13) in 'assigns_t2_bound'' in 'call_assigns_t2' at call 'assigns_t2_bound' (file assigns_range.i, line 57)
 :
 Assume { Type: is_sint32(i). (* Pre-condition *) Have: (5 <= i) /\ (i <= 7).
 }
@@ -235,7 +235,7 @@ Prove: i <= 0.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_acsl/assigns_range.i, line 23) in 'assigns_t4_sup_bound'' in 'call_assigns_t4' at call 'assigns_t4_sup_bound' (file tests/wp_acsl/assigns_range.i, line 65)
+Goal Instance of 'Pre-condition (file assigns_range.i, line 23) in 'assigns_t4_sup_bound'' in 'call_assigns_t4' at call 'assigns_t4_sup_bound' (file assigns_range.i, line 65)
 :
 Assume {
   Type: is_sint32(i) /\ is_sint32(j).
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/axioms.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/axioms.res.oracle
index 564b0922bf517645be26e01bd384ba93f17ec04e..cf94d511c389ef5c6427479cb877279569e533c0 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/axioms.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/axioms.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/axioms.i (no preprocessing)
+[kernel] Parsing axioms.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -50,7 +50,7 @@ Prove: P_Q(Malloc_0, a_2, t, a, b).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Index' (file tests/wp_acsl/axioms.i, line 30):
+Goal Preservation of Invariant 'Index' (file axioms.i, line 30):
 Let a_1 = shift_sint32(t, a).
 Let x = -a.
 Let x_1 = 1 + i.
@@ -72,7 +72,7 @@ Prove: a <= x_1.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Index' (file tests/wp_acsl/axioms.i, line 30):
+Goal Establishment of Invariant 'Index' (file axioms.i, line 30):
 Assume {
   Type: is_sint32(a) /\ is_sint32(b).
   (* Heap *)
@@ -84,7 +84,7 @@ Prove: a <= (1 + b).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Positive' (file tests/wp_acsl/axioms.i, line 31):
+Goal Preservation of Invariant 'Positive' (file axioms.i, line 31):
 Let a_1 = shift_sint32(t, a).
 Let x = -a.
 Let a_2 = havoc(Mint_undef_0, Mint_0, a_1, i - a).
@@ -108,23 +108,23 @@ Prove: 0 < a_2[shift_sint32(t, i) <- 1][shift_sint32(t, i_1)].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Positive' (file tests/wp_acsl/axioms.i, line 31):
+Goal Establishment of Invariant 'Positive' (file axioms.i, line 31):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/axioms.i, line 32) (1/3):
+Goal Loop assigns (file axioms.i, line 32) (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/axioms.i, line 32) (2/3):
+Goal Loop assigns (file axioms.i, line 32) (2/3):
 Effect at line 34
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/axioms.i, line 32) (3/3):
+Goal Loop assigns (file axioms.i, line 32) (3/3):
 Effect at line 34
 Let a_1 = shift_sint32(t, a).
 Let x = -a.
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/base_offset.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/base_offset.res.oracle
index 386eb1ab4c230b4cf63caf69909dc39e7909de02..951ae643d2584fc32706fffa6ebe102eea648066 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/base_offset.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/base_offset.res.oracle
@@ -1,22 +1,22 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/base_offset.i (no preprocessing)
+[kernel] Parsing base_offset.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/base_offset.i, line 11) in 'f':
+Goal Post-condition (file base_offset.i, line 11) in 'f':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/base_offset.i, line 13) in 'f':
+Goal Post-condition (file base_offset.i, line 13) in 'f':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/base_offset.i, line 15) in 'f':
+Goal Post-condition (file base_offset.i, line 15) in 'f':
 Let x = p.base.
 Let a = table_of_base(x).
 Let x_1 = p.offset.
@@ -33,12 +33,12 @@ Prove: table_to_offset(a, 1 + i + x_1) <= table_to_offset(a, 1 + i_1 + x_1).
   Function g
 ------------------------------------------------------------
 
-Goal Check 'KO' (file tests/wp_acsl/base_offset.i, line 29):
+Goal Check 'KO' (file base_offset.i, line 29):
 Prove: table_of_base(G_z_33) = table_of_base(G_x_31).
 
 ------------------------------------------------------------
 
-Goal Check 'KO' (file tests/wp_acsl/base_offset.i, line 30):
+Goal Check 'KO' (file base_offset.i, line 30):
 Prove: table_of_base(G_y_32) != table_of_base(G_x_31).
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/bitwise.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/bitwise.res.oracle
index 320a3fd9ef45d2ece137443e12d54dc8fd2b4ecb..8d9e8dd50bb25e5516503c34720a0e24d1dd53ce 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/bitwise.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/bitwise.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/bitwise.i (no preprocessing)
+[kernel] Parsing bitwise.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function band
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/bitwise.i, line 5) in 'band':
+Goal Post-condition (file bitwise.i, line 5) in 'band':
 Prove: true.
 
 ------------------------------------------------------------
@@ -73,7 +73,7 @@ Prove: land(65535, a) != 21845.
   Function band_bool with behavior false
 ------------------------------------------------------------
 
-Goal Post-condition for 'false' (file tests/wp_acsl/bitwise.i, line 91) in 'band_bool':
+Goal Post-condition for 'false' (file bitwise.i, line 91) in 'band_bool':
 Assume {
   Type: is_bool(a) /\ is_bool(b).
   (* Pre-condition for 'false' *)
@@ -86,7 +86,7 @@ Prove: land(a, b) = 0.
   Function band_bool with behavior true
 ------------------------------------------------------------
 
-Goal Post-condition for 'true' (file tests/wp_acsl/bitwise.i, line 88) in 'band_bool':
+Goal Post-condition for 'true' (file bitwise.i, line 88) in 'band_bool':
 Prove: true.
 
 ------------------------------------------------------------
@@ -94,7 +94,7 @@ Prove: true.
   Function bnot
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/bitwise.i, line 55) in 'bnot':
+Goal Post-condition (file bitwise.i, line 55) in 'bnot':
 Prove: true.
 
 ------------------------------------------------------------
@@ -102,7 +102,7 @@ Prove: true.
   Function bor
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/bitwise.i, line 28) in 'bor':
+Goal Post-condition (file bitwise.i, line 28) in 'bor':
 Prove: true.
 
 ------------------------------------------------------------
@@ -139,7 +139,7 @@ Prove: true.
   Function bor_bool with behavior false
 ------------------------------------------------------------
 
-Goal Post-condition for 'false' (file tests/wp_acsl/bitwise.i, line 81) in 'bor_bool':
+Goal Post-condition for 'false' (file bitwise.i, line 81) in 'bor_bool':
 Assume {
   Type: is_bool(a) /\ is_bool(b).
   (* Pre-condition for 'false' *)
@@ -152,7 +152,7 @@ Prove: (a = 0) /\ (b = 0).
   Function bor_bool with behavior true
 ------------------------------------------------------------
 
-Goal Post-condition for 'true' (file tests/wp_acsl/bitwise.i, line 78) in 'bor_bool':
+Goal Post-condition for 'true' (file bitwise.i, line 78) in 'bor_bool':
 Assume {
   Type: is_bool(a) /\ is_bool(b).
   (* Pre-condition for 'true' *)
@@ -165,7 +165,7 @@ Prove: (a != 0) \/ (b != 0).
   Function bxor
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/bitwise.i, line 42) in 'bxor':
+Goal Post-condition (file bitwise.i, line 42) in 'bxor':
 Prove: true.
 
 ------------------------------------------------------------
@@ -173,7 +173,7 @@ Prove: true.
   Function bxor with behavior bit1
 ------------------------------------------------------------
 
-Goal Post-condition for 'bit1' (file tests/wp_acsl/bitwise.i, line 45) in 'bxor':
+Goal Post-condition for 'bit1' (file bitwise.i, line 45) in 'bxor':
 Prove: true.
 
 ------------------------------------------------------------
@@ -181,7 +181,7 @@ Prove: true.
   Function bxor with behavior bit2
 ------------------------------------------------------------
 
-Goal Post-condition for 'bit2' (file tests/wp_acsl/bitwise.i, line 48) in 'bxor':
+Goal Post-condition for 'bit2' (file bitwise.i, line 48) in 'bxor':
 Prove: true.
 
 ------------------------------------------------------------
@@ -199,7 +199,7 @@ Prove: lnot(x) = b.
   Function bxor_bool with behavior false
 ------------------------------------------------------------
 
-Goal Post-condition for 'false' (file tests/wp_acsl/bitwise.i, line 100) in 'bxor_bool':
+Goal Post-condition for 'false' (file bitwise.i, line 100) in 'bxor_bool':
 Assume {
   Type: is_bool(a) /\ is_bool(b).
   (* Pre-condition for 'false' *)
@@ -212,7 +212,7 @@ Prove: b = a.
   Function bxor_bool with behavior true
 ------------------------------------------------------------
 
-Goal Post-condition for 'true' (file tests/wp_acsl/bitwise.i, line 97) in 'bxor_bool':
+Goal Post-condition for 'true' (file bitwise.i, line 97) in 'bxor_bool':
 Assume {
   Type: is_bool(a) /\ is_bool(b).
   (* Pre-condition for 'true' *)
@@ -225,7 +225,7 @@ Prove: b != a.
   Function lshift
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/bitwise.i, line 58) in 'lshift':
+Goal Post-condition (file bitwise.i, line 58) in 'lshift':
 Prove: true.
 
 ------------------------------------------------------------
@@ -254,7 +254,7 @@ Prove: true.
   Function rshift
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/bitwise.i, line 69) in 'rshift':
+Goal Post-condition (file bitwise.i, line 69) in 'rshift':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/bitwise2.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/bitwise2.res.oracle
index 107c96ad0ad4ac2eb88940c98f7ff9726181977f..df15ed05880afb9fe03988052af61dddaab7cc1d 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/bitwise2.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/bitwise2.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/bitwise2.i (no preprocessing)
+[kernel] Parsing bitwise2.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function job1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/bitwise2.i, line 2) in 'job1':
+Goal Post-condition (file bitwise2.i, line 2) in 'job1':
 Prove: true.
 
 ------------------------------------------------------------
@@ -14,7 +14,7 @@ Prove: true.
   Function job1bis
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/bitwise2.i, line 7) in 'job1bis':
+Goal Post-condition (file bitwise2.i, line 7) in 'job1bis':
 Prove: true.
 
 ------------------------------------------------------------
@@ -22,7 +22,7 @@ Prove: true.
   Function job2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/bitwise2.i, line 12) in 'job2':
+Goal Post-condition (file bitwise2.i, line 12) in 'job2':
 Prove: true.
 
 ------------------------------------------------------------
@@ -30,7 +30,7 @@ Prove: true.
   Function job3
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/bitwise2.i, line 17) in 'job3':
+Goal Post-condition (file bitwise2.i, line 17) in 'job3':
 Prove: true.
 
 ------------------------------------------------------------
@@ -38,7 +38,7 @@ Prove: true.
   Function job4
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/bitwise2.i, line 22) in 'job4':
+Goal Post-condition (file bitwise2.i, line 22) in 'job4':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/block_length.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/block_length.res.oracle
index 30094770c411e4aa75176fddc8e066d4a72b9dd0..c483a78ae3010fec77ea340f92f2a96757e791cd 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/block_length.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/block_length.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/block_length.i (no preprocessing)
+[kernel] Parsing block_length.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/boolean.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/boolean.res.oracle
index 61274ae7016221aea497a6e1da08c24d18c39a02..a83d4680fb04a7a5685595e42814541d3a0078d8 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/boolean.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/boolean.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/boolean.i (no preprocessing)
+[kernel] Parsing boolean.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 [wp] 4 goals scheduled
@@ -11,7 +11,7 @@
   Function u8_is_continue
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/boolean.i, line 12) in 'u8_is_continue':
+Goal Post-condition (file boolean.i, line 12) in 'u8_is_continue':
 Assume {
   Type: is_uint8(b) /\ is_sint32(u8_is_continue_0).
   If 128 <= b
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/checks.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/checks.0.res.oracle
index 795c0dfaafc34ca26946948a2665e97dde5f859d..62c88f2e9e711cff03ac866b2e79a27c47b3bb3e 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/checks.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/checks.0.res.oracle
@@ -1,27 +1,27 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/checks.i (no preprocessing)
+[kernel] Parsing checks.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
 
-Goal Check 'c1' (file tests/wp_acsl/checks.i, line 14):
+Goal Check 'c1' (file checks.i, line 14):
 Prove: P_P.
 
 ------------------------------------------------------------
 
-Goal Assertion 'a1' (file tests/wp_acsl/checks.i, line 15):
+Goal Assertion 'a1' (file checks.i, line 15):
 Prove: P_P.
 
 ------------------------------------------------------------
 
-Goal Check 'c2' (file tests/wp_acsl/checks.i, line 16):
+Goal Check 'c2' (file checks.i, line 16):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'a2' (file tests/wp_acsl/checks.i, line 17):
+Goal Assertion 'a2' (file checks.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
@@ -30,12 +30,10 @@ Prove: true.
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva:alarm] tests/wp_acsl/checks.i:14: Warning: check 'c1' got status unknown.
-[eva:alarm] tests/wp_acsl/checks.i:15: Warning: 
-  assertion 'a1' got status unknown.
-[eva:alarm] tests/wp_acsl/checks.i:16: Warning: check 'c2' got status unknown.
-[eva:alarm] tests/wp_acsl/checks.i:17: Warning: 
-  assertion 'a2' got status unknown.
+[eva:alarm] checks.i:14: Warning: check 'c1' got status unknown.
+[eva:alarm] checks.i:15: Warning: assertion 'a1' got status unknown.
+[eva:alarm] checks.i:16: Warning: check 'c2' got status unknown.
+[eva:alarm] checks.i:17: Warning: assertion 'a2' got status unknown.
 [eva] done for function main
 [scope:rm_asserts] removing 2 assertion(s)
 [eva] ====== VALUES COMPUTED ======
@@ -67,16 +65,16 @@ Prove: true.
 --- Properties of Function 'main'
 --------------------------------------------------------------------------------
 
-[    -    ] Check 'c1' (file tests/wp_acsl/checks.i, line 14)
+[    -    ] Check 'c1' (file checks.i, line 14)
             tried with Eva.
-[    -    ] Assertion 'a1' (file tests/wp_acsl/checks.i, line 15)
+[    -    ] Assertion 'a1' (file checks.i, line 15)
             tried with Eva.
-[ Partial ] Check 'c2' (file tests/wp_acsl/checks.i, line 16)
+[ Partial ] Check 'c2' (file checks.i, line 16)
             By RedundantAlarms, with pending:
-             - Assertion 'a1' (file tests/wp_acsl/checks.i, line 15)
-[ Partial ] Assertion 'a2' (file tests/wp_acsl/checks.i, line 17)
+             - Assertion 'a1' (file checks.i, line 15)
+[ Partial ] Assertion 'a2' (file checks.i, line 17)
             By RedundantAlarms, with pending:
-             - Assertion 'a1' (file tests/wp_acsl/checks.i, line 15)
+             - Assertion 'a1' (file checks.i, line 15)
 
 --------------------------------------------------------------------------------
 --- Status Report Summary
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/checks.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/checks.1.res.oracle
index d9362c1ce5cc1fe74d725ed4624ae6a958693cf7..8654e039fc16f9bf7867a7afcea2af76fcacbc41 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/checks.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/checks.1.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/checks.i (no preprocessing)
+[kernel] Parsing checks.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
 
-Goal Check 'c1' (file tests/wp_acsl/checks.i, line 14):
+Goal Check 'c1' (file checks.i, line 14):
 Prove: P_P.
 
 ------------------------------------------------------------
 
-Goal Check 'c2' (file tests/wp_acsl/checks.i, line 16):
+Goal Check 'c2' (file checks.i, line 16):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/checks.2.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/checks.2.res.oracle
index 38d790b5a4d7ec91bd75576bd168291c4eac1231..1075b9678d674b641fb2e0411183399b38aa7bf6 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/checks.2.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/checks.2.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/checks.i (no preprocessing)
+[kernel] Parsing checks.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
 
-Goal Assertion 'a1' (file tests/wp_acsl/checks.i, line 15):
+Goal Assertion 'a1' (file checks.i, line 15):
 Prove: P_P.
 
 ------------------------------------------------------------
 
-Goal Assertion 'a2' (file tests/wp_acsl/checks.i, line 17):
+Goal Assertion 'a2' (file checks.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing.res.oracle
index f318abf289fadf2fa603a1f23a2c77466a989011..be38a06db10fb4ee9ff2fd55527e002fc0699e7f 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp_acsl/chunk_typing.i (no preprocessing)
+[kernel] Parsing chunk_typing.i (no preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function function
 ------------------------------------------------------------
   Function function
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/chunk_typing.i, line 15) in 'function':
+Goal Post-condition (file chunk_typing.i, line 15) in 'function':
 Let a = shift_sint8(i8_0, 0).
 Let a_1 = havoc(Mchar_undef_0, Mchar_0, a, 10).
 Let a_2 = shift_uint8(u8_0, 0).
@@ -89,7 +89,7 @@ Prove: (a_16 = (1 + x[i])) /\ (a_17 = (1 + a_16)) /\ (a_18 = (1 + a_17)) /\
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/chunk_typing.i, line 31):
+Goal Preservation of Invariant (file chunk_typing.i, line 31):
 Let a = shift_uint64(u64_0, i).
 Let a_1 = shift_sint64(i64_0, i).
 Let a_2 = shift_uint32(u32_0, i).
@@ -189,12 +189,12 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/chunk_typing.i, line 31):
+Goal Establishment of Invariant (file chunk_typing.i, line 31):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/chunk_typing.i, line 32):
+Goal Preservation of Invariant (file chunk_typing.i, line 32):
 Let a = shift_uint64(u64_0, i).
 Let a_1 = shift_sint64(i64_0, i).
 Let a_2 = shift_uint32(u32_0, i).
@@ -297,12 +297,12 @@ Prove: a_24[shift_sint8(i8_0, i_1)] = 1.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/chunk_typing.i, line 32):
+Goal Establishment of Invariant (file chunk_typing.i, line 32):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/chunk_typing.i, line 33):
+Goal Preservation of Invariant (file chunk_typing.i, line 33):
 Let a = shift_uint64(u64_0, i).
 Let a_1 = shift_sint64(i64_0, i).
 Let a_2 = shift_uint32(u32_0, i).
@@ -405,12 +405,12 @@ Prove: a_24[shift_uint8(u8_0, i_1)] = 2.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/chunk_typing.i, line 33):
+Goal Establishment of Invariant (file chunk_typing.i, line 33):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/chunk_typing.i, line 34):
+Goal Preservation of Invariant (file chunk_typing.i, line 34):
 Let a = shift_uint64(u64_0, i).
 Let a_1 = shift_sint64(i64_0, i).
 Let a_2 = shift_uint32(u32_0, i).
@@ -513,12 +513,12 @@ Prove: a_24[shift_sint16(i16_0, i_1)] = 3.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/chunk_typing.i, line 34):
+Goal Establishment of Invariant (file chunk_typing.i, line 34):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/chunk_typing.i, line 35):
+Goal Preservation of Invariant (file chunk_typing.i, line 35):
 Let a = shift_uint64(u64_0, i).
 Let a_1 = shift_sint64(i64_0, i).
 Let a_2 = shift_uint32(u32_0, i).
@@ -621,12 +621,12 @@ Prove: a_24[shift_uint16(u16_0, i_1)] = 4.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/chunk_typing.i, line 35):
+Goal Establishment of Invariant (file chunk_typing.i, line 35):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/chunk_typing.i, line 36):
+Goal Preservation of Invariant (file chunk_typing.i, line 36):
 Let a = shift_uint64(u64_0, i).
 Let a_1 = shift_sint64(i64_0, i).
 Let a_2 = shift_uint32(u32_0, i).
@@ -729,12 +729,12 @@ Prove: a_24[shift_sint32(i32_0, i_1)] = 5.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/chunk_typing.i, line 36):
+Goal Establishment of Invariant (file chunk_typing.i, line 36):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/chunk_typing.i, line 37):
+Goal Preservation of Invariant (file chunk_typing.i, line 37):
 Let a = shift_uint64(u64_0, i).
 Let a_1 = shift_sint64(i64_0, i).
 Let a_2 = shift_uint32(u32_0, i).
@@ -837,12 +837,12 @@ Prove: a_24[shift_uint32(u32_0, i_1)] = 6.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/chunk_typing.i, line 37):
+Goal Establishment of Invariant (file chunk_typing.i, line 37):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/chunk_typing.i, line 38):
+Goal Preservation of Invariant (file chunk_typing.i, line 38):
 Let a = shift_uint64(u64_0, i).
 Let a_1 = shift_sint64(i64_0, i).
 Let a_2 = shift_uint32(u32_0, i).
@@ -945,12 +945,12 @@ Prove: a_24[shift_sint64(i64_0, i_1)] = 7.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/chunk_typing.i, line 38):
+Goal Establishment of Invariant (file chunk_typing.i, line 38):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/chunk_typing.i, line 39):
+Goal Preservation of Invariant (file chunk_typing.i, line 39):
 Let a = shift_uint64(u64_0, i).
 Let a_1 = shift_sint64(i64_0, i).
 Let a_2 = shift_uint32(u32_0, i).
@@ -1053,12 +1053,12 @@ Prove: a_24[shift_uint64(u64_0, i_1)] = 8.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/chunk_typing.i, line 39):
+Goal Establishment of Invariant (file chunk_typing.i, line 39):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_acsl/chunk_typing.i, line 45):
+Goal Assertion 'rte,mem_access' (file chunk_typing.i, line 45):
 Let a = shift_sint8(i8_0, 0).
 Let a_1 = havoc(Mchar_undef_0, Mchar_0, a, 10).
 Let a_2 = shift_uint8(u8_0, 0).
@@ -1127,7 +1127,7 @@ Prove: valid_rw(Malloc_0, shift_sint8(i8_0, i), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_acsl/chunk_typing.i, line 46):
+Goal Assertion 'rte,mem_access' (file chunk_typing.i, line 46):
 Let a = shift_sint8(i8_0, i).
 Let a_1 = shift_sint8(i8_0, 0).
 Let a_2 = havoc(Mchar_undef_0, Mchar_0, a_1, 10).
@@ -1200,7 +1200,7 @@ Prove: valid_rw(Malloc_0, shift_uint8(u8_0, i), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_acsl/chunk_typing.i, line 47):
+Goal Assertion 'rte,mem_access' (file chunk_typing.i, line 47):
 Let a = shift_uint8(u8_0, i).
 Let a_1 = shift_sint8(i8_0, i).
 Let a_2 = shift_sint8(i8_0, 0).
@@ -1277,7 +1277,7 @@ Prove: valid_rw(Malloc_0, shift_sint16(i16_0, i), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_acsl/chunk_typing.i, line 48):
+Goal Assertion 'rte,mem_access' (file chunk_typing.i, line 48):
 Let a = shift_sint16(i16_0, i).
 Let a_1 = shift_uint8(u8_0, i).
 Let a_2 = shift_sint8(i8_0, i).
@@ -1358,7 +1358,7 @@ Prove: valid_rw(Malloc_0, shift_uint16(u16_0, i), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_acsl/chunk_typing.i, line 49):
+Goal Assertion 'rte,mem_access' (file chunk_typing.i, line 49):
 Let a = shift_uint16(u16_0, i).
 Let a_1 = shift_sint16(i16_0, i).
 Let a_2 = shift_uint8(u8_0, i).
@@ -1442,7 +1442,7 @@ Prove: valid_rw(Malloc_0, shift_sint32(i32_0, i), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_acsl/chunk_typing.i, line 50):
+Goal Assertion 'rte,mem_access' (file chunk_typing.i, line 50):
 Let a = shift_sint32(i32_0, i).
 Let a_1 = shift_uint16(u16_0, i).
 Let a_2 = shift_sint16(i16_0, i).
@@ -1530,7 +1530,7 @@ Prove: valid_rw(Malloc_0, shift_uint32(u32_0, i), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_acsl/chunk_typing.i, line 51):
+Goal Assertion 'rte,mem_access' (file chunk_typing.i, line 51):
 Let a = shift_uint32(u32_0, i).
 Let a_1 = shift_sint32(i32_0, i).
 Let a_2 = shift_uint16(u16_0, i).
@@ -1621,7 +1621,7 @@ Prove: valid_rw(Malloc_0, shift_sint64(i64_0, i), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_acsl/chunk_typing.i, line 52):
+Goal Assertion 'rte,mem_access' (file chunk_typing.i, line 52):
 Let a = shift_sint64(i64_0, i).
 Let a_1 = shift_uint32(u32_0, i).
 Let a_2 = shift_sint32(i32_0, i).
@@ -1716,7 +1716,7 @@ Prove: valid_rw(Malloc_0, shift_uint64(u64_0, i), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,signed_overflow' (file tests/wp_acsl/chunk_typing.i, line 44):
+Goal Assertion 'rte,signed_overflow' (file chunk_typing.i, line 44):
 Let a = shift_uint64(u64_0, i).
 Let a_1 = shift_sint64(i64_0, i).
 Let a_2 = shift_uint32(u32_0, i).
@@ -1814,65 +1814,65 @@ Prove: i <= 2147483646.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/chunk_typing.i, line 40) (1/9):
+Goal Loop assigns (file chunk_typing.i, line 40) (1/9):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/chunk_typing.i, line 40) (2/9):
+Goal Loop assigns (file chunk_typing.i, line 40) (2/9):
 Effect at line 45
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/chunk_typing.i, line 40) (3/9):
+Goal Loop assigns (file chunk_typing.i, line 40) (3/9):
 Effect at line 46
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/chunk_typing.i, line 40) (4/9):
+Goal Loop assigns (file chunk_typing.i, line 40) (4/9):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/chunk_typing.i, line 40) (5/9):
+Goal Loop assigns (file chunk_typing.i, line 40) (5/9):
 Effect at line 48
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/chunk_typing.i, line 40) (6/9):
+Goal Loop assigns (file chunk_typing.i, line 40) (6/9):
 Effect at line 49
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/chunk_typing.i, line 40) (7/9):
+Goal Loop assigns (file chunk_typing.i, line 40) (7/9):
 Effect at line 50
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/chunk_typing.i, line 40) (8/9):
+Goal Loop assigns (file chunk_typing.i, line 40) (8/9):
 Effect at line 51
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/chunk_typing.i, line 40) (9/9):
+Goal Loop assigns (file chunk_typing.i, line 40) (9/9):
 Effect at line 52
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_acsl/chunk_typing.i, line 44):
+Goal Decreasing of Loop variant at loop (file chunk_typing.i, line 44):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_acsl/chunk_typing.i, line 44):
+Goal Positivity of Loop variant at loop (file chunk_typing.i, line 44):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing_usable.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing_usable.res.oracle
index 40c1a5853ba9a3b15b69d970d38ae3fd4867bcf2..c3d335a24738053c84d4ae2e5d27fdc1d10e1275 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing_usable.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing_usable.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp_acsl/chunk_typing_usable.i (no preprocessing)
+[kernel] Parsing chunk_typing_usable.i (no preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function usable_axiom
 [rte] annotating function usable_lemma
@@ -465,7 +465,7 @@ Prove: (f_0<=s_0) -> (s_0<=t_0) -> (is_sint32_chunk Mint_0)
   Function usable_axiom
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/chunk_typing_usable.i, line 29) in 'usable_axiom':
+Goal Post-condition (file chunk_typing_usable.i, line 29) in 'usable_axiom':
 Let x = e - 1.
 Assume {
   Type: is_sint32_chunk(Mint_0) /\ is_uint32(b) /\ is_uint32(e).
@@ -483,7 +483,7 @@ Prove: L_occ(Mint_0, i, a, b, x) = L_occ(Mint_0, i, a, b, e).
   Function usable_lemma
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/chunk_typing_usable.i, line 43) in 'usable_lemma':
+Goal Post-condition (file chunk_typing_usable.i, line 43) in 'usable_lemma':
 Assume {
   Type: is_sint32_chunk(Mint_0) /\ is_uint32(b) /\ is_uint32(e) /\
       is_uint32(s).
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/classify_float.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/classify_float.res.oracle
index 27e7dccf57532b66742c01ee93edb017b646013d..9b774b65ecfa34ea852099b25e14e53e32cfe710 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/classify_float.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/classify_float.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/classify_float.c (with preprocessing)
+[kernel] Parsing classify_float.c (with preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Global
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/ctor.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/ctor.res.oracle
index dc62954e6b56dc190839ba2e88927577dc635871..2dcc418b1a264c225dbdaaa90862c174cfe0e740 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/ctor.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/ctor.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/ctor.i (no preprocessing)
+[kernel] Parsing ctor.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Axiomatic 'Event'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/div_mod.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/div_mod.res.oracle
index 670b0774270e298341dd46d12f96d11cc431aa67..a889a36d0fbe4b82c26ac0732c5fd5d8d5116912 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/div_mod.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/div_mod.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/div_mod.i (no preprocessing)
+[kernel] Parsing div_mod.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/e_imply.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/e_imply.res.oracle
index ea5fa8f594547d2bf9cc4d1969c692bad80c8188..d93974a10a40eb080212d833583d5b90d28a30f8 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/e_imply.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/e_imply.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/e_imply.i (no preprocessing)
+[kernel] Parsing e_imply.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/equal.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/equal.res.oracle
index a543f1f54a26874ef7f4f376be1c4b2d51369253..1427dc4b7f1f4508815afa3d9a82f01673045b3c 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/equal.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/equal.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/equal.i (no preprocessing)
+[kernel] Parsing equal.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function simple_array
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/equal.i, line 22) in 'simple_array':
+Goal Post-condition (file equal.i, line 22) in 'simple_array':
 Let x = t0_0[0].
 Let x_1 = t0_0[1].
 Assume {
@@ -20,7 +20,7 @@ Prove: EqArray1_int(2, t0_0, t1_0[0 <- x][1 <- x_1]).
   Function simple_struct
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/equal.i, line 16) in 'simple_struct':
+Goal Post-condition (file equal.i, line 16) in 'simple_struct':
 Prove: true.
 
 ------------------------------------------------------------
@@ -28,7 +28,7 @@ Prove: true.
   Function with_array_struct
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/equal.i, line 28) in 'with_array_struct':
+Goal Post-condition (file equal.i, line 28) in 'with_array_struct':
 Let a = st0_0.F2_St_tab.
 Let a_1 = st1_0.F2_St_tab.
 Assume {
@@ -44,7 +44,7 @@ Prove: EqS2_St(st0_0, st1_0).
   Function with_ptr_and_array_struct
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/equal.i, line 47) in 'with_ptr_and_array_struct':
+Goal Post-condition (file equal.i, line 47) in 'with_ptr_and_array_struct':
 Let a = q1_0.F4_Q_qp.
 Let a_1 = q0_0.F4_Q_qp.
 Let a_2 = q0_0.F4_Q_qs.
@@ -66,7 +66,7 @@ Prove: EqS4_Q(q0_0, q1_0).
   Function with_ptr_array
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/equal.i, line 40) in 'with_ptr_array':
+Goal Post-condition (file equal.i, line 40) in 'with_ptr_array':
 Assume {
   (* Heap *)
   Type: (forall i : Z. region(tp0_0[i].base) <= 0) /\
@@ -81,7 +81,7 @@ Prove: EqArray1_pointer(5, tp0_0, tp1_0).
   Function with_ptr_struct
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/equal.i, line 34) in 'with_ptr_struct':
+Goal Post-condition (file equal.i, line 34) in 'with_ptr_struct':
 Let a = sp1_0.F3_Sp_p.
 Let a_1 = sp0_0.F3_Sp_p.
 Assume {
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/float_compare.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/float_compare.res.oracle
index 54ae1cc9e6b493c54f2fbed3298c0e419efb64b3..3e1f36b8541ed62cb3163414dd44a8373963e91a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/float_compare.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/float_compare.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/float_compare.i (no preprocessing)
+[kernel] Parsing float_compare.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -120,13 +120,13 @@ Prove: lt_f64(a_1, b) <-> (r < of_f64(b)).
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_acsl/float_compare.i, line 63):
+Goal Assertion (file float_compare.i, line 63):
 Assume { (* Pre-condition *) Have: is_finite_f32(a) /\ is_finite_f64(b). }
 Prove: is_finite_f64(to_f64(of_f32(a))).
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_acsl/float_compare.i, line 64):
+Goal Assertion (file float_compare.i, line 64):
 Let r = of_f32(a).
 Let a_1 = to_f64(r).
 Assume {
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/float_const.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/float_const.res.oracle
index 6d6043595cf02040d1ccd036cab58b9a0246bbf2..d2a7099d197a2fe4f62737743a2e14dfa1d77034 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/float_const.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/float_const.res.oracle
@@ -1,8 +1,8 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/float_const.i (no preprocessing)
-[kernel:parser:decimal-float] tests/wp_acsl/float_const.i:10: Warning: 
+[kernel] Parsing float_const.i (no preprocessing)
+[kernel:parser:decimal-float] float_const.i:10: Warning: 
   Floating-point constant 0.1f is not represented exactly. Will use 0x1.99999a0000000p-4.
-[kernel:parser:decimal-float] tests/wp_acsl/float_const.i:19: Warning: 
+[kernel:parser:decimal-float] float_const.i:19: Warning: 
   Floating-point constant 0.1 is not represented exactly. Will use 0x1.999999999999ap-4.
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
@@ -256,7 +256,7 @@
   Function double_convertible
 ------------------------------------------------------------
 
-Goal Check (file tests/wp_acsl/float_const.i, line 20):
+Goal Check (file float_const.i, line 20):
 Assume {
   (* Then *)
   Have: eq_f64(d, to_f64((3602879701896397.0/36028797018963968))).
@@ -265,7 +265,7 @@ Prove: of_f64(d) != (1.0/10).
 
 ------------------------------------------------------------
 
-Goal Check (file tests/wp_acsl/float_const.i, line 21):
+Goal Check (file float_const.i, line 21):
 Assume {
   (* Then *)
   Have: eq_f64(d, to_f64((3602879701896397.0/36028797018963968))).
@@ -274,7 +274,7 @@ Prove: of_f64(d) = (3602879701896397.0/36028797018963968).
 
 ------------------------------------------------------------
 
-Goal Check (file tests/wp_acsl/float_const.i, line 22):
+Goal Check (file float_const.i, line 22):
 Assume {
   (* Then *)
   Have: eq_f64(d, to_f64((3602879701896397.0/36028797018963968))).
@@ -283,7 +283,7 @@ Prove: of_f64(d) != (13421773.0/134217728).
 
 ------------------------------------------------------------
 
-Goal Check (file tests/wp_acsl/float_const.i, line 23):
+Goal Check (file float_const.i, line 23):
 Let r = of_f32(to_f32(of_f64(d))).
 Assume {
   (* Then *)
@@ -296,25 +296,25 @@ Prove: of_f64(to_f64(r)) = r.
   Function float_convertible
 ------------------------------------------------------------
 
-Goal Check (file tests/wp_acsl/float_const.i, line 11):
+Goal Check (file float_const.i, line 11):
 Assume { (* Then *) Have: eq_f32(f, to_f32((13421773.0/134217728))). }
 Prove: of_f32(f) != (1.0/10).
 
 ------------------------------------------------------------
 
-Goal Check (file tests/wp_acsl/float_const.i, line 12):
+Goal Check (file float_const.i, line 12):
 Assume { (* Then *) Have: eq_f32(f, to_f32((13421773.0/134217728))). }
 Prove: of_f32(f) = (13421773.0/134217728).
 
 ------------------------------------------------------------
 
-Goal Check (file tests/wp_acsl/float_const.i, line 13):
+Goal Check (file float_const.i, line 13):
 Assume { (* Then *) Have: eq_f32(f, to_f32((13421773.0/134217728))). }
 Prove: of_f32(f) != (3602879701896397.0/36028797018963968).
 
 ------------------------------------------------------------
 
-Goal Check (file tests/wp_acsl/float_const.i, line 14):
+Goal Check (file float_const.i, line 14):
 Let r = of_f32(f).
 Assume { (* Then *) Have: eq_f32(f, to_f32((13421773.0/134217728))). }
 Prove: of_f32(to_f32(of_f64(to_f64(r)))) = r.
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/funvar_inv.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/funvar_inv.0.res.oracle
index 2c16374dc4ab5dda44513eea004949b6fed2b4f0..af1aedabde197f1fbbc2119319f78ac294f57320 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/funvar_inv.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/funvar_inv.0.res.oracle
@@ -1,25 +1,19 @@
 # frama-c -wp -wp-model 'Hoare' [...]
-[kernel] Parsing tests/wp_acsl/funvar_inv.i (no preprocessing)
+[kernel] Parsing funvar_inv.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_acsl/funvar_inv.i:24: Warning: 
-  Can not compare pointers in Empty model
-[wp] tests/wp_acsl/funvar_inv.i:23: Warning: 
-  Can not compare pointers in Empty model
-[wp] tests/wp_acsl/funvar_inv.i:38: Warning: 
-  Can not compare pointers in Empty model
-[wp] tests/wp_acsl/funvar_inv.i:37: Warning: 
-  Can not compare pointers in Empty model
-[wp] tests/wp_acsl/funvar_inv.i:53: Warning: 
-  Can not compare pointers in Empty model
-[wp] tests/wp_acsl/funvar_inv.i:52: Warning: 
-  Can not compare pointers in Empty model
+[wp] funvar_inv.i:24: Warning: Can not compare pointers in Empty model
+[wp] funvar_inv.i:23: Warning: Can not compare pointers in Empty model
+[wp] funvar_inv.i:38: Warning: Can not compare pointers in Empty model
+[wp] funvar_inv.i:37: Warning: Can not compare pointers in Empty model
+[wp] funvar_inv.i:53: Warning: Can not compare pointers in Empty model
+[wp] funvar_inv.i:52: Warning: Can not compare pointers in Empty model
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
 Goal Post-condition 'P_startof' in 'f':
-tests/wp_acsl/funvar_inv.i:23: warning from Empty Model:
+funvar_inv.i:23: warning from Empty Model:
  - Warning: Target turned to False, looking for context inconsistency
    Reason: Can not compare pointers in Empty model
 Let x = G[0].
@@ -35,7 +29,7 @@ Prove: x != 0.
 ------------------------------------------------------------
 
 Goal Post-condition 'P_addr' in 'f':
-tests/wp_acsl/funvar_inv.i:24: warning from Empty Model:
+funvar_inv.i:24: warning from Empty Model:
  - Warning: Target turned to False, looking for context inconsistency
    Reason: Can not compare pointers in Empty model
 Let x = G[0].
@@ -61,7 +55,7 @@ Prove: true.
 ------------------------------------------------------------
 
 Goal Post-condition 'P_startof_shift' in 'f2':
-tests/wp_acsl/funvar_inv.i:37: warning from Empty Model:
+funvar_inv.i:37: warning from Empty Model:
  - Warning: Target turned to False, looking for context inconsistency
    Reason: Can not compare pointers in Empty model
 Let x = G[0].
@@ -77,7 +71,7 @@ Prove: x != 0.
 ------------------------------------------------------------
 
 Goal Post-condition 'P_addr_shift' in 'f2':
-tests/wp_acsl/funvar_inv.i:38: warning from Empty Model:
+funvar_inv.i:38: warning from Empty Model:
  - Warning: Target turned to False, looking for context inconsistency
    Reason: Can not compare pointers in Empty model
 Let x = G[0].
@@ -103,7 +97,7 @@ Prove: true.
 ------------------------------------------------------------
 
 Goal Post-condition 'P_addr_startof_shift' in 'g':
-tests/wp_acsl/funvar_inv.i:52: warning from Empty Model:
+funvar_inv.i:52: warning from Empty Model:
  - Warning: Target turned to False, looking for context inconsistency
    Reason: Can not compare pointers in Empty model
 Let x = G[0].
@@ -119,7 +113,7 @@ Prove: x != 0.
 ------------------------------------------------------------
 
 Goal Post-condition 'P_addr_addr_shift' in 'g':
-tests/wp_acsl/funvar_inv.i:53: warning from Empty Model:
+funvar_inv.i:53: warning from Empty Model:
  - Warning: Target turned to False, looking for context inconsistency
    Reason: Can not compare pointers in Empty model
 Let x = G[0].
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/funvar_inv.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/funvar_inv.1.res.oracle
index 9ed2d133feedc53a1329bd81aaf5f4c4960d8e9d..2f8b841aab1bb0f02b2fce301b2adef573b20c46 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/funvar_inv.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/funvar_inv.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_acsl/funvar_inv.i (no preprocessing)
+[kernel] Parsing funvar_inv.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/generalized_checks.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/generalized_checks.res.oracle
index 233aa076c4f47f9a17aefdc2159597328de1ab61..46ee59467ebb774e30443da27b70545a942e428a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/generalized_checks.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/generalized_checks.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/generalized_checks.i (no preprocessing)
+[kernel] Parsing generalized_checks.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -66,19 +66,19 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'A' in 'job'' in 'caller' at call 'job' (file tests/wp_acsl/generalized_checks.i, line 65)
+Goal Instance of 'Pre-condition 'A' in 'job'' in 'caller' at call 'job' (file generalized_checks.i, line 65)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'CA1' in 'job'' in 'caller' at call 'job' (file tests/wp_acsl/generalized_checks.i, line 65)
+Goal Instance of 'Pre-condition 'CA1' in 'job'' in 'caller' at call 'job' (file generalized_checks.i, line 65)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'CA2,ko' in 'job'' in 'caller' at call 'job' (file tests/wp_acsl/generalized_checks.i, line 65)
+Goal Instance of 'Pre-condition 'CA2,ko' in 'job'' in 'caller' at call 'job' (file generalized_checks.i, line 65)
 :
 Assume { Type: is_sint32(x). (* Pre-condition *) Have: P_A(x) /\ P_CA1(x). }
 Prove: P_CA2(x).
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/implicit_enum_cast.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/implicit_enum_cast.res.oracle
index 42361373ebac6c8663e3e5546108a194331eb896..fafa04b3b56da46d8a5282e4f170ff014fd214b2 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/implicit_enum_cast.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/implicit_enum_cast.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/implicit_enum_cast.i (no preprocessing)
+[kernel] Parsing implicit_enum_cast.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function bar
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/implicit_enum_cast.i, line 6) in 'bar':
+Goal Post-condition (file implicit_enum_cast.i, line 6) in 'bar':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/inductive.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/inductive.res.oracle
index 5a0fc4b056cc4d4e20fa1c9abef0dcf5cf6072f2..982b66a1342f47f627b60d988b9cc4890a35b48a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/inductive.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/inductive.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/inductive.i (no preprocessing)
+[kernel] Parsing inductive.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] 3 goals scheduled
 ---------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/init_label.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/init_label.res.oracle
index d6d7a763dabdbea22d9406d84cb02d2b21587f8d..fc9b88c34af4dfba1468b4feb8b92e245b22a7d8 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/init_label.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/init_label.res.oracle
@@ -1,7 +1,7 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/init_label.i (no preprocessing)
+[kernel] Parsing init_label.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_acsl/init_label.i:27: Warning: 
+[kernel] init_label.i:27: Warning: 
   No code nor implicit assigns clause for function main, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/init_value.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/init_value.0.res.oracle
index c072c17ac8b64cf178f59ff7f1087f5bcdb32880..1cf376f224d14db9690e01b14328c29d918b8e6c 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/init_value.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/init_value.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-no-let [...]
-[kernel] Parsing tests/wp_acsl/init_value.i (no preprocessing)
+[kernel] Parsing init_value.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/init_value.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/init_value.1.res.oracle
index 9501f9dee9b89f89211b0539e9b92a7d6dd01576..6bd5711a072a0ab27b8f381d1a86a2b43b32c1d9 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/init_value.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/init_value.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-no-let [...]
-[kernel] Parsing tests/wp_acsl/init_value.i (no preprocessing)
+[kernel] Parsing init_value.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/init_value_mem.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/init_value_mem.0.res.oracle
index c1cd26ad0172b9be22729b1c29f15e9e44681a06..1336b3880dea072f0baf12cb774fd262d37458a9 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/init_value_mem.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/init_value_mem.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/init_value_mem.i (no preprocessing)
+[kernel] Parsing init_value_mem.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/init_value_mem.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/init_value_mem.1.res.oracle
index c84b034766cb8247a37687e4559607b6510b27eb..b7feef815a3f905fcf725705b5d54d9097d0d695 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/init_value_mem.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/init_value_mem.1.res.oracle
@@ -1,9 +1,8 @@
 # frama-c -wp -wp-model 'Hoare' [...]
-[kernel] Parsing tests/wp_acsl/init_value_mem.i (no preprocessing)
+[kernel] Parsing init_value_mem.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_acsl/init_value_mem.i:24: Warning: 
-  Can not load value in Empty model
+[wp] init_value_mem.i:24: Warning: Can not load value in Empty model
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
@@ -25,7 +24,7 @@ Prove: EqS1_St(v, w).
 ------------------------------------------------------------
 
 Goal Post-condition 'Q' in 'main':
-tests/wp_acsl/init_value_mem.i:24: warning from Empty Model:
+init_value_mem.i:24: warning from Empty Model:
  - Warning: Hide sub-term definition
    Reason: Can not load value in Empty model
 Assume {
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/initialized_memtyped.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/initialized_memtyped.res.oracle
index 106088887237948475c2ecd809f1749403db46fb..aa7594911a47f59a359854dec0913dedc9ee437c 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/initialized_memtyped.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/initialized_memtyped.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/initialized_memtyped.i (no preprocessing)
+[kernel] Parsing initialized_memtyped.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function formal
 ------------------------------------------------------------
 
-Goal Assertion 'provable' (file tests/wp_acsl/initialized_memtyped.i, line 83):
+Goal Assertion 'provable' (file initialized_memtyped.i, line 83):
 Assume { (* Heap *) Type: cinits(Init_0). }
 Prove: (Init_0[global(P_x_59)]=true).
 
@@ -55,35 +55,35 @@ Prove: (Init_0[px_0]=true).
   Function test
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 12):
+Goal Check 'unknown' (file initialized_memtyped.i, line 12):
 Assume { (* Heap *) Type: (region(x.base) <= 0) /\ cinits(Init_0). }
 Prove: (Init_0[x]=true).
 
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 13):
+Goal Check 'unknown' (file initialized_memtyped.i, line 13):
 Assume { (* Heap *) Type: (region(a.base) <= 0) /\ cinits(Init_0). }
 Prove: IsInitArray1_int(a, 2, Init_0).
 
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 14):
+Goal Check 'unknown' (file initialized_memtyped.i, line 14):
 Assume { (* Heap *) Type: (region(c.base) <= 0) /\ cinits(Init_0). }
 Prove: IsInit_S2_C(c, Init_0).
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memtyped.i, line 17):
+Goal Check 'qed_ok' (file initialized_memtyped.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memtyped.i, line 20):
+Goal Check 'qed_ok' (file initialized_memtyped.i, line 20):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 21):
+Goal Check 'unknown' (file initialized_memtyped.i, line 21):
 Assume {
   (* Heap *)
   Type: (region(a.base) <= 0) /\ (region(x.base) <= 0) /\ cinits(Init_0).
@@ -92,7 +92,7 @@ Prove: (Init_0[x <- true][shift_sint32(a, 1)]=true).
 
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 22):
+Goal Check 'unknown' (file initialized_memtyped.i, line 22):
 Assume {
   (* Heap *)
   Type: (region(a.base) <= 0) /\ (region(x.base) <= 0) /\ cinits(Init_0).
@@ -101,17 +101,17 @@ Prove: IsInitArray1_int(a, 2, Init_0[x <- true][shift_sint32(a, 0) <- true]).
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memtyped.i, line 25):
+Goal Check 'qed_ok' (file initialized_memtyped.i, line 25):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memtyped.i, line 26):
+Goal Check 'qed_ok' (file initialized_memtyped.i, line 26):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'provable' (file tests/wp_acsl/initialized_memtyped.i, line 27):
+Goal Check 'provable' (file initialized_memtyped.i, line 27):
 Assume {
   (* Heap *)
   Type: (region(a.base) <= 0) /\ (region(x.base) <= 0) /\ cinits(Init_0).
@@ -122,12 +122,12 @@ Prove: IsInitArray1_int(a, 2,
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memtyped.i, line 30):
+Goal Check 'qed_ok' (file initialized_memtyped.i, line 30):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 31):
+Goal Check 'unknown' (file initialized_memtyped.i, line 31):
 Assume {
   (* Heap *)
   Type: (region(a.base) <= 0) /\ (region(c.base) <= 0) /\
@@ -139,7 +139,7 @@ Prove: IsInit_S1_S(shiftfield_F2_C_s(c),
 
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 32):
+Goal Check 'unknown' (file initialized_memtyped.i, line 32):
 Assume {
   (* Heap *)
   Type: (region(a.base) <= 0) /\ (region(c.base) <= 0) /\
@@ -151,7 +151,7 @@ Prove: IsInitArray1_int(shiftfield_F2_C_a(c), 10,
 
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 33):
+Goal Check 'unknown' (file initialized_memtyped.i, line 33):
 Assume {
   (* Heap *)
   Type: (region(a.base) <= 0) /\ (region(c.base) <= 0) /\
@@ -163,12 +163,12 @@ Prove: IsInit_S2_C(c,
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memtyped.i, line 36):
+Goal Check 'qed_ok' (file initialized_memtyped.i, line 36):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 37):
+Goal Check 'unknown' (file initialized_memtyped.i, line 37):
 Assume {
   (* Heap *)
   Type: (region(a.base) <= 0) /\ (region(c.base) <= 0) /\
@@ -179,7 +179,7 @@ Prove: (Init_0[x <- true][shift_sint32(a, 0) <- true][shift_sint32(a, 1)
 
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 38):
+Goal Check 'unknown' (file initialized_memtyped.i, line 38):
 Let a_1 = shiftfield_F2_C_s(c).
 Assume {
   (* Heap *)
@@ -193,7 +193,7 @@ Prove: IsInit_S1_S(a_1,
 
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 39):
+Goal Check 'unknown' (file initialized_memtyped.i, line 39):
 Assume {
   (* Heap *)
   Type: (region(a.base) <= 0) /\ (region(c.base) <= 0) /\
@@ -206,7 +206,7 @@ Prove: IsInit_S2_C(c,
 
 ------------------------------------------------------------
 
-Goal Check 'provable' (file tests/wp_acsl/initialized_memtyped.i, line 42):
+Goal Check 'provable' (file initialized_memtyped.i, line 42):
 Let a_1 = shiftfield_F2_C_s(c).
 Assume {
   (* Heap *)
@@ -220,7 +220,7 @@ Prove: IsInit_S1_S(a_1,
 
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 43):
+Goal Check 'unknown' (file initialized_memtyped.i, line 43):
 Let a_1 = shiftfield_F2_C_s(c).
 Assume {
   (* Heap *)
@@ -234,7 +234,7 @@ Prove: IsInit_S2_C(c,
 
 ------------------------------------------------------------
 
-Goal Check 'provable' (file tests/wp_acsl/initialized_memtyped.i, line 46):
+Goal Check 'provable' (file initialized_memtyped.i, line 46):
 Let a_1 = shiftfield_F2_C_s(c).
 Let a_2 = shiftfield_F2_C_a(c).
 Assume {
@@ -255,7 +255,7 @@ Prove: (Init_0[x <- true][shift_sint32(a, 0) <- true][shift_sint32(a, 1)
 
 ------------------------------------------------------------
 
-Goal Check 'unknown' (file tests/wp_acsl/initialized_memtyped.i, line 47):
+Goal Check 'unknown' (file initialized_memtyped.i, line 47):
 Let a_1 = shiftfield_F2_C_s(c).
 Let a_2 = shiftfield_F2_C_a(c).
 Assume {
@@ -275,7 +275,7 @@ Prove: IsInit_S2_C(c,
 
 ------------------------------------------------------------
 
-Goal Check 'provable' (file tests/wp_acsl/initialized_memtyped.i, line 50):
+Goal Check 'provable' (file initialized_memtyped.i, line 50):
 Let a_1 = shiftfield_F2_C_s(c).
 Let a_2 = shiftfield_F2_C_a(c).
 Assume {
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/initialized_memvar.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/initialized_memvar.res.oracle
index 5a91bd928d651804096c4ff7df91b8872952db8d..60a162825f447281ee98566fcd8ab72ebfe978c6 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/initialized_memvar.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/initialized_memvar.res.oracle
@@ -1,168 +1,168 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/initialized_memvar.i (no preprocessing)
+[kernel] Parsing initialized_memvar.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function globals
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 19):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 19):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 22):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 22):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 24):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 24):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ko' (file tests/wp_acsl/initialized_memvar.i, line 25):
+Goal Check 'qed_ko' (file initialized_memvar.i, line 25):
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 27):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 27):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ko' (file tests/wp_acsl/initialized_memvar.i, line 28):
+Goal Check 'qed_ko' (file initialized_memvar.i, line 28):
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 31):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 31):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 32):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 32):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 33):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 33):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 35):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 35):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 36):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 36):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ko' (file tests/wp_acsl/initialized_memvar.i, line 37):
+Goal Check 'qed_ko' (file initialized_memvar.i, line 37):
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 38):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 38):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ko' (file tests/wp_acsl/initialized_memvar.i, line 39):
+Goal Check 'qed_ko' (file initialized_memvar.i, line 39):
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 43):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 43):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 44):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 44):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 45):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 45):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 46):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 46):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 47):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 47):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 48):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 48):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'provable' (file tests/wp_acsl/initialized_memvar.i, line 49):
+Goal Check 'provable' (file initialized_memvar.i, line 49):
 Assume { (* Goal *) When: (2 <= i) /\ (i <= 4). }
 Prove: (0 <= i) /\ (i <= 9).
 
 ------------------------------------------------------------
 
-Goal Check 'provable' (file tests/wp_acsl/initialized_memvar.i, line 50):
+Goal Check 'provable' (file initialized_memvar.i, line 50):
 Assume { (* Goal *) When: (2 <= i) /\ (i <= 6). }
 Prove: (0 <= i) /\ (i <= 9).
 
 ------------------------------------------------------------
 
-Goal Check 'provable' (file tests/wp_acsl/initialized_memvar.i, line 51):
+Goal Check 'provable' (file initialized_memvar.i, line 51):
 Assume { (* Goal *) When: (3 <= i) /\ (i <= 7). }
 Prove: (0 <= i) /\ (i <= 9).
 
 ------------------------------------------------------------
 
-Goal Check 'provable' (file tests/wp_acsl/initialized_memvar.i, line 52):
+Goal Check 'provable' (file initialized_memvar.i, line 52):
 Assume { (* Goal *) When: (2 <= i) /\ (5 <= i_1) /\ (i_1 <= 8) /\ (i <= 9). }
 Prove: (0 <= i) /\ (0 <= i_1) /\ (i_1 <= 9).
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ko' (file tests/wp_acsl/initialized_memvar.i, line 55):
+Goal Check 'qed_ko' (file initialized_memvar.i, line 55):
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ko' (file tests/wp_acsl/initialized_memvar.i, line 56):
+Goal Check 'qed_ko' (file initialized_memvar.i, line 56):
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ko' (file tests/wp_acsl/initialized_memvar.i, line 57):
+Goal Check 'qed_ko' (file initialized_memvar.i, line 57):
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ko' (file tests/wp_acsl/initialized_memvar.i, line 58):
+Goal Check 'qed_ko' (file initialized_memvar.i, line 58):
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Check 'not_provable' (file tests/wp_acsl/initialized_memvar.i, line 59):
+Goal Check 'not_provable' (file initialized_memvar.i, line 59):
 Assume { (* Goal *) When: (0 <= i) /\ (i <= 10). }
 Prove: i <= 9.
 
 ------------------------------------------------------------
 
-Goal Check 'not_provable' (file tests/wp_acsl/initialized_memvar.i, line 60):
+Goal Check 'not_provable' (file initialized_memvar.i, line 60):
 Assume { (* Goal *) When: (0 <= i) /\ (i <= 10). }
 Prove: i <= 9.
 
 ------------------------------------------------------------
 
-Goal Check 'not_provable' (file tests/wp_acsl/initialized_memvar.i, line 61):
+Goal Check 'not_provable' (file initialized_memvar.i, line 61):
 Assume { (* Goal *) When: (0 <= i_1) /\ (0 <= i) /\ (i_1 <= 9) /\ (i <= 10).
 }
 Prove: i <= 9.
@@ -172,120 +172,120 @@ Prove: i <= 9.
   Function locals
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 70):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 70):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 71):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 71):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 72):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 72):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 75):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 75):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 78):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 78):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 79):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 79):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 80):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 80):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 83):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 83):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 84):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 84):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'provable' (file tests/wp_acsl/initialized_memvar.i, line 85):
+Goal Check 'provable' (file initialized_memvar.i, line 85):
 Assume { (* Goal *) When: (0 <= i) /\ (i <= 1). }
 Prove: (([false..])[0 <- true][1 <- true][i]=true).
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 88):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 88):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 89):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 89):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 90):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 90):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 91):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 91):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 94):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 94):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 95):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 95):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 96):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 96):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 97):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 97):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 100):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 100):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 101):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 101):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'provable' (file tests/wp_acsl/initialized_memvar.i, line 104):
+Goal Check 'provable' (file initialized_memvar.i, line 104):
 Assume { (* Goal *) When: (0 <= i) /\ (i <= 8). }
 Prove: (([false..])[8 <- true][7 <- true][6 <- true][5 <- true][4 <- true][3
           <- true][2 <- true][1 <- true][0 <- true][i]=true).
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 105):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 105):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'qed_ok' (file tests/wp_acsl/initialized_memvar.i, line 108):
+Goal Check 'qed_ok' (file initialized_memvar.i, line 108):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/intbool.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/intbool.res.oracle
index be8e2dc018cf0f402c6f5db0a4ed3f9484ec68fe..8fe720bf8af1399e2c976274e55facf03ee626c1 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/intbool.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/intbool.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/intbool.i (no preprocessing)
+[kernel] Parsing intbool.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function bug
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/intbool.i, line 1) in 'bug':
+Goal Post-condition (file intbool.i, line 1) in 'bug':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/invalid_pointer.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/invalid_pointer.res.oracle
index a9d75cace6c480bb82fe3bd6f959244041928bb4..b3c48ca80fd30dc7f14eda4351ca76de222f48e4 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/invalid_pointer.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/invalid_pointer.res.oracle
@@ -1,13 +1,13 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/invalid_pointer.c (with preprocessing)
+[kernel] Parsing invalid_pointer.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_acsl/invalid_pointer.c:21: Warning: void object
+[wp] invalid_pointer.c:21: Warning: void object
 ------------------------------------------------------------
   Function array
 ------------------------------------------------------------
 
-Goal Check 'ARR' (file tests/wp_acsl/invalid_pointer.c, line 29):
+Goal Check 'ARR' (file invalid_pointer.c, line 29):
 Assume { Type: is_sint32(k). (* Heap *) Type: linked(Malloc_0). }
 Prove: ((0 <= k) /\ (k <= 25)) <->
     valid_obj(Malloc_0[L_a_32 <- 25], shift_sint32(global(L_a_32), k), 1).
@@ -17,53 +17,53 @@ Prove: ((0 <= k) /\ (k <= 25)) <->
   Function compound
 ------------------------------------------------------------
 
-Goal Check 'M1' (file tests/wp_acsl/invalid_pointer.c, line 44):
+Goal Check 'M1' (file invalid_pointer.c, line 44):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'P0' (file tests/wp_acsl/invalid_pointer.c, line 45):
+Goal Check 'P0' (file invalid_pointer.c, line 45):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'P1' (file tests/wp_acsl/invalid_pointer.c, line 46):
+Goal Check 'P1' (file invalid_pointer.c, line 46):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'P2' (file tests/wp_acsl/invalid_pointer.c, line 47):
+Goal Check 'P2' (file invalid_pointer.c, line 47):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'F' (file tests/wp_acsl/invalid_pointer.c, line 50):
+Goal Check 'F' (file invalid_pointer.c, line 50):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: valid_obj(Malloc_0[L_s_37 <- 2], shiftfield_F1_S_f(global(L_s_37)), 1).
 
 ------------------------------------------------------------
 
-Goal Check 'G' (file tests/wp_acsl/invalid_pointer.c, line 51):
+Goal Check 'G' (file invalid_pointer.c, line 51):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: valid_obj(Malloc_0[L_s_37 <- 2], shiftfield_F1_S_g(global(L_s_37)), 1).
 
 ------------------------------------------------------------
 
-Goal Check 'F2' (file tests/wp_acsl/invalid_pointer.c, line 52):
+Goal Check 'F2' (file invalid_pointer.c, line 52):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: valid_obj(Malloc_0[L_s_37 <- 2],
          shift_sint32(shiftfield_F1_S_f(global(L_s_37)), 2), 1).
 
 ------------------------------------------------------------
 
-Goal Check 'G2' (file tests/wp_acsl/invalid_pointer.c, line 53):
+Goal Check 'G2' (file invalid_pointer.c, line 53):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: !valid_obj(Malloc_0[L_s_37 <- 2],
           shift_sint32(shiftfield_F1_S_g(global(L_s_37)), 2), 1).
 
 ------------------------------------------------------------
 
-Goal Check 'AM' (file tests/wp_acsl/invalid_pointer.c, line 56):
+Goal Check 'AM' (file invalid_pointer.c, line 56):
 Prove: true.
 
 ------------------------------------------------------------
@@ -71,22 +71,22 @@ Prove: true.
   Function memvar
 ------------------------------------------------------------
 
-Goal Check 'M1' (file tests/wp_acsl/invalid_pointer.c, line 6):
+Goal Check 'M1' (file invalid_pointer.c, line 6):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'P0' (file tests/wp_acsl/invalid_pointer.c, line 7):
+Goal Check 'P0' (file invalid_pointer.c, line 7):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'P1' (file tests/wp_acsl/invalid_pointer.c, line 8):
+Goal Check 'P1' (file invalid_pointer.c, line 8):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'P2' (file tests/wp_acsl/invalid_pointer.c, line 9):
+Goal Check 'P2' (file invalid_pointer.c, line 9):
 Prove: true.
 
 ------------------------------------------------------------
@@ -94,31 +94,31 @@ Prove: true.
   Function pointer
 ------------------------------------------------------------
 
-Goal Check 'M1' (file tests/wp_acsl/invalid_pointer.c, line 17):
+Goal Check 'M1' (file invalid_pointer.c, line 17):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: !valid_obj(Malloc_0[L_x_27 <- 1], shift_sint32(global(L_x_27), -1), 1).
 
 ------------------------------------------------------------
 
-Goal Check 'P0' (file tests/wp_acsl/invalid_pointer.c, line 18):
+Goal Check 'P0' (file invalid_pointer.c, line 18):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: valid_obj(Malloc_0[L_x_27 <- 1], global(L_x_27), 1).
 
 ------------------------------------------------------------
 
-Goal Check 'P1' (file tests/wp_acsl/invalid_pointer.c, line 19):
+Goal Check 'P1' (file invalid_pointer.c, line 19):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: valid_obj(Malloc_0[L_x_27 <- 1], shift_sint32(global(L_x_27), 1), 1).
 
 ------------------------------------------------------------
 
-Goal Check 'P2' (file tests/wp_acsl/invalid_pointer.c, line 20):
+Goal Check 'P2' (file invalid_pointer.c, line 20):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: !valid_obj(Malloc_0[L_x_27 <- 1], shift_sint32(global(L_x_27), 2), 1).
 
 ------------------------------------------------------------
 
-Goal Check 'NULL' (file tests/wp_acsl/invalid_pointer.c, line 21):
+Goal Check 'NULL' (file invalid_pointer.c, line 21):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: valid_obj(Malloc_0[L_x_27 <- 1], null, 1).
 
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/label_escape.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/label_escape.res.oracle
index 4fca509b7392b2e7a3b27d079450d68e8503c62e..43061e1881e367d013367f6e60d337e7e326aa89 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/label_escape.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/label_escape.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/label_escape.i (no preprocessing)
+[kernel] Parsing label_escape.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ko,oracle_ko' (file tests/wp_acsl/label_escape.i, line 12):
+Goal Assertion 'qed_ko,oracle_ko' (file label_escape.i, line 12):
 Assume { Type: is_sint32(x) /\ is_sint32(y). If x != 0 Else { Have: y = 1. }
 }
 Prove: y = 0.
@@ -16,7 +16,7 @@ Prove: y = 0.
   Function g
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ok,ok' (file tests/wp_acsl/label_escape.i, line 25):
+Goal Assertion 'qed_ok,ok' (file label_escape.i, line 25):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/logic.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/logic.res.oracle
index 631003d71ae2bd9f15345fe79b47e6560a2aa869..d9e9a69ba178e2f836828e6fb512f378136a75f0 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/logic.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/logic.res.oracle
@@ -1,43 +1,34 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/logic.i (no preprocessing)
+[kernel] Parsing logic.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_acsl/logic.i:65: Warning: 
+[wp] logic.i:65: Warning: 
   Cast with incompatible pointers types (source: __anonstruct_Buint_4*)
      (target: uint32*)
-[wp] tests/wp_acsl/logic.i:49: Warning: 
-  Logic cast from struct (Tint2) not implemented yet
-[wp] tests/wp_acsl/logic.i:50: Warning: 
-  Logic cast from struct (Point) not implemented yet
-[wp] tests/wp_acsl/logic.i:51: Warning: 
+[wp] logic.i:49: Warning: Logic cast from struct (Tint2) not implemented yet
+[wp] logic.i:50: Warning: Logic cast from struct (Point) not implemented yet
+[wp] logic.i:51: Warning: 
   Logic cast to struct (Point) from (int [2]) not implemented yet
-[wp] tests/wp_acsl/logic.i:52: Warning: 
-  Logic cast from struct (Point) not implemented yet
-[wp] tests/wp_acsl/logic.i:53: Warning: 
-  Logic cast from struct (Tint2) not implemented yet
-[wp] tests/wp_acsl/logic.i:54: Warning: 
-  Logic cast from struct (Buint) not implemented yet
-[wp] tests/wp_acsl/logic.i:55: Warning: 
+[wp] logic.i:52: Warning: Logic cast from struct (Point) not implemented yet
+[wp] logic.i:53: Warning: Logic cast from struct (Tint2) not implemented yet
+[wp] logic.i:54: Warning: Logic cast from struct (Buint) not implemented yet
+[wp] logic.i:55: Warning: 
   Logic cast to struct (Buint) from (unsigned int) not implemented yet
-[wp] tests/wp_acsl/logic.i:56: Warning: 
-  Logic cast from struct (Tint6) not implemented yet
-[wp] tests/wp_acsl/logic.i:57: Warning: 
+[wp] logic.i:56: Warning: Logic cast from struct (Tint6) not implemented yet
+[wp] logic.i:57: Warning: 
   Logic cast to sized array (Triangle) from (int [6]) not implemented yet
-[wp] tests/wp_acsl/logic.i:58: Warning: 
-  Logic cast from struct (Tint6) not implemented yet
-[wp] tests/wp_acsl/logic.i:59: Warning: 
-  Logic cast from struct (Tint6) not implemented yet
-[wp] tests/wp_acsl/logic.i:60: Warning: 
+[wp] logic.i:58: Warning: Logic cast from struct (Tint6) not implemented yet
+[wp] logic.i:59: Warning: Logic cast from struct (Tint6) not implemented yet
+[wp] logic.i:60: Warning: 
   Logic cast to sized array (int [2]) from (int [6]) not implemented yet
-[wp] tests/wp_acsl/logic.i:61: Warning: 
-  Logic cast from struct (Tint6) not implemented yet
-[wp] tests/wp_acsl/logic.i:62: Warning: 
+[wp] logic.i:61: Warning: Logic cast from struct (Tint6) not implemented yet
+[wp] logic.i:62: Warning: 
   Logic cast to struct (Tint2) from (int [6]) not implemented yet
 ------------------------------------------------------------
   Function h
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/logic.i, line 21) in 'h':
+Goal Post-condition (file logic.i, line 21) in 'h':
 Let a = global(G_t_29).
 Let m = Array1_S1(shift___anonstruct_Point_1(a, 0), 3, Mint_0).
 Let m_1 = Array1_S1(a, 3, Mint_0).
@@ -141,7 +132,7 @@ Prove: P_P(m).
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:49: warning from wp:
+logic.i:49: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast from struct (Tint2) not implemented yet
 Prove: (w.F1_y) = 11.
@@ -149,7 +140,7 @@ Prove: (w.F1_y) = 11.
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:50: warning from wp:
+logic.i:50: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast from struct (Point) not implemented yet
 Prove: (w.F3_tab)[1] = 11.
@@ -157,7 +148,7 @@ Prove: (w.F3_tab)[1] = 11.
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:51: warning from wp:
+logic.i:51: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast to struct (Point) from (int [2]) not implemented yet
 Prove: (w.F1_y) = 11.
@@ -165,7 +156,7 @@ Prove: (w.F1_y) = 11.
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:52: warning from wp:
+logic.i:52: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast from struct (Point) not implemented yet
 Prove: w[1] = 11.
@@ -173,7 +164,7 @@ Prove: w[1] = 11.
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:53: warning from wp:
+logic.i:53: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast from struct (Tint2) not implemented yet
 Prove: w[1] = 11.
@@ -181,7 +172,7 @@ Prove: w[1] = 11.
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:54: warning from wp:
+logic.i:54: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast from struct (Buint) not implemented yet
 Prove: w = 134480385.
@@ -189,7 +180,7 @@ Prove: w = 134480385.
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:55: warning from wp:
+logic.i:55: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast to struct (Buint) from (unsigned int) not implemented yet
 Let a = global(G_buint_41).
@@ -211,7 +202,7 @@ Prove: EqS4(a_2, w).
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:56: warning from wp:
+logic.i:56: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast from struct (Tint6) not implemented yet
 Prove: (w[1].F1_y) = 21.
@@ -219,7 +210,7 @@ Prove: (w[1].F1_y) = 21.
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:57: warning from wp:
+logic.i:57: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast to sized array (Triangle) from (int [6]) not implemented yet
 Prove: (w[1].F1_y) = 21.
@@ -227,7 +218,7 @@ Prove: (w[1].F1_y) = 21.
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:58: warning from wp:
+logic.i:58: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast from struct (Tint6) not implemented yet
 Prove: w[4] = 30.
@@ -235,7 +226,7 @@ Prove: w[4] = 30.
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:59: warning from wp:
+logic.i:59: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast from struct (Tint6) not implemented yet
 Prove: w[1] = 11.
@@ -243,7 +234,7 @@ Prove: w[1] = 11.
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:60: warning from wp:
+logic.i:60: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast to sized array (int [2]) from (int [6]) not implemented yet
 Prove: w[1] = 11.
@@ -251,7 +242,7 @@ Prove: w[1] = 11.
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:61: warning from wp:
+logic.i:61: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast from struct (Tint6) not implemented yet
 Prove: (w.F3_tab)[1] = 11.
@@ -259,7 +250,7 @@ Prove: (w.F3_tab)[1] = 11.
 ------------------------------------------------------------
 
 Goal Pre-condition 'qed_ok' in 'main':
-tests/wp_acsl/logic.i:62: warning from wp:
+logic.i:62: warning from wp:
  - Warning: Hide sub-term definition
    Reason: Logic cast to struct (Tint2) from (int [6]) not implemented yet
 Prove: (w.F3_tab)[1] = 11.
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/looplabels.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/looplabels.res.oracle
index c4c9cd16d8a6f2fab6c268ab7db6f9a08b92b855..2d0106f8d81566a9836dbeb52c8a1935f5e9164d 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/looplabels.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/looplabels.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/looplabels.i (no preprocessing)
+[kernel] Parsing looplabels.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function copy
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/looplabels.i, line 13) in 'copy':
+Goal Post-condition (file looplabels.i, line 13) in 'copy':
 Let a_1 = shift_sint32(b, 0).
 Let a_2 = shift_sint32(a, 0).
 Assume {
@@ -27,7 +27,7 @@ Prove: P_IsEqual(havoc(Mint_undef_0, Mint_0, a_1, i), a, b, i).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/looplabels.i, line 18):
+Goal Preservation of Invariant (file looplabels.i, line 18):
 Let a_1 = shift_sint32(b, 0).
 Let a_2 = shift_sint32(a, 0).
 Assume {
@@ -48,12 +48,12 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/looplabels.i, line 18):
+Goal Establishment of Invariant (file looplabels.i, line 18):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/looplabels.i, line 19):
+Goal Preservation of Invariant (file looplabels.i, line 19):
 Let a_1 = shift_sint32(b, 0).
 Let a_2 = havoc(Mint_undef_0, Mint_0, a_1, n).
 Let a_3 = shift_sint32(a, 0).
@@ -76,7 +76,7 @@ Prove: P_IsEqual(a_2[shift_sint32(b, i) <- a_2[shift_sint32(a, i)]], a, b, x).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/looplabels.i, line 19):
+Goal Establishment of Invariant (file looplabels.i, line 19):
 Let a_1 = shift_sint32(a, 0).
 Let a_2 = shift_sint32(b, 0).
 Assume {
@@ -91,12 +91,12 @@ Prove: P_IsEqual(Mint_0, a, b, 0).
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/looplabels.i, line 20) (1/2):
+Goal Loop assigns (file looplabels.i, line 20) (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/looplabels.i, line 20) (2/2):
+Goal Loop assigns (file looplabels.i, line 20) (2/2):
 Effect at line 23
 Let a_1 = shift_sint32(b, 0).
 Let a_2 = shift_sint32(a, 0).
@@ -121,7 +121,7 @@ Prove: included(a_3, 1, a_1, n).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_acsl/looplabels.i, line 14) in 'copy':
+Goal Assigns (file looplabels.i, line 14) in 'copy':
 Effect at line 22
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/memvar_chunk_typing.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/memvar_chunk_typing.res.oracle
index 26231a706b7047c6fddebcf89f9bf3c419d934e2..7fdbb2db27425bc72926d5442e28a9fe87895a6c 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/memvar_chunk_typing.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/memvar_chunk_typing.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp_acsl/memvar_chunk_typing.i (no preprocessing)
+[kernel] Parsing memvar_chunk_typing.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Global
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/null.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/null.res.oracle
index 16ac874aa695270bd9cf2784c559eb4e32c7fa23..726375fd9fe70d88951932d5a1d18f98fec27290 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/null.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/null.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/null.c (with preprocessing)
+[kernel] Parsing null.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -20,7 +20,7 @@ Prove: not (valid_rd Malloc_0 null 1)
   Function null_is_zero
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/null.c, line 4) in 'null_is_zero':
+Goal Post-condition (file null.c, line 4) in 'null_is_zero':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/pointer.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/pointer.res.oracle
index 4339266bbaf17b0b122e18a85903f672b452e038..f4928b544b2b911f88534a092738e4a00557a8c5 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/pointer.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/pointer.res.oracle
@@ -1,19 +1,13 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/pointer.i (no preprocessing)
+[kernel] Parsing pointer.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_acsl/pointer.i:50: Warning: 
-  Uncomparable locations p_0 and mem:t.(0)
-[wp] tests/wp_acsl/pointer.i:49: Warning: 
-  Uncomparable locations p_0 and mem:t.(0)
-[wp] tests/wp_acsl/pointer.i:48: Warning: 
-  Uncomparable locations p_0 and mem:t.(0)
-[wp] tests/wp_acsl/pointer.i:47: Warning: 
-  Uncomparable locations p_0 and mem:t.(0)
-[wp] tests/wp_acsl/pointer.i:46: Warning: 
-  Uncomparable locations p_0 and mem:t.(0)
-[wp] tests/wp_acsl/pointer.i:45: Warning: 
-  Uncomparable locations p_0 and mem:t.(0)
+[wp] pointer.i:50: Warning: Uncomparable locations p_0 and mem:t.(0)
+[wp] pointer.i:49: Warning: Uncomparable locations p_0 and mem:t.(0)
+[wp] pointer.i:48: Warning: Uncomparable locations p_0 and mem:t.(0)
+[wp] pointer.i:47: Warning: Uncomparable locations p_0 and mem:t.(0)
+[wp] pointer.i:46: Warning: Uncomparable locations p_0 and mem:t.(0)
+[wp] pointer.i:45: Warning: Uncomparable locations p_0 and mem:t.(0)
 ------------------------------------------------------------
   Function absurd
 ------------------------------------------------------------
@@ -112,7 +106,7 @@ Prove: q = p.
 ------------------------------------------------------------
 
 Goal Post-condition 'qed_ok,Lt' in 'mixed_array_pointer':
-tests/wp_acsl/pointer.i:45: warning from Reference Variable Model:
+pointer.i:45: warning from Reference Variable Model:
  - Warning: Hide sub-term definition
    Reason: Uncomparable locations p_0 and mem:t.(0)
 Assume { (* Goal *) When: 0 < w. (* Pre-condition *) Have: p.base = G_t_21. }
@@ -121,7 +115,7 @@ Prove: addr_lt(shift_sint32(global(G_t_21), 0), p).
 ------------------------------------------------------------
 
 Goal Post-condition 'qed_ok,Le' in 'mixed_array_pointer':
-tests/wp_acsl/pointer.i:46: warning from Reference Variable Model:
+pointer.i:46: warning from Reference Variable Model:
  - Warning: Hide sub-term definition
    Reason: Uncomparable locations p_0 and mem:t.(0)
 Assume { (* Goal *) When: 0 <= w. (* Pre-condition *) Have: p.base = G_t_21.
@@ -131,7 +125,7 @@ Prove: addr_le(shift_sint32(global(G_t_21), 0), p).
 ------------------------------------------------------------
 
 Goal Post-condition 'qed_ok,Eq' in 'mixed_array_pointer':
-tests/wp_acsl/pointer.i:47: warning from Reference Variable Model:
+pointer.i:47: warning from Reference Variable Model:
  - Warning: Hide sub-term definition
    Reason: Uncomparable locations p_0 and mem:t.(0)
 Assume { (* Pre-condition *) Have: p.base = G_t_21. }
@@ -140,7 +134,7 @@ Prove: shift_sint32(global(G_t_21), 0) = p.
 ------------------------------------------------------------
 
 Goal Post-condition 'qed_ok,Ne' in 'mixed_array_pointer':
-tests/wp_acsl/pointer.i:48: warning from Reference Variable Model:
+pointer.i:48: warning from Reference Variable Model:
  - Warning: Hide sub-term definition
    Reason: Uncomparable locations p_0 and mem:t.(0)
 Assume { (* Goal *) When: w != 0. (* Pre-condition *) Have: p.base = G_t_21.
@@ -150,7 +144,7 @@ Prove: shift_sint32(global(G_t_21), 0) != p.
 ------------------------------------------------------------
 
 Goal Post-condition 'qed_ko,Le_oracle_ko' in 'mixed_array_pointer':
-tests/wp_acsl/pointer.i:49: warning from Reference Variable Model:
+pointer.i:49: warning from Reference Variable Model:
  - Warning: Hide sub-term definition
    Reason: Uncomparable locations p_0 and mem:t.(0)
 Assume { (* Goal *) When: 0 <= w. (* Pre-condition *) Have: p.base = G_t_21.
@@ -160,7 +154,7 @@ Prove: addr_lt(shift_sint32(global(G_t_21), 0), p).
 ------------------------------------------------------------
 
 Goal Post-condition 'qed_ko,Lt_oracle_ko' in 'mixed_array_pointer':
-tests/wp_acsl/pointer.i:50: warning from Reference Variable Model:
+pointer.i:50: warning from Reference Variable Model:
  - Warning: Hide sub-term definition
    Reason: Uncomparable locations p_0 and mem:t.(0)
 Assume { (* Goal *) When: 0 < w. (* Pre-condition *) Have: p.base = G_t_21. }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/post_result.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/post_result.res.oracle
index ea63412d59c5d71be853ac19c19e87d65ecbae1a..b44368d3777b7e780051748f80e15b39e89db1a5 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/post_result.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/post_result.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/post_result.i (no preprocessing)
+[kernel] Parsing post_result.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function correct
 ------------------------------------------------------------
 
-Goal Assertion 'OK' (file tests/wp_acsl/post_result.i, line 16):
+Goal Assertion 'OK' (file post_result.i, line 16):
 Prove: true.
 
 ------------------------------------------------------------
@@ -14,7 +14,7 @@ Prove: true.
   Function wrong
 ------------------------------------------------------------
 
-Goal Assertion 'KO' (file tests/wp_acsl/post_result.i, line 22):
+Goal Assertion 'KO' (file post_result.i, line 22):
 Let a = shift_sint32(global(G_a_20), 1).
 Let x = Mint_0[a].
 Let x_1 = Mint_undef_0[a].
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/precedence.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/precedence.res.oracle
index eac17274f2665b22412eeef5c0f3cdc6d7215b32..747ead2f39520b0b60e68cc0295062fc3bb28a58 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/precedence.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/precedence.res.oracle
@@ -1,40 +1,24 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/precedence.i (no preprocessing)
-[kernel:annot-error] tests/wp_acsl/precedence.i:90: Warning: 
-  unexpected token ';'
-[kernel:annot-error] tests/wp_acsl/precedence.i:135: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:134: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:133: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:132: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:130: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:129: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:128: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:127: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:125: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:124: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:123: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:122: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:120: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:119: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:118: Warning: 
-  Inconsistent relation chain.
-[kernel:annot-error] tests/wp_acsl/precedence.i:175: Warning: 
+[kernel] Parsing precedence.i (no preprocessing)
+[kernel:annot-error] precedence.i:90: Warning: unexpected token ';'
+[kernel:annot-error] precedence.i:135: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:134: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:133: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:132: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:130: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:129: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:128: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:127: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:125: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:124: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:123: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:122: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:120: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:119: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:118: Warning: Inconsistent relation chain.
+[kernel:annot-error] precedence.i:175: Warning: 
   R is not a logic variable. Ignoring code annotation
-[kernel:annot-error] tests/wp_acsl/precedence.i:176: Warning: 
+[kernel:annot-error] precedence.i:176: Warning: 
   P is not a logic variable. Ignoring code annotation
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/predicates_functions.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/predicates_functions.res.oracle
index 666a26c85f56963f5b071d371f368c685ab8e46c..67a25621bb869debb0266cef37f13f481f8aa753 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/predicates_functions.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/predicates_functions.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/predicates_functions.i (no preprocessing)
+[kernel] Parsing predicates_functions.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] 1 goal scheduled
 [wp:print-generated] 
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/range.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/range.res.oracle
index e0054bf13b602a75c7f62e23aa586efff7111dd3..0489900f8b49f71d2498a4b02876a751a2b475ef 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/range.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/range.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/range.i (no preprocessing)
+[kernel] Parsing range.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -16,13 +16,13 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'HP,ok' in 'val_assigns_p'' in 'test' at call 'val_assigns_p' (file tests/wp_acsl/range.i, line 32)
+Goal Instance of 'Pre-condition 'HP,ok' in 'val_assigns_p'' in 'test' at call 'val_assigns_p' (file range.i, line 32)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'HQ,ok' in 'val_assigns_q'' in 'test' at call 'val_assigns_q' (file tests/wp_acsl/range.i, line 33)
+Goal Instance of 'Pre-condition 'HQ,ok' in 'val_assigns_q'' in 'test' at call 'val_assigns_q' (file range.i, line 33)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/reads.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/reads.res.oracle
index 430cdc96add4646c44083c74bfc1b93928ca43d1..d422432ec0c28c19eef8cd6c5a10c3e915e9e729 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/reads.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/reads.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/reads.i (no preprocessing)
+[kernel] Parsing reads.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/record.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/record.res.oracle
index 43d8c4d3eceaa9b41e44c062e7c6911fc91ab7ca..3b5da5293fc0e220c42e472c97348d16d111f302 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/record.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/record.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/record.i (no preprocessing)
+[kernel] Parsing record.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/simpl_is_type.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/simpl_is_type.res.oracle
index f4bf9c3fb0ee68f5f3174bd207003e8881f3eb04..f3317df160133be9393b0c923558079b25b43b68 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/simpl_is_type.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/simpl_is_type.res.oracle
@@ -1,146 +1,146 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/simpl_is_type.i (no preprocessing)
+[kernel] Parsing simpl_is_type.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function check_acsl
 ------------------------------------------------------------
 
-Goal Check 'ko,A1,absorb_is_cint' (file tests/wp_acsl/simpl_is_type.i, line 62):
+Goal Check 'ko,A1,absorb_is_cint' (file simpl_is_type.i, line 62):
 Prove: exists i : Z. forall i_1 : Z. ((0 <= i_1) -> ((i_1 <= 63) ->
     P_P(i_1, i, 1.0))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,A2,absorb_is_cint' (file tests/wp_acsl/simpl_is_type.i, line 63):
+Goal Check 'ko,A2,absorb_is_cint' (file simpl_is_type.i, line 63):
 Prove: exists i : Z. forall i_1 : Z. ((0 <= i_1) -> ((i_1 <= 63) ->
     (P_P(i, i_1, 1.0) -> P_P(i_1, i, 1.0)))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,A3,absorb_is_cint' (file tests/wp_acsl/simpl_is_type.i, line 64):
+Goal Check 'ko,A3,absorb_is_cint' (file simpl_is_type.i, line 64):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. ((0 <= i_1) -> ((i_1 <= 63) -> P_P(i_1, i, r))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,A4,absorb_is_cint' (file tests/wp_acsl/simpl_is_type.i, line 65):
+Goal Check 'ko,A4,absorb_is_cint' (file simpl_is_type.i, line 65):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. ((0 <= i_1) -> ((i_1 <= 63) -> (P_P(i, i_1, r) ->
      P_P(i_1, i, r)))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ok,C1,absurd_is_cint' (file tests/wp_acsl/simpl_is_type.i, line 67):
+Goal Check 'ok,C1,absurd_is_cint' (file simpl_is_type.i, line 67):
 Prove: exists i : Z. forall i_1 : Z. ((i_1 < 0) -> (((-900000) <= i_1) ->
     (is_uint8(i_1) -> (P_P(i, i_1, 1.0) -> P_P(i_1, i, 1.0))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ok,C2,absurd_is_cint' (file tests/wp_acsl/simpl_is_type.i, line 68):
+Goal Check 'ok,C2,absurd_is_cint' (file simpl_is_type.i, line 68):
 Prove: exists i : Z. forall i_1 : Z. ((i_1 < 0) -> (((-900000) <= i_1) ->
     (is_uint8(i_1) -> (P_P(i, i_1, 1.0) -> P_P(i_1, i, 1.0))))).
 
 ------------------------------------------------------------
 
-Goal Check 'lack,C3,absurd_is_cint' (file tests/wp_acsl/simpl_is_type.i, line 69):
+Goal Check 'lack,C3,absurd_is_cint' (file simpl_is_type.i, line 69):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. ((i_1 < 0) -> (((-900000) <= i_1) -> (P_P(i, i_1, r) ->
      P_P(i_1, i, r)))))).
 
 ------------------------------------------------------------
 
-Goal Check 'lack,C4,absurd_is_cint' (file tests/wp_acsl/simpl_is_type.i, line 70):
+Goal Check 'lack,C4,absurd_is_cint' (file simpl_is_type.i, line 70):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. ((i_1 < 0) -> (((-900000) <= i_1) -> (P_P(i, i_1, r) ->
      P_P(i_1, i, r)))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ok,C5,absurd_cmp' (file tests/wp_acsl/simpl_is_type.i, line 71):
+Goal Check 'ok,C5,absurd_cmp' (file simpl_is_type.i, line 71):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'ko,B5,no_absurd_cmp' (file tests/wp_acsl/simpl_is_type.i, line 72):
+Goal Check 'ko,B5,no_absurd_cmp' (file simpl_is_type.i, line 72):
 Assume { (* Goal *) When: (.0 < r) /\ (r < 1.0). }
 Prove: P_P(3, 5, 1.0).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Min1,reduces_min' (file tests/wp_acsl/simpl_is_type.i, line 74):
+Goal Check 'ko,Min1,reduces_min' (file simpl_is_type.i, line 74):
 Prove: exists i : Z. forall i_1 : Z. ((0 <= i_1) -> (((-5) <= i_1) ->
     ((i_1 <= 99) -> P_P(i_1, i, 1.0)))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Min2,reduces_min' (file tests/wp_acsl/simpl_is_type.i, line 75):
+Goal Check 'ko,Min2,reduces_min' (file simpl_is_type.i, line 75):
 Prove: exists i : Z. forall i_1 : Z. ((10 <= i_1) -> ((11 <= i_1) ->
     ((i_1 <= 99) -> (P_P(10, i, 1.0) -> P_P(i_1, i, 1.0))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Min3,reduces_min' (file tests/wp_acsl/simpl_is_type.i, line 76):
+Goal Check 'ko,Min3,reduces_min' (file simpl_is_type.i, line 76):
 Prove: exists i : Z. forall i_1 : Z. ((10 <= i_1) -> ((12 <= i_1) ->
     ((i_1 <= 99) -> (P_P(10, i, 1.0) -> (P_P(11, i, 1.0) ->
     (P_P(13, i, 1.0) -> P_P(i_1, i, 1.0))))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Min4,reduces_min' (file tests/wp_acsl/simpl_is_type.i, line 77):
+Goal Check 'ko,Min4,reduces_min' (file simpl_is_type.i, line 77):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. (((-5) <= i_1) -> ((i_1 <= 99) -> P_P(i_1, i, r))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Min5,reduces_min' (file tests/wp_acsl/simpl_is_type.i, line 78):
+Goal Check 'ko,Min5,reduces_min' (file simpl_is_type.i, line 78):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. ((10 <= i_1) -> ((i_1 <= 99) -> (P_P(10, i, r) ->
      P_P(i_1, i, r)))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Min6,reduces_min' (file tests/wp_acsl/simpl_is_type.i, line 79):
+Goal Check 'ko,Min6,reduces_min' (file simpl_is_type.i, line 79):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. ((10 <= i_1) -> ((i_1 <= 99) -> (P_P(10, i, r) ->
      (P_P(11, i, r) -> (P_P(13, i, r) -> P_P(i_1, i, r)))))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Max1,reduces_max' (file tests/wp_acsl/simpl_is_type.i, line 81):
+Goal Check 'ko,Max1,reduces_max' (file simpl_is_type.i, line 81):
 Prove: exists i : Z. forall i_1 : Z. ((10 <= i_1) -> ((i_1 <= 255) ->
     ((i_1 <= 599) -> P_P(i_1, i, 1.0)))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Max2,reduces_max' (file tests/wp_acsl/simpl_is_type.i, line 82):
+Goal Check 'ko,Max2,reduces_max' (file simpl_is_type.i, line 82):
 Prove: exists i : Z. forall i_1 : Z. ((10 <= i_1) -> ((i_1 <= 97) ->
     ((i_1 <= 99) -> (P_P(98, i, 1.0) -> (P_P(99, i, 1.0) ->
     P_P(i_1, i, 1.0)))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Max3,reduces_max' (file tests/wp_acsl/simpl_is_type.i, line 83):
+Goal Check 'ko,Max3,reduces_max' (file simpl_is_type.i, line 83):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. ((10 <= i_1) -> ((i_1 <= 599) -> P_P(i_1, i, r))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Max4,reduces_max' (file tests/wp_acsl/simpl_is_type.i, line 84):
+Goal Check 'ko,Max4,reduces_max' (file simpl_is_type.i, line 84):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. ((10 <= i_1) -> ((i_1 <= 99) -> (P_P(98, i, r) ->
      (P_P(99, i, r) -> P_P(i_1, i, r))))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,MinMax1,reduce_minmax' (file tests/wp_acsl/simpl_is_type.i, line 86):
+Goal Check 'ko,MinMax1,reduce_minmax' (file simpl_is_type.i, line 86):
 Prove: exists i : Z. forall i_1 : Z. ((0 <= i_1) -> (((-5) <= i_1) ->
     ((i_1 <= 97) -> ((i_1 <= 99) -> (P_P(98, i, 1.0) -> (P_P(99, i, 1.0) ->
     P_P(i_1, i, 1.0))))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,MinMax2,reduce_minmax' (file tests/wp_acsl/simpl_is_type.i, line 87):
+Goal Check 'ko,MinMax2,reduce_minmax' (file simpl_is_type.i, line 87):
 Prove: exists i : Z. forall i_1 : Z. ((10 <= i_1) -> ((12 <= i_1) ->
     ((i_1 <= 97) -> ((i_1 <= 99) -> (P_P(10, i, 1.0) -> (P_P(11, i, 1.0) ->
     (P_P(13, i, 1.0) -> (P_P(98, i, 1.0) -> (P_P(99, i, 1.0) ->
@@ -148,14 +148,14 @@ Prove: exists i : Z. forall i_1 : Z. ((10 <= i_1) -> ((12 <= i_1) ->
 
 ------------------------------------------------------------
 
-Goal Check 'ko,MinMax3,reduce_minmax' (file tests/wp_acsl/simpl_is_type.i, line 88):
+Goal Check 'ko,MinMax3,reduce_minmax' (file simpl_is_type.i, line 88):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. (((-5) <= i_1) -> ((i_1 <= 99) -> (P_P(98, i, r) ->
      (P_P(99, i, r) -> P_P(i_1, i, r))))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,MinMax4,reduce_minmax' (file tests/wp_acsl/simpl_is_type.i, line 89):
+Goal Check 'ko,MinMax4,reduce_minmax' (file simpl_is_type.i, line 89):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. ((10 <= i_1) -> ((i_1 <= 99) -> (P_P(10, i, r) ->
      (P_P(11, i, r) -> (P_P(13, i, r) -> (P_P(98, i, r) -> (P_P(99, i, r) ->
@@ -163,34 +163,34 @@ Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Let1,intro_let' (file tests/wp_acsl/simpl_is_type.i, line 92):
+Goal Check 'ko,Let1,intro_let' (file simpl_is_type.i, line 92):
 Prove: exists i : Z. P_P(10, i, 1.0).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Let2,intro_let' (file tests/wp_acsl/simpl_is_type.i, line 93):
+Goal Check 'ko,Let2,intro_let' (file simpl_is_type.i, line 93):
 Prove: exists i : Z. P_P(0, i, 1.0).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Let3,intro_let' (file tests/wp_acsl/simpl_is_type.i, line 94):
+Goal Check 'ko,Let3,intro_let' (file simpl_is_type.i, line 94):
 Prove: exists i : Z. P_P(255, i, 1.0).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Let4,intro_let' (file tests/wp_acsl/simpl_is_type.i, line 95):
+Goal Check 'ko,Let4,intro_let' (file simpl_is_type.i, line 95):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. ((10 <= i_1) -> ((i_1 <= 10) -> P_P(i_1, i, r))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Let5,intro_let' (file tests/wp_acsl/simpl_is_type.i, line 96):
+Goal Check 'ko,Let5,intro_let' (file simpl_is_type.i, line 96):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. ((i_1 <= 0) -> (((-5) <= i_1) -> P_P(i_1, i, r))))).
 
 ------------------------------------------------------------
 
-Goal Check 'ko,Let6,intro_let' (file tests/wp_acsl/simpl_is_type.i, line 97):
+Goal Check 'ko,Let6,intro_let' (file simpl_is_type.i, line 97):
 Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
     (exists r : R. ((255 <= i_1) -> ((i_1 <= 599) -> P_P(i_1, i, r))))).
 
@@ -199,7 +199,7 @@ Prove: exists i : Z. forall i_1 : Z. (is_uint8(i_1) ->
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/simpl_is_type.i, line 17) in 'f':
+Goal Post-condition (file simpl_is_type.i, line 17) in 'f':
 Let a = shift_sint32(t, 0).
 Let a_1 = havoc(Mint_undef_0, Mint_0, a, size_0).
 Assume {
@@ -227,7 +227,7 @@ Prove: 0 < havoc(Mint_undef_0, Mint_0, a, i)[shift_sint32(t, i_1)].
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/simpl_is_type.i, line 22):
+Goal Preservation of Invariant (file simpl_is_type.i, line 22):
 Let a = havoc(Mint_undef_0, Mint_0, shift_sint32(t, 0), size_0).
 Assume {
   Type: is_sint32(i) /\ is_sint32(size_0) /\ is_sint32(1 + i).
@@ -252,12 +252,12 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/simpl_is_type.i, line 22):
+Goal Establishment of Invariant (file simpl_is_type.i, line 22):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/simpl_is_type.i, line 23):
+Goal Preservation of Invariant (file simpl_is_type.i, line 23):
 Let a = havoc(Mint_undef_0, Mint_0, shift_sint32(t, 0), size_0).
 Let a_1 = shift_sint32(t, i).
 Let a_2 = a[a_1].
@@ -287,12 +287,12 @@ Prove: 0 < a[a_1 <- -a_2][shift_sint32(t, i_1)].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/simpl_is_type.i, line 23):
+Goal Establishment of Invariant (file simpl_is_type.i, line 23):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/simpl_is_type.i, line 24):
+Goal Preservation of Invariant (file simpl_is_type.i, line 24):
 Let a = havoc(Mint_undef_0, Mint_0, shift_sint32(t, 0), size_0).
 Let a_1 = shift_sint32(t, i).
 Let a_2 = a[a_1].
@@ -322,7 +322,7 @@ Prove: a[a_1 <- -a_2][shift_sint32(t, i_1)] < 0.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/simpl_is_type.i, line 24):
+Goal Establishment of Invariant (file simpl_is_type.i, line 24):
 Assume {
   Type: is_sint32(size_0).
   (* Heap *)
@@ -338,12 +338,12 @@ Prove: Mint_0[shift_sint32(t, i)] < 0.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/simpl_is_type.i, line 25) (1/2):
+Goal Loop assigns (file simpl_is_type.i, line 25) (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/simpl_is_type.i, line 25) (2/2):
+Goal Loop assigns (file simpl_is_type.i, line 25) (2/2):
 Effect at line 28
 Let a = shift_sint32(t, 0).
 Let a_1 = havoc(Mint_undef_0, Mint_0, a, size_0).
@@ -376,7 +376,7 @@ Prove: included(a_2, 1, a, size_0).
   Function g
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_acsl/simpl_is_type.i, line 35) in 'g':
+Goal Post-condition (file simpl_is_type.i, line 35) in 'g':
 Let x = Mint_0[shift_sint32(t, i)].
 Assume {
   Type: is_sint32(i) /\ is_sint32(size_0) /\ is_sint32(x).
@@ -398,7 +398,7 @@ Prove: exists i_1 : Z. (Mint_0[shift_sint32(t, i_1)] = x) /\ (0 <= i_1) /\
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/simpl_is_type.i, line 44):
+Goal Preservation of Invariant (file simpl_is_type.i, line 44):
 Let x_1 = Mint_0[shift_sint32(t, i)].
 Assume {
   Type: is_sint32(i) /\ is_sint32(size_0) /\ is_sint32(x) /\
@@ -421,12 +421,12 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/simpl_is_type.i, line 44):
+Goal Establishment of Invariant (file simpl_is_type.i, line 44):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_acsl/simpl_is_type.i, line 46):
+Goal Preservation of Invariant (file simpl_is_type.i, line 46):
 Let x_1 = Mint_0[shift_sint32(t, i_1)].
 Assume {
   Type: is_sint32(i_1) /\ is_sint32(size_0) /\ is_sint32(x) /\
@@ -451,12 +451,12 @@ Prove: Mint_0[shift_sint32(t, i)] != x.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_acsl/simpl_is_type.i, line 46):
+Goal Establishment of Invariant (file simpl_is_type.i, line 46):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_acsl/simpl_is_type.i, line 48):
+Goal Loop assigns (file simpl_is_type.i, line 48):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/sizeof.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/sizeof.res.oracle
index 36be29ece00d5befea013d85ab46a0f7ef6cfa1e..f535829909eabf8e439a33f11949db5246119cfa 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/sizeof.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/sizeof.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/sizeof.i (no preprocessing)
+[kernel] Parsing sizeof.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function foo
 ------------------------------------------------------------
 
-Goal Assertion 'A' (file tests/wp_acsl/sizeof.i, line 10):
+Goal Assertion 'A' (file sizeof.i, line 10):
 Prove: !P_eq(12, 9).
 
 ------------------------------------------------------------
 
-Goal Assertion 'B' (file tests/wp_acsl/sizeof.i, line 11):
+Goal Assertion 'B' (file sizeof.i, line 11):
 Assume { (* Assertion 'A' *) Have: !P_eq(12, 9). }
 Prove: P_eq(48, 48).
 
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/struct_fields.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/struct_fields.res.oracle
index 0a7a16a6acadb3ef41857bbbff863c300b5da1be..e6935b4689f8ef7f1edd31b99af88b71fa96d265 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/struct_fields.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/struct_fields.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte -wp-no-let [...]
-[kernel] Parsing tests/wp_acsl/struct_fields.i (no preprocessing)
+[kernel] Parsing struct_fields.i (no preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function foo
 [wp] 2 goals scheduled
@@ -239,7 +239,7 @@ end
   Function foo
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_acsl/struct_fields.i, line 15):
+Goal Assertion 'rte,mem_access' (file struct_fields.i, line 15):
 Assume {
   Type: IsS1_X(r) /\ is_sint16_chunk(Mint_0) /\ is_sint32_chunk(Mint_1) /\
       is_sint8_chunk(Mchar_0) /\
@@ -259,7 +259,7 @@ Prove: valid_rd(Malloc_0, p, 3).
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_acsl/struct_fields.i, line 16):
+Goal Assertion 'rte,mem_access' (file struct_fields.i, line 16):
 Let a = Load_S1_X(p, Mchar_0, Mint_0, Mint_1).
 Assume {
   Type: IsS1_X(r) /\ is_sint16_chunk(Mint_0) /\ is_sint32_chunk(Mint_1) /\
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/struct_use_case.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/struct_use_case.res.oracle
index 64f1be48e24c86ff4c8a415eec93aa0fa33581d0..e5319403413bcc0affb2ee48466e5706c21c7c2c 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/struct_use_case.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/struct_use_case.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Caveat)' [...]
-[kernel] Parsing tests/wp_acsl/struct_use_case.i (no preprocessing)
+[kernel] Parsing struct_use_case.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/sum_types.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/sum_types.res.oracle
index ed60c90f28251a77c85ba2795070ecd1e677415e..cdd8f66f15d13a7f04f6b2bfab4e4af0b8aed0a0 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/sum_types.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/sum_types.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/sum_types.i (no preprocessing)
+[kernel] Parsing sum_types.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] 3 goals scheduled
 ---------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/tset.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/tset.res.oracle
index 60245b69a897f75bf1485cc637107cacb55a45d3..87f8fa4d9a538f8ec39ce6012eb82d75493e2718 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/tset.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/tset.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/tset.i (no preprocessing)
+[kernel] Parsing tset.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Global
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/type_guard.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/type_guard.res.oracle
index 795eedf06cd80d6c7b0ebd3e2d5e5384c049503b..b05e385162da60821def1184d7093c1a9c258aa6 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/type_guard.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/type_guard.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/type_guard.i (no preprocessing)
+[kernel] Parsing type_guard.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/unit_bit_test.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/unit_bit_test.res.oracle
index 9cc603d5697fb6981218c143fa1352eff8620530..cd6729ea2d5b979d9cf3e4b7439032f6a16aa32b 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/unit_bit_test.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/unit_bit_test.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/unit_bit_test.c (with preprocessing)
+[kernel] Parsing unit_bit_test.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/unit_bool.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/unit_bool.res.oracle
index ed47c09c4a64ce354e0558afdac39b0e2c0c76cf..d2afa50ad8b79a1b61c55af9cdfd7b2ee449af47 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/unit_bool.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/unit_bool.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/unit_bool.i (no preprocessing)
+[kernel] Parsing unit_bool.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -15,72 +15,72 @@ Prove: (L_f 1)
   Function boolean_casts
 ------------------------------------------------------------
 
-Goal Check 'C0' (file tests/wp_acsl/unit_bool.i, line 12):
+Goal Check 'C0' (file unit_bool.i, line 12):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'C1' (file tests/wp_acsl/unit_bool.i, line 13):
+Goal Check 'C1' (file unit_bool.i, line 13):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'c0' (file tests/wp_acsl/unit_bool.i, line 14):
+Goal Check 'c0' (file unit_bool.i, line 14):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'c1' (file tests/wp_acsl/unit_bool.i, line 15):
+Goal Check 'c1' (file unit_bool.i, line 15):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'c2' (file tests/wp_acsl/unit_bool.i, line 16):
+Goal Check 'c2' (file unit_bool.i, line 16):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'X0' (file tests/wp_acsl/unit_bool.i, line 18):
+Goal Check 'X0' (file unit_bool.i, line 18):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'X1' (file tests/wp_acsl/unit_bool.i, line 19):
+Goal Check 'X1' (file unit_bool.i, line 19):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'x0' (file tests/wp_acsl/unit_bool.i, line 20):
+Goal Check 'x0' (file unit_bool.i, line 20):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'x1' (file tests/wp_acsl/unit_bool.i, line 21):
+Goal Check 'x1' (file unit_bool.i, line 21):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'x2' (file tests/wp_acsl/unit_bool.i, line 22):
+Goal Check 'x2' (file unit_bool.i, line 22):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'B0' (file tests/wp_acsl/unit_bool.i, line 24):
+Goal Check 'B0' (file unit_bool.i, line 24):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'B1' (file tests/wp_acsl/unit_bool.i, line 25):
+Goal Check 'B1' (file unit_bool.i, line 25):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'b0' (file tests/wp_acsl/unit_bool.i, line 26):
+Goal Check 'b0' (file unit_bool.i, line 26):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check 'b1' (file tests/wp_acsl/unit_bool.i, line 27):
+Goal Check 'b1' (file unit_bool.i, line 27):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/unit_compare.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/unit_compare.res.oracle
index b0b0dba7b56f820f5ccdc133b8d9012b4f41d519..9bef8478689fd9c4dd95ce4f6b9f9db50490b97c 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/unit_compare.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/unit_compare.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/unit_compare.i (no preprocessing)
+[kernel] Parsing unit_compare.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/unsupported_builtin.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/unsupported_builtin.res.oracle
index 0becba4e3779f4a17ec4a22b65cbde6ffa263a4b..aae8be6b43b9d7abd88a0dc8f986722bcfbf482f 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/unsupported_builtin.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/unsupported_builtin.res.oracle
@@ -1,17 +1,16 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/unsupported_builtin.i (no preprocessing)
+[kernel] Parsing unsupported_builtin.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_acsl/unsupported_builtin.i:10: Warning: 
+[kernel] unsupported_builtin.i:10: Warning: 
   No code nor implicit assigns clause for function foo, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_acsl/unsupported_builtin.i:7: Warning: 
-  Builtin unimplemented_builtin not defined
+[wp] unsupported_builtin.i:7: Warning: Builtin unimplemented_builtin not defined
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_acsl/unsupported_builtin.i, line 12):
-tests/wp_acsl/unsupported_builtin.i:7: warning from wp:
+Goal Assertion (file unsupported_builtin.i, line 12):
+unsupported_builtin.i:7: warning from wp:
  - Warning: Ignored Hypothesis
    Reason: Builtin unimplemented_builtin not defined
 Prove: true.
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/user_def_type_guard.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/user_def_type_guard.res.oracle
index c617b1318c2d2ecbab5e0c441ba6513bfc85a418..28e82e54afa395e32faa5d99ab2c9255355db8fc 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/user_def_type_guard.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/user_def_type_guard.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/user_def_type_guard.i (no preprocessing)
+[kernel] Parsing user_def_type_guard.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.res.oracle
index 76d4cc6f9ddb98747bf335c3dd82f12c1ec50b75..af1378e391d547f67fe53f59135d2195168a5767 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.res.oracle
@@ -26,16 +26,16 @@
 --- Properties of Function 'main'
 --------------------------------------------------------------------------------
 
-[    -    ] Check 'c1' (file tests/wp_acsl/checks.i, line 14)
+[    -    ] Check 'c1' (file checks.i, line 14)
             tried with Wp.typed.
-[    -    ] Assertion 'a1' (file tests/wp_acsl/checks.i, line 15)
+[    -    ] Assertion 'a1' (file checks.i, line 15)
             tried with Wp.typed.
-[ Partial ] Check 'c2' (file tests/wp_acsl/checks.i, line 16)
+[ Partial ] Check 'c2' (file checks.i, line 16)
             By Wp.typed, with pending:
-             - Assertion 'a1' (file tests/wp_acsl/checks.i, line 15)
-[ Partial ] Assertion 'a2' (file tests/wp_acsl/checks.i, line 17)
+             - Assertion 'a1' (file checks.i, line 15)
+[ Partial ] Assertion 'a2' (file checks.i, line 17)
             By Wp.typed, with pending:
-             - Assertion 'a1' (file tests/wp_acsl/checks.i, line 15)
+             - Assertion 'a1' (file checks.i, line 15)
 
 --------------------------------------------------------------------------------
 --- Status Report Summary
diff --git a/src/plugins/wp/tests/wp_acsl/unsupported_builtin.i b/src/plugins/wp/tests/wp_acsl/unsupported_builtin.i
index b412a516663d5e3e228cfbeb7d43971796145812..69c15b0d9e62214981e97090b62b4900d3f47a73 100644
--- a/src/plugins/wp/tests/wp_acsl/unsupported_builtin.i
+++ b/src/plugins/wp/tests/wp_acsl/unsupported_builtin.i
@@ -1,5 +1,5 @@
 /* run.config
-  OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.ml
+  MODULE: @PTEST_NAME@.cmxs
 */
 /* run.config_qualif
   DONTRUN:
@@ -10,4 +10,4 @@ void foo(void);
 int main(void){
   foo();
   //@ assert \true ;
-}
\ No newline at end of file
+}
diff --git a/src/plugins/wp/tests/wp_bts/bts_2110.i b/src/plugins/wp/tests/wp_bts/bts_2110.i
index 59e26712f6995c7046c95bbf23a93f892c4c334e..6a07080d51155f534e8b4dcc267ceedffc4f6486 100644
--- a/src/plugins/wp/tests/wp_bts/bts_2110.i
+++ b/src/plugins/wp/tests/wp_bts/bts_2110.i
@@ -1,5 +1,5 @@
 /* run.config
-   CMD: @frama-c@ -wp -wp-msg-key shell,cluster,print-generated -wp-prover why3 -wp-gen -wp-share ./share
+   CMD: @frama-c@ -wp -wp-msg-key shell,cluster,print-generated -wp-prover why3 -wp-gen -wp-share ../../../share
    OPT:
 */
 
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts0708.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts0708.res.oracle
index fc7dbb7557375a27b8f636f82c2ff029d6d9dca5..23aa05170c2edb09a934ff600f074b6810ea3174 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts0708.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts0708.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts0708.i (no preprocessing)
+[kernel] Parsing bts0708.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts0843.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts0843.res.oracle
index 8c6fd6aed1b7c5243665509741e7e24b10b1b1d3..26157ff45c160d4d9c5f86bbfa3bbdf198d4c5ac 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts0843.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts0843.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts0843.i (no preprocessing)
+[kernel] Parsing bts0843.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f3
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/bts0843.i, line 12) in 'f3':
+Goal Assigns (file bts0843.i, line 12) in 'f3':
 Effect at line 13
 Prove: true.
 
@@ -15,7 +15,7 @@ Prove: true.
   Function g3
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/bts0843.i, line 14) in 'g3':
+Goal Assigns (file bts0843.i, line 14) in 'g3':
 Call Effect at line 16
 Let a = Mptr_0[global(G_p_20)].
 Let a_1 = shiftfield_F1_a(a).
@@ -31,7 +31,7 @@ Prove: a_1 = shiftfield_F1_a(Mptr_0[L_p_ref]).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/bts0843.i, line 14) in 'g3':
+Goal Assigns (file bts0843.i, line 14) in 'g3':
 Call Effect at line 16
 Let a = Mptr_0[global(G_p_20)].
 Let a_1 = shiftfield_F1_a(a).
@@ -47,7 +47,7 @@ Prove: a_1 = shiftfield_F1_a(Mptr_0[L_p_ref]).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_bts/bts0843.i, line 12) in 'f3'' in 'g3' at call 'f3' (file tests/wp_bts/bts0843.i, line 16)
+Goal Instance of 'Pre-condition (file bts0843.i, line 12) in 'f3'' in 'g3' at call 'f3' (file bts0843.i, line 16)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts779.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts779.res.oracle
index 0340355af423b21ba8a63a6e43d4a90ecf02a36e..5683dde8aeb75d334dfbcca8ca1510e3ecf372c6 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts779.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts779.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts779.i (no preprocessing)
+[kernel] Parsing bts779.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/bts779.i, line 6):
+Goal Assertion (file bts779.i, line 6):
 Let x = Mint_0[shift_uint8(t, 0)].
 Assume { Type: is_uint8(x). (* Heap *) Type: region(t.base) <= 0. }
 Prove: x <= 255.
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts788.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts788.res.oracle
index fcb5d4edc8639f9d425fbee2ebd30647340de889..a385ef5420ba9a9279a420959548cce774bf21e3 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts788.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts788.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_bts/bts788.i (no preprocessing)
+[kernel] Parsing bts788.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts986.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts986.res.oracle
index f7dbfc4d45a09b6b9ad0e8b85880c2960ff53936..d2bd329daedcbf97a0abc4c16d9e286d3d393a84 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts986.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts986.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts986.i (no preprocessing)
+[kernel] Parsing bts986.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion 'A' (file tests/wp_bts/bts986.i, line 12):
+Goal Assertion 'A' (file bts986.i, line 12):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: !valid_rw(Malloc_0[L_x_23 <- 0], global(L_x_23), 1).
 
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_0896.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_0896.res.oracle
index 8e39845f5244432af66b2c8cb5089df1639ff511..b7eab00b22b296aac58854ba734ed9fd844f2153 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_0896.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_0896.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_0896.i (no preprocessing)
+[kernel] Parsing bts_0896.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'r2' in 'g'' in 'f' at call 'g' (file tests/wp_bts/bts_0896.i, line 22)
+Goal Instance of 'Pre-condition 'r2' in 'g'' in 'f' at call 'g' (file bts_0896.i, line 22)
 :
 Prove: true.
 
@@ -15,12 +15,12 @@ Prove: true.
   Function g
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/bts_0896.i, line 18) in 'g':
+Goal Assigns (file bts_0896.i, line 18) in 'g':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/bts_0896.i, line 18) in 'g':
+Goal Assigns (file bts_0896.i, line 18) in 'g':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1174.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1174.res.oracle
index 377b382940609689df319629a70bdfd49c887b52..00aa077de76ad7836e39c0b5365fba9f5807b9eb 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1174.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1174.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_1174.i (no preprocessing)
+[kernel] Parsing bts_1174.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function job
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ok' (file tests/wp_bts/bts_1174.i, line 11):
+Goal Assertion 'qed_ok' (file bts_1174.i, line 11):
 Let r = of_f64(x).
 Assume {
   Type: is_sint32(a).
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1176.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1176.res.oracle
index b56f41848c0865b4acdef17fdac95ef7fa48e55a..804a63ffa338876f020aa1feb4ba04fc8459a9bc 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1176.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1176.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_1176.i (no preprocessing)
+[kernel] Parsing bts_1176.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ok' (file tests/wp_bts/bts_1176.i, line 17):
+Goal Assertion 'qed_ok' (file bts_1176.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1360.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1360.res.oracle
index 7c44e0c9ee57925c84a2e57dd1e15ff1a96f603f..3728402b0b1a5b8d565de2394aff036f55cc8dd0 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1360.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1360.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp_bts/bts_1360.i (no preprocessing)
+[kernel] Parsing bts_1360.i (no preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function foo_correct
 [rte] annotating function foo_wrong
@@ -7,12 +7,12 @@
   Function foo_correct
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_bts/bts_1360.i, line 24) in 'foo_correct':
+Goal Post-condition (file bts_1360.i, line 24) in 'foo_correct':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_bts/bts_1360.i, line 29):
+Goal Assertion 'rte,mem_access' (file bts_1360.i, line 29):
 Assume {
   (* Heap *)
   Type: (region(a.base) <= 0) /\ (region(b.base) <= 0) /\ linked(Malloc_0).
@@ -23,17 +23,17 @@ Prove: valid_rd(Malloc_0, a, 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_bts/bts_1360.i, line 29):
+Goal Assertion 'rte,mem_access' (file bts_1360.i, line 29):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_bts/bts_1360.i, line 30):
+Goal Assertion 'rte,mem_access' (file bts_1360.i, line 30):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/bts_1360.i, line 25) in 'foo_correct':
+Goal Assigns (file bts_1360.i, line 25) in 'foo_correct':
 Effect at line 30
 Prove: true.
 
@@ -42,22 +42,22 @@ Prove: true.
   Function foo_wrong
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_bts/bts_1360.i, line 13) in 'foo_wrong':
+Goal Post-condition (file bts_1360.i, line 13) in 'foo_wrong':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_bts/bts_1360.i, line 18):
+Goal Assertion 'rte,mem_access' (file bts_1360.i, line 18):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_bts/bts_1360.i, line 18):
+Goal Assertion 'rte,mem_access' (file bts_1360.i, line 18):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'rte,mem_access' (file tests/wp_bts/bts_1360.i, line 19):
+Goal Assertion 'rte,mem_access' (file bts_1360.i, line 19):
 Assume {
   (* Heap *)
   Type: (region(a.base) <= 0) /\ (region(b.base) <= 0) /\ linked(Malloc_0).
@@ -68,7 +68,7 @@ Prove: valid_rw(Malloc_0, a, 1).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/bts_1360.i, line 14) in 'foo_wrong':
+Goal Assigns (file bts_1360.i, line 14) in 'foo_wrong':
 Effect at line 19
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1382.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1382.res.oracle
index d59e50a899d25afd1fed7894040cff25c96ebba0..7c75d0f20151bf543155ca5791b62dbe20007b77 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1382.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1382.res.oracle
@@ -1,34 +1,34 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_1382.i (no preprocessing)
+[kernel] Parsing bts_1382.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_bts/bts_1382.i:18: Warning: 
+[wp] bts_1382.i:18: Warning: 
   Cast with incompatible pointers types (source: sint32*) (target: sint8*)
-[wp] tests/wp_bts/bts_1382.i:18: Warning: 
+[wp] bts_1382.i:18: Warning: 
   Cast with incompatible pointers types (source: sint32*) (target: sint8*)
-[wp] tests/wp_bts/bts_1382.i:17: Warning: 
+[wp] bts_1382.i:17: Warning: 
   Cast with incompatible pointers types (source: sint32*) (target: uint8*)
 ------------------------------------------------------------
   Function loop
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/bts_1382.i, line 15) (1/3):
-tests/wp_bts/bts_1382.i:17: warning from Typed Model:
+Goal Loop assigns (file bts_1382.i, line 15) (1/3):
+bts_1382.i:17: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: sint32*) (target: uint8*)
-tests/wp_bts/bts_1382.i:18: warning from Typed Model:
+bts_1382.i:18: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: sint32*) (target: sint8*)
-tests/wp_bts/bts_1382.i:18: warning from Typed Model:
+bts_1382.i:18: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: sint32*) (target: sint8*)
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/bts_1382.i, line 15) (2/3):
+Goal Loop assigns (file bts_1382.i, line 15) (2/3):
 Call Effect at line 17
-tests/wp_bts/bts_1382.i:17: warning from Typed Model:
+bts_1382.i:17: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: sint32*) (target: uint8*)
 Assume {
@@ -44,15 +44,15 @@ Prove: global(G_dest_45) = w.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/bts_1382.i, line 15) (3/3):
+Goal Loop assigns (file bts_1382.i, line 15) (3/3):
 Call Effect at line 18
-tests/wp_bts/bts_1382.i:17: warning from Typed Model:
+bts_1382.i:17: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: sint32*) (target: uint8*)
-tests/wp_bts/bts_1382.i:18: warning from Typed Model:
+bts_1382.i:18: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: sint32*) (target: sint8*)
-tests/wp_bts/bts_1382.i:18: warning from Typed Model:
+bts_1382.i:18: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: sint32*) (target: sint8*)
 Let a = shift_sint8(w, 0).
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1462.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1462.res.oracle
index aa5c4e320017bf051c70668612f5c91e0cea0fe1..9feb8cf0bdfbdab7d0f376b16e3f3d9099ff9aa9 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1462.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1462.res.oracle
@@ -1,27 +1,27 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_1462.i (no preprocessing)
+[kernel] Parsing bts_1462.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function local
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_bts/bts_1462.i, line 26):
+Goal Preservation of Invariant (file bts_1462.i, line 26):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_bts/bts_1462.i, line 26):
+Goal Establishment of Invariant (file bts_1462.i, line 26):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/bts_1462.i, line 26) (1/2):
+Goal Loop assigns (file bts_1462.i, line 26) (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/bts_1462.i, line 26) (2/2):
+Goal Loop assigns (file bts_1462.i, line 26) (2/2):
 Effect at line 30
 Prove: true.
 
@@ -30,13 +30,13 @@ Prove: true.
   Function wrong
 ------------------------------------------------------------
 
-Goal Assertion 'for_value' (file tests/wp_bts/bts_1462.i, line 5):
+Goal Assertion 'for_value' (file bts_1462.i, line 5):
 Assume { Type: is_sint32(c). }
 Prove: (c = 1) \/ (c <= 0) \/ (2 <= c).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'A_KO' (file tests/wp_bts/bts_1462.i, line 9):
+Goal Preservation of Invariant 'A_KO' (file bts_1462.i, line 9):
 Assume {
   Type: is_sint32(c) /\ is_sint32(i) /\ is_sint32(x) /\ is_sint32(y) /\
       is_sint32(y_1) /\ is_sint32(1 + i).
@@ -59,32 +59,32 @@ Prove: y = 0.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'A_KO' (file tests/wp_bts/bts_1462.i, line 9):
+Goal Establishment of Invariant 'A_KO' (file bts_1462.i, line 9):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'B' (file tests/wp_bts/bts_1462.i, line 10):
+Goal Preservation of Invariant 'B' (file bts_1462.i, line 10):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'B' (file tests/wp_bts/bts_1462.i, line 10):
+Goal Establishment of Invariant 'B' (file bts_1462.i, line 10):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'C' (file tests/wp_bts/bts_1462.i, line 11):
+Goal Preservation of Invariant 'C' (file bts_1462.i, line 11):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'C' (file tests/wp_bts/bts_1462.i, line 11):
+Goal Establishment of Invariant 'C' (file bts_1462.i, line 11):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'consequence_of_false_invariant' (file tests/wp_bts/bts_1462.i, line 19):
+Goal Assertion 'consequence_of_false_invariant' (file bts_1462.i, line 19):
 Assume {
   Type: is_sint32(i) /\ is_sint32(y).
   (* Invariant 'A_KO' *)
@@ -96,7 +96,7 @@ Prove: y = 0.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/bts_1462.i, line 12):
+Goal Loop assigns (file bts_1462.i, line 12):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1586.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1586.res.oracle
index 4020061d0ec44c03bc9d59578561dc3b7965518b..3e6b2a47180393f81e66b33b0c7334d02c4aaa7c 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1586.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1586.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_1586.i (no preprocessing)
+[kernel] Parsing bts_1586.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -22,7 +22,7 @@ Prove: true.
   Function main_bizarre_KO
 ------------------------------------------------------------
 
-Goal Assertion 'FALSE' (file tests/wp_bts/bts_1586.i, line 32):
+Goal Assertion 'FALSE' (file bts_1586.i, line 32):
 Tags: Case 0.
 Prove: false.
 
@@ -31,7 +31,7 @@ Prove: false.
   Function main_normal_KO
 ------------------------------------------------------------
 
-Goal Assertion 'FALSE' (file tests/wp_bts/bts_1586.i, line 47):
+Goal Assertion 'FALSE' (file bts_1586.i, line 47):
 Tags: Case 0.
 Prove: false.
 
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1588.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1588.res.oracle
index a688528d7bc5b18ca5ddde8d44aa69c4c8583364..a2e0829e31e510e90e242ef8dd5862e30d680d51 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1588.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1588.res.oracle
@@ -1,26 +1,26 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_1588.i (no preprocessing)
+[kernel] Parsing bts_1588.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_bts/bts_1588.i:19: Warning: 
+[wp] bts_1588.i:19: Warning: 
   Missing assigns clause (assigns 'everything' instead)
-[wp] tests/wp_bts/bts_1588.i:5: Warning: 
+[wp] bts_1588.i:5: Warning: 
   Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'l1_2' (file tests/wp_bts/bts_1588.i, line 4):
+Goal Preservation of Invariant 'l1_2' (file bts_1588.i, line 4):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'l1_2' (file tests/wp_bts/bts_1588.i, line 4):
+Goal Establishment of Invariant 'l1_2' (file bts_1588.i, line 4):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'a1' (file tests/wp_bts/bts_1588.i, line 8):
+Goal Assertion 'a1' (file bts_1588.i, line 8):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1601.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1601.res.oracle
index a7a44770530b48f65807c1cdfeb42ca20823b9ac..3576da4866d6190baaa95022eb792cea6e7e863e 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1601.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1601.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_1601.c (with preprocessing)
+[kernel] Parsing bts_1601.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function foo
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/bts_1601.c, line 72):
+Goal Assertion (file bts_1601.c, line 72):
 Assume {
   Type: is_uint32(tenumRMode_0).
   (* Residual *)
@@ -18,32 +18,32 @@ Prove: tenumRMode_0 = 1.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/bts_1601.c, line 84):
+Goal Assertion (file bts_1601.c, line 84):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/bts_1601.c, line 104):
+Goal Assertion (file bts_1601.c, line 104):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/bts_1601.c, line 136):
+Goal Assertion (file bts_1601.c, line 136):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/bts_1601.c, line 147):
+Goal Assertion (file bts_1601.c, line 147):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/bts_1601.c, line 153):
+Goal Assertion (file bts_1601.c, line 153):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/bts_1601.c, line 157):
+Goal Assertion (file bts_1601.c, line 157):
 Prove: true.
 
 ------------------------------------------------------------
@@ -51,7 +51,7 @@ Prove: true.
   Function foo with behavior basic
 ------------------------------------------------------------
 
-Goal Post-condition for 'basic' (file tests/wp_bts/bts_1601.c, line 46) in 'foo':
+Goal Post-condition for 'basic' (file bts_1601.c, line 46) in 'foo':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1647.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1647.res.oracle
index d2d36e4287a387e29ae21351c92540767d685465..cc80d5815b7554ae6b774b61c0fe4ad768e86352 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1647.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1647.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_1647.c (with preprocessing)
+[kernel] Parsing bts_1647.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1776.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1776.res.oracle
index aff5dc75447d73eeda97747d7a31ae338cbc89c4..9eb784093dcbb677d17334d264044f964d7e0273 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1776.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1776.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_1776.i (no preprocessing)
+[kernel] Parsing bts_1776.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion 'KO,ax2' (file tests/wp_bts/bts_1776.i, line 14):
+Goal Assertion 'KO,ax2' (file bts_1776.i, line 14):
 Assume {
   Type: is_sint32(X) /\ is_sint32(X_1) /\ is_sint32(x).
   (* Then *)
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1828.0.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1828.0.res.oracle
index 640c9952226375d9ac25aa5260796f23f8a44c67..efe6fbf33e205bd6bd70116f55c4d427ac106b23 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1828.0.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1828.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_1828.i (no preprocessing)
+[kernel] Parsing bts_1828.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -42,12 +42,12 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_bts/bts_1828.i, line 60):
+Goal Assertion 'ok' (file bts_1828.i, line 60):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_bts/bts_1828.i, line 61):
+Goal Assertion 'ok' (file bts_1828.i, line 61):
 Prove: true.
 
 ------------------------------------------------------------
@@ -55,7 +55,7 @@ Prove: true.
   Function local_frame
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_bts/bts_1828.i, line 23):
+Goal Assertion 'ok' (file bts_1828.i, line 23):
 Assume {
   (* Heap *)
   Type: (region(one_0.base) <= 0) /\ linked(Malloc_0).
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1828.1.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1828.1.res.oracle
index 5b00c3b48f392cf59718f82003f6f14f9c6376d4..33e43fd27122db698220f443603c909410f7d7f3 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1828.1.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1828.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_bts/bts_1828.i (no preprocessing)
+[kernel] Parsing bts_1828.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -21,12 +21,12 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_bts/bts_1828.i, line 60):
+Goal Assertion 'ok' (file bts_1828.i, line 60):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_bts/bts_1828.i, line 61):
+Goal Assertion 'ok' (file bts_1828.i, line 61):
 Prove: true.
 
 ------------------------------------------------------------
@@ -34,7 +34,7 @@ Prove: true.
   Function local_frame
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_bts/bts_1828.i, line 23):
+Goal Assertion 'ok' (file bts_1828.i, line 23):
 Assume {
   (* Heap *)
   Type: (region(one_0.base) <= 0) /\ linked(Malloc_0).
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_2040.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_2040.res.oracle
index 3601e1976dd36c501db6dff8996b4430a3abb9cf..9d4fdad2acf6623b00c47e263932c8cc15c6abfa 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_2040.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_2040.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_2040.i (no preprocessing)
+[kernel] Parsing bts_2040.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function call
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/bts_2040.i, line 17):
+Goal Assertion (file bts_2040.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_2079.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_2079.res.oracle
index a59bf7022499d7715b34018a9c0b5b37229f4b9c..915f89ccfe4f29e8ad0040b7ef8a34fcc8b1b1a1 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_2079.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_2079.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_2079.i (no preprocessing)
+[kernel] Parsing bts_2079.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_2110.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_2110.res.oracle
index ccaf0802ca728955534bc9243cd74a446b58e60b..131f591cec144786ea0ccf243e270cf580f0b394 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_2110.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_2110.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_2110.i (no preprocessing)
+[kernel] Parsing bts_2110.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 [wp] 2 goals scheduled
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_2159.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_2159.res.oracle
index 445eee0ff7667ada42e020df177835474aa85f27..5807a250cd4496e2abe9437882b8490a4cbfdf67 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_2159.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_2159.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_2159.i (no preprocessing)
+[kernel] Parsing bts_2159.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function job
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_bts/bts_2159.i, line 5) in 'job':
+Goal Post-condition (file bts_2159.i, line 5) in 'job':
 Assume {
   Type: is_sint32(s) /\ is_sint32(s_1) /\ is_sint32(x).
   If 0 <= x
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_2201.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_2201.res.oracle
index 61491a01bbbc8eb4bb111c8c08a71bdf6e391b0a..bdfc07b3b33226ae730a48325ff6e45089eea791 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_2201.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_2201.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_2201.i (no preprocessing)
+[kernel] Parsing bts_2201.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_2246.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_2246.res.oracle
index 9d81968e9e5457308a1058107e00dcc574be8b46..69e71198b169c56844c2582b5e7ed75d500fdf4d 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_2246.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_2246.res.oracle
@@ -1,24 +1,24 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_2246.i (no preprocessing)
+[kernel] Parsing bts_2246.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function bad
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_bts/bts_2246.i, line 9) in 'bad' (1/3):
+Goal Post-condition (file bts_2246.i, line 9) in 'bad' (1/3):
 Tags: Default.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_bts/bts_2246.i, line 9) in 'bad' (2/3):
+Goal Post-condition (file bts_2246.i, line 9) in 'bad' (2/3):
 Tags: Case 1.
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_bts/bts_2246.i, line 9) in 'bad' (3/3):
+Goal Post-condition (file bts_2246.i, line 9) in 'bad' (3/3):
 Tags: Case 0.
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_2501.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_2501.res.oracle
index 550dd7a5454b01100b579c964ea4a0784253e269..8de6080cdca8fff48fc150d99083edfaae91b5bf 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_2501.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_2501.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/bts_2501.i (no preprocessing)
+[kernel] Parsing bts_2501.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] 2 goals scheduled
 [wp] 2 goals generated
diff --git a/src/plugins/wp/tests/wp_bts/oracle/ergo_typecheck.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/ergo_typecheck.res.oracle
index 5cbab700501139b9988a526165935592e16c5bb3..59e5c2fa70b9b588969a0285fd3bdc9fd78d78e7 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/ergo_typecheck.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/ergo_typecheck.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/ergo_typecheck.i (no preprocessing)
+[kernel] Parsing ergo_typecheck.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -41,7 +41,7 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/ergo_typecheck.i, line 34) in 'f':
+Goal Assigns (file ergo_typecheck.i, line 34) in 'f':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/ex5.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/ex5.res.oracle
index b7b15905eb28679b166ca6e89fcfb8e5bcbc97c8..5e8dbbdb083eaebabe3ecc551b3c132ed4cba53b 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/ex5.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/ex5.res.oracle
@@ -1,22 +1,22 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/ex5.i (no preprocessing)
+[kernel] Parsing ex5.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function dummy
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/ex5.i, line 7):
+Goal Assertion (file ex5.i, line 7):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/ex5.i, line 9):
+Goal Assertion (file ex5.i, line 9):
 Prove: exists i_4,i_3,i_2,i_1,i : Z. 7 <= (i + i_1 + i_2 + i_3 + i_4).
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/ex5.i, line 11):
+Goal Assertion (file ex5.i, line 11):
 Assume { (* Assertion *) Have: 7 <= (i + i_1 + i_2 + i_3 + i_4). }
 Prove: exists i_5 : Z. 4 <= i_5.
 
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue-364.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue-364.res.oracle
index cb25cf5612d6889bfaae292402eabc65e15e5e33..d8574e291aa03e8f0a5641d0e89a31f9b5c524f9 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue-364.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue-364.res.oracle
@@ -1,18 +1,18 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue-364.i (no preprocessing)
+[kernel] Parsing issue-364.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
 
-Goal Assertion 'ZERO' (file tests/wp_bts/issue-364.i, line 5):
+Goal Assertion 'ZERO' (file issue-364.i, line 5):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: valid_rd(Malloc_0, shift_sint8(global(Str_1), 3), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'OVER' (file tests/wp_bts/issue-364.i, line 6):
+Goal Assertion 'OVER' (file issue-364.i, line 6):
 Let a = global(Str_1).
 Assume {
   (* Heap *)
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue-516.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue-516.res.oracle
index 7a59fcea651b51295a354f4963df487bc73e6335..45d8786badc44d06ab76b322856998bc561e59b5 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue-516.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue-516.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue-516.c (with preprocessing)
+[kernel] Parsing issue-516.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 [wp] Warning: No definition for 'to_logic_list' interpreted as reads nothing
@@ -7,14 +7,14 @@
   Function list_remove
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_bts/issue-516.c, line 21):
+Goal Assertion (file issue-516.c, line 21):
 Let a = Mptr_0[list_0].
 Assume { (* Heap *) Type: (region(list_0.base) <= 0) /\ framed(Mptr_0). }
 Prove: (a != null) /\ (a = nth(L_to_logic_list(a, null), 0)).
 
 ------------------------------------------------------------
 
-Goal Assertion 'UNROLL' (file tests/wp_bts/issue-516.c, line 23):
+Goal Assertion 'UNROLL' (file issue-516.c, line 23):
 Let a = Mptr_0[list_0].
 Let a_1 = Mptr_0[shiftfield_F1_list_next(a)].
 Assume {
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue-684-exit.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue-684-exit.res.oracle
index cb499212b74e034784cefec5bc0743455477de99..538a435357f6b9b94235fbc8e5ac1d346e6d24b6 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue-684-exit.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue-684-exit.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue-684-exit.c (with preprocessing)
+[kernel] Parsing issue-684-exit.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function inconditional_exit
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_bts/issue-684-exit.c, line 4) in 'inconditional_exit':
+Goal Post-condition (file issue-684-exit.c, line 4) in 'inconditional_exit':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Exit-condition (file tests/wp_bts/issue-684-exit.c, line 3) in 'inconditional_exit':
+Goal Exit-condition (file issue-684-exit.c, line 3) in 'inconditional_exit':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_141.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_141.res.oracle
index 9dd3dd748e7ee050326d660ce198563a2c639db4..216f5e76554bf4fbb5c0759d37fa55c9afc616a2 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_141.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_141.res.oracle
@@ -1,9 +1,9 @@
 # frama-c -wp -wp-rte -wp-steps 50 [...]
-[kernel] Parsing tests/wp_bts/issue_141.i (no preprocessing)
+[kernel] Parsing issue_141.i (no preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function f
 [rte] annotating function main
-[wp] tests/wp_bts/issue_141.i:18: Warning: 
+[wp] issue_141.i:18: Warning: 
   calculus failed on strategy
   for 'main', behavior 'default!', all properties, both assigns or not because
   unsupported strange loop(s). (abort)
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_198.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_198.res.oracle
index e7f427ccd5d7c4cafa4fbdc06014a05b965aa853..dc9daceae331bedaec75a1e45dd84951c47df3be 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_198.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_198.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_198.i (no preprocessing)
+[kernel] Parsing issue_198.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Global
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_447.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_447.res.oracle
index f8dc63d5e2026929898298dece6f3877bb581932..16ad27c3c9e4bbff63b08183b341e23f5b4419a1 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_447.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_447.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_447.i (no preprocessing)
+[kernel] Parsing issue_447.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Global
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_453.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_453.res.oracle
index 9c1dde973cc4e3eb98f278b9b5e659b8b357387b..284a0101b85e7863cec161be0e1814ca8e50e79f 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_453.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_453.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_453.i (no preprocessing)
+[kernel] Parsing issue_453.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f1
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/issue_453.i, line 13):
+Goal Loop assigns (file issue_453.i, line 13):
 Prove: true.
 
 ------------------------------------------------------------
@@ -14,12 +14,12 @@ Prove: true.
   Function f1 with behavior default_for_stmt_7
 ------------------------------------------------------------
 
-Goal Post-condition 'Sincr' at call 'incr' (file tests/wp_bts/issue_453.i, line 19):
+Goal Post-condition 'Sincr' at call 'incr' (file issue_453.i, line 19):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/issue_453.i, line 16) at call 'incr' (file tests/wp_bts/issue_453.i, line 19):
+Goal Assigns (file issue_453.i, line 16) at call 'incr' (file issue_453.i, line 19):
 Prove: true.
 
 ------------------------------------------------------------
@@ -27,7 +27,7 @@ Prove: true.
   Function f2
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/issue_453.i, line 25):
+Goal Loop assigns (file issue_453.i, line 25):
 Prove: true.
 
 ------------------------------------------------------------
@@ -35,12 +35,12 @@ Prove: true.
   Function f2 with behavior default_for_stmt_17
 ------------------------------------------------------------
 
-Goal Post-condition 'Sincr' at call 'incr' (file tests/wp_bts/issue_453.i, line 32):
+Goal Post-condition 'Sincr' at call 'incr' (file issue_453.i, line 32):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/issue_453.i, line 29) at call 'incr' (file tests/wp_bts/issue_453.i, line 32):
+Goal Assigns (file issue_453.i, line 29) at call 'incr' (file issue_453.i, line 32):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_494.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_494.res.oracle
index faaeeb6e2dd17053e3ed2dd5f8cb9a5eb2890623..2dc69bd85363eba5d80a6fa14874158a9eff58ce 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_494.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_494.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_494.i (no preprocessing)
+[kernel] Parsing issue_494.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_bts/issue_494.i, line 4) in 'f':
+Goal Post-condition (file issue_494.i, line 4) in 'f':
 Let x = Mint_0[p].
 Let x_1 = 1 + x.
 Assume {
@@ -21,7 +21,7 @@ Prove: P_R(x, x_1).
   Function job_ko_fixed
 ------------------------------------------------------------
 
-Goal Assertion 'Wrong' (file tests/wp_bts/issue_494.i, line 10):
+Goal Assertion 'Wrong' (file issue_494.i, line 10):
 Assume {
   Type: is_sint32(x) /\ is_sint32(x_1).
   (* Call 'f' *)
@@ -34,7 +34,7 @@ Prove: false.
   Function job_ko_success
 ------------------------------------------------------------
 
-Goal Assertion 'Wrong' (file tests/wp_bts/issue_494.i, line 16):
+Goal Assertion 'Wrong' (file issue_494.i, line 16):
 Assume {
   Type: is_sint32(y) /\ is_sint32(y_1).
   (* Call 'f' *)
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_508.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_508.res.oracle
index 69016b5d1ff4920ddce03d5b1be0a83071485b7d..5457fd667faa5e4a48456916f73b8667c45c5d7a 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_508.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_508.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_508.c (with preprocessing)
+[kernel] Parsing issue_508.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function add
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/issue_508.c, line 17) in 'add' (1/3):
+Goal Assigns (file issue_508.c, line 17) in 'add' (1/3):
 Effect at line 21
 Let a = shiftfield_F2_data(tbl_0).
 Let x = to_uint32(d).
@@ -25,13 +25,13 @@ Prove: (x <= d) /\ (d <= x).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/issue_508.c, line 17) in 'add' (2/3):
+Goal Assigns (file issue_508.c, line 17) in 'add' (2/3):
 Effect at line 22
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/issue_508.c, line 17) in 'add' (3/3):
+Goal Assigns (file issue_508.c, line 17) in 'add' (3/3):
 Effect at line 23
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_711.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_711.res.oracle
index d30781324d40f3bac332a4451a931fcc924badb3..a60681e0712374e66190a6e141c8c69c67d76ef5 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_711.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_711.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_711.i (no preprocessing)
+[kernel] Parsing issue_711.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Axiomatic 'LISTS'
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_715_a.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_715_a.res.oracle
index e41e8f471f50b9d327ff0a48c2556f9a990f57af..1bed6f65bc40584922571536d04f0d44016f29e8 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_715_a.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_715_a.res.oracle
@@ -1,14 +1,14 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_715_a.i (no preprocessing)
+[kernel] Parsing issue_715_a.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_bts/issue_715_a.i:6: Warning: 
+[kernel] issue_715_a.i:6: Warning: 
   No code nor implicit assigns clause for function dummy, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function foo
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_bts/issue_715_a.i, line 2) in 'dummy'' in 'foo' at call 'dummy' (file tests/wp_bts/issue_715_a.i, line 9)
+Goal Instance of 'Pre-condition (file issue_715_a.i, line 2) in 'dummy'' in 'foo' at call 'dummy' (file issue_715_a.i, line 9)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_715_b.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_715_b.res.oracle
index 8c82bc192bafd62b31a091cb7954318093d79a85..1809a095bf9e67412647d8d64b402cfa516eb437 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_715_b.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_715_b.res.oracle
@@ -1,21 +1,21 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_715_b.i (no preprocessing)
+[kernel] Parsing issue_715_b.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_bts/issue_715_b.i:9: Warning: 
+[kernel] issue_715_b.i:9: Warning: 
   No code nor implicit assigns clause for function dummy, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function foo
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_bts/issue_715_b.i, line 4) in 'dummy'' in 'foo' at call 'dummy' (file tests/wp_bts/issue_715_b.i, line 11)
+Goal Instance of 'Pre-condition (file issue_715_b.i, line 4) in 'dummy'' in 'foo' at call 'dummy' (file issue_715_b.i, line 11)
 :
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: P_isValid(Malloc_0[L_p_30 <- 1], shift_sint32(global(L_p_30), 0)).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_bts/issue_715_b.i, line 5) in 'dummy'' in 'foo' at call 'dummy' (file tests/wp_bts/issue_715_b.i, line 11)
+Goal Instance of 'Pre-condition (file issue_715_b.i, line 5) in 'dummy'' in 'foo' at call 'dummy' (file issue_715_b.i, line 11)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_751.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_751.res.oracle
index 14535c7cf0c072d0d5733260c788e4cb80ebb297..06f3d8038bb7a4346884d3380ce2cb4d7dab53ee 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_751.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_751.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_751.i (no preprocessing)
+[kernel] Parsing issue_751.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function acquire
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'RANGE' (file tests/wp_bts/issue_751.i, line 7):
+Goal Preservation of Invariant 'RANGE' (file issue_751.i, line 7):
 Let x = land(3840, R).
 Let x_1 = x / 256.
 Assume {
@@ -23,17 +23,17 @@ Prove: (-1) <= j.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'RANGE' (file tests/wp_bts/issue_751.i, line 7):
+Goal Establishment of Invariant 'RANGE' (file issue_751.i, line 7):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/issue_751.i, line 8) (1/2):
+Goal Loop assigns (file issue_751.i, line 8) (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/issue_751.i, line 8) (2/2):
+Goal Loop assigns (file issue_751.i, line 8) (2/2):
 Effect at line 11
 Let x = land(3840, R).
 Let x_1 = x / 256.
@@ -57,133 +57,133 @@ Prove: j <= 7.
   Function issue_751
 ------------------------------------------------------------
 
-Goal Check (file tests/wp_bts/issue_751.i, line 32):
+Goal Check (file issue_751.i, line 32):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check (file tests/wp_bts/issue_751.i, line 33):
+Goal Check (file issue_751.i, line 33):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check (file tests/wp_bts/issue_751.i, line 34):
+Goal Check (file issue_751.i, line 34):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Check (file tests/wp_bts/issue_751.i, line 35):
+Goal Check (file issue_751.i, line 35):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'pos_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 37)
+Goal Instance of 'Pre-condition 'pos_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 37)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'neg_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 37)
+Goal Instance of 'Pre-condition 'neg_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 37)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'pos_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 37)
+Goal Instance of 'Pre-condition 'pos_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 37)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'neg_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 37)
+Goal Instance of 'Pre-condition 'neg_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 37)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_pos_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 37)
+Goal Instance of 'Pre-condition 'strict_pos_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 37)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_neg_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 37)
+Goal Instance of 'Pre-condition 'strict_neg_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 37)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_pos_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 37)
+Goal Instance of 'Pre-condition 'strict_pos_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 37)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_neg_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 37)
+Goal Instance of 'Pre-condition 'strict_neg_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 37)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'pos_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 38)
+Goal Instance of 'Pre-condition 'pos_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 38)
 :
 Assume { Type: is_sint32(V). (* Goal *) When: 0 <= V. }
 Prove: ((-3) <= V) <-> ((-4) <= V).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'neg_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 38)
+Goal Instance of 'Pre-condition 'neg_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 38)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'pos_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 38)
+Goal Instance of 'Pre-condition 'pos_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 38)
 :
 Assume { Type: is_sint32(V). (* Goal *) When: 0 < V. }
 Prove: (V <= (-3)) <-> (V <= (-4)).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'neg_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 38)
+Goal Instance of 'Pre-condition 'neg_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 38)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_pos_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 38)
+Goal Instance of 'Pre-condition 'strict_pos_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 38)
 :
 Assume { Type: is_sint32(V). (* Goal *) When: 0 < V. }
 Prove: ((-2) <= V) <-> ((-3) <= V).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_neg_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 38)
+Goal Instance of 'Pre-condition 'strict_neg_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 38)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_pos_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 38)
+Goal Instance of 'Pre-condition 'strict_pos_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 38)
 :
 Assume { Type: is_sint32(V). (* Goal *) When: 0 <= V. }
 Prove: (V <= (-4)) <-> (V <= (-5)).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_neg_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 38)
+Goal Instance of 'Pre-condition 'strict_neg_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 38)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'pos_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 40)
+Goal Instance of 'Pre-condition 'pos_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 40)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'neg_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 40)
+Goal Instance of 'Pre-condition 'neg_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 40)
 :
 Assume {
   Type: is_sint32(V).
@@ -197,13 +197,13 @@ Prove: (V <= 113) <-> (V <= 95).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'pos_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 40)
+Goal Instance of 'Pre-condition 'pos_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 40)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'neg_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 40)
+Goal Instance of 'Pre-condition 'neg_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 40)
 :
 Assume {
   Type: is_sint32(V).
@@ -217,13 +217,13 @@ Prove: (95 <= V) <-> (77 <= V).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_pos_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 40)
+Goal Instance of 'Pre-condition 'strict_pos_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 40)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_neg_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 40)
+Goal Instance of 'Pre-condition 'strict_neg_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 40)
 :
 Assume {
   Type: is_sint32(V).
@@ -237,13 +237,13 @@ Prove: (V <= 94) <-> (V <= 76).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_pos_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 40)
+Goal Instance of 'Pre-condition 'strict_pos_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 40)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_neg_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 40)
+Goal Instance of 'Pre-condition 'strict_neg_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 40)
 :
 Assume {
   Type: is_sint32(V).
@@ -257,7 +257,7 @@ Prove: (114 <= V) <-> (96 <= V).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'pos_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 41)
+Goal Instance of 'Pre-condition 'pos_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 41)
 :
 Assume {
   Type: is_sint32(V).
@@ -277,13 +277,13 @@ Prove: (V <= (-139)) <-> (V <= (-161)).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'neg_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 41)
+Goal Instance of 'Pre-condition 'neg_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 41)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'pos_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 41)
+Goal Instance of 'Pre-condition 'pos_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 41)
 :
 Assume {
   Type: is_sint32(V).
@@ -303,13 +303,13 @@ Prove: ((-161) <= V) <-> ((-183) <= V).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'neg_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 41)
+Goal Instance of 'Pre-condition 'neg_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 41)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_pos_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 41)
+Goal Instance of 'Pre-condition 'strict_pos_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 41)
 :
 Assume {
   Type: is_sint32(V).
@@ -329,13 +329,13 @@ Prove: (V <= (-162)) <-> (V <= (-184)).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_neg_max' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 41)
+Goal Instance of 'Pre-condition 'strict_neg_max' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 41)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_pos_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 41)
+Goal Instance of 'Pre-condition 'strict_pos_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 41)
 :
 Assume {
   Type: is_sint32(V).
@@ -355,7 +355,7 @@ Prove: ((-138) <= V) <-> ((-160) <= V).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'strict_neg_min' in 'checks'' in 'issue_751' at call 'checks' (file tests/wp_bts/issue_751.i, line 41)
+Goal Instance of 'Pre-condition 'strict_neg_min' in 'checks'' in 'issue_751' at call 'checks' (file issue_751.i, line 41)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_801.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_801.res.oracle
index 0021dc1ad13f35291453f98e675313a297afc67c..cfbb459fd88da558974f65186d488547519a3fe4 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_801.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_801.res.oracle
@@ -1,38 +1,38 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_801.i (no preprocessing)
+[kernel] Parsing issue_801.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function LoopCurrent
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_bts/issue_801.i, line 5) in 'LoopCurrent':
+Goal Post-condition (file issue_801.i, line 5) in 'LoopCurrent':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'A' (file tests/wp_bts/issue_801.i, line 11):
+Goal Preservation of Invariant 'A' (file issue_801.i, line 11):
 Assume { Type: is_sint32(s). (* Then *) Have: s <= 9. }
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'A' (file tests/wp_bts/issue_801.i, line 11):
+Goal Establishment of Invariant 'A' (file issue_801.i, line 11):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/issue_801.i, line 10):
+Goal Loop assigns (file issue_801.i, line 10):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_bts/issue_801.i, line 14):
+Goal Decreasing of Loop variant at loop (file issue_801.i, line 14):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_bts/issue_801.i, line 14):
+Goal Positivity of Loop variant at loop (file issue_801.i, line 14):
 Assume { Type: is_sint32(s). (* Then *) Have: s <= 9. }
 Prove: s <= 10.
 
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_81.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_81.res.oracle
index ede0b64f8b9bb21f73b923ba01523ba756be0499..b7904bf6a73e800406b6d6a056f4ad55aa511a52 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_81.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_81.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_81.i (no preprocessing)
+[kernel] Parsing issue_81.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function getMax
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_bts/issue_81.i, line 3) in 'getMax':
+Goal Post-condition (file issue_81.i, line 3) in 'getMax':
 Assume {
   Type: is_sint32(a) /\ is_sint32(b) /\ is_sint32(getMax_0).
   If a <= b
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_825.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_825.res.oracle
index 6af1e96a96a3ebadd603d0249caef12e68caca2f..c56e98c33f3cc71a0d2eb949fed24012aea5c688 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_825.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_825.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_825.i (no preprocessing)
+[kernel] Parsing issue_825.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function issue
 ------------------------------------------------------------
 
-Goal Check 'ko' (file tests/wp_bts/issue_825.i, line 18):
+Goal Check 'ko' (file issue_825.i, line 18):
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Check 'ko' (file tests/wp_bts/issue_825.i, line 19):
+Goal Check 'ko' (file issue_825.i, line 19):
 Assume { Type: is_sint32(a). }
 Prove: a = 0.
 
@@ -20,28 +20,28 @@ Prove: a = 0.
   Function job
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_bts/issue_825.i, line 2) in 'job':
+Goal Post-condition (file issue_825.i, line 2) in 'job':
 Assume { Type: is_sint32(i). (* Else *) Have: 10 <= i. }
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_bts/issue_825.i, line 9):
+Goal Preservation of Invariant (file issue_825.i, line 9):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_bts/issue_825.i, line 9):
+Goal Establishment of Invariant (file issue_825.i, line 9):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/issue_825.i, line 10) (1/2):
+Goal Loop assigns (file issue_825.i, line 10) (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_bts/issue_825.i, line 10) (2/2):
+Goal Loop assigns (file issue_825.i, line 10) (2/2):
 Effect at line 13
 Assume { Type: is_sint32(i). (* Then *) Have: i <= 9. }
 Prove: false.
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_837.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_837.res.oracle
index 6505c959c081e472fd5b92a077fddf9aac826e27..d488fbe26748ab8737d10352a6237f49623664b1 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_837.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_837.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_837.c (with preprocessing)
+[kernel] Parsing issue_837.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_898.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_898.res.oracle
index d832b6f57960c51cd42578d6398f586a9028bc4f..d3b5d5d04f30caba50ef0d187e04f4df1f11d144 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_898.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_898.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/issue_898.i (no preprocessing)
+[kernel] Parsing issue_898.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function job
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_bts/issue_898.i, line 8) in 'job':
+Goal Post-condition (file issue_898.i, line 8) in 'job':
 Let a = job_0.F1_S_value.
 Assume { (* Pre-condition *) Have: is_finite_f64(a). }
 Prove: eq_f64(a, a).
diff --git a/src/plugins/wp/tests/wp_bts/oracle/nupw-bcl-bts1120.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/nupw-bcl-bts1120.res.oracle
index 60c6a834f15bdb4a543704f01696ec53c64f493f..367d019ba50de6490b26d683338e8ceb43d56c89 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/nupw-bcl-bts1120.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/nupw-bcl-bts1120.res.oracle
@@ -1,9 +1,9 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_bts/nupw-bcl-bts1120.i (no preprocessing)
+[kernel] Parsing nupw-bcl-bts1120.i (no preprocessing)
 [wp] Running WP plugin...
-[wp] tests/wp_bts/nupw-bcl-bts1120.i:54: Warning: 
+[wp] nupw-bcl-bts1120.i:54: Warning: 
   [cfg] Forget exits clause of node <blkIn-stmt:26>
-[wp] tests/wp_bts/nupw-bcl-bts1120.i:54: Warning: 
+[wp] nupw-bcl-bts1120.i:54: Warning: 
   [cfg] Forget exits clause of node <blkIn-stmt:26>
 [wp] [CFG] Goal unreachable_smt_with_contract_assigns : Valid (Unreachable)
 [wp] [CFG] Goal unreachable_smt_with_contract_exits_ok : Valid (Unreachable)
@@ -25,7 +25,7 @@ Prove: P_ExitP(0).
   Function cfg_domination_problem with behavior default_for_stmt_26
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_bts/nupw-bcl-bts1120.i, line 60) at block:
+Goal Assigns (file nupw-bcl-bts1120.i, line 60) at block:
 Prove: true.
 
 ------------------------------------------------------------
@@ -73,7 +73,7 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'ok' in 'f_with_precond'' in 'unreachable_smt_with_contract' at initialization of 'tmp' (file tests/wp_bts/nupw-bcl-bts1120.i, line 40)
+Goal Instance of 'Pre-condition 'ok' in 'f_with_precond'' in 'unreachable_smt_with_contract' at initialization of 'tmp' (file nupw-bcl-bts1120.i, line 40)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/binary-multiplication-without-overflow.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/binary-multiplication-without-overflow.res.oracle
index d48fc137832a2d7e441b479b86b96e968db3b572..28237b20e82952365c6dce412e7dd899aab45260 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/binary-multiplication-without-overflow.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/binary-multiplication-without-overflow.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte -warn-unsigned-overflow [...]
-[kernel] Parsing tests/wp_gallery/binary-multiplication-without-overflow.c (with preprocessing)
+[kernel] Parsing binary-multiplication-without-overflow.c (with preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function BinaryMultiplication
 [wp] Goal typed_lemma_half : not tried
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/binary-multiplication.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/binary-multiplication.res.oracle
index 58d59aef85258fe52c3a1d4b176d66dd618f57cf..048a6c47d58e6ddf6a25d77e35f3c7b63d3df16e 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/binary-multiplication.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/binary-multiplication.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp_gallery/binary-multiplication.c (with preprocessing)
+[kernel] Parsing binary-multiplication.c (with preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function BinaryMultiplication
 [wp] Goal typed_lemma_ax1_lack : not tried
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/find.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/find.res.oracle
index b8198f111f13136e793f65b38dfee5cbd67a1d9d..3404140fd4c049bd09fa26d16d0631dc65133622 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/find.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/find.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp_gallery/find.i (no preprocessing)
+[kernel] Parsing find.i (no preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function find
 [rte] annotating function find_ptr
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo1_solved.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo1_solved.res.oracle
index cdf72d9135a17beec35a1d60cacb9a081f9d7175..a64994d35ec0157bee80e6e73d6630ffe17ffd13 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo1_solved.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo1_solved.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp_gallery/frama_c_exo1_solved.c (with preprocessing)
+[kernel] Parsing frama_c_exo1_solved.c (with preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function exo1
 [wp] Goal typed_exo1_ensures : not tried
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo2_solved.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo2_solved.res.oracle
index daf1e9d366bd36406edf6a848378db5cfd4ed352..0428d0c647cd3f9919b4ddc584cbdb65cdf8d74a 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo2_solved.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo2_solved.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte -no-warn-signed-overflow [...]
-[kernel] Parsing tests/wp_gallery/frama_c_exo2_solved.c (with preprocessing)
+[kernel] Parsing frama_c_exo2_solved.c (with preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function max_subarray
 [wp] Goal typed_max_subarray_ensures : not tried
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.res.oracle
index e21f8f5fe4bc97954c318b6c4531baf28e311bc2..c30427e3509427594dbf5465ecf6c93522d56640 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_gallery/frama_c_exo3_solved.old.c (with preprocessing)
+[kernel] Parsing frama_c_exo3_solved.old.c (with preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function equal_elements
 [wp] Goal typed_ref_equal_elements_ensures : not tried
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.v2.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.v2.res.oracle
index 0a5004c676571d4ea94cd0cf4e06b37217771f29..266e08d235f86734fe0e325c6344d1ff080bde27 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.v2.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.v2.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_gallery/frama_c_exo3_solved.old.v2.c (with preprocessing)
+[kernel] Parsing frama_c_exo3_solved.old.v2.c (with preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function equal_elements
 [wp] Goal typed_ref_equal_elements_ensures_v1_good : not tried
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.simplified.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.simplified.res.oracle
index fb3bb56176fc1dab5f0860370d48c9f6384ab68a..87662055df23ba6c321a2bc60e5b5168f5b87d15 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.simplified.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.simplified.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp_gallery/frama_c_exo3_solved.simplified.c (with preprocessing)
+[kernel] Parsing frama_c_exo3_solved.simplified.c (with preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function pair
 [wp] Goal typed_pair_complete_has_pair_no_pair : trivial
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_hashtbl_solved.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_hashtbl_solved.res.oracle
index 2429963d412aaa3b426504d27c25d7c2fc60722a..348854ab2a2864bf3bbde78b21b9acd64b020743 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_hashtbl_solved.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_hashtbl_solved.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp_gallery/frama_c_hashtbl_solved.c (with preprocessing)
+[kernel] Parsing frama_c_hashtbl_solved.c (with preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function add
 [rte] annotating function eq_string
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/loop-statement.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/loop-statement.res.oracle
index 50da7d7cc9742dc4a67cbc33ad14e981cf8ba729..f8fa052d8e0a246603ecc91666f450bda1525dd7 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/loop-statement.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/loop-statement.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_gallery/loop-statement.c (with preprocessing)
+[kernel] Parsing loop-statement.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 [wp] Goal typed_lemma_Lb : not tried
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.0.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.0.res.oracle
index 832baab84eb61db255327ed172594084b92caa0c..a7563068d19a59845279655762f8fe59609d31ce 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.0.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.0.res.oracle
@@ -1,22 +1,22 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_hoare/alias_assigns_hypotheses.i (no preprocessing)
+[kernel] Parsing alias_assigns_hypotheses.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function comprehension_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 90) in 'comprehension_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 90) in 'comprehension_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 91) in 'comprehension_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 91) in 'comprehension_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 89) in 'comprehension_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 89) in 'comprehension_alias':
 Effect at line 93
 Prove: true.
 
@@ -25,17 +25,17 @@ Prove: true.
   Function field_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 59) in 'field_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 59) in 'field_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 60) in 'field_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 60) in 'field_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 58) in 'field_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 58) in 'field_alias':
 Effect at line 62
 Prove: true.
 
@@ -44,17 +44,17 @@ Prove: true.
   Function field_range_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 71) in 'field_range_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 71) in 'field_range_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 72) in 'field_range_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 72) in 'field_range_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 70) in 'field_range_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 70) in 'field_range_alias':
 Effect at line 74
 Prove: true.
 
@@ -63,17 +63,17 @@ Prove: true.
   Function formal_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 30) in 'formal_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 30) in 'formal_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 31) in 'formal_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 31) in 'formal_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 29) in 'formal_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 29) in 'formal_alias':
 Effect at line 33
 Prove: true.
 
@@ -82,28 +82,28 @@ Prove: true.
   Function formal_alias_array
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 45) in 'formal_alias_array':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 45) in 'formal_alias_array':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 46) in 'formal_alias_array':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 46) in 'formal_alias_array':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 47) in 'formal_alias_array':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 47) in 'formal_alias_array':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 44) in 'formal_alias_array' (1/2):
+Goal Assigns (file alias_assigns_hypotheses.i, line 44) in 'formal_alias_array' (1/2):
 Effect at line 49
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 44) in 'formal_alias_array' (2/2):
+Goal Assigns (file alias_assigns_hypotheses.i, line 44) in 'formal_alias_array' (2/2):
 Effect at line 50
 Prove: true.
 
@@ -112,12 +112,12 @@ Prove: true.
   Function formal_no_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 38) in 'formal_no_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 38) in 'formal_no_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 37) in 'formal_no_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 37) in 'formal_no_alias':
 Effect at line 40
 Prove: true.
 
@@ -126,17 +126,17 @@ Prove: true.
   Function global_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 15) in 'global_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 15) in 'global_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 16) in 'global_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 16) in 'global_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 14) in 'global_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 14) in 'global_alias':
 Effect at line 18
 Prove: true.
 
@@ -145,12 +145,12 @@ Prove: true.
   Function global_no_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 23) in 'global_no_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 23) in 'global_no_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 22) in 'global_no_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 22) in 'global_no_alias':
 Effect at line 25
 Prove: true.
 
@@ -159,17 +159,17 @@ Prove: true.
   Function set_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 79) in 'set_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 79) in 'set_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 80) in 'set_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 80) in 'set_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 78) in 'set_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 78) in 'set_alias':
 Effect at line 82
 Prove: true.
 
@@ -178,17 +178,17 @@ Prove: true.
   Function union_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 100) in 'union_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 100) in 'union_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 101) in 'union_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 101) in 'union_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 99) in 'union_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 99) in 'union_alias':
 Effect at line 103
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.1.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.1.res.oracle
index 3da623e24931019ca8f1a8fbdc64132f1611c015..8d8b21790fbe3f8679a4e78669396e93dde80db2 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.1.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.1.res.oracle
@@ -1,22 +1,22 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_hoare/alias_assigns_hypotheses.i (no preprocessing)
+[kernel] Parsing alias_assigns_hypotheses.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function comprehension_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 90) in 'comprehension_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 90) in 'comprehension_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 91) in 'comprehension_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 91) in 'comprehension_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 89) in 'comprehension_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 89) in 'comprehension_alias':
 Effect at line 93
 Prove: true.
 
@@ -25,17 +25,17 @@ Prove: true.
   Function field_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 59) in 'field_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 59) in 'field_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 60) in 'field_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 60) in 'field_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 58) in 'field_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 58) in 'field_alias':
 Effect at line 62
 Prove: true.
 
@@ -44,17 +44,17 @@ Prove: true.
   Function field_range_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 71) in 'field_range_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 71) in 'field_range_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 72) in 'field_range_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 72) in 'field_range_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 70) in 'field_range_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 70) in 'field_range_alias':
 Effect at line 74
 Prove: true.
 
@@ -63,17 +63,17 @@ Prove: true.
   Function formal_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 30) in 'formal_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 30) in 'formal_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 31) in 'formal_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 31) in 'formal_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 29) in 'formal_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 29) in 'formal_alias':
 Effect at line 33
 Prove: true.
 
@@ -82,28 +82,28 @@ Prove: true.
   Function formal_alias_array
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 45) in 'formal_alias_array':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 45) in 'formal_alias_array':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 46) in 'formal_alias_array':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 46) in 'formal_alias_array':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 47) in 'formal_alias_array':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 47) in 'formal_alias_array':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 44) in 'formal_alias_array' (1/2):
+Goal Assigns (file alias_assigns_hypotheses.i, line 44) in 'formal_alias_array' (1/2):
 Effect at line 49
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 44) in 'formal_alias_array' (2/2):
+Goal Assigns (file alias_assigns_hypotheses.i, line 44) in 'formal_alias_array' (2/2):
 Effect at line 50
 Prove: true.
 
@@ -112,12 +112,12 @@ Prove: true.
   Function formal_no_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 38) in 'formal_no_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 38) in 'formal_no_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 37) in 'formal_no_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 37) in 'formal_no_alias':
 Effect at line 40
 Prove: true.
 
@@ -126,17 +126,17 @@ Prove: true.
   Function global_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 15) in 'global_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 15) in 'global_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 16) in 'global_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 16) in 'global_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 14) in 'global_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 14) in 'global_alias':
 Effect at line 18
 Prove: true.
 
@@ -145,12 +145,12 @@ Prove: true.
   Function global_no_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 23) in 'global_no_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 23) in 'global_no_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 22) in 'global_no_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 22) in 'global_no_alias':
 Effect at line 25
 Prove: true.
 
@@ -159,17 +159,17 @@ Prove: true.
   Function set_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 79) in 'set_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 79) in 'set_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 80) in 'set_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 80) in 'set_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 78) in 'set_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 78) in 'set_alias':
 Effect at line 82
 Prove: true.
 
@@ -178,17 +178,17 @@ Prove: true.
   Function union_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 100) in 'union_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 100) in 'union_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 101) in 'union_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 101) in 'union_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 99) in 'union_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 99) in 'union_alias':
 Effect at line 103
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.res.oracle
index c9a461392e7cb29343481e9e0560a5021bf0beb2..290bc031ca0df2a69b143f3c8fe368053428895d 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_hoare/alias_assigns_hypotheses.i (no preprocessing)
+[kernel] Parsing alias_assigns_hypotheses.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
 [wp] Warning: Missing RTE guards
@@ -7,17 +7,17 @@
   Function comprehension_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 85) in 'comprehension_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 85) in 'comprehension_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 86) in 'comprehension_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 86) in 'comprehension_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 84) in 'comprehension_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 84) in 'comprehension_alias':
 Effect at line 88
 Prove: true.
 
@@ -26,17 +26,17 @@ Prove: true.
   Function field_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 54) in 'field_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 54) in 'field_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 55) in 'field_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 55) in 'field_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 53) in 'field_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 53) in 'field_alias':
 Effect at line 57
 Prove: true.
 
@@ -45,17 +45,17 @@ Prove: true.
   Function field_range_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 66) in 'field_range_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 66) in 'field_range_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 67) in 'field_range_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 67) in 'field_range_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 65) in 'field_range_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 65) in 'field_range_alias':
 Effect at line 69
 Prove: true.
 
@@ -64,17 +64,17 @@ Prove: true.
   Function formal_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 25) in 'formal_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 25) in 'formal_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 26) in 'formal_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 26) in 'formal_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 24) in 'formal_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 24) in 'formal_alias':
 Effect at line 28
 Prove: true.
 
@@ -83,28 +83,28 @@ Prove: true.
   Function formal_alias_array
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 40) in 'formal_alias_array':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 40) in 'formal_alias_array':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 41) in 'formal_alias_array':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 41) in 'formal_alias_array':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 42) in 'formal_alias_array':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 42) in 'formal_alias_array':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 39) in 'formal_alias_array' (1/2):
+Goal Assigns (file alias_assigns_hypotheses.i, line 39) in 'formal_alias_array' (1/2):
 Effect at line 44
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 39) in 'formal_alias_array' (2/2):
+Goal Assigns (file alias_assigns_hypotheses.i, line 39) in 'formal_alias_array' (2/2):
 Effect at line 45
 Prove: true.
 
@@ -113,12 +113,12 @@ Prove: true.
   Function formal_no_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 33) in 'formal_no_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 33) in 'formal_no_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 32) in 'formal_no_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 32) in 'formal_no_alias':
 Effect at line 35
 Prove: true.
 
@@ -127,17 +127,17 @@ Prove: true.
   Function global_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 10) in 'global_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 10) in 'global_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 11) in 'global_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 11) in 'global_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 9) in 'global_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 9) in 'global_alias':
 Effect at line 13
 Prove: true.
 
@@ -146,12 +146,12 @@ Prove: true.
   Function global_no_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 18) in 'global_no_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 18) in 'global_no_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 17) in 'global_no_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 17) in 'global_no_alias':
 Effect at line 20
 Prove: true.
 
@@ -160,17 +160,17 @@ Prove: true.
   Function set_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 74) in 'set_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 74) in 'set_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 75) in 'set_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 75) in 'set_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 73) in 'set_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 73) in 'set_alias':
 Effect at line 77
 Prove: true.
 
@@ -179,17 +179,17 @@ Prove: true.
   Function union_alias
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 95) in 'union_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 95) in 'union_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/alias_assigns_hypotheses.i, line 96) in 'union_alias':
+Goal Post-condition (file alias_assigns_hypotheses.i, line 96) in 'union_alias':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/alias_assigns_hypotheses.i, line 94) in 'union_alias':
+Goal Assigns (file alias_assigns_hypotheses.i, line 94) in 'union_alias':
 Effect at line 98
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/byref.0.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/byref.0.res.oracle
index f9c6a96edce7dd37271023e690bf5433412604b6..f3f3795feeead47723b0e92a48bdeefe42a0cffd 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/byref.0.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/byref.0.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_hoare/byref.i (no preprocessing)
+[kernel] Parsing byref.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/byref.i, line 12) in 'f':
+Goal Post-condition (file byref.i, line 12) in 'f':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/byref.i, line 13) in 'f':
+Goal Assigns (file byref.i, line 13) in 'f':
 Effect at line 14
 Prove: true.
 
@@ -20,12 +20,12 @@ Prove: true.
   Function formal
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/byref.i, line 47) in 'formal':
+Goal Post-condition (file byref.i, line 47) in 'formal':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/byref.i, line 11) in 'f'' in 'formal' at call 'f' (file tests/wp_hoare/byref.i, line 50)
+Goal Instance of 'Pre-condition (file byref.i, line 11) in 'f'' in 'formal' at call 'f' (file byref.i, line 50)
 :
 Prove: true.
 
@@ -34,12 +34,12 @@ Prove: true.
   Function global
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/byref.i, line 57) in 'global':
+Goal Post-condition (file byref.i, line 57) in 'global':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/byref.i, line 11) in 'f'' in 'global' at call 'f' (file tests/wp_hoare/byref.i, line 60)
+Goal Instance of 'Pre-condition (file byref.i, line 11) in 'f'' in 'global' at call 'f' (file byref.i, line 60)
 :
 Prove: true.
 
@@ -48,12 +48,12 @@ Prove: true.
   Function local
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/byref.i, line 38) in 'local':
+Goal Post-condition (file byref.i, line 38) in 'local':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/byref.i, line 11) in 'f'' in 'local' at call 'f' (file tests/wp_hoare/byref.i, line 42)
+Goal Instance of 'Pre-condition (file byref.i, line 11) in 'f'' in 'local' at call 'f' (file byref.i, line 42)
 :
 Prove: true.
 
@@ -62,12 +62,12 @@ Prove: true.
   Function pointer
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/byref.i, line 29) in 'pointer':
+Goal Post-condition (file byref.i, line 29) in 'pointer':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/byref.i, line 11) in 'f'' in 'pointer' at call 'f' (file tests/wp_hoare/byref.i, line 33)
+Goal Instance of 'Pre-condition (file byref.i, line 11) in 'f'' in 'pointer' at call 'f' (file byref.i, line 33)
 :
 Prove: true.
 
@@ -76,12 +76,12 @@ Prove: true.
   Function wrong_without_ref
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/byref.i, line 18) in 'wrong_without_ref':
+Goal Post-condition (file byref.i, line 18) in 'wrong_without_ref':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/byref.i, line 11) in 'f'' in 'wrong_without_ref' at call 'f' (file tests/wp_hoare/byref.i, line 22)
+Goal Instance of 'Pre-condition (file byref.i, line 11) in 'f'' in 'wrong_without_ref' at call 'f' (file byref.i, line 22)
 :
 Assume { (* Heap *) Type: (region(q.base) <= 0) /\ linked(Malloc_0). }
 Prove: valid_rw(Malloc_0, q, 1).
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/byref.1.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/byref.1.res.oracle
index 54ad8489278e68186e342fc1157d755cd613d62f..7e293d6784d6dfa5c7c664bd3debd11c28ae933b 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/byref.1.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/byref.1.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_hoare/byref.i (no preprocessing)
+[kernel] Parsing byref.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/byref.i, line 12) in 'f':
+Goal Post-condition (file byref.i, line 12) in 'f':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/byref.i, line 13) in 'f':
+Goal Assigns (file byref.i, line 13) in 'f':
 Prove: true.
 
 ------------------------------------------------------------
@@ -19,12 +19,12 @@ Prove: true.
   Function formal
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/byref.i, line 47) in 'formal':
+Goal Post-condition (file byref.i, line 47) in 'formal':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/byref.i, line 11) in 'f'' in 'formal' at call 'f' (file tests/wp_hoare/byref.i, line 50)
+Goal Instance of 'Pre-condition (file byref.i, line 11) in 'f'' in 'formal' at call 'f' (file byref.i, line 50)
 :
 Prove: true.
 
@@ -33,12 +33,12 @@ Prove: true.
   Function global
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/byref.i, line 57) in 'global':
+Goal Post-condition (file byref.i, line 57) in 'global':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/byref.i, line 11) in 'f'' in 'global' at call 'f' (file tests/wp_hoare/byref.i, line 60)
+Goal Instance of 'Pre-condition (file byref.i, line 11) in 'f'' in 'global' at call 'f' (file byref.i, line 60)
 :
 Prove: true.
 
@@ -47,12 +47,12 @@ Prove: true.
   Function local
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/byref.i, line 38) in 'local':
+Goal Post-condition (file byref.i, line 38) in 'local':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/byref.i, line 11) in 'f'' in 'local' at call 'f' (file tests/wp_hoare/byref.i, line 42)
+Goal Instance of 'Pre-condition (file byref.i, line 11) in 'f'' in 'local' at call 'f' (file byref.i, line 42)
 :
 Prove: true.
 
@@ -61,12 +61,12 @@ Prove: true.
   Function pointer
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/byref.i, line 29) in 'pointer':
+Goal Post-condition (file byref.i, line 29) in 'pointer':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/byref.i, line 11) in 'f'' in 'pointer' at call 'f' (file tests/wp_hoare/byref.i, line 33)
+Goal Instance of 'Pre-condition (file byref.i, line 11) in 'f'' in 'pointer' at call 'f' (file byref.i, line 33)
 :
 Prove: true.
 
@@ -75,12 +75,12 @@ Prove: true.
   Function wrong_without_ref
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/byref.i, line 18) in 'wrong_without_ref':
+Goal Post-condition (file byref.i, line 18) in 'wrong_without_ref':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/byref.i, line 11) in 'f'' in 'wrong_without_ref' at call 'f' (file tests/wp_hoare/byref.i, line 22)
+Goal Instance of 'Pre-condition (file byref.i, line 11) in 'f'' in 'wrong_without_ref' at call 'f' (file byref.i, line 22)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var.res.oracle
index d2646994c22e0a1dbada00d2f6169e04da38ab0e..5ecf70e38eea266e5585b70fe06f5b276265938d 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_hoare/dispatch_var.i (no preprocessing)
+[kernel] Parsing dispatch_var.i (no preprocessing)
 [wp] Running WP plugin...
 .................................................
 ... Ref Usage
@@ -46,47 +46,47 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 114) in 'call_no_ref_bd' (1/3):
+Goal Assigns (file dispatch_var.i, line 114) in 'call_no_ref_bd' (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 114) in 'call_no_ref_bd' (2/3):
+Goal Assigns (file dispatch_var.i, line 114) in 'call_no_ref_bd' (2/3):
 Effect at line 121
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 114) in 'call_no_ref_bd' (3/3):
+Goal Assigns (file dispatch_var.i, line 114) in 'call_no_ref_bd' (3/3):
 Call Result at line 122
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 114) in 'call_no_ref_bd' (1/5):
+Goal Assigns (file dispatch_var.i, line 114) in 'call_no_ref_bd' (1/5):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 114) in 'call_no_ref_bd' (2/5):
+Goal Assigns (file dispatch_var.i, line 114) in 'call_no_ref_bd' (2/5):
 Effect at line 121
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 114) in 'call_no_ref_bd' (3/5):
+Goal Assigns (file dispatch_var.i, line 114) in 'call_no_ref_bd' (3/5):
 Call Result at line 122
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 114) in 'call_no_ref_bd' (4/5):
+Goal Assigns (file dispatch_var.i, line 114) in 'call_no_ref_bd' (4/5):
 Call Result at line 123
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 114) in 'call_no_ref_bd' (5/5):
+Goal Assigns (file dispatch_var.i, line 114) in 'call_no_ref_bd' (5/5):
 Effect at line 122
 Prove: true.
 
@@ -100,17 +100,17 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 51) in 'call_ref_bd':
+Goal Assigns (file dispatch_var.i, line 51) in 'call_ref_bd':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 51) in 'call_ref_bd' (1/2):
+Goal Assigns (file dispatch_var.i, line 51) in 'call_ref_bd' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 51) in 'call_ref_bd' (2/2):
+Goal Assigns (file dispatch_var.i, line 51) in 'call_ref_bd' (2/2):
 Call Result at line 57
 Prove: true.
 
@@ -124,41 +124,41 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 63) in 'call_ref_bd2' (1/2):
+Goal Assigns (file dispatch_var.i, line 63) in 'call_ref_bd2' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 63) in 'call_ref_bd2' (2/2):
+Goal Assigns (file dispatch_var.i, line 63) in 'call_ref_bd2' (2/2):
 Effect at line 68
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 63) in 'call_ref_bd2' (1/5):
+Goal Assigns (file dispatch_var.i, line 63) in 'call_ref_bd2' (1/5):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 63) in 'call_ref_bd2' (2/5):
+Goal Assigns (file dispatch_var.i, line 63) in 'call_ref_bd2' (2/5):
 Effect at line 68
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 63) in 'call_ref_bd2' (3/5):
+Goal Assigns (file dispatch_var.i, line 63) in 'call_ref_bd2' (3/5):
 Call Result at line 70
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 63) in 'call_ref_bd2' (4/5):
+Goal Assigns (file dispatch_var.i, line 63) in 'call_ref_bd2' (4/5):
 Effect at line 70
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 63) in 'call_ref_bd2' (5/5):
+Goal Assigns (file dispatch_var.i, line 63) in 'call_ref_bd2' (5/5):
 Effect at line 71
 Prove: true.
 
@@ -172,17 +172,17 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 17) in 'call_ref_ctr':
+Goal Assigns (file dispatch_var.i, line 17) in 'call_ref_ctr':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 17) in 'call_ref_ctr' (1/2):
+Goal Assigns (file dispatch_var.i, line 17) in 'call_ref_ctr' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 17) in 'call_ref_ctr' (2/2):
+Goal Assigns (file dispatch_var.i, line 17) in 'call_ref_ctr' (2/2):
 Call Result at line 23
 Prove: true.
 
@@ -196,41 +196,41 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 28) in 'call_ref_ctr2' (1/2):
+Goal Assigns (file dispatch_var.i, line 28) in 'call_ref_ctr2' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 28) in 'call_ref_ctr2' (2/2):
+Goal Assigns (file dispatch_var.i, line 28) in 'call_ref_ctr2' (2/2):
 Effect at line 33
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 28) in 'call_ref_ctr2' (1/5):
+Goal Assigns (file dispatch_var.i, line 28) in 'call_ref_ctr2' (1/5):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 28) in 'call_ref_ctr2' (2/5):
+Goal Assigns (file dispatch_var.i, line 28) in 'call_ref_ctr2' (2/5):
 Effect at line 33
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 28) in 'call_ref_ctr2' (3/5):
+Goal Assigns (file dispatch_var.i, line 28) in 'call_ref_ctr2' (3/5):
 Call Result at line 35
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 28) in 'call_ref_ctr2' (4/5):
+Goal Assigns (file dispatch_var.i, line 28) in 'call_ref_ctr2' (4/5):
 Effect at line 35
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 28) in 'call_ref_ctr2' (5/5):
+Goal Assigns (file dispatch_var.i, line 28) in 'call_ref_ctr2' (5/5):
 Effect at line 36
 Prove: true.
 
@@ -249,47 +249,47 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 139) in 'call_ref_ctr_nr' (1/3):
+Goal Assigns (file dispatch_var.i, line 139) in 'call_ref_ctr_nr' (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 139) in 'call_ref_ctr_nr' (2/3):
+Goal Assigns (file dispatch_var.i, line 139) in 'call_ref_ctr_nr' (2/3):
 Effect at line 147
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 139) in 'call_ref_ctr_nr' (3/3):
+Goal Assigns (file dispatch_var.i, line 139) in 'call_ref_ctr_nr' (3/3):
 Effect at line 147
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 139) in 'call_ref_ctr_nr' (1/4):
+Goal Assigns (file dispatch_var.i, line 139) in 'call_ref_ctr_nr' (1/4):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 139) in 'call_ref_ctr_nr' (2/4):
+Goal Assigns (file dispatch_var.i, line 139) in 'call_ref_ctr_nr' (2/4):
 Effect at line 147
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 139) in 'call_ref_ctr_nr' (3/4):
+Goal Assigns (file dispatch_var.i, line 139) in 'call_ref_ctr_nr' (3/4):
 Effect at line 147
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 139) in 'call_ref_ctr_nr' (4/4):
+Goal Assigns (file dispatch_var.i, line 139) in 'call_ref_ctr_nr' (4/4):
 Call Result at line 148
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var.i, line 129) in 'ref_ctr_nr'' in 'call_ref_ctr_nr' at call 'ref_ctr_nr' (file tests/wp_hoare/dispatch_var.i, line 148)
+Goal Instance of 'Pre-condition (file dispatch_var.i, line 129) in 'ref_ctr_nr'' in 'call_ref_ctr_nr' at call 'ref_ctr_nr' (file dispatch_var.i, line 148)
 :
 Prove: true.
 
@@ -298,7 +298,7 @@ Prove: true.
   Function call_ref_ctr_nstars
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var.i, line 162) in 'call_ref_ctr_nstars':
+Goal Post-condition (file dispatch_var.i, line 162) in 'call_ref_ctr_nstars':
 Prove: true.
 
 ------------------------------------------------------------
@@ -339,59 +339,59 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 87) in 'call_ref_valid' (1/3):
+Goal Assigns (file dispatch_var.i, line 87) in 'call_ref_valid' (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 87) in 'call_ref_valid' (2/3):
+Goal Assigns (file dispatch_var.i, line 87) in 'call_ref_valid' (2/3):
 Effect at line 94
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 87) in 'call_ref_valid' (3/3):
+Goal Assigns (file dispatch_var.i, line 87) in 'call_ref_valid' (3/3):
 Call Result at line 95
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 87) in 'call_ref_valid' (1/5):
+Goal Assigns (file dispatch_var.i, line 87) in 'call_ref_valid' (1/5):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 87) in 'call_ref_valid' (2/5):
+Goal Assigns (file dispatch_var.i, line 87) in 'call_ref_valid' (2/5):
 Effect at line 94
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 87) in 'call_ref_valid' (3/5):
+Goal Assigns (file dispatch_var.i, line 87) in 'call_ref_valid' (3/5):
 Call Result at line 95
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 87) in 'call_ref_valid' (4/5):
+Goal Assigns (file dispatch_var.i, line 87) in 'call_ref_valid' (4/5):
 Call Result at line 96
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 87) in 'call_ref_valid' (5/5):
+Goal Assigns (file dispatch_var.i, line 87) in 'call_ref_valid' (5/5):
 Effect at line 95
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var.i, line 79) in 'ref_valid'' in 'call_ref_valid' at call 'ref_valid' (file tests/wp_hoare/dispatch_var.i, line 95)
+Goal Instance of 'Pre-condition (file dispatch_var.i, line 79) in 'ref_valid'' in 'call_ref_valid' at call 'ref_valid' (file dispatch_var.i, line 95)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var.i, line 79) in 'ref_valid'' in 'call_ref_valid' at call 'ref_valid' (file tests/wp_hoare/dispatch_var.i, line 96)
+Goal Instance of 'Pre-condition (file dispatch_var.i, line 79) in 'ref_valid'' in 'call_ref_valid' at call 'ref_valid' (file dispatch_var.i, line 96)
 :
 Prove: true.
 
@@ -400,40 +400,40 @@ Prove: true.
   Function call_two_ref
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var.i, line 177) in 'call_two_ref':
+Goal Post-condition (file dispatch_var.i, line 177) in 'call_two_ref':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 176) in 'call_two_ref' (1/2):
+Goal Assigns (file dispatch_var.i, line 176) in 'call_two_ref' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 176) in 'call_two_ref' (2/2):
+Goal Assigns (file dispatch_var.i, line 176) in 'call_two_ref' (2/2):
 Call Result at line 182
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 176) in 'call_two_ref' (1/4):
+Goal Assigns (file dispatch_var.i, line 176) in 'call_two_ref' (1/4):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 176) in 'call_two_ref' (2/4):
+Goal Assigns (file dispatch_var.i, line 176) in 'call_two_ref' (2/4):
 Call Result at line 182
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 176) in 'call_two_ref' (3/4):
+Goal Assigns (file dispatch_var.i, line 176) in 'call_two_ref' (3/4):
 Call Result at line 182
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var.i, line 176) in 'call_two_ref' (4/4):
+Goal Assigns (file dispatch_var.i, line 176) in 'call_two_ref' (4/4):
 Effect at line 182
 Prove: true.
 
@@ -442,7 +442,7 @@ Prove: true.
   Function g
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var.i, line 192) in 'g':
+Goal Post-condition (file dispatch_var.i, line 192) in 'g':
 Prove: true.
 
 ------------------------------------------------------------
@@ -466,7 +466,7 @@ Prove: true.
   Function no_ref_bd
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var.i, line 104) in 'no_ref_bd':
+Goal Post-condition (file dispatch_var.i, line 104) in 'no_ref_bd':
 Prove: true.
 
 ------------------------------------------------------------
@@ -486,7 +486,7 @@ Prove: true.
   Function ref_bd
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var.i, line 42) in 'ref_bd':
+Goal Post-condition (file dispatch_var.i, line 42) in 'ref_bd':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.0.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.0.res.oracle
index 61bf6b67367b214b40e53f5d9d9e9fff16e4a0fe..c3108b02bc744f6f503e66fc7cab7b99c970a0de 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.0.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.0.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Ref)' -wp-no-let [...]
-[kernel] Parsing tests/wp_hoare/dispatch_var2.i (no preprocessing)
+[kernel] Parsing dispatch_var2.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function call_global
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 37) in 'call_global':
+Goal Post-condition (file dispatch_var2.i, line 37) in 'call_global':
 Assume {
   Type: is_sint32(call_global_0) /\ is_sint32(load_0) /\ is_sint32(tmp_0) /\
       is_sint32(x).
@@ -32,17 +32,17 @@ Prove: call_global_0 = 0.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 36) in 'call_global':
+Goal Assigns (file dispatch_var2.i, line 36) in 'call_global':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 36) in 'call_global' (1/2):
+Goal Assigns (file dispatch_var2.i, line 36) in 'call_global' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 36) in 'call_global' (2/2):
+Goal Assigns (file dispatch_var2.i, line 36) in 'call_global' (2/2):
 Call Result at line 42
 Assume {
   Type: is_sint32(load_0) /\ is_sint32(tmp_0) /\ is_sint32(x).
@@ -63,13 +63,13 @@ Prove: (ta_tmp_0=false).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 12) in 'reset'' in 'call_global' at call 'reset' (file tests/wp_hoare/dispatch_var2.i, line 41)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 12) in 'reset'' in 'call_global' at call 'reset' (file dispatch_var2.i, line 41)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 27) in 'load'' in 'call_global' at call 'load' (file tests/wp_hoare/dispatch_var2.i, line 42)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 27) in 'load'' in 'call_global' at call 'load' (file dispatch_var2.i, line 42)
 :
 Prove: true.
 
@@ -78,7 +78,7 @@ Prove: true.
   Function call_local
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 56) in 'call_local':
+Goal Post-condition (file dispatch_var2.i, line 56) in 'call_local':
 Assume {
   Type: is_sint32(call_local_0) /\ is_sint32(load_0) /\ is_sint32(tmp_0) /\
       is_sint32(z).
@@ -188,7 +188,7 @@ Prove: (ta_tmp_0=false).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 12) in 'reset'' in 'call_local' at call 'reset' (file tests/wp_hoare/dispatch_var2.i, line 61)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 12) in 'reset'' in 'call_local' at call 'reset' (file dispatch_var2.i, line 61)
 :
 Assume {
   (* Block In *)
@@ -198,7 +198,7 @@ Prove: (ta_z_0=true).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 27) in 'load'' in 'call_local' at call 'load' (file tests/wp_hoare/dispatch_var2.i, line 62)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 27) in 'load'' in 'call_local' at call 'load' (file dispatch_var2.i, line 62)
 :
 Assume {
   Type: is_sint32(z).
@@ -219,7 +219,7 @@ Prove: (ta_z_0=true).
   Function call_param
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 47) in 'call_param':
+Goal Post-condition (file dispatch_var2.i, line 47) in 'call_param':
 Assume {
   Type: is_sint32(call_param_0) /\ is_sint32(load_0) /\ is_sint32(tmp_0) /\
       is_sint32(y).
@@ -324,7 +324,7 @@ Prove: (ta_tmp_0=false).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 12) in 'reset'' in 'call_param' at call 'reset' (file tests/wp_hoare/dispatch_var2.i, line 51)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 12) in 'reset'' in 'call_param' at call 'reset' (file dispatch_var2.i, line 51)
 :
 Assume {
   (* Pre-condition *)
@@ -340,7 +340,7 @@ Prove: (ta_y_0=true).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 27) in 'load'' in 'call_param' at call 'load' (file tests/wp_hoare/dispatch_var2.i, line 52)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 27) in 'load'' in 'call_param' at call 'load' (file dispatch_var2.i, line 52)
 :
 Assume {
   Type: is_sint32(y).
@@ -362,7 +362,7 @@ Prove: (ta_y_0=true).
   Function call_param_ref
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 68) in 'call_param_ref':
+Goal Post-condition (file dispatch_var2.i, line 68) in 'call_param_ref':
 Assume {
   Type: is_sint32(call_param_ref_0) /\ is_sint32(load_0) /\ is_sint32(q) /\
       is_sint32(tmp_0).
@@ -386,17 +386,17 @@ Prove: call_param_ref_0 = 0.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 67) in 'call_param_ref':
+Goal Assigns (file dispatch_var2.i, line 67) in 'call_param_ref':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 67) in 'call_param_ref' (1/2):
+Goal Assigns (file dispatch_var2.i, line 67) in 'call_param_ref' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 67) in 'call_param_ref' (2/2):
+Goal Assigns (file dispatch_var2.i, line 67) in 'call_param_ref' (2/2):
 Call Result at line 73
 Assume {
   Type: is_sint32(load_0) /\ is_sint32(q) /\ is_sint32(tmp_0).
@@ -415,13 +415,13 @@ Prove: (ta_tmp_0=false).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 12) in 'reset'' in 'call_param_ref' at call 'reset' (file tests/wp_hoare/dispatch_var2.i, line 72)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 12) in 'reset'' in 'call_param_ref' at call 'reset' (file dispatch_var2.i, line 72)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 27) in 'load'' in 'call_param_ref' at call 'load' (file tests/wp_hoare/dispatch_var2.i, line 73)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 27) in 'load'' in 'call_param_ref' at call 'load' (file dispatch_var2.i, line 73)
 :
 Prove: true.
 
@@ -430,7 +430,7 @@ Prove: true.
   Function incr
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 21) in 'incr':
+Goal Post-condition (file dispatch_var2.i, line 21) in 'incr':
 Assume {
   Type: is_sint32(ip_0) /\ is_sint32(ip_1) /\ is_sint32(ip_2).
   Have: ip_2 = ip_0.
@@ -440,7 +440,7 @@ Prove: (1 + ip_0) = ip_1.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 20) in 'incr':
+Goal Assigns (file dispatch_var2.i, line 20) in 'incr':
 Prove: true.
 
 ------------------------------------------------------------
@@ -448,7 +448,7 @@ Prove: true.
   Function load
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 29) in 'load':
+Goal Post-condition (file dispatch_var2.i, line 29) in 'load':
 Assume {
   Type: is_sint32(load_0) /\ is_sint32(lp_0) /\ is_sint32(retres_0).
   (* Block In *)
@@ -475,13 +475,13 @@ Prove: (ta_retres_0=false).
   Function reset
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 14) in 'reset':
+Goal Post-condition (file dispatch_var2.i, line 14) in 'reset':
 Assume { Type: is_sint32(rp_0). Have: rp_0 = 0. }
 Prove: rp_0 = 0.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 13) in 'reset':
+Goal Assigns (file dispatch_var2.i, line 13) in 'reset':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.1.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.1.res.oracle
index 44ae58e7b74ba0fb1e7c7ef27a28f0155be239f7..25c2a4d8d8919b9129781a66b5970a88558301bd 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.1.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.1.res.oracle
@@ -1,39 +1,39 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_hoare/dispatch_var2.i (no preprocessing)
+[kernel] Parsing dispatch_var2.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function call_global
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 37) in 'call_global':
+Goal Post-condition (file dispatch_var2.i, line 37) in 'call_global':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 36) in 'call_global':
+Goal Assigns (file dispatch_var2.i, line 36) in 'call_global':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 36) in 'call_global' (1/2):
+Goal Assigns (file dispatch_var2.i, line 36) in 'call_global' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 36) in 'call_global' (2/2):
+Goal Assigns (file dispatch_var2.i, line 36) in 'call_global' (2/2):
 Call Result at line 42
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 12) in 'reset'' in 'call_global' at call 'reset' (file tests/wp_hoare/dispatch_var2.i, line 41)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 12) in 'reset'' in 'call_global' at call 'reset' (file dispatch_var2.i, line 41)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 27) in 'load'' in 'call_global' at call 'load' (file tests/wp_hoare/dispatch_var2.i, line 42)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 27) in 'load'' in 'call_global' at call 'load' (file dispatch_var2.i, line 42)
 :
 Prove: true.
 
@@ -42,7 +42,7 @@ Prove: true.
   Function call_local
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 56) in 'call_local':
+Goal Post-condition (file dispatch_var2.i, line 56) in 'call_local':
 Prove: true.
 
 ------------------------------------------------------------
@@ -75,13 +75,13 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 12) in 'reset'' in 'call_local' at call 'reset' (file tests/wp_hoare/dispatch_var2.i, line 61)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 12) in 'reset'' in 'call_local' at call 'reset' (file dispatch_var2.i, line 61)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 27) in 'load'' in 'call_local' at call 'load' (file tests/wp_hoare/dispatch_var2.i, line 62)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 27) in 'load'' in 'call_local' at call 'load' (file dispatch_var2.i, line 62)
 :
 Prove: true.
 
@@ -90,7 +90,7 @@ Prove: true.
   Function call_param
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 47) in 'call_param':
+Goal Post-condition (file dispatch_var2.i, line 47) in 'call_param':
 Prove: true.
 
 ------------------------------------------------------------
@@ -123,13 +123,13 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 12) in 'reset'' in 'call_param' at call 'reset' (file tests/wp_hoare/dispatch_var2.i, line 51)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 12) in 'reset'' in 'call_param' at call 'reset' (file dispatch_var2.i, line 51)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 27) in 'load'' in 'call_param' at call 'load' (file tests/wp_hoare/dispatch_var2.i, line 52)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 27) in 'load'' in 'call_param' at call 'load' (file dispatch_var2.i, line 52)
 :
 Prove: true.
 
@@ -138,34 +138,34 @@ Prove: true.
   Function call_param_ref
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 68) in 'call_param_ref':
+Goal Post-condition (file dispatch_var2.i, line 68) in 'call_param_ref':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 67) in 'call_param_ref':
+Goal Assigns (file dispatch_var2.i, line 67) in 'call_param_ref':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 67) in 'call_param_ref' (1/2):
+Goal Assigns (file dispatch_var2.i, line 67) in 'call_param_ref' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 67) in 'call_param_ref' (2/2):
+Goal Assigns (file dispatch_var2.i, line 67) in 'call_param_ref' (2/2):
 Call Result at line 73
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 12) in 'reset'' in 'call_param_ref' at call 'reset' (file tests/wp_hoare/dispatch_var2.i, line 72)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 12) in 'reset'' in 'call_param_ref' at call 'reset' (file dispatch_var2.i, line 72)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/dispatch_var2.i, line 27) in 'load'' in 'call_param_ref' at call 'load' (file tests/wp_hoare/dispatch_var2.i, line 73)
+Goal Instance of 'Pre-condition (file dispatch_var2.i, line 27) in 'load'' in 'call_param_ref' at call 'load' (file dispatch_var2.i, line 73)
 :
 Prove: true.
 
@@ -174,12 +174,12 @@ Prove: true.
   Function incr
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 21) in 'incr':
+Goal Post-condition (file dispatch_var2.i, line 21) in 'incr':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 20) in 'incr':
+Goal Assigns (file dispatch_var2.i, line 20) in 'incr':
 Prove: true.
 
 ------------------------------------------------------------
@@ -187,7 +187,7 @@ Prove: true.
   Function load
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 29) in 'load':
+Goal Post-condition (file dispatch_var2.i, line 29) in 'load':
 Prove: true.
 
 ------------------------------------------------------------
@@ -201,12 +201,12 @@ Prove: true.
   Function reset
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/dispatch_var2.i, line 14) in 'reset':
+Goal Post-condition (file dispatch_var2.i, line 14) in 'reset':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/dispatch_var2.i, line 13) in 'reset':
+Goal Assigns (file dispatch_var2.i, line 13) in 'reset':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/isHoare.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/isHoare.res.oracle
index 31b64ff33371aa2341a89848adec14774f4cec9d..960bf6a133c65306250a08d193261e2304800481 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/isHoare.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/isHoare.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_hoare/isHoare.i (no preprocessing)
+[kernel] Parsing isHoare.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/logicarr.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/logicarr.res.oracle
index 9875c8c8f6706fc59099d8de937fd5c9e2a0d06a..536d759c1d2d465ff68f9297ee2310f8bf8ef29d 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/logicarr.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/logicarr.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_hoare/logicarr.i (no preprocessing)
+[kernel] Parsing logicarr.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/logicref.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/logicref.res.oracle
index 0eb822224664ad3e2e81465f27005edaadb02a90..c9c28e7a3752c56d3c45d4960df0e1385d647730 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/logicref.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/logicref.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_hoare/logicref.i (no preprocessing)
+[kernel] Parsing logicref.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function fvrange_n
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/logicref.i, line 11) in 'fvrange_n':
+Goal Post-condition (file logicref.i, line 11) in 'fvrange_n':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_hoare/logicref.i, line 14):
+Goal Assertion (file logicref.i, line 14):
 Assume {
   Type: is_sint32(i) /\ is_sint32(k).
   (* Heap *)
@@ -23,7 +23,7 @@ Prove: valid_rw(Malloc_0, shift_sint32(a, i), 1).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/logicref.i, line 11) in 'fvrange_n':
+Goal Assigns (file logicref.i, line 11) in 'fvrange_n':
 Effect at line 15
 Prove: true.
 
@@ -32,7 +32,7 @@ Prove: true.
   Function gcd
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/logicref.i, line 23) in 'gcd':
+Goal Post-condition (file logicref.i, line 23) in 'gcd':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/logicref_simple.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/logicref_simple.res.oracle
index 3d20b3ef6be8edcf0fae09ea401482f89d8faa9f..2ac7b3857074eb300a7afe0c480f28c9276dcb18 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/logicref_simple.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/logicref_simple.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_hoare/logicref_simple.i (no preprocessing)
+[kernel] Parsing logicref_simple.i (no preprocessing)
 [wp] Running WP plugin...
 .................................................
 ... Ref Usage
@@ -15,7 +15,7 @@ Function fvpositive: { b }
   Function fsimple
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/logicref_simple.i, line 14) in 'fsimple':
+Goal Post-condition (file logicref_simple.i, line 14) in 'fsimple':
 Let x = Mint_0[c].
 Assume {
   Type: is_sint32(x) /\ is_sint32(1 + x).
@@ -37,7 +37,7 @@ Prove: true.
   Function fsimple_array
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/logicref_simple.i, line 19) in 'fsimple_array':
+Goal Post-condition (file logicref_simple.i, line 19) in 'fsimple_array':
 Let a = global(G_t_35).
 Let x = Mint_0[shift_sint32(a, 3)].
 Assume {
@@ -58,7 +58,7 @@ Prove: true.
   Function ftwo_star
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/logicref_simple.i, line 22) in 'ftwo_star':
+Goal Post-condition (file logicref_simple.i, line 22) in 'ftwo_star':
 Let x = Mint_0[Mptr_0[d]].
 Assume {
   Type: is_sint32(x) /\ is_sint32(1 + x).
@@ -80,12 +80,12 @@ Prove: true.
   Function fvpositive
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/logicref_simple.i, line 26) in 'fvpositive':
+Goal Post-condition (file logicref_simple.i, line 26) in 'fvpositive':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'OK' (file tests/wp_hoare/logicref_simple.i, line 30):
+Goal Assertion 'OK' (file logicref_simple.i, line 30):
 Assume {
   (* Heap *)
   Type: (region(b.base) <= 0) /\ linked(Malloc_0).
@@ -96,7 +96,7 @@ Prove: valid_rw(Malloc_0, b, 1).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/logicref_simple.i, line 26) in 'fvpositive':
+Goal Assigns (file logicref_simple.i, line 26) in 'fvpositive':
 Effect at line 31
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/reference.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/reference.res.oracle
index c6bec6fef0728d4b3598e5ec6ae9d881cbec4150..9e26b3821a8ac83000ece941db30910386026504 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/reference.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/reference.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_hoare/reference.i (no preprocessing)
+[kernel] Parsing reference.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function call_f2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/reference.i, line 35) in 'call_f2':
+Goal Post-condition (file reference.i, line 35) in 'call_f2':
 Prove: true.
 
 ------------------------------------------------------------
@@ -51,7 +51,7 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference.i, line 26) in 'f2'' in 'call_f2' at call 'f2' (file tests/wp_hoare/reference.i, line 40)
+Goal Instance of 'Pre-condition (file reference.i, line 26) in 'f2'' in 'call_f2' at call 'f2' (file reference.i, line 40)
 :
 Prove: true.
 
@@ -60,7 +60,7 @@ Prove: true.
   Function call_global
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/reference.i, line 46) in 'call_global':
+Goal Post-condition (file reference.i, line 46) in 'call_global':
 Prove: true.
 
 ------------------------------------------------------------
@@ -81,7 +81,7 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference.i, line 10) in 'f'' in 'call_global' at call 'f' (file tests/wp_hoare/reference.i, line 49)
+Goal Instance of 'Pre-condition (file reference.i, line 10) in 'f'' in 'call_global' at call 'f' (file reference.i, line 49)
 :
 Prove: true.
 
@@ -90,7 +90,7 @@ Prove: true.
   Function g
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/reference.i, line 18) in 'g':
+Goal Post-condition (file reference.i, line 18) in 'g':
 Prove: true.
 
 ------------------------------------------------------------
@@ -123,7 +123,7 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference.i, line 10) in 'f'' in 'g' at call 'f' (file tests/wp_hoare/reference.i, line 22)
+Goal Instance of 'Pre-condition (file reference.i, line 10) in 'f'' in 'g' at call 'f' (file reference.i, line 22)
 :
 Prove: true.
 
@@ -132,12 +132,12 @@ Prove: true.
   Function write
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/reference.i, line 58) in 'write':
+Goal Post-condition (file reference.i, line 58) in 'write':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference.i, line 57) in 'write':
+Goal Assigns (file reference.i, line 57) in 'write':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/reference_and_struct.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/reference_and_struct.res.oracle
index 6be3aa72874003dc78af525fd268a665aad32185..9e00691a476c29f6affde9a08cad6cd0ae5472c5 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/reference_and_struct.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/reference_and_struct.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_hoare/reference_and_struct.i (no preprocessing)
+[kernel] Parsing reference_and_struct.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -16,17 +16,17 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 98) in 'call_array_in_struct_param':
+Goal Assigns (file reference_and_struct.i, line 98) in 'call_array_in_struct_param':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 98) in 'call_array_in_struct_param':
+Goal Assigns (file reference_and_struct.i, line 98) in 'call_array_in_struct_param':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_and_struct.i, line 83) in 'load_5'' in 'call_array_in_struct_param' at call 'load_5' (file tests/wp_hoare/reference_and_struct.i, line 102)
+Goal Instance of 'Pre-condition (file reference_and_struct.i, line 83) in 'load_5'' in 'call_array_in_struct_param' at call 'load_5' (file reference_and_struct.i, line 102)
 :
 Prove: true.
 
@@ -50,17 +50,17 @@ Prove: a[i] = reg_load_0[i].
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 91) in 'call_on_array_in_struct_global':
+Goal Assigns (file reference_and_struct.i, line 91) in 'call_on_array_in_struct_global':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 91) in 'call_on_array_in_struct_global':
+Goal Assigns (file reference_and_struct.i, line 91) in 'call_on_array_in_struct_global':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_and_struct.i, line 83) in 'load_5'' in 'call_on_array_in_struct_global' at call 'load_5' (file tests/wp_hoare/reference_and_struct.i, line 94)
+Goal Instance of 'Pre-condition (file reference_and_struct.i, line 83) in 'load_5'' in 'call_on_array_in_struct_global' at call 'load_5' (file reference_and_struct.i, line 94)
 :
 Prove: true.
 
@@ -69,28 +69,28 @@ Prove: true.
   Function call_reset
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/reference_and_struct.i, line 20) in 'call_reset':
+Goal Post-condition (file reference_and_struct.i, line 20) in 'call_reset':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 19) in 'call_reset':
+Goal Assigns (file reference_and_struct.i, line 19) in 'call_reset':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 19) in 'call_reset' (1/2):
+Goal Assigns (file reference_and_struct.i, line 19) in 'call_reset' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 19) in 'call_reset' (2/2):
+Goal Assigns (file reference_and_struct.i, line 19) in 'call_reset' (2/2):
 Effect at line 23
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_and_struct.i, line 11) in 'reset'' in 'call_reset' at call 'reset' (file tests/wp_hoare/reference_and_struct.i, line 23)
+Goal Instance of 'Pre-condition (file reference_and_struct.i, line 11) in 'reset'' in 'call_reset' at call 'reset' (file reference_and_struct.i, line 23)
 :
 Prove: true.
 
@@ -111,17 +111,17 @@ Prove: (v[i].F1_T_a) = 0.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 63) in 'call_reset_1_5':
+Goal Assigns (file reference_and_struct.i, line 63) in 'call_reset_1_5':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 63) in 'call_reset_1_5':
+Goal Assigns (file reference_and_struct.i, line 63) in 'call_reset_1_5':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_and_struct.i, line 53) in 'reset_1_5'' in 'call_reset_1_5' at call 'reset_1_5' (file tests/wp_hoare/reference_and_struct.i, line 67)
+Goal Instance of 'Pre-condition (file reference_and_struct.i, line 53) in 'reset_1_5'' in 'call_reset_1_5' at call 'reset_1_5' (file reference_and_struct.i, line 67)
 :
 Prove: true.
 
@@ -147,17 +147,17 @@ Prove: (ts_0[i].F1_T_a) = 0.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 35) in 'call_reset_5':
+Goal Assigns (file reference_and_struct.i, line 35) in 'call_reset_5':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 35) in 'call_reset_5':
+Goal Assigns (file reference_and_struct.i, line 35) in 'call_reset_5':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_and_struct.i, line 26) in 'reset_5'' in 'call_reset_5' at call 'reset_5' (file tests/wp_hoare/reference_and_struct.i, line 39)
+Goal Instance of 'Pre-condition (file reference_and_struct.i, line 26) in 'reset_5'' in 'call_reset_5' at call 'reset_5' (file reference_and_struct.i, line 39)
 :
 Prove: true.
 
@@ -183,17 +183,17 @@ Prove: (m[i].F1_T_a) = 0.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 71) in 'call_reset_5_dim2':
+Goal Assigns (file reference_and_struct.i, line 71) in 'call_reset_5_dim2':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 71) in 'call_reset_5_dim2':
+Goal Assigns (file reference_and_struct.i, line 71) in 'call_reset_5_dim2':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_and_struct.i, line 26) in 'reset_5'' in 'call_reset_5_dim2' at call 'reset_5' (file tests/wp_hoare/reference_and_struct.i, line 75)
+Goal Instance of 'Pre-condition (file reference_and_struct.i, line 26) in 'reset_5'' in 'call_reset_5_dim2' at call 'reset_5' (file reference_and_struct.i, line 75)
 :
 Prove: true.
 
@@ -221,19 +221,19 @@ Prove: a_2[shiftfield_F1_T_a(shift_T(a, i))] = 0.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 45) in 'call_reset_5_tps':
+Goal Assigns (file reference_and_struct.i, line 45) in 'call_reset_5_tps':
 Call Effect at line 49
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 45) in 'call_reset_5_tps':
+Goal Assigns (file reference_and_struct.i, line 45) in 'call_reset_5_tps':
 Call Effect at line 49
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_and_struct.i, line 26) in 'reset_5'' in 'call_reset_5_tps' at call 'reset_5' (file tests/wp_hoare/reference_and_struct.i, line 49)
+Goal Instance of 'Pre-condition (file reference_and_struct.i, line 26) in 'reset_5'' in 'call_reset_5_tps' at call 'reset_5' (file reference_and_struct.i, line 49)
 :
 Prove: true.
 
@@ -242,12 +242,12 @@ Prove: true.
   Function reset
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/reference_and_struct.i, line 13) in 'reset':
+Goal Post-condition (file reference_and_struct.i, line 13) in 'reset':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_and_struct.i, line 12) in 'reset':
+Goal Assigns (file reference_and_struct.i, line 12) in 'reset':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/reference_array.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/reference_array.res.oracle
index 2801c12e3a4d356ed5996b851196fd7ed9a0015f..175ac961943d3546564ac173347c2d5f584461eb 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/reference_array.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/reference_array.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_hoare/reference_array.i (no preprocessing)
+[kernel] Parsing reference_array.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function add_1_5
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/reference_array.i, line 49) in 'add_1_5':
+Goal Post-condition (file reference_array.i, line 49) in 'add_1_5':
 Let a = shift_A5_sint32(ap_0, 0).
 Assume {
   (* Heap *)
@@ -24,17 +24,17 @@ Prove: reg_add_0[i] = (reg_load_0[i] + Mint_0[shift_sint32(a, i)]).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_array.i, line 48) in 'add_1_5':
+Goal Assigns (file reference_array.i, line 48) in 'add_1_5':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_array.i, line 48) in 'add_1_5':
+Goal Assigns (file reference_array.i, line 48) in 'add_1_5':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_array.i, line 26) in 'add_5'' in 'add_1_5' at call 'add_5' (file tests/wp_hoare/reference_array.i, line 52)
+Goal Instance of 'Pre-condition (file reference_array.i, line 26) in 'add_5'' in 'add_1_5' at call 'add_5' (file reference_array.i, line 52)
 :
 Prove: true.
 
@@ -109,29 +109,29 @@ Prove: t[i] = reg_add_0[i].
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_array.i, line 58) in 'calls_on_array_dim_1':
+Goal Assigns (file reference_array.i, line 58) in 'calls_on_array_dim_1':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_array.i, line 58) in 'calls_on_array_dim_1':
+Goal Assigns (file reference_array.i, line 58) in 'calls_on_array_dim_1':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_array.i, line 19) in 'load_5'' in 'calls_on_array_dim_1' at call 'load_5' (file tests/wp_hoare/reference_array.i, line 65)
+Goal Instance of 'Pre-condition (file reference_array.i, line 19) in 'load_5'' in 'calls_on_array_dim_1' at call 'load_5' (file reference_array.i, line 65)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_array.i, line 9) in 'reset_5'' in 'calls_on_array_dim_1' at call 'reset_5' (file tests/wp_hoare/reference_array.i, line 66)
+Goal Instance of 'Pre-condition (file reference_array.i, line 9) in 'reset_5'' in 'calls_on_array_dim_1' at call 'reset_5' (file reference_array.i, line 66)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_array.i, line 26) in 'add_5'' in 'calls_on_array_dim_1' at call 'add_5' (file tests/wp_hoare/reference_array.i, line 67)
+Goal Instance of 'Pre-condition (file reference_array.i, line 26) in 'add_5'' in 'calls_on_array_dim_1' at call 'add_5' (file reference_array.i, line 67)
 :
 Prove: true.
 
@@ -199,29 +199,29 @@ Prove: m[i] = reg_add_0[i].
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_array.i, line 91) in 'calls_on_array_dim_2':
+Goal Assigns (file reference_array.i, line 91) in 'calls_on_array_dim_2':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_array.i, line 91) in 'calls_on_array_dim_2':
+Goal Assigns (file reference_array.i, line 91) in 'calls_on_array_dim_2':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_array.i, line 40) in 'load_1_5'' in 'calls_on_array_dim_2' at call 'load_1_5' (file tests/wp_hoare/reference_array.i, line 98)
+Goal Instance of 'Pre-condition (file reference_array.i, line 40) in 'load_1_5'' in 'calls_on_array_dim_2' at call 'load_1_5' (file reference_array.i, line 98)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_array.i, line 33) in 'reset_1_5'' in 'calls_on_array_dim_2' at call 'reset_1_5' (file tests/wp_hoare/reference_array.i, line 99)
+Goal Instance of 'Pre-condition (file reference_array.i, line 33) in 'reset_1_5'' in 'calls_on_array_dim_2' at call 'reset_1_5' (file reference_array.i, line 99)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_array.i, line 47) in 'add_1_5'' in 'calls_on_array_dim_2' at call 'add_1_5' (file tests/wp_hoare/reference_array.i, line 100)
+Goal Instance of 'Pre-condition (file reference_array.i, line 47) in 'add_1_5'' in 'calls_on_array_dim_2' at call 'add_1_5' (file reference_array.i, line 100)
 :
 Prove: true.
 
@@ -298,29 +298,29 @@ Prove: m_1[i] = reg_add_0[i].
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_array.i, line 73) in 'calls_on_array_dim_2_to_1':
+Goal Assigns (file reference_array.i, line 73) in 'calls_on_array_dim_2_to_1':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_array.i, line 73) in 'calls_on_array_dim_2_to_1':
+Goal Assigns (file reference_array.i, line 73) in 'calls_on_array_dim_2_to_1':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_array.i, line 19) in 'load_5'' in 'calls_on_array_dim_2_to_1' at call 'load_5' (file tests/wp_hoare/reference_array.i, line 83)
+Goal Instance of 'Pre-condition (file reference_array.i, line 19) in 'load_5'' in 'calls_on_array_dim_2_to_1' at call 'load_5' (file reference_array.i, line 83)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_array.i, line 9) in 'reset_5'' in 'calls_on_array_dim_2_to_1' at call 'reset_5' (file tests/wp_hoare/reference_array.i, line 84)
+Goal Instance of 'Pre-condition (file reference_array.i, line 9) in 'reset_5'' in 'calls_on_array_dim_2_to_1' at call 'reset_5' (file reference_array.i, line 84)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_array.i, line 26) in 'add_5'' in 'calls_on_array_dim_2_to_1' at call 'add_5' (file tests/wp_hoare/reference_array.i, line 85)
+Goal Instance of 'Pre-condition (file reference_array.i, line 26) in 'add_5'' in 'calls_on_array_dim_2_to_1' at call 'add_5' (file reference_array.i, line 85)
 :
 Prove: true.
 
@@ -329,7 +329,7 @@ Prove: true.
   Function load_1_5
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/reference_array.i, line 42) in 'load_1_5':
+Goal Post-condition (file reference_array.i, line 42) in 'load_1_5':
 Let a = shift_A5_sint32(lp_0, 0).
 Assume {
   (* Heap *)
@@ -346,17 +346,17 @@ Prove: Mint_0[shift_sint32(a, i)] = reg_load_0[i].
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_array.i, line 41) in 'load_1_5':
+Goal Assigns (file reference_array.i, line 41) in 'load_1_5':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_array.i, line 41) in 'load_1_5':
+Goal Assigns (file reference_array.i, line 41) in 'load_1_5':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_array.i, line 19) in 'load_5'' in 'load_1_5' at call 'load_5' (file tests/wp_hoare/reference_array.i, line 45)
+Goal Instance of 'Pre-condition (file reference_array.i, line 19) in 'load_5'' in 'load_1_5' at call 'load_5' (file reference_array.i, line 45)
 :
 Prove: true.
 
@@ -365,7 +365,7 @@ Prove: true.
   Function reset_1_5
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/reference_array.i, line 36) in 'reset_1_5':
+Goal Post-condition (file reference_array.i, line 36) in 'reset_1_5':
 Let a = shift_A5_sint32(rp_0, 0).
 Let a_1 = shift_sint32(a, 0).
 Let a_2 = havoc(Mint_undef_0, Mint_0, a_1, 5).
@@ -384,19 +384,19 @@ Prove: a_2[shift_sint32(a, i)] = 0.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_array.i, line 34) in 'reset_1_5':
+Goal Assigns (file reference_array.i, line 34) in 'reset_1_5':
 Call Effect at line 38
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_hoare/reference_array.i, line 34) in 'reset_1_5':
+Goal Assigns (file reference_array.i, line 34) in 'reset_1_5':
 Call Effect at line 38
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_hoare/reference_array.i, line 9) in 'reset_5'' in 'reset_1_5' at call 'reset_5' (file tests/wp_hoare/reference_array.i, line 38)
+Goal Instance of 'Pre-condition (file reference_array.i, line 9) in 'reset_5'' in 'reset_1_5' at call 'reset_5' (file reference_array.i, line 38)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/reference_array_simple.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/reference_array_simple.res.oracle
index 2c5447e5d1d9013e345c34ecb12cebb4310f5712..3a1216bb1ed46dbf42c16b1ee2abc1b2b36db476 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/reference_array_simple.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/reference_array_simple.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_hoare/reference_array_simple.i (no preprocessing)
+[kernel] Parsing reference_array_simple.i (no preprocessing)
 [wp] Running WP plugin...
 .................................................
 ... Ref Usage
@@ -17,7 +17,7 @@ Function call_f3: { tp tmp }
   Function call_f1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/reference_array_simple.i, line 14) in 'call_f1':
+Goal Post-condition (file reference_array_simple.i, line 14) in 'call_f1':
 Prove: true.
 
 ------------------------------------------------------------
@@ -25,7 +25,7 @@ Prove: true.
   Function call_f2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/reference_array_simple.i, line 25) in 'call_f2':
+Goal Post-condition (file reference_array_simple.i, line 25) in 'call_f2':
 Prove: true.
 
 ------------------------------------------------------------
@@ -33,7 +33,7 @@ Prove: true.
   Function call_f3
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/reference_array_simple.i, line 39) in 'call_f3':
+Goal Post-condition (file reference_array_simple.i, line 39) in 'call_f3':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/refguards.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/refguards.res.oracle
index 59c0568ee15ab1f2f1a4475f688e303403a07b4b..697ea47b596a00eabdd1cd3397cbc8db0bad30b9 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/refguards.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/refguards.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_hoare/refguards.i (no preprocessing)
+[kernel] Parsing refguards.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/refguards.i, line 9) in 'f':
+Goal Post-condition (file refguards.i, line 9) in 'f':
 Prove: true.
 
 ------------------------------------------------------------
@@ -14,7 +14,7 @@ Prove: true.
   Function g
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/refguards.i, line 17) in 'g':
+Goal Post-condition (file refguards.i, line 17) in 'g':
 Let a_1 = shift_sint32(b, k).
 Let x = Mint_0[a_1].
 Let x_1 = Mint_0[shift_sint32(a, k) <- x][a_1].
@@ -30,7 +30,7 @@ Prove: x_1 = x.
   Function h
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/refguards.i, line 24) in 'h':
+Goal Post-condition (file refguards.i, line 24) in 'h':
 Prove: true.
 
 ------------------------------------------------------------
@@ -38,27 +38,27 @@ Prove: true.
   Function s
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/refguards.i, line 32) in 's':
+Goal Post-condition (file refguards.i, line 32) in 's':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/refguards.i, line 33) in 's':
+Goal Post-condition (file refguards.i, line 33) in 's':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/refguards.i, line 34) in 's':
+Goal Post-condition (file refguards.i, line 34) in 's':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/refguards.i, line 35) in 's':
+Goal Post-condition (file refguards.i, line 35) in 's':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_hoare/refguards.i, line 36) in 's':
+Goal Post-condition (file refguards.i, line 36) in 's':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_manual/manual.i b/src/plugins/wp/tests/wp_manual/manual.i
index 11a04e0783ab7854b9dcb873766eaa739de19bfa..8158d6377504a25cd33c50547d22a7169d1ec873 100644
--- a/src/plugins/wp/tests/wp_manual/manual.i
+++ b/src/plugins/wp/tests/wp_manual/manual.i
@@ -2,8 +2,8 @@
    DONTRUN:
 */
 /* run.config_qualif
-   OPT: -wp-msg-key shell @PTEST_DIR@/working_dir/swap.c @PTEST_DIR@/working_dir/swap1.h
-   OPT: -wp-msg-key shell -wp-rte @PTEST_DIR@/working_dir/swap.c @PTEST_DIR@/working_dir/swap2.h
-   OPT: -load-module report -kernel-verbose 0 -wp-msg-key shell -wp-rte @PTEST_DIR@/working_dir/swap.c @PTEST_DIR@/working_dir/swap2.h -wp-verbose 0 -then -no-unicode -report
+   OPT: -wp-msg-key shell %{dep:../working_dir/swap.c} %{dep:../working_dir/swap1.h}
+   OPT: -wp-msg-key shell -wp-rte %{dep:../working_dir/swap.c} %{dep:../working_dir/swap2.h}
+   OPT: -load-module report -kernel-verbose 0 -wp-msg-key shell -wp-rte %{dep:../working_dir/swap.c} %{dep:../working_dir/swap2.h} -wp-verbose 0 -then -no-unicode -report
 */
 void look_at_working_dir(void);
diff --git a/src/plugins/wp/tests/wp_plugin/abs.i b/src/plugins/wp/tests/wp_plugin/abs.i
index 1697ccefd8ee4b92eb75798d33d238f27df347aa..263e819296c1afbea3939882ea8760277f2b3bf6 100644
--- a/src/plugins/wp/tests/wp_plugin/abs.i
+++ b/src/plugins/wp/tests/wp_plugin/abs.i
@@ -1,11 +1,11 @@
 /* run.config
-   OPT: -wp-driver tests/wp_plugin/abs.driver
+   OPT: -wp-driver %{dep:abs.driver}
  */
 
 /* run.config_qualif
-   OPT: -wp -wp-driver tests/wp_plugin/abs.driver -wp-prover alt-ergo
-   OPT: -wp -wp-driver tests/wp_plugin/abs.driver -wp-prover native:coq -wp-coq-script tests/wp_plugin/abs.script
-   OPT: -wp -wp-driver tests/wp_plugin/abs.driver -wp-prover native:alt-ergo
+   OPT: -wp -wp-driver %{dep:abs.driver} -wp-prover alt-ergo
+   OPT: -wp -wp-driver %{dep:abs.driver} -wp-prover native:coq -wp-coq-script %{dep:abs.script}
+   OPT: -wp -wp-driver %{dep:abs.driver} -wp-prover native:alt-ergo
 */
 
 /*@ axiomatic Absolute { logic integer ABS(integer x) ; } */
diff --git a/src/plugins/wp/tests/wp_plugin/bit_test.c b/src/plugins/wp/tests/wp_plugin/bit_test.c
index 96f24adfa142c51f5be4046ccd5abddc23671f08..9592d49a00236c6026f9589def9fcdd1b322ade3 100644
--- a/src/plugins/wp/tests/wp_plugin/bit_test.c
+++ b/src/plugins/wp/tests/wp_plugin/bit_test.c
@@ -1,9 +1,9 @@
 /* run.config
-   OPT: -wp-driver tests/wp_plugin/bit_test.driver
+   OPT: -wp-driver %{dep:bit_test.driver}
  */
 
 /* run.config_qualif
-   OPT: -wp-driver tests/wp_plugin/bit_test.driver -wp-prover why3:alt-ergo
+   OPT: -wp-driver %{dep:bit_test.driver} -wp-prover why3:alt-ergo
 */
 
 /*@
diff --git a/src/plugins/wp/tests/wp_plugin/flash.c b/src/plugins/wp/tests/wp_plugin/flash.c
index 829f2e439c4b9d3dd25481ed80fd463ed9ec3884..5e4d395ff8b6ae1b06367c300092d3cb409b885b 100644
--- a/src/plugins/wp/tests/wp_plugin/flash.c
+++ b/src/plugins/wp/tests/wp_plugin/flash.c
@@ -1,15 +1,15 @@
 /* run.config
+   CMXS: flash
    OPT:
-   OPT: -wp-driver tests/wp_plugin/flash.driver,tests/wp_plugin/flash-ergo.driver
-   OPT: -wp-driver tests/wp_plugin/flash.driver -load-module tests/wp_plugin/flash.ml
+   OPT: -wp-driver %{dep:flash.driver},%{dep:flash-ergo.driver}
+   OPT: -wp-driver %{dep:flash.driver} -load-module %{dep:flash.cmxs}
 */
-
 /* run.config_qualif
+   CMXS: flash
    OPT: -wp-timeout 1
-   OPT: -wp-driver tests/wp_plugin/flash.driver,tests/wp_plugin/flash-ergo.driver
-   OPT: -wp-driver tests/wp_plugin/flash.driver -load-module tests/wp_plugin/flash.ml
+   OPT: -wp-driver %{dep:flash.driver},%{dep:flash-ergo.driver}
+   OPT: -wp-driver %{dep:flash.driver} -load-module %{dep:flash.cmxs}
 */
-
 /* -------------------------------------------------------------------------- */
 /* --- Observation of Sequence of Reads and Writes                        --- */
 /* -------------------------------------------------------------------------- */
diff --git a/src/plugins/wp/tests/wp_plugin/init_extern.i b/src/plugins/wp/tests/wp_plugin/init_extern.i
index bffc36707c1eb0caac372542a470eeccb54caf86..ce9bd0c0bf416f1c9d504ddfd38f3dd6aacd4725 100644
--- a/src/plugins/wp/tests/wp_plugin/init_extern.i
+++ b/src/plugins/wp/tests/wp_plugin/init_extern.i
@@ -1,9 +1,9 @@
 /* run.config
-   OPT: tests/wp_plugin/init_linker.i
+   OPT: %{dep:init_linker.i}
  */
 
 /* run.config_qualif
-   OPT: tests/wp_plugin/init_linker.i
+   OPT: %{dep:init_linker.i}
  */
 
 // To be linked with init_linker that defines the initial value of 'a'
diff --git a/src/plugins/wp/tests/wp_plugin/model.i b/src/plugins/wp/tests/wp_plugin/model.i
index 81b49ed20d473590181d159b37f404a4564e5395..84705f66e845fd8375b05ab5b2f94e958f98aa2d 100644
--- a/src/plugins/wp/tests/wp_plugin/model.i
+++ b/src/plugins/wp/tests/wp_plugin/model.i
@@ -1,5 +1,5 @@
 /* run.config
-   CMD: @frama-c@ -wp-share ./share -wp-msg-key cluster,shell,print-generated -wp-prover why3
+   CMD: @frama-c@ -wp-share ../../../share -wp-msg-key cluster,shell,print-generated -wp-prover why3
    OPT: -wp-model Typed -wp -wp-gen -wp-print -then -wp-model Typed+ref -wp -wp-gen -wp-print
 */
 
diff --git a/src/plugins/wp/tests/wp_plugin/nosession.i b/src/plugins/wp/tests/wp_plugin/nosession.i
index 46b01faf9e1da3618797ea1027ac7f7fd80fd9f6..36b69197ada328bde3c048c4d8e4d5ad31ba4125 100644
--- a/src/plugins/wp/tests/wp_plugin/nosession.i
+++ b/src/plugins/wp/tests/wp_plugin/nosession.i
@@ -3,7 +3,7 @@
 */
 
 /* run.config_qualif
-   CMD: @frama-c@ -no-autoload-plugins -load-module wp -wp-share ./share -wp-msg-key shell
+   CMD: @frama-c@ -no-autoload-plugins -load-module wp -wp-share ../../../share -wp-msg-key shell
    OPT: -wp -wp-prover alt-ergo -wp-session shall_not_exists_dir -wp-cache offline -wp-no-cache-env
    COMMENT: The session directory shall not be created
  */
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/abs.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/abs.res.oracle
index 9a4cc9410828748161c0e18f9d4f8515b1f360ea..2bfda3e2447475511ce53a7f9cfa432ee664b45f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/abs.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/abs.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/abs.i (no preprocessing)
+[kernel] Parsing abs.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function abs
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/abs.i, line 13) in 'abs':
+Goal Post-condition (file abs.i, line 13) in 'abs':
 Assume {
   Type: is_sint32(abs_0) /\ is_sint32(x).
   If x < 0
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/asm.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/asm.res.oracle
index 0f8a43912a0cc578bfd602dbfe6432b3a3911553..ef59bd8f4ba7e850d04db8b6d11d2f67da78110b 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/asm.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/asm.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/asm.i (no preprocessing)
+[kernel] Parsing asm.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
 
-Goal Assertion 'OK' (file tests/wp_plugin/asm.i, line 10):
+Goal Assertion 'OK' (file asm.i, line 10):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'KO' (file tests/wp_plugin/asm.i, line 11):
+Goal Assertion 'KO' (file asm.i, line 11):
 Assume { Type: is_sint32(dst_0). }
 Prove: dst_0 = 2.
 
@@ -20,7 +20,7 @@ Prove: dst_0 = 2.
   Function main with behavior default_for_stmt_3
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/asm.i, line 5) at assembly (file tests/wp_plugin/asm.i, line 5):
+Goal Assigns (file asm.i, line 5) at assembly (file asm.i, line 5):
 Effect at line 5
 Prove: false.
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/bit_test.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/bit_test.res.oracle
index 1296b169a5ddc881354e6e23094e3e9b0164a1e5..8e497938b87a560c384540c4308bb84ac4f7cf1f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/bit_test.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/bit_test.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/bit_test.c (with preprocessing)
+[kernel] Parsing bit_test.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/bool.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/bool.res.oracle
index fd6a26d1a47e1e500fb53783e6de294dceaf19ab..793da66afbe9986aeed70cb90c1742cb4034d8a5 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/bool.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/bool.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-no-let [...]
-[kernel] Parsing tests/wp_plugin/bool.i (no preprocessing)
+[kernel] Parsing bool.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function band_bool with behavior false
 ------------------------------------------------------------
 
-Goal Post-condition for 'false' (file tests/wp_plugin/bool.i, line 28) in 'band_bool':
+Goal Post-condition for 'false' (file bool.i, line 28) in 'band_bool':
 Assume {
   Type: is_bool(a) /\ is_bool(a_1) /\ is_bool(b) /\ is_bool(b_1) /\
       is_bool(band_bool_0) /\ is_bool(retres_0).
@@ -24,7 +24,7 @@ Prove: band_bool_0 = 0.
   Function band_bool with behavior true
 ------------------------------------------------------------
 
-Goal Post-condition for 'true' (file tests/wp_plugin/bool.i, line 25) in 'band_bool':
+Goal Post-condition for 'true' (file bool.i, line 25) in 'band_bool':
 Assume {
   Type: is_bool(a) /\ is_bool(a_1) /\ is_bool(b) /\ is_bool(b_1) /\
       is_bool(band_bool_0) /\ is_bool(retres_0).
@@ -42,7 +42,7 @@ Prove: band_bool_0 = 1.
   Function bor_bool with behavior false
 ------------------------------------------------------------
 
-Goal Post-condition for 'false' (file tests/wp_plugin/bool.i, line 18) in 'bor_bool':
+Goal Post-condition for 'false' (file bool.i, line 18) in 'bor_bool':
 Assume {
   Type: is_bool(a) /\ is_bool(a_1) /\ is_bool(b) /\ is_bool(b_1) /\
       is_bool(bor_bool_0) /\ is_bool(retres_0).
@@ -60,7 +60,7 @@ Prove: bor_bool_0 = 0.
   Function bor_bool with behavior true
 ------------------------------------------------------------
 
-Goal Post-condition for 'true' (file tests/wp_plugin/bool.i, line 15) in 'bor_bool':
+Goal Post-condition for 'true' (file bool.i, line 15) in 'bor_bool':
 Assume {
   Type: is_bool(a) /\ is_bool(a_1) /\ is_bool(b) /\ is_bool(b_1) /\
       is_bool(bor_bool_0) /\ is_bool(retres_0).
@@ -78,7 +78,7 @@ Prove: bor_bool_0 = 1.
   Function bxor_bool with behavior false
 ------------------------------------------------------------
 
-Goal Post-condition for 'false' (file tests/wp_plugin/bool.i, line 37) in 'bxor_bool':
+Goal Post-condition for 'false' (file bool.i, line 37) in 'bxor_bool':
 Assume {
   Type: is_bool(a) /\ is_bool(a_1) /\ is_bool(b) /\ is_bool(b_1) /\
       is_bool(bxor_bool_0) /\ is_bool(retres_0).
@@ -96,7 +96,7 @@ Prove: bxor_bool_0 = 0.
   Function bxor_bool with behavior true
 ------------------------------------------------------------
 
-Goal Post-condition for 'true' (file tests/wp_plugin/bool.i, line 34) in 'bxor_bool':
+Goal Post-condition for 'true' (file bool.i, line 34) in 'bxor_bool':
 Assume {
   Type: is_bool(a) /\ is_bool(a_1) /\ is_bool(b) /\ is_bool(b_1) /\
       is_bool(bxor_bool_0) /\ is_bool(retres_0).
@@ -114,7 +114,7 @@ Prove: bxor_bool_0 = 1.
   Function job
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/bool.i, line 10) in 'job':
+Goal Post-condition (file bool.i, line 10) in 'job':
 Assume {
   Type: is_bool(a) /\ is_bool(b) /\ is_sint32(job_0) /\ is_sint32(retres_0).
   Have: (a + b) = retres_0.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/call.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/call.res.oracle
index 5199a49d5ed126e04c5d30fa6fbdf2726c4fab72..4f5c7ab827872b990c6e6b3d57ddb2ee42996a60 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/call.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/call.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/call.i (no preprocessing)
+[kernel] Parsing call.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/call.i, line 17) in 'main':
+Goal Post-condition (file call.i, line 17) in 'main':
 Prove: true.
 
 ------------------------------------------------------------
@@ -51,13 +51,13 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_plugin/call.i, line 13) in 'job'' in 'main' at call 'job' (file tests/wp_plugin/call.i, line 28)
+Goal Instance of 'Pre-condition (file call.i, line 13) in 'job'' in 'main' at call 'job' (file call.i, line 28)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_plugin/call.i, line 13) in 'job'' in 'main' at call 'job' (file tests/wp_plugin/call.i, line 29)
+Goal Instance of 'Pre-condition (file call.i, line 13) in 'job'' in 'main' at call 'job' (file call.i, line 29)
 :
 Prove: true.
 
@@ -66,7 +66,7 @@ Prove: true.
   Function main with behavior A
 ------------------------------------------------------------
 
-Goal Post-condition for 'A' (file tests/wp_plugin/call.i, line 21) in 'main':
+Goal Post-condition for 'A' (file call.i, line 21) in 'main':
 Prove: true.
 
 ------------------------------------------------------------
@@ -74,7 +74,7 @@ Prove: true.
   Function main with behavior B
 ------------------------------------------------------------
 
-Goal Post-condition for 'B' (file tests/wp_plugin/call.i, line 24) in 'main':
+Goal Post-condition for 'B' (file call.i, line 24) in 'main':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/cint.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/cint.0.res.oracle
index 6f58be4f1af5a946f6687e5a557255da6b6eb5bd..65d52c833292b385eab20d59f6f41e7f78cdf64d 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/cint.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/cint.0.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/cint.i (no preprocessing)
-[kernel] tests/wp_plugin/cint.i:22: Warning: 
+[kernel] Parsing cint.i (no preprocessing)
+[kernel] cint.i:22: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
@@ -8,7 +8,7 @@
   Function signed_bitwise
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 24) in 'signed_bitwise':
+Goal Post-condition (file cint.i, line 24) in 'signed_bitwise':
 Let x = lnot(a). Assume { Type: is_sint32(a) /\ is_sint32(x). }
 Prove: P_R(x, a).
 
@@ -17,7 +17,7 @@ Prove: P_R(x, a).
   Function signed_downcast
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 30) in 'signed_downcast':
+Goal Post-condition (file cint.i, line 30) in 'signed_downcast':
 Assume { Type: is_sint32(a). }
 Prove: P_R(to_sint16(a), a).
 
@@ -26,7 +26,7 @@ Prove: P_R(to_sint16(a), a).
   Function signed_overflow
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 36) in 'signed_overflow':
+Goal Post-condition (file cint.i, line 36) in 'signed_overflow':
 Assume { Type: is_sint32(signed_overflow_0). }
 Prove: P_R(signed_overflow_0, signed_overflow_0).
 
@@ -35,7 +35,7 @@ Prove: P_R(signed_overflow_0, signed_overflow_0).
   Function unsigned_bitwise
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 42) in 'unsigned_bitwise':
+Goal Post-condition (file cint.i, line 42) in 'unsigned_bitwise':
 Assume { Type: is_uint32(a). }
 Prove: P_R(to_uint32(lnot(a)), a).
 
@@ -44,7 +44,7 @@ Prove: P_R(to_uint32(lnot(a)), a).
   Function unsigned_downcast
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 48) in 'unsigned_downcast':
+Goal Post-condition (file cint.i, line 48) in 'unsigned_downcast':
 Assume { Type: is_sint32(a). }
 Prove: P_R(to_uint32(a), a).
 
@@ -53,7 +53,7 @@ Prove: P_R(to_uint32(a), a).
   Function unsigned_overflow
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 54) in 'unsigned_overflow':
+Goal Post-condition (file cint.i, line 54) in 'unsigned_overflow':
 Let x = a + b. Assume { Type: is_uint32(a) /\ is_uint32(b). }
 Prove: P_R(to_uint32(x), x).
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/cint.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/cint.1.res.oracle
index 59b50c4132f5a58a210f4d72d5caef95df6a6b96..4460c49028b3956f62422056f8699316a78f9c0f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/cint.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/cint.1.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp -no-warn-signed-overflow [...]
-[kernel] Parsing tests/wp_plugin/cint.i (no preprocessing)
-[kernel] tests/wp_plugin/cint.i:22: Warning: 
+[kernel] Parsing cint.i (no preprocessing)
+[kernel] cint.i:22: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
@@ -8,7 +8,7 @@
   Function signed_bitwise
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 24) in 'signed_bitwise':
+Goal Post-condition (file cint.i, line 24) in 'signed_bitwise':
 Let x = lnot(a). Assume { Type: is_sint32(a) /\ is_sint32(x). }
 Prove: P_R(x, a).
 
@@ -17,7 +17,7 @@ Prove: P_R(x, a).
   Function signed_downcast
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 30) in 'signed_downcast':
+Goal Post-condition (file cint.i, line 30) in 'signed_downcast':
 Assume { Type: is_sint32(a). }
 Prove: P_R(to_sint16(a), a).
 
@@ -26,7 +26,7 @@ Prove: P_R(to_sint16(a), a).
   Function signed_overflow
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 36) in 'signed_overflow':
+Goal Post-condition (file cint.i, line 36) in 'signed_overflow':
 Let x = a + b. Assume { Type: is_sint32(a) /\ is_sint32(b). }
 Prove: P_R(to_sint32(x), x).
 
@@ -35,7 +35,7 @@ Prove: P_R(to_sint32(x), x).
   Function unsigned_bitwise
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 42) in 'unsigned_bitwise':
+Goal Post-condition (file cint.i, line 42) in 'unsigned_bitwise':
 Assume { Type: is_uint32(a). }
 Prove: P_R(to_uint32(lnot(a)), a).
 
@@ -44,7 +44,7 @@ Prove: P_R(to_uint32(lnot(a)), a).
   Function unsigned_downcast
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 48) in 'unsigned_downcast':
+Goal Post-condition (file cint.i, line 48) in 'unsigned_downcast':
 Assume { Type: is_sint32(a). }
 Prove: P_R(to_uint32(a), a).
 
@@ -53,7 +53,7 @@ Prove: P_R(to_uint32(a), a).
   Function unsigned_overflow
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 54) in 'unsigned_overflow':
+Goal Post-condition (file cint.i, line 54) in 'unsigned_overflow':
 Let x = a + b. Assume { Type: is_uint32(a) /\ is_uint32(b). }
 Prove: P_R(to_uint32(x), x).
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/cint.2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/cint.2.res.oracle
index 514e872a60043bdf0a7938905fa9fbbdebfa030b..e708992f7cd6c06b90d81b821f329586b032361c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/cint.2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/cint.2.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp -warn-unsigned-overflow [...]
-[kernel] Parsing tests/wp_plugin/cint.i (no preprocessing)
-[kernel] tests/wp_plugin/cint.i:22: Warning: 
+[kernel] Parsing cint.i (no preprocessing)
+[kernel] cint.i:22: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
@@ -8,7 +8,7 @@
   Function signed_bitwise
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 24) in 'signed_bitwise':
+Goal Post-condition (file cint.i, line 24) in 'signed_bitwise':
 Let x = lnot(a). Assume { Type: is_sint32(a) /\ is_sint32(x). }
 Prove: P_R(x, a).
 
@@ -17,7 +17,7 @@ Prove: P_R(x, a).
   Function signed_downcast
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 30) in 'signed_downcast':
+Goal Post-condition (file cint.i, line 30) in 'signed_downcast':
 Assume { Type: is_sint32(a). }
 Prove: P_R(to_sint16(a), a).
 
@@ -26,7 +26,7 @@ Prove: P_R(to_sint16(a), a).
   Function signed_overflow
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 36) in 'signed_overflow':
+Goal Post-condition (file cint.i, line 36) in 'signed_overflow':
 Assume { Type: is_sint32(signed_overflow_0). }
 Prove: P_R(signed_overflow_0, signed_overflow_0).
 
@@ -35,7 +35,7 @@ Prove: P_R(signed_overflow_0, signed_overflow_0).
   Function unsigned_bitwise
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 42) in 'unsigned_bitwise':
+Goal Post-condition (file cint.i, line 42) in 'unsigned_bitwise':
 Assume { Type: is_uint32(a). }
 Prove: P_R(to_uint32(lnot(a)), a).
 
@@ -44,7 +44,7 @@ Prove: P_R(to_uint32(lnot(a)), a).
   Function unsigned_downcast
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 48) in 'unsigned_downcast':
+Goal Post-condition (file cint.i, line 48) in 'unsigned_downcast':
 Assume { Type: is_sint32(a). }
 Prove: P_R(to_uint32(a), a).
 
@@ -53,7 +53,7 @@ Prove: P_R(to_uint32(a), a).
   Function unsigned_overflow
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 54) in 'unsigned_overflow':
+Goal Post-condition (file cint.i, line 54) in 'unsigned_overflow':
 Assume { Type: is_uint32(unsigned_overflow_0). }
 Prove: P_R(unsigned_overflow_0, unsigned_overflow_0).
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/cint.3.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/cint.3.res.oracle
index 3aaad8d66c9b1eeefb620fb7bb9f568538e6afba..13ce327181d2578f82c4d34b8708521ed3719056 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/cint.3.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/cint.3.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp -warn-signed-downcast [...]
-[kernel] Parsing tests/wp_plugin/cint.i (no preprocessing)
-[kernel] tests/wp_plugin/cint.i:22: Warning: 
+[kernel] Parsing cint.i (no preprocessing)
+[kernel] cint.i:22: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
@@ -8,7 +8,7 @@
   Function signed_bitwise
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 24) in 'signed_bitwise':
+Goal Post-condition (file cint.i, line 24) in 'signed_bitwise':
 Let x = lnot(a). Assume { Type: is_sint32(a) /\ is_sint32(x). }
 Prove: P_R(x, a).
 
@@ -17,7 +17,7 @@ Prove: P_R(x, a).
   Function signed_downcast
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 30) in 'signed_downcast':
+Goal Post-condition (file cint.i, line 30) in 'signed_downcast':
 Assume { Type: is_sint16(signed_downcast_0) /\ is_sint32(signed_downcast_0).
 }
 Prove: P_R(signed_downcast_0, signed_downcast_0).
@@ -27,7 +27,7 @@ Prove: P_R(signed_downcast_0, signed_downcast_0).
   Function signed_overflow
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 36) in 'signed_overflow':
+Goal Post-condition (file cint.i, line 36) in 'signed_overflow':
 Assume { Type: is_sint32(signed_overflow_0). }
 Prove: P_R(signed_overflow_0, signed_overflow_0).
 
@@ -36,7 +36,7 @@ Prove: P_R(signed_overflow_0, signed_overflow_0).
   Function unsigned_bitwise
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 42) in 'unsigned_bitwise':
+Goal Post-condition (file cint.i, line 42) in 'unsigned_bitwise':
 Assume { Type: is_uint32(a). }
 Prove: P_R(to_uint32(lnot(a)), a).
 
@@ -45,7 +45,7 @@ Prove: P_R(to_uint32(lnot(a)), a).
   Function unsigned_downcast
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 48) in 'unsigned_downcast':
+Goal Post-condition (file cint.i, line 48) in 'unsigned_downcast':
 Assume { Type: is_sint32(a). }
 Prove: P_R(to_uint32(a), a).
 
@@ -54,7 +54,7 @@ Prove: P_R(to_uint32(a), a).
   Function unsigned_overflow
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 54) in 'unsigned_overflow':
+Goal Post-condition (file cint.i, line 54) in 'unsigned_overflow':
 Let x = a + b. Assume { Type: is_uint32(a) /\ is_uint32(b). }
 Prove: P_R(to_uint32(x), x).
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/cint.4.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/cint.4.res.oracle
index 6530278cbb976598154e0d8dc198ca868fbb12e1..0509ca3629cb1d9b512beece23843f58f76a2fa0 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/cint.4.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/cint.4.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp -warn-unsigned-downcast [...]
-[kernel] Parsing tests/wp_plugin/cint.i (no preprocessing)
-[kernel] tests/wp_plugin/cint.i:22: Warning: 
+[kernel] Parsing cint.i (no preprocessing)
+[kernel] cint.i:22: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
@@ -8,7 +8,7 @@
   Function signed_bitwise
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 24) in 'signed_bitwise':
+Goal Post-condition (file cint.i, line 24) in 'signed_bitwise':
 Let x = lnot(a). Assume { Type: is_sint32(a) /\ is_sint32(x). }
 Prove: P_R(x, a).
 
@@ -17,7 +17,7 @@ Prove: P_R(x, a).
   Function signed_downcast
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 30) in 'signed_downcast':
+Goal Post-condition (file cint.i, line 30) in 'signed_downcast':
 Assume { Type: is_sint32(a). }
 Prove: P_R(to_sint16(a), a).
 
@@ -26,7 +26,7 @@ Prove: P_R(to_sint16(a), a).
   Function signed_overflow
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 36) in 'signed_overflow':
+Goal Post-condition (file cint.i, line 36) in 'signed_overflow':
 Assume { Type: is_sint32(signed_overflow_0). }
 Prove: P_R(signed_overflow_0, signed_overflow_0).
 
@@ -35,7 +35,7 @@ Prove: P_R(signed_overflow_0, signed_overflow_0).
   Function unsigned_bitwise
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 42) in 'unsigned_bitwise':
+Goal Post-condition (file cint.i, line 42) in 'unsigned_bitwise':
 Assume { Type: is_uint32(a). }
 Prove: P_R(to_uint32(lnot(a)), a).
 
@@ -44,7 +44,7 @@ Prove: P_R(to_uint32(lnot(a)), a).
   Function unsigned_downcast
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 48) in 'unsigned_downcast':
+Goal Post-condition (file cint.i, line 48) in 'unsigned_downcast':
 Assume {
   Type: is_uint32(unsigned_downcast_0) /\ is_sint32(unsigned_downcast_0).
 }
@@ -55,7 +55,7 @@ Prove: P_R(unsigned_downcast_0, unsigned_downcast_0).
   Function unsigned_overflow
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 54) in 'unsigned_overflow':
+Goal Post-condition (file cint.i, line 54) in 'unsigned_overflow':
 Let x = a + b. Assume { Type: is_uint32(a) /\ is_uint32(b). }
 Prove: P_R(to_uint32(x), x).
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/cint.5.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/cint.5.res.oracle
index 064a3b6849118946b732e22b0bd412a0e07b5ee6..6189109b87fdd273352ce58e4d7cb788ac43c3c8 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/cint.5.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/cint.5.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp -wp-model 'Typed (Nat)' [...]
-[kernel] Parsing tests/wp_plugin/cint.i (no preprocessing)
-[kernel] tests/wp_plugin/cint.i:22: Warning: 
+[kernel] Parsing cint.i (no preprocessing)
+[kernel] cint.i:22: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
@@ -8,7 +8,7 @@
   Function signed_bitwise
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 24) in 'signed_bitwise':
+Goal Post-condition (file cint.i, line 24) in 'signed_bitwise':
 Prove: P_R(lnot(a), a).
 
 ------------------------------------------------------------
@@ -16,7 +16,7 @@ Prove: P_R(lnot(a), a).
   Function signed_downcast
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 30) in 'signed_downcast':
+Goal Post-condition (file cint.i, line 30) in 'signed_downcast':
 Prove: P_R(to_sint16(a), a).
 
 ------------------------------------------------------------
@@ -24,7 +24,7 @@ Prove: P_R(to_sint16(a), a).
   Function signed_overflow
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 36) in 'signed_overflow':
+Goal Post-condition (file cint.i, line 36) in 'signed_overflow':
 Prove: P_R(signed_overflow_0, signed_overflow_0).
 
 ------------------------------------------------------------
@@ -32,7 +32,7 @@ Prove: P_R(signed_overflow_0, signed_overflow_0).
   Function unsigned_bitwise
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 42) in 'unsigned_bitwise':
+Goal Post-condition (file cint.i, line 42) in 'unsigned_bitwise':
 Assume { Type: 0 <= a. }
 Prove: P_R(to_uint32(lnot(a)), a).
 
@@ -41,7 +41,7 @@ Prove: P_R(to_uint32(lnot(a)), a).
   Function unsigned_downcast
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 48) in 'unsigned_downcast':
+Goal Post-condition (file cint.i, line 48) in 'unsigned_downcast':
 Prove: P_R(to_uint32(a), a).
 
 ------------------------------------------------------------
@@ -49,7 +49,7 @@ Prove: P_R(to_uint32(a), a).
   Function unsigned_overflow
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/cint.i, line 54) in 'unsigned_overflow':
+Goal Post-condition (file cint.i, line 54) in 'unsigned_overflow':
 Let x = a + b. Assume { Type: (0 <= a) /\ (0 <= b). }
 Prove: P_R(to_uint32(x), x).
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/combined.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/combined.res.oracle
index 232d0259c30a3aec71ca0610cdc0af2b68750042..f7a53ec326301e8b767442d36fd1d3fc363ea000 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/combined.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/combined.res.oracle
@@ -1,18 +1,18 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/combined.c (with preprocessing)
+[kernel] Parsing combined.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function job
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_plugin/combined.c, line 27):
+Goal Assertion (file combined.c, line 27):
 Assume { Type: is_sint32(A). }
 Prove: (50 <= A) /\ (A <= 100).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_plugin/combined.c, line 29):
+Goal Preservation of Invariant (file combined.c, line 29):
 Assume {
   Type: is_sint32(A) /\ is_sint32(i) /\ is_sint32(v) /\ is_sint32(1 + i).
   (* Heap *)
@@ -34,12 +34,12 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_plugin/combined.c, line 29):
+Goal Establishment of Invariant (file combined.c, line 29):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_plugin/combined.c, line 30):
+Goal Preservation of Invariant (file combined.c, line 30):
 Let a = havoc(Mint_undef_0, Mint_0, shift_sint32(t, 0), 50).
 Assume {
   Type: is_sint32(A) /\ is_sint32(i) /\ is_sint32(v) /\ is_sint32(1 + i).
@@ -63,12 +63,12 @@ Prove: P_P(a[shift_sint32(t, i) <- v][shift_sint32(t, i_1)]).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_plugin/combined.c, line 30):
+Goal Establishment of Invariant (file combined.c, line 30):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_plugin/combined.c, line 35):
+Goal Preservation of Invariant (file combined.c, line 35):
 Let x = 1 + j.
 Assume {
   Type: is_sint32(A) /\ is_sint32(i) /\ is_sint32(j) /\ is_sint32(x).
@@ -93,12 +93,12 @@ Prove: A <= x.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_plugin/combined.c, line 35):
+Goal Establishment of Invariant (file combined.c, line 35):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_plugin/combined.c, line 40):
+Goal Assertion (file combined.c, line 40):
 Let a = havoc(Mint_undef_1, Mint_0, shift_sint32(t, 0), 50).
 Assume {
   Type: is_sint32(A) /\ is_sint32(i_1) /\ is_sint32(j).
@@ -125,35 +125,35 @@ Prove: P_P(havoc(Mint_undef_0, a, shift_sint32(t, A), 100 - A)
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/combined.c, line 31) (1/3):
+Goal Loop assigns (file combined.c, line 31) (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/combined.c, line 31) (2/3):
+Goal Loop assigns (file combined.c, line 31) (2/3):
 Effect at line 33
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/combined.c, line 31) (3/3):
+Goal Loop assigns (file combined.c, line 31) (3/3):
 Call Result at line 33
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/combined.c, line 36) (1/3):
+Goal Loop assigns (file combined.c, line 36) (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/combined.c, line 36) (2/3):
+Goal Loop assigns (file combined.c, line 36) (2/3):
 Effect at line 38
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/combined.c, line 36) (3/3):
+Goal Loop assigns (file combined.c, line 36) (3/3):
 Call Result at line 38
 Let a = shift_sint32(t, j).
 Assume {
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/convert.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/convert.res.oracle
index a05054d57a9a98b37b8307d412ef6ae99757ca51..783f118546afb3fb2f957115291c8f1499e0395c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/convert.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/convert.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/convert.i (no preprocessing)
+[kernel] Parsing convert.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Global
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/copy.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/copy.res.oracle
index 2df09a43e2a673bf3e6e8921b8fd05865126d17a..39a506cec44bea4ff536be85bcdc83cb84f19a20 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/copy.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/copy.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/copy.i (no preprocessing)
+[kernel] Parsing copy.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function copy
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/copy.i, line 5) in 'copy':
+Goal Post-condition (file copy.i, line 5) in 'copy':
 Let a_1 = shift_sint32(a, 0).
 Let a_2 = havoc(Mint_undef_0, Mint_0, a_1, n).
 Let a_3 = havoc(Mint_undef_0, Mint_0, a_1, i).
@@ -30,7 +30,7 @@ Prove: a_3[shift_sint32(b, i_1)] = a_3[shift_sint32(a, i_1)].
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Copy' (file tests/wp_plugin/copy.i, line 11):
+Goal Preservation of Invariant 'Copy' (file copy.i, line 11):
 Let a_1 = shift_sint32(a, 0).
 Let a_2 = havoc(Mint_undef_0, Mint_0, a_1, n).
 Let a_3 = a_2[shift_sint32(a, i) <- a_2[shift_sint32(b, i)]].
@@ -60,12 +60,12 @@ Prove: a_3[shift_sint32(b, i_1)] = a_3[shift_sint32(a, i_1)].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Copy' (file tests/wp_plugin/copy.i, line 11):
+Goal Establishment of Invariant 'Copy' (file copy.i, line 11):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range' (file tests/wp_plugin/copy.i, line 10):
+Goal Preservation of Invariant 'Range' (file copy.i, line 10):
 Let a_1 = shift_sint32(a, 0).
 Let a_2 = havoc(Mint_undef_0, Mint_0, a_1, n).
 Let a_3 = a_2[shift_sint32(a, i) <- a_2[shift_sint32(b, i)]].
@@ -93,12 +93,12 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range' (file tests/wp_plugin/copy.i, line 10):
+Goal Establishment of Invariant 'Range' (file copy.i, line 10):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'A' (file tests/wp_plugin/copy.i, line 17):
+Goal Assertion 'A' (file copy.i, line 17):
 Let a_1 = shift_sint32(a, 0).
 Let a_2 = havoc(Mint_undef_0, Mint_0, a_1, n).
 Let a_3 = shift_sint32(a, i_1).
@@ -122,7 +122,7 @@ Prove: a_2[shift_sint32(a, i) <- a_2[shift_sint32(b, i)]][a_3] = a_2[a_3].
 
 ------------------------------------------------------------
 
-Goal Assertion 'B' (file tests/wp_plugin/copy.i, line 18):
+Goal Assertion 'B' (file copy.i, line 18):
 Let a_1 = shift_sint32(a, 0).
 Let a_2 = havoc(Mint_undef_0, Mint_0, a_1, n).
 Let a_3 = a_2[shift_sint32(a, i) <- a_2[shift_sint32(b, i)]].
@@ -150,18 +150,18 @@ Prove: a_3[a_4] = a_2[a_4].
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/copy.i, line 12) (1/3):
+Goal Loop assigns (file copy.i, line 12) (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/copy.i, line 12) (2/3):
+Goal Loop assigns (file copy.i, line 12) (2/3):
 Effect at line 14
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/copy.i, line 12) (3/3):
+Goal Loop assigns (file copy.i, line 12) (3/3):
 Effect at line 16
 Let a_1 = shift_sint32(a, 0).
 Let a_2 = havoc(Mint_undef_0, Mint_0, a_1, n).
@@ -193,7 +193,7 @@ Prove: included(a_3, 1, a_1, n).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/copy.i, line 6) in 'copy':
+Goal Assigns (file copy.i, line 6) in 'copy':
 Effect at line 14
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/doomed.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/doomed.0.res.oracle
index 0e195c8fcd205635db50093d6a98b9e2cda3d842..354a721828d7cb5372d8362e3fb79f19862c291c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/doomed.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/doomed.0.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/doomed.i (no preprocessing)
+[kernel] Parsing doomed.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function bar
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/doomed.i, line 34) in 'bar':
+Goal Post-condition (file doomed.i, line 34) in 'bar':
 Prove: true.
 
 ------------------------------------------------------------
@@ -14,7 +14,7 @@ Prove: true.
   Function buzz
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/doomed.i, line 40) in 'buzz':
+Goal Post-condition (file doomed.i, line 40) in 'buzz':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/doomed.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/doomed.1.res.oracle
index 07bf46ceb48fa2196aac1041d66a314f86781b30..7e2377b49f55fea04274cbf4c4bc37d393778ddd 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/doomed.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/doomed.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/doomed.i (no preprocessing)
+[kernel] Parsing doomed.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -12,7 +12,7 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/doomed.i, line 34) in 'bar':
+Goal Post-condition (file doomed.i, line 34) in 'bar':
 Prove: true.
 
 ------------------------------------------------------------
@@ -25,7 +25,7 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/doomed.i, line 40) in 'buzz':
+Goal Post-condition (file doomed.i, line 40) in 'buzz':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/doomed_axioms.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/doomed_axioms.res.oracle
index da669bd36ebf0b30082de682bb0d52b17a6faec3..06d332840ef2482e77fecda6c9729bffde01727d 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/doomed_axioms.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/doomed_axioms.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/doomed_axioms.i (no preprocessing)
+[kernel] Parsing doomed_axioms.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function foo
 ------------------------------------------------------------
 
-Goal Wp_smoke_dead_loop in 'foo' at loop (file tests/wp_plugin/doomed_axioms.i, line 29):
+Goal Wp_smoke_dead_loop in 'foo' at loop (file doomed_axioms.i, line 29):
 Assume {
   Type: is_sint32(n).
   (* Invariant 'C' *)
@@ -20,7 +20,7 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Wp_smoke_dead_code in 'foo' at instruction (file tests/wp_plugin/doomed_axioms.i, line 30):
+Goal Wp_smoke_dead_code in 'foo' at instruction (file doomed_axioms.i, line 30):
 Assume {
   Type: is_sint32(n) /\ is_sint32(x).
   (* Invariant 'C' *)
@@ -36,7 +36,7 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Wp_smoke_dead_code in 'foo' at return (file tests/wp_plugin/doomed_axioms.i, line 32):
+Goal Wp_smoke_dead_code in 'foo' at return (file doomed_axioms.i, line 32):
 Assume {
   Type: is_sint32(n) /\ is_sint32(x).
   (* Invariant 'C' *)
@@ -52,7 +52,7 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'A' (file tests/wp_plugin/doomed_axioms.i, line 24):
+Goal Preservation of Invariant 'A' (file doomed_axioms.i, line 24):
 Let x_1 = 1 + n.
 Assume {
   Type: is_sint32(n) /\ is_sint32(x) /\ is_sint32(x_1).
@@ -69,12 +69,12 @@ Prove: P_P(x_1).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'A' (file tests/wp_plugin/doomed_axioms.i, line 24):
+Goal Establishment of Invariant 'A' (file doomed_axioms.i, line 24):
 Prove: P_P(0).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'B' (file tests/wp_plugin/doomed_axioms.i, line 25):
+Goal Preservation of Invariant 'B' (file doomed_axioms.i, line 25):
 Let x_1 = 1 + n.
 Assume {
   Type: is_sint32(n) /\ is_sint32(x) /\ is_sint32(x_1).
@@ -91,12 +91,12 @@ Prove: P_Q(x_1).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'B' (file tests/wp_plugin/doomed_axioms.i, line 25):
+Goal Establishment of Invariant 'B' (file doomed_axioms.i, line 25):
 Prove: P_Q(0).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'C' (file tests/wp_plugin/doomed_axioms.i, line 26):
+Goal Preservation of Invariant 'C' (file doomed_axioms.i, line 26):
 Let x_1 = 1 + n.
 Assume {
   Type: is_sint32(n) /\ is_sint32(x) /\ is_sint32(x_1).
@@ -113,12 +113,12 @@ Prove: P_R(x_1).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'C' (file tests/wp_plugin/doomed_axioms.i, line 26):
+Goal Establishment of Invariant 'C' (file doomed_axioms.i, line 26):
 Prove: P_R(0).
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/doomed_axioms.i, line 27):
+Goal Loop assigns (file doomed_axioms.i, line 27):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/doomed_loop.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/doomed_loop.res.oracle
index 97103136af1d61d0f9dc62a842e18b5184bc026c..1af8e3de68dd9c8a9926f186f109f97993e7b4c1 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/doomed_loop.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/doomed_loop.res.oracle
@@ -1,47 +1,47 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/doomed_loop.i (no preprocessing)
+[kernel] Parsing doomed_loop.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function foo
 ------------------------------------------------------------
 
-Goal Wp_smoke_dead_loop in 'foo' at loop (file tests/wp_plugin/doomed_loop.i, line 22):
+Goal Wp_smoke_dead_loop in 'foo' at loop (file doomed_loop.i, line 22):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Wp_smoke_dead_code in 'foo' at instruction (file tests/wp_plugin/doomed_loop.i, line 23):
+Goal Wp_smoke_dead_code in 'foo' at instruction (file doomed_loop.i, line 23):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Wp_smoke_dead_code in 'foo' at return (file tests/wp_plugin/doomed_loop.i, line 25):
+Goal Wp_smoke_dead_code in 'foo' at return (file doomed_loop.i, line 25):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'A' (file tests/wp_plugin/doomed_loop.i, line 18):
+Goal Preservation of Invariant 'A' (file doomed_loop.i, line 18):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'A' (file tests/wp_plugin/doomed_loop.i, line 18):
+Goal Establishment of Invariant 'A' (file doomed_loop.i, line 18):
 Prove: P_P(0).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'B' (file tests/wp_plugin/doomed_loop.i, line 19):
+Goal Preservation of Invariant 'B' (file doomed_loop.i, line 19):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'B' (file tests/wp_plugin/doomed_loop.i, line 19):
+Goal Establishment of Invariant 'B' (file doomed_loop.i, line 19):
 Prove: !P_P(0).
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/doomed_loop.i, line 20):
+Goal Loop assigns (file doomed_loop.i, line 20):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/doomed_unroll.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/doomed_unroll.res.oracle
index 53bfdc8c969e99993428bf4e063da2a0978394bd..aa3d8504e60dafe2cfe1af4ddd0b66222628dae3 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/doomed_unroll.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/doomed_unroll.res.oracle
@@ -1,24 +1,24 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/doomed_unroll.i (no preprocessing)
+[kernel] Parsing doomed_unroll.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_plugin/doomed_unroll.i:15: Warning: 
+[wp] doomed_unroll.i:15: Warning: 
   Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function foo
 ------------------------------------------------------------
 
-Goal Wp_smoke_dead_code in 'foo' at instruction (file tests/wp_plugin/doomed_unroll.i, line 15):
+Goal Wp_smoke_dead_code in 'foo' at instruction (file doomed_unroll.i, line 15):
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Wp_smoke_dead_code in 'foo' at instruction (file tests/wp_plugin/doomed_unroll.i, line 15):
+Goal Wp_smoke_dead_code in 'foo' at instruction (file doomed_unroll.i, line 15):
 Prove: false.
 
 ------------------------------------------------------------
 
-Goal Wp_smoke_dead_code in 'foo' at instruction (file tests/wp_plugin/doomed_unroll.i, line 15):
+Goal Wp_smoke_dead_code in 'foo' at instruction (file doomed_unroll.i, line 15):
 Prove: false.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/dynamic.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/dynamic.res.oracle
index e71c6e9ae9aea0d46a37b93de7f0bd295d0e1fb5..03d68021707791cc389033e69a27d62ab912d813 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/dynamic.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/dynamic.res.oracle
@@ -1,70 +1,70 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/dynamic.i (no preprocessing)
+[kernel] Parsing dynamic.i (no preprocessing)
 [wp] Running WP plugin...
 [wp:calls] Computing dynamic calls.
-[wp] tests/wp_plugin/dynamic.i:30: Calls f1 f2
-[wp] tests/wp_plugin/dynamic.i:44: Calls g
-[wp] tests/wp_plugin/dynamic.i:65: Calls h1 h2
-[wp] tests/wp_plugin/dynamic.i:78: Calls (for bhv1) h1 h2 h0
-[wp] tests/wp_plugin/dynamic.i:78: Calls (for bhv0) h1 h2 h0
-[wp] tests/wp_plugin/dynamic.i:87: Calls h1
-[wp] tests/wp_plugin/dynamic.i:100: Calls unreachable_g
+[wp] dynamic.i:30: Calls f1 f2
+[wp] dynamic.i:44: Calls g
+[wp] dynamic.i:65: Calls h1 h2
+[wp] dynamic.i:78: Calls (for bhv1) h1 h2 h0
+[wp] dynamic.i:78: Calls (for bhv0) h1 h2 h0
+[wp] dynamic.i:87: Calls h1
+[wp] dynamic.i:100: Calls unreachable_g
 [wp:calls] Dynamic call(s): 6.
-[wp] tests/wp_plugin/dynamic.i:78: Warning: Missing 'calls' for default behavior
+[wp] dynamic.i:78: Warning: Missing 'calls' for default behavior
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function behavior with behavior bhv1
 ------------------------------------------------------------
 
-Goal Call point h1 h2 in 'behavior' at instruction (file tests/wp_plugin/dynamic.i, line 65):
+Goal Call point h1 h2 in 'behavior' at instruction (file dynamic.i, line 65):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition for 'bhv1' (file tests/wp_plugin/dynamic.i, line 62) in 'behavior' (1/2):
+Goal Post-condition for 'bhv1' (file dynamic.i, line 62) in 'behavior' (1/2):
 Tags: Call h1.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition for 'bhv1' (file tests/wp_plugin/dynamic.i, line 62) in 'behavior' (2/2):
+Goal Post-condition for 'bhv1' (file dynamic.i, line 62) in 'behavior' (2/2):
 Tags: Call h2.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 61) in 'behavior' (1/2):
+Goal Assigns for 'bhv1' (file dynamic.i, line 61) in 'behavior' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 61) in 'behavior' (2/2):
+Goal Assigns for 'bhv1' (file dynamic.i, line 61) in 'behavior' (2/2):
 Call Effect at line 65
 Tags: Call h2.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 61) in 'behavior' (1/4):
+Goal Assigns for 'bhv1' (file dynamic.i, line 61) in 'behavior' (1/4):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 61) in 'behavior' (2/4):
+Goal Assigns for 'bhv1' (file dynamic.i, line 61) in 'behavior' (2/4):
 Call Effect at line 65
 Tags: Call h2.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 61) in 'behavior' (3/4):
+Goal Assigns for 'bhv1' (file dynamic.i, line 61) in 'behavior' (3/4):
 Call Result at line 65
 Tags: Call h1.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 61) in 'behavior' (4/4):
+Goal Assigns for 'bhv1' (file dynamic.i, line 61) in 'behavior' (4/4):
 Call Result at line 65
 Tags: Call h2.
 Prove: true.
@@ -74,7 +74,7 @@ Prove: true.
   Function call
 ------------------------------------------------------------
 
-Goal Call point f1 f2 in 'call' at instruction (file tests/wp_plugin/dynamic.i, line 30):
+Goal Call point f1 f2 in 'call' at instruction (file dynamic.i, line 30):
 Let a = Mptr_0[shiftfield_F1_S_f(closure_0)].
 Let a_1 = global(G_f2_30).
 Let a_2 = global(G_f1_22).
@@ -90,19 +90,19 @@ Prove: (a = a_2) \/ (a = a_1).
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/dynamic.i, line 26) in 'call' (1/2):
+Goal Post-condition (file dynamic.i, line 26) in 'call' (1/2):
 Tags: Call f1.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/dynamic.i, line 26) in 'call' (2/2):
+Goal Post-condition (file dynamic.i, line 26) in 'call' (2/2):
 Tags: Call f2.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_plugin/dynamic.i, line 10) in 'f1'' in 'call' at instruction (file tests/wp_plugin/dynamic.i, line 30)
+Goal Instance of 'Pre-condition (file dynamic.i, line 10) in 'f1'' in 'call' at instruction (file dynamic.i, line 30)
 :
 Tags: Call f1.
 Let x = Mint_0[shiftfield_F1_S_param(closure_0)].
@@ -123,12 +123,12 @@ Prove: ((-10) <= x) /\ (x <= 10).
   Function guarded_call
 ------------------------------------------------------------
 
-Goal Call point g in 'guarded_call' at instruction (file tests/wp_plugin/dynamic.i, line 44):
+Goal Call point g in 'guarded_call' at instruction (file dynamic.i, line 44):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/dynamic.i, line 38) in 'guarded_call' (1/2):
+Goal Post-condition (file dynamic.i, line 38) in 'guarded_call' (1/2):
 Assume {
   Type: is_sint32(X).
   (* Heap *)
@@ -142,18 +142,18 @@ Prove: X = 1.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/dynamic.i, line 38) in 'guarded_call' (2/2):
+Goal Post-condition (file dynamic.i, line 38) in 'guarded_call' (2/2):
 Tags: Call g.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/dynamic.i, line 39) in 'guarded_call' (1/2):
+Goal Post-condition (file dynamic.i, line 39) in 'guarded_call' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/dynamic.i, line 39) in 'guarded_call' (2/2):
+Goal Post-condition (file dynamic.i, line 39) in 'guarded_call' (2/2):
 Tags: Call g.
 Prove: true.
 
@@ -162,29 +162,29 @@ Prove: true.
   Function missing_context
 ------------------------------------------------------------
 
-Goal Call point h1 in 'missing_context' at instruction (file tests/wp_plugin/dynamic.i, line 87):
+Goal Call point h1 in 'missing_context' at instruction (file dynamic.i, line 87):
 Assume { (* Heap *) Type: region(p.base) <= 0. }
 Prove: global(G_h1_61) = p.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/dynamic.i, line 82) in 'missing_context':
+Goal Post-condition (file dynamic.i, line 82) in 'missing_context':
 Tags: Call h1.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/dynamic.i, line 83) in 'missing_context':
+Goal Assigns (file dynamic.i, line 83) in 'missing_context':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/dynamic.i, line 83) in 'missing_context' (1/2):
+Goal Assigns (file dynamic.i, line 83) in 'missing_context' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/dynamic.i, line 83) in 'missing_context' (2/2):
+Goal Assigns (file dynamic.i, line 83) in 'missing_context' (2/2):
 Call Result at line 87
 Tags: Call h1.
 Prove: true.
@@ -194,23 +194,23 @@ Prove: true.
   Function no_call
 ------------------------------------------------------------
 
-Goal Call point unreachable_g in 'no_call' at instruction (file tests/wp_plugin/dynamic.i, line 100):
+Goal Call point unreachable_g in 'no_call' at instruction (file dynamic.i, line 100):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/dynamic.i, line 94) in 'no_call' (1/2):
+Goal Post-condition (file dynamic.i, line 94) in 'no_call' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/dynamic.i, line 94) in 'no_call' (2/2):
+Goal Post-condition (file dynamic.i, line 94) in 'no_call' (2/2):
 Tags: Call unreachable_g.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_plugin/dynamic.i, line 91) in 'unreachable_g'' in 'no_call' at instruction (file tests/wp_plugin/dynamic.i, line 100)
+Goal Instance of 'Pre-condition (file dynamic.i, line 91) in 'unreachable_g'' in 'no_call' at instruction (file dynamic.i, line 100)
 :
 Tags: Call unreachable_g.
 Prove: true.
@@ -220,24 +220,24 @@ Prove: true.
   Function some_behaviors with behavior bhv0
 ------------------------------------------------------------
 
-Goal Call point h1 h2 h0 for bhv0 in 'some_behaviors' at instruction (file tests/wp_plugin/dynamic.i, line 78):
+Goal Call point h1 h2 h0 for bhv0 in 'some_behaviors' at instruction (file dynamic.i, line 78):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition for 'bhv0' (file tests/wp_plugin/dynamic.i, line 75) in 'some_behaviors' (1/3):
+Goal Post-condition for 'bhv0' (file dynamic.i, line 75) in 'some_behaviors' (1/3):
 Tags: Call h0.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition for 'bhv0' (file tests/wp_plugin/dynamic.i, line 75) in 'some_behaviors' (2/3):
+Goal Post-condition for 'bhv0' (file dynamic.i, line 75) in 'some_behaviors' (2/3):
 Tags: Call h2.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition for 'bhv0' (file tests/wp_plugin/dynamic.i, line 75) in 'some_behaviors' (3/3):
+Goal Post-condition for 'bhv0' (file dynamic.i, line 75) in 'some_behaviors' (3/3):
 Tags: Call h1.
 Prove: true.
 
@@ -305,68 +305,68 @@ Prove: true.
   Function some_behaviors with behavior bhv1
 ------------------------------------------------------------
 
-Goal Call point h1 h2 h0 for bhv1 in 'some_behaviors' at instruction (file tests/wp_plugin/dynamic.i, line 78):
+Goal Call point h1 h2 h0 for bhv1 in 'some_behaviors' at instruction (file dynamic.i, line 78):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition for 'bhv1' (file tests/wp_plugin/dynamic.i, line 71) in 'some_behaviors' (1/3):
+Goal Post-condition for 'bhv1' (file dynamic.i, line 71) in 'some_behaviors' (1/3):
 Tags: Call h0.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition for 'bhv1' (file tests/wp_plugin/dynamic.i, line 71) in 'some_behaviors' (2/3):
+Goal Post-condition for 'bhv1' (file dynamic.i, line 71) in 'some_behaviors' (2/3):
 Tags: Call h2.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition for 'bhv1' (file tests/wp_plugin/dynamic.i, line 71) in 'some_behaviors' (3/3):
+Goal Post-condition for 'bhv1' (file dynamic.i, line 71) in 'some_behaviors' (3/3):
 Tags: Call h1.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 70) in 'some_behaviors' (1/2):
+Goal Assigns for 'bhv1' (file dynamic.i, line 70) in 'some_behaviors' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 70) in 'some_behaviors' (2/2):
+Goal Assigns for 'bhv1' (file dynamic.i, line 70) in 'some_behaviors' (2/2):
 Call Effect at line 78
 Tags: Call h2.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 70) in 'some_behaviors' (1/5):
+Goal Assigns for 'bhv1' (file dynamic.i, line 70) in 'some_behaviors' (1/5):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 70) in 'some_behaviors' (2/5):
+Goal Assigns for 'bhv1' (file dynamic.i, line 70) in 'some_behaviors' (2/5):
 Call Effect at line 78
 Tags: Call h2.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 70) in 'some_behaviors' (3/5):
+Goal Assigns for 'bhv1' (file dynamic.i, line 70) in 'some_behaviors' (3/5):
 Call Result at line 78
 Tags: Call h0.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 70) in 'some_behaviors' (4/5):
+Goal Assigns for 'bhv1' (file dynamic.i, line 70) in 'some_behaviors' (4/5):
 Call Result at line 78
 Tags: Call h2.
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns for 'bhv1' (file tests/wp_plugin/dynamic.i, line 70) in 'some_behaviors' (5/5):
+Goal Assigns for 'bhv1' (file dynamic.i, line 70) in 'some_behaviors' (5/5):
 Call Result at line 78
 Tags: Call h1.
 Prove: true.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/fallback.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/fallback.res.oracle
index c3ed1e741d463a42a6f13570e273586242789306..37491acea2999ba903294f3ab83dcd2f5d1530f7 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/fallback.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/fallback.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/fallback.i (no preprocessing)
+[kernel] Parsing fallback.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function job
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/fallback.i, line 5) in 'job':
+Goal Post-condition (file fallback.i, line 5) in 'job':
 Let x = b + (b * (a - 1)).
 Assume { Type: is_sint32(a) /\ is_sint32(b) /\ is_sint32(x). }
 Prove: (a * b) = x.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/flash.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/flash.0.res.oracle
index d987807fecd4c5359e3a5c1fecdcf86b1f1df7f9..5c44fa9913b412af71575dc0d42e712a6fdb6181 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/flash.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/flash.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/flash.c (with preprocessing)
+[kernel] Parsing flash.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/flash.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/flash.1.res.oracle
index 31d6bb17966eb81c3efddb017b847781a52d9709..f8a479932604c71f7265ca134a33f9b8848beb35 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/flash.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/flash.1.res.oracle
@@ -1,8 +1,7 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/flash.c (with preprocessing)
+[kernel] Parsing flash.c (with preprocessing)
 [wp] Running WP plugin...
-[wp] tests/wp_plugin/flash-ergo.driver:2: Warning: 
-  Redefinition of logic INDEX_init
+[wp] flash-ergo.driver:2: Warning: Redefinition of logic INDEX_init
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function job
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/flash.2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/flash.2.res.oracle
index c1cd5c4035a144f84d1d282586471b9664aa036b..f8d847b6ba4862b3d75a7ae339fe60a4414f0ef7 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/flash.2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/flash.2.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/flash.c (with preprocessing)
+[kernel] Parsing flash.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/float_driver.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/float_driver.res.oracle
index d7358dce80b3d94ff5c052884965adccd6c8d92b..d51da1782ec9c52fa002dffa3d03cb71d6200d36 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/float_driver.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/float_driver.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/float_driver.i (no preprocessing)
+[kernel] Parsing float_driver.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 [wp] 20 goals scheduled
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/float_format.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/float_format.res.oracle
index 4a8215d591e6f88e181b04cb50a6518f789fad8e..de8342d87a74aa1c4d12bb1bd09b641a3bce47b3 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/float_format.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/float_format.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/float_format.i (no preprocessing)
-[kernel:parser:decimal-float] tests/wp_plugin/float_format.i:10: Warning: 
+[kernel] Parsing float_format.i (no preprocessing)
+[kernel:parser:decimal-float] float_format.i:10: Warning: 
   Floating-point constant 0.2 is not represented exactly. Will use 0x1.999999999999ap-3.
   (warn-once: no further messages from category 'parser:decimal-float' will be emitted)
 [wp] Running WP plugin...
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/float_model.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/float_model.0.res.oracle
index 00f3e8dab4c76c330a7c167e974e51d8c8078a9f..67420b0907df7e974c25673dd6548c0ed048ee64 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/float_model.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/float_model.0.res.oracle
@@ -1,8 +1,8 @@
 # frama-c -wp -wp-model 'Typed (Real)' [...]
-[kernel] Parsing tests/wp_plugin/float_model.i (no preprocessing)
-[kernel] tests/wp_plugin/float_model.i:10: Warning: 
+[kernel] Parsing float_model.i (no preprocessing)
+[kernel] float_model.i:10: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
-[kernel:parser:decimal-float] tests/wp_plugin/float_model.i:28: Warning: 
+[kernel:parser:decimal-float] float_model.i:28: Warning: 
   Floating-point constant 2.1 is not represented exactly. Will use 0x1.0cccccccccccdp1.
   (warn-once: no further messages from category 'parser:decimal-float' will be emitted)
 [wp] Running WP plugin...
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/float_model.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/float_model.1.res.oracle
index 7fbd6b3ca7bdb5449c6a81d4457b4acc712d3681..cf8dc0e833133df2ed585d3d5838db787a1b6406 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/float_model.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/float_model.1.res.oracle
@@ -1,8 +1,8 @@
 # frama-c -wp -wp-model 'Typed' [...]
-[kernel] Parsing tests/wp_plugin/float_model.i (no preprocessing)
-[kernel] tests/wp_plugin/float_model.i:10: Warning: 
+[kernel] Parsing float_model.i (no preprocessing)
+[kernel] float_model.i:10: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
-[kernel:parser:decimal-float] tests/wp_plugin/float_model.i:28: Warning: 
+[kernel:parser:decimal-float] float_model.i:28: Warning: 
   Floating-point constant 2.1 is not represented exactly. Will use 0x1.0cccccccccccdp1.
   (warn-once: no further messages from category 'parser:decimal-float' will be emitted)
 [wp] Running WP plugin...
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/float_real.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/float_real.0.res.oracle
index 39e9f3d83596b5d28e157b5556f5c0450b7badb0..8cf3487d8986fb13b6ad19186409391476b4d917 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/float_real.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/float_real.0.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp -wp-model 'Typed (Real)' [...]
-[kernel] Parsing tests/wp_plugin/float_real.i (no preprocessing)
-[kernel:parser:decimal-float] tests/wp_plugin/float_real.i:19: Warning: 
+[kernel] Parsing float_real.i (no preprocessing)
+[kernel:parser:decimal-float] float_real.i:19: Warning: 
   Floating-point constant 1e-5 is not represented exactly. Will use 0x1.4f8b588e368f1p-17.
   (warn-once: no further messages from category 'parser:decimal-float' will be emitted)
 [wp] Running WP plugin...
@@ -9,7 +9,7 @@
   Function dequal
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/float_real.i, line 14) in 'dequal':
+Goal Post-condition (file float_real.i, line 14) in 'dequal':
 Assume {
   Type: is_sint32(dequal_0).
   If x < ((1.0/100000) + y)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/float_real.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/float_real.1.res.oracle
index acae1296cda548c49122e49e55befe3e44cd1d16..e272691f73f944b2c040f6d802861dff8f69fd39 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/float_real.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/float_real.1.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp -wp-model 'Typed' [...]
-[kernel] Parsing tests/wp_plugin/float_real.i (no preprocessing)
-[kernel:parser:decimal-float] tests/wp_plugin/float_real.i:19: Warning: 
+[kernel] Parsing float_real.i (no preprocessing)
+[kernel:parser:decimal-float] float_real.i:19: Warning: 
   Floating-point constant 1e-5 is not represented exactly. Will use 0x1.4f8b588e368f1p-17.
   (warn-once: no further messages from category 'parser:decimal-float' will be emitted)
 [wp] Running WP plugin...
@@ -9,7 +9,7 @@
   Function dequal
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/float_real.i, line 14) in 'dequal':
+Goal Post-condition (file float_real.i, line 14) in 'dequal':
 Assume {
   Type: is_sint32(dequal_0).
   If lt_f64(sub_f64(x, y),
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/frame.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/frame.res.oracle
index b48c65edf9e1ad6aa5e63ca9ca24a01d79f5bece..3b10a84cc851063f301df3ec0c0940d3a68f3c6d 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/frame.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/frame.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/frame.i (no preprocessing)
+[kernel] Parsing frame.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -53,7 +53,7 @@ Prove: x_1 = x.
 
 ------------------------------------------------------------
 
-Goal Assertion 'FRAMED' (file tests/wp_plugin/frame.i, line 28):
+Goal Assertion 'FRAMED' (file frame.i, line 28):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/ground_real.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/ground_real.res.oracle
index 1777e7e419823d03a7333505f6b74efa093807fc..ac75280fb3dff38bdb35a548f12b5947d2046041 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/ground_real.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/ground_real.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/ground_real.i (no preprocessing)
+[kernel] Parsing ground_real.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Global
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/inductive.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/inductive.res.oracle
index 56fce1fae014c63f99ea466d2d9e3981f3f7ea77..682a46a629d55a852430add96b479063d9d0821c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/inductive.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/inductive.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/inductive.c (with preprocessing)
+[kernel] Parsing inductive.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: native support for coq is deprecated, use tip instead
 [wp] 2 goals scheduled
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/init_const.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/init_const.res.oracle
index 46f3cde2efb264d10baff2ace945c9c5420c50ec..1f0968040f74932c7dcfeeae82b3ca54c52cab50 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/init_const.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/init_const.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/init_const.i (no preprocessing)
+[kernel] Parsing init_const.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/init_const_guard.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/init_const_guard.res.oracle
index 1b028ec86bae7521af2821488cc935e87f17bae6..c0b1dbd01ced29546c67b5a0bb2ccbbf71d70d47 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/init_const_guard.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/init_const_guard.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/init_const_guard.i (no preprocessing)
+[kernel] Parsing init_const_guard.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -35,13 +35,13 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Read' (file tests/wp_plugin/init_const_guard.i, line 31):
+Goal Assertion 'Read' (file init_const_guard.i, line 31):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: valid_rd(Malloc_0, global(G_x_20), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'Guard_against_Const' (file tests/wp_plugin/init_const_guard.i, line 32):
+Goal Assertion 'Guard_against_Const' (file init_const_guard.i, line 32):
 Let a = global(G_x_20).
 Assume {
   (* Heap *)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/init_extern.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/init_extern.res.oracle
index 4fb7c09c0aa6b08007c34a255858fbfd3b5ca5a9..ed2963a39188cb9a3f371fdc351e684038604dca 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/init_extern.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/init_extern.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/init_extern.i (no preprocessing)
-[kernel] Parsing tests/wp_plugin/init_linker.i (no preprocessing)
+[kernel] Parsing init_extern.i (no preprocessing)
+[kernel] Parsing init_linker.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/init_valid.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/init_valid.res.oracle
index c630d5f5437f03e7d42293b302cdca2568cb3bee..0cb7168534d2cd540f047cf584fbaa2ca66eb4cd 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/init_valid.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/init_valid.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/init_valid.i (no preprocessing)
+[kernel] Parsing init_valid.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function validA
 ------------------------------------------------------------
 
-Goal Assertion 'OK' (file tests/wp_plugin/init_valid.i, line 6):
+Goal Assertion 'OK' (file init_valid.i, line 6):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'OK' (file tests/wp_plugin/init_valid.i, line 7):
+Goal Assertion 'OK' (file init_valid.i, line 7):
 Prove: true.
 
 ------------------------------------------------------------
@@ -19,12 +19,12 @@ Prove: true.
   Function validB
 ------------------------------------------------------------
 
-Goal Assertion 'OK' (file tests/wp_plugin/init_valid.i, line 13):
+Goal Assertion 'OK' (file init_valid.i, line 13):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'KO' (file tests/wp_plugin/init_valid.i, line 14):
+Goal Assertion 'KO' (file init_valid.i, line 14):
 Prove: false.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/initarr.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/initarr.res.oracle
index 296121a1db1ff800e6f48a6fc03fce1cba2d5620..24f3eab4bec071a17da9420071f5416f9a83cbc0 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/initarr.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/initarr.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/initarr.i (no preprocessing)
+[kernel] Parsing initarr.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/injector.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/injector.res.oracle
index 1ac8bbc1f3f459984a7a6b40e72e777fbc165f77..ec9bd5f67e90d61fb0025c4dbe78960865fcb9b0 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/injector.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/injector.res.oracle
@@ -1,18 +1,18 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/injector.c (with preprocessing)
+[kernel] Parsing injector.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_plugin/injector.c, line 13) in 'g'' in 'f' at call 'g' (file tests/wp_plugin/injector.c, line 54)
+Goal Instance of 'Pre-condition (file injector.c, line 13) in 'g'' in 'f' at call 'g' (file injector.c, line 54)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_plugin/injector.c, line 13) in 'g'' in 'f' at call 'g' (file tests/wp_plugin/injector.c, line 56)
+Goal Instance of 'Pre-condition (file injector.c, line 13) in 'g'' in 'f' at call 'g' (file injector.c, line 56)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/invertible.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/invertible.res.oracle
index fb1d1f3185b5bf46c75c4b4fe15662149d1b093c..90301835e4554489d0da0eafe5894c07cfc85b01 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/invertible.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/invertible.res.oracle
@@ -1,7 +1,7 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/invertible.i (no preprocessing)
+[kernel] Parsing invertible.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_plugin/invertible.i:17: Warning: 
+[kernel] invertible.i:17: Warning: 
   No code nor implicit assigns clause for function main, generating default assigns from the prototype
 ------------------------------------------------------------
   Function main
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/loop.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/loop.res.oracle
index 42f63d8aedbeb628172cc98d3ac216fdde2e2b4e..24f12fc2a62d8eeadf8f6ef03ddc833bc6a024d4 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/loop.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/loop.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/loop.i (no preprocessing)
+[kernel] Parsing loop.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -30,7 +30,7 @@ Prove: a_2[shift_sint32(t, i_1)] = e.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'qed_ok' (file tests/wp_plugin/loop.i, line 12):
+Goal Preservation of Invariant 'qed_ok' (file loop.i, line 12):
 Let a_1 = shift_sint32(t, a).
 Let x = -a.
 Let x_1 = 1 + i.
@@ -52,7 +52,7 @@ Prove: a <= x_1.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'qed_ok' (file tests/wp_plugin/loop.i, line 12):
+Goal Establishment of Invariant 'qed_ok' (file loop.i, line 12):
 Assume {
   Type: is_sint32(a) /\ is_sint32(b).
   (* Heap *)
@@ -64,7 +64,7 @@ Prove: a <= (1 + b).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'qed_ok' (file tests/wp_plugin/loop.i, line 13):
+Goal Preservation of Invariant 'qed_ok' (file loop.i, line 13):
 Let a_1 = shift_sint32(t, a).
 Let x = -a.
 Let a_2 = havoc(Mint_undef_0, Mint_0, a_1, i - a).
@@ -88,7 +88,7 @@ Prove: a_2[shift_sint32(t, i) <- e][shift_sint32(t, i_1)] = e.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'qed_ok' (file tests/wp_plugin/loop.i, line 13):
+Goal Establishment of Invariant 'qed_ok' (file loop.i, line 13):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/loopcurrent.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/loopcurrent.res.oracle
index a562cec21c990ee024f6d5a25157be8e176e53e9..91a9000e48b3a3dd5dfb0882335eb31efa4c5c69 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/loopcurrent.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/loopcurrent.res.oracle
@@ -1,29 +1,29 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/loopcurrent.i (no preprocessing)
+[kernel] Parsing loopcurrent.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_plugin/loopcurrent.i:12: Warning: 
+[wp] loopcurrent.i:12: Warning: 
   Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_plugin/loopcurrent.i, line 9):
+Goal Preservation of Invariant (file loopcurrent.i, line 9):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_plugin/loopcurrent.i, line 9):
+Goal Establishment of Invariant (file loopcurrent.i, line 9):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_plugin/loopcurrent.i, line 10):
+Goal Preservation of Invariant (file loopcurrent.i, line 10):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_plugin/loopcurrent.i, line 10):
+Goal Establishment of Invariant (file loopcurrent.i, line 10):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/loopentry.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/loopentry.res.oracle
index fad72a0a7693a1a1d22c79a43cfe2858e82d774a..5b684d4bca1d7fc7d23798a9aecf7788017c604e 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/loopentry.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/loopentry.res.oracle
@@ -1,29 +1,29 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/loopentry.i (no preprocessing)
+[kernel] Parsing loopentry.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_plugin/loopentry.i:12: Warning: 
+[wp] loopentry.i:12: Warning: 
   Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_plugin/loopentry.i, line 9):
+Goal Preservation of Invariant (file loopentry.i, line 9):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_plugin/loopentry.i, line 9):
+Goal Establishment of Invariant (file loopentry.i, line 9):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_plugin/loopentry.i, line 10):
+Goal Preservation of Invariant (file loopentry.i, line 10):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_plugin/loopentry.i, line 10):
+Goal Establishment of Invariant (file loopentry.i, line 10):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/loopextra.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/loopextra.res.oracle
index ba2abdd43f81268c465ed20737613b5b7eb69c3f..a3fb1af5e7e56d715349826a87c895f31304535d 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/loopextra.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/loopextra.res.oracle
@@ -1,26 +1,26 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/loopextra.i (no preprocessing)
+[kernel] Parsing loopextra.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_plugin/loopextra.i:6: Warning: 
+[wp] loopextra.i:6: Warning: 
   Missing assigns clause (assigns 'everything' instead)
-[wp] tests/wp_plugin/loopextra.i:3: Warning: 
+[wp] loopextra.i:3: Warning: 
   Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_plugin/loopextra.i, line 4):
+Goal Assertion (file loopextra.i, line 4):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_plugin/loopextra.i, line 7):
+Goal Assertion (file loopextra.i, line 7):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_plugin/loopextra.i, line 8):
+Goal Assertion (file loopextra.i, line 8):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/mask.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/mask.res.oracle
index ee4cd2e5dd9e372305e6ff4acc2a01582e583bb8..4e4181c75d3793c408c4fb17ae98d20c0fac383a 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/mask.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/mask.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/mask.i (no preprocessing)
+[kernel] Parsing mask.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/math.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/math.res.oracle
index 738cdb2ffba8c36d383642c39e2778c8bd518fd3..cdc664a97caad3fc04bd56c4474c1c7ebdd2d6fd 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/math.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/math.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/math.i (no preprocessing)
+[kernel] Parsing math.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle
index 82ecbd70541d86c7a419e37e600542f381f6f451..70fd22d935e3729b93f16fb6b817a9b65b97d11a 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/model.i (no preprocessing)
-[kernel] tests/wp_plugin/model.i:10: Warning: 
+[kernel] Parsing model.i (no preprocessing)
+[kernel] model.i:10: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
@@ -81,7 +81,7 @@ end
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/model.i, line 12) in 'f':
+Goal Post-condition (file model.i, line 12) in 'f':
 Let x = Mint_0[shift_sint32(p, k)].
 Assume {
   Type: is_sint32(k) /\ is_sint32(x).
@@ -169,7 +169,7 @@ end
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/model.i, line 12) in 'f':
+Goal Post-condition (file model.i, line 12) in 'f':
 Let x = Mint_0[shift_sint32(p, k)].
 Assume {
   Type: is_sint32(k) /\ is_sint32(x).
@@ -180,7 +180,7 @@ Prove: P_P(x).
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/model.i, line 12) in 'f':
+Goal Post-condition (file model.i, line 12) in 'f':
 Let x = Mint_0[shift_sint32(p, k)].
 Assume {
   Type: is_sint32(k) /\ is_sint32(x).
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/nowp.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/nowp.res.oracle
index 78a2178dc9531c58407c5c11cde605ea4fbcfd5e..28d80d7c1e3686dddf90e4a2d2a79eb3d3494e3c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/nowp.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/nowp.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/nowp.c (with preprocessing)
+[kernel] Parsing nowp.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 [wp] No proof obligations
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/nth.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/nth.res.oracle
index 565ac6b571e7eea4ba8381807c1b66aa60b66c55..908af494da9eac274fa2f4293aa6379dc9accb7c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/nth.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/nth.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/nth.i (no preprocessing)
+[kernel] Parsing nth.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Axiomatic 'Nth'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/overarray.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/overarray.res.oracle
index 5392e0e5e2bbbebc8a843d784fa3e16fb565cbda..e5444b2c2059346f884cdc3f567d4139705fe512 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/overarray.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/overarray.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/overarray.i (no preprocessing)
+[kernel] Parsing overarray.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f1_ok
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/overarray.i, line 12) in 'f1_ok':
+Goal Assigns (file overarray.i, line 12) in 'f1_ok':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/overarray.i, line 12) in 'f1_ok':
+Goal Assigns (file overarray.i, line 12) in 'f1_ok':
 Prove: true.
 
 ------------------------------------------------------------
@@ -19,12 +19,12 @@ Prove: true.
   Function f2_ok
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/overarray.i, line 15) in 'f2_ok':
+Goal Assigns (file overarray.i, line 15) in 'f2_ok':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/overarray.i, line 15) in 'f2_ok':
+Goal Assigns (file overarray.i, line 15) in 'f2_ok':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/overassign.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/overassign.res.oracle
index a3bcc315fdac6c66cfa7881ddf59d613adc25e89..2a1d599dfd15200ad924b9bc5aeebe98bb5d46fc 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/overassign.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/overassign.res.oracle
@@ -1,18 +1,18 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/overassign.i (no preprocessing)
+[kernel] Parsing overassign.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f1_ok
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/overassign.i, line 13) in 'f1_ok':
+Goal Assigns (file overassign.i, line 13) in 'f1_ok':
 Call Effect at line 14
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/overassign.i, line 13) in 'f1_ok':
+Goal Assigns (file overassign.i, line 13) in 'f1_ok':
 Call Effect at line 14
 Prove: true.
 
@@ -21,13 +21,13 @@ Prove: true.
   Function f2_ok
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/overassign.i, line 16) in 'f2_ok':
+Goal Assigns (file overassign.i, line 16) in 'f2_ok':
 Call Effect at line 17
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/overassign.i, line 16) in 'f2_ok':
+Goal Assigns (file overassign.i, line 16) in 'f2_ok':
 Call Effect at line 17
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/params.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/params.res.oracle
index b61273a928c127ddb95c816feb979e425f967971..a2492d3a5aeb36cb81cbd7cc60cb074c934abcb5 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/params.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/params.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/params.i (no preprocessing)
+[kernel] Parsing params.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Global
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/plet.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/plet.res.oracle
index 6dafe4cc77a16fbc972deabce8e93a237da882f5..d923b22917a2366ea1208a3e2e8ea4aa659a3ddf 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/plet.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/plet.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/plet.i (no preprocessing)
+[kernel] Parsing plet.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Axiomatic 'Test'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/post_assigns.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/post_assigns.res.oracle
index fc8605283009333c1cc2ed29037b8ce30203b737..f69509e4a44ccceb58d2a621b35b3aadf2decf9b 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/post_assigns.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/post_assigns.res.oracle
@@ -1,33 +1,33 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/post_assigns.i (no preprocessing)
+[kernel] Parsing post_assigns.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function receive
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/post_assigns.i, line 9) in 'receive':
+Goal Post-condition (file post_assigns.i, line 9) in 'receive':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/post_assigns.i, line 10) in 'receive' (1/2):
+Goal Assigns (file post_assigns.i, line 10) in 'receive' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/post_assigns.i, line 10) in 'receive' (2/2):
+Goal Assigns (file post_assigns.i, line 10) in 'receive' (2/2):
 Call Effect at line 14
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/post_assigns.i, line 10) in 'receive' (1/2):
+Goal Assigns (file post_assigns.i, line 10) in 'receive' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/post_assigns.i, line 10) in 'receive' (2/2):
+Goal Assigns (file post_assigns.i, line 10) in 'receive' (2/2):
 Call Effect at line 14
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/post_valid.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/post_valid.res.oracle
index 9848d7b4c8d5789b1bd7bc6dc08efa16612c0b68..00f58bfd512f5f470dadd874c8c980686cb14d01 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/post_valid.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/post_valid.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/post_valid.i (no preprocessing)
+[kernel] Parsing post_valid.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/prenex.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/prenex.res.oracle
index 0697c55a730d66e76ef9f11d90bfc7c1664240ff..5e84409b5ab052c8cfbb0d87264bed776180f621 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/prenex.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/prenex.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/prenex.i (no preprocessing)
+[kernel] Parsing prenex.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function diag
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/prenex.i, line 11) in 'diag':
+Goal Post-condition (file prenex.i, line 11) in 'diag':
 Assume {
   Type: is_sint32(diag_0) /\ is_sint32(i) /\ is_sint32(i_1) /\
       is_sint32(j) /\ is_sint32(m) /\ is_sint32(n).
@@ -46,7 +46,7 @@ Prove: (forall i_2 : Z. ((0 <= i_2) -> ((i_2 < n) ->
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'I' (file tests/wp_plugin/prenex.i, line 19):
+Goal Preservation of Invariant 'I' (file prenex.i, line 19):
 Assume {
   Type: is_sint32(i) /\ is_sint32(j) /\ is_sint32(m) /\ is_sint32(n) /\
       is_sint32(1 + i).
@@ -74,12 +74,12 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'I' (file tests/wp_plugin/prenex.i, line 19):
+Goal Establishment of Invariant 'I' (file prenex.i, line 19):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'PI' (file tests/wp_plugin/prenex.i, line 21):
+Goal Preservation of Invariant 'PI' (file prenex.i, line 21):
 Assume {
   Type: is_sint32(i_2) /\ is_sint32(j) /\ is_sint32(m) /\ is_sint32(n) /\
       is_sint32(1 + i_2).
@@ -109,12 +109,12 @@ Prove: Mint_0[shift_sint32(p, i)] < Mint_0[shift_sint32(q, i_1)].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'PI' (file tests/wp_plugin/prenex.i, line 21):
+Goal Establishment of Invariant 'PI' (file prenex.i, line 21):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'J' (file tests/wp_plugin/prenex.i, line 28):
+Goal Preservation of Invariant 'J' (file prenex.i, line 28):
 Let x = Mint_0[shift_sint32(p, i)].
 Let x_1 = Mint_0[shift_sint32(q, j)].
 Assume {
@@ -146,12 +146,12 @@ Prove: (-1) <= j.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'J' (file tests/wp_plugin/prenex.i, line 28):
+Goal Establishment of Invariant 'J' (file prenex.i, line 28):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'PJ' (file tests/wp_plugin/prenex.i, line 30):
+Goal Preservation of Invariant 'PJ' (file prenex.i, line 30):
 Let x = Mint_0[shift_sint32(p, i)].
 Let x_1 = Mint_0[shift_sint32(q, j)].
 Assume {
@@ -185,23 +185,23 @@ Prove: x < Mint_0[shift_sint32(q, i_1)].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'PJ' (file tests/wp_plugin/prenex.i, line 30):
+Goal Establishment of Invariant 'PJ' (file prenex.i, line 30):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/prenex.i, line 24) (1/2):
+Goal Loop assigns (file prenex.i, line 24) (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/prenex.i, line 24) (2/2):
+Goal Loop assigns (file prenex.i, line 24) (2/2):
 Effect at line 34
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/prenex.i, line 32):
+Goal Loop assigns (file prenex.i, line 32):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/repeat.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/repeat.res.oracle
index 02280de6dca96be0cbd3c7204c43b7f3599919be..6a174c0d37d8f60ee0a02c2e07ca389459fe1273 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/repeat.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/repeat.res.oracle
@@ -1,19 +1,18 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/repeat.c (with preprocessing)
+[kernel] Parsing repeat.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_plugin/repeat.c:47: Warning: 
-  Missing assigns clause (assigns 'everything' instead)
+[wp] repeat.c:47: Warning: Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function induction
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/repeat.c, line 55) in 'induction':
+Goal Post-condition (file repeat.c, line 55) in 'induction':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_plugin/repeat.c, line 61):
+Goal Preservation of Invariant (file repeat.c, line 61):
 Let a = L_sequence(calls_1).
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(1 + i).
@@ -36,12 +35,12 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_plugin/repeat.c, line 61):
+Goal Establishment of Invariant (file repeat.c, line 61):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_plugin/repeat.c, line 62):
+Goal Preservation of Invariant (file repeat.c, line 62):
 Let a = L_sequence(calls_0).
 Let a_1 = a ^ [ 1, 2 ].
 Let a_2 = [ 1, 2 ].
@@ -67,28 +66,28 @@ Prove: (a_2 *^ x) = a_1.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_plugin/repeat.c, line 62):
+Goal Establishment of Invariant (file repeat.c, line 62):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/repeat.c, line 63):
+Goal Loop assigns (file repeat.c, line 63):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 56) in 'induction' (1/2):
+Goal Assigns (file repeat.c, line 56) in 'induction' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 56) in 'induction' (2/2):
+Goal Assigns (file repeat.c, line 56) in 'induction' (2/2):
 Effect at line 65
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 56) in 'induction':
+Goal Assigns (file repeat.c, line 56) in 'induction':
 Effect at line 65
 Prove: true.
 
@@ -97,17 +96,17 @@ Prove: true.
   Function master
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/repeat.c, line 29) in 'master':
+Goal Post-condition (file repeat.c, line 29) in 'master':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 30) in 'master':
+Goal Assigns (file repeat.c, line 30) in 'master':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 30) in 'master':
+Goal Assigns (file repeat.c, line 30) in 'master':
 Prove: true.
 
 ------------------------------------------------------------
@@ -115,7 +114,7 @@ Prove: true.
   Function shifted
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/repeat.c, line 73) in 'shifted':
+Goal Post-condition (file repeat.c, line 73) in 'shifted':
 Let a = [ 1, 2 ].
 Let a_1 = (a *^ i).
 Let a_2 = a_1 ^ [ 1, 2 ].
@@ -140,7 +139,7 @@ Prove: (a *^ 1 + i) = a_2.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_plugin/repeat.c, line 81):
+Goal Preservation of Invariant (file repeat.c, line 81):
 Let a = ([ 1, 2 ] *^ i).
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(1 + i).
@@ -165,12 +164,12 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_plugin/repeat.c, line 81):
+Goal Establishment of Invariant (file repeat.c, line 81):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_plugin/repeat.c, line 82):
+Goal Preservation of Invariant (file repeat.c, line 82):
 Let a = [ 1, 2 ].
 Let a_1 = (a *^ i).
 Let a_2 = a_1 ^ [ 1, 2 ].
@@ -198,33 +197,33 @@ Prove: (a *^ x) = a_2.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_plugin/repeat.c, line 82):
+Goal Establishment of Invariant (file repeat.c, line 82):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/repeat.c, line 83):
+Goal Loop assigns (file repeat.c, line 83):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 74) in 'shifted' (1/2):
+Goal Assigns (file repeat.c, line 74) in 'shifted' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 74) in 'shifted' (2/2):
+Goal Assigns (file repeat.c, line 74) in 'shifted' (2/2):
 Effect at line 85
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 74) in 'shifted' (1/2):
+Goal Assigns (file repeat.c, line 74) in 'shifted' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 74) in 'shifted' (2/2):
+Goal Assigns (file repeat.c, line 74) in 'shifted' (2/2):
 Effect at line 85
 Prove: true.
 
@@ -233,7 +232,7 @@ Prove: true.
   Function unroll
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/repeat.c, line 41) in 'unroll':
+Goal Post-condition (file repeat.c, line 41) in 'unroll':
 Prove: true.
 
 ------------------------------------------------------------
@@ -248,131 +247,131 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (1/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (1/11):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (2/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (2/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (3/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (3/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (4/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (4/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (5/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (5/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (6/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (6/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (7/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (7/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (8/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (8/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (9/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (9/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (10/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (10/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (11/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (11/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (1/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (1/11):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (2/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (2/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (3/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (3/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (4/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (4/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (5/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (5/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (6/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (6/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (7/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (7/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (8/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (8/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (9/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (9/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (10/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (10/11):
 Effect at line 47
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/repeat.c, line 42) in 'unroll' (11/11):
+Goal Assigns (file repeat.c, line 42) in 'unroll' (11/11):
 Effect at line 47
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/rte.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/rte.0.res.oracle
index 979f8d1dcd4039fe328b62722013317352985167..6758f5c2af389c91e2ac42aacc7c3d4716bd6156 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/rte.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/rte.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp_plugin/rte.i (no preprocessing)
+[kernel] Parsing rte.i (no preprocessing)
 [wp] Running WP plugin...
 [wp:rte] function job: generate rte for memory access
 [wp:rte] function job: generate rte for division by zero
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/rte.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/rte.1.res.oracle
index 14242727aae2d7a8ca563f10313a0ad855189af5..5cb9e76206e07f7c982e840bb11552c20ee680db 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/rte.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/rte.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte -no-warn-signed-overflow [...]
-[kernel] Parsing tests/wp_plugin/rte.i (no preprocessing)
+[kernel] Parsing rte.i (no preprocessing)
 [wp] Running WP plugin...
 [wp:rte] function job: generate rte for memory access
 [wp:rte] function job: generate rte for division by zero
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/rte.2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/rte.2.res.oracle
index a19a1e491e60eb7ebdfb54fedfaddfd717ad9623..f78e3c8930ce95f24ba6ea0847664d402e8a53a6 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/rte.2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/rte.2.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte -warn-unsigned-overflow [...]
-[kernel] Parsing tests/wp_plugin/rte.i (no preprocessing)
+[kernel] Parsing rte.i (no preprocessing)
 [wp] Running WP plugin...
 [wp:rte] function job: generate rte for memory access
 [wp:rte] function job: generate rte for division by zero
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/rte.3.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/rte.3.res.oracle
index 0e988b3631124ef9c85bdb13ad170abe2e1b3461..ca65238c06beb808941b138b80fe02065816b958 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/rte.3.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/rte.3.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte -wp-model 'Typed (Nat)' [...]
-[kernel] Parsing tests/wp_plugin/rte.i (no preprocessing)
+[kernel] Parsing rte.i (no preprocessing)
 [wp] Running WP plugin...
 [wp:rte] function job: generate rte for memory access
 [wp:rte] function job: generate rte for division by zero
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/rte.4.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/rte.4.res.oracle
index e9d3ee4047ace47e692ce22e6e5aec6980a4b7c1..d4211b890b2b0d7793c20f9d35ce225d18bfd9dc 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/rte.4.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/rte.4.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte -wp-model 'Typed (Nat)' -warn-unsigned-overflow [...]
-[kernel] Parsing tests/wp_plugin/rte.i (no preprocessing)
+[kernel] Parsing rte.i (no preprocessing)
 [wp] Running WP plugin...
 [wp:rte] function job: generate rte for memory access
 [wp:rte] function job: generate rte for division by zero
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/rte.5.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/rte.5.res.oracle
index 6d174fd9f0f15990c40b726e345b56112384a719..01ed64fcc7105b6530c08bff35a2c7d4577264b4 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/rte.5.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/rte.5.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Nat)' [...]
-[kernel] Parsing tests/wp_plugin/rte.i (no preprocessing)
+[kernel] Parsing rte.i (no preprocessing)
 [wp] Running WP plugin...
 [wp:rte] function job: missing rte for memory access
 [wp:rte] function job: missing rte for division by zero
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/rte.6.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/rte.6.res.oracle
index 0a3228cc97c8794d2bbea41005d478b4e47111ca..ab2f5f38105deb6dea776cc40aff3a7f66f30e1c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/rte.6.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/rte.6.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-rte -wp-model 'Typed (Nat)' [...]
-[kernel] Parsing tests/wp_plugin/rte.i (no preprocessing)
+[kernel] Parsing rte.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: -wp-rte can annotate memory access because -rte-mem is not set
 [wp:rte] function job: generate rte for division by zero
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/sep.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/sep.res.oracle
index fdfb80b6c398acb479a2221181fa65057e0b48bf..5453a8805d08a62eb68968b15c4931998d42734c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/sep.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/sep.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Caveat)' [...]
-[kernel] Parsing tests/wp_plugin/sep.i (no preprocessing)
+[kernel] Parsing sep.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f1_none
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/sep.i, line 13) in 'f1_none':
+Goal Post-condition (file sep.i, line 13) in 'f1_none':
 Prove: true.
 
 ------------------------------------------------------------
@@ -14,7 +14,7 @@ Prove: true.
   Function f2_p_a
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/sep.i, line 17) in 'f2_p_a':
+Goal Post-condition (file sep.i, line 17) in 'f2_p_a':
 Prove: true.
 
 ------------------------------------------------------------
@@ -22,7 +22,7 @@ Prove: true.
   Function f3_p_ab
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/sep.i, line 21) in 'f3_p_ab':
+Goal Post-condition (file sep.i, line 21) in 'f3_p_ab':
 Prove: true.
 
 ------------------------------------------------------------
@@ -30,7 +30,7 @@ Prove: true.
   Function f4_pq_ab
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/sep.i, line 25) in 'f4_pq_ab':
+Goal Post-condition (file sep.i, line 25) in 'f4_pq_ab':
 Prove: true.
 
 ------------------------------------------------------------
@@ -38,7 +38,7 @@ Prove: true.
   Function f5_pq
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/sep.i, line 29) in 'f5_pq':
+Goal Post-condition (file sep.i, line 29) in 'f5_pq':
 Prove: true.
 
 ------------------------------------------------------------
@@ -46,7 +46,7 @@ Prove: true.
   Function f6_Pa
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/sep.i, line 33) in 'f6_Pa':
+Goal Post-condition (file sep.i, line 33) in 'f6_Pa':
 Prove: true.
 
 ------------------------------------------------------------
@@ -54,7 +54,7 @@ Prove: true.
   Function f7_pq_ad
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/sep.i, line 42) in 'f7_pq_ad':
+Goal Post-condition (file sep.i, line 42) in 'f7_pq_ad':
 Prove: true.
 
 ------------------------------------------------------------
@@ -62,7 +62,7 @@ Prove: true.
   Function f8_pq_a
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/sep.i, line 48) in 'f8_pq_a':
+Goal Post-condition (file sep.i, line 48) in 'f8_pq_a':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/sequence.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/sequence.res.oracle
index 62b9c9001fa65dc0a6ae6d537f6b888a6043b3b8..cdfb28dd81e6380e098b9e7b401a54c49f282199 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/sequence.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/sequence.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Caveat)' [...]
-[kernel] Parsing tests/wp_plugin/sequence.i (no preprocessing)
+[kernel] Parsing sequence.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -38,7 +38,7 @@ Prove: nth(a_1, 1 + length(a)) = z.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ok,id_max' (file tests/wp_plugin/sequence.i, line 97):
+Goal Preservation of Invariant 'ok,id_max' (file sequence.i, line 97):
 Let a = ([ y ] *^ i).
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(x) /\ is_sint32(y) /\
@@ -64,12 +64,12 @@ Prove: 0 <= n.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ok,id_max' (file tests/wp_plugin/sequence.i, line 97):
+Goal Establishment of Invariant 'ok,id_max' (file sequence.i, line 97):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ok,id_min' (file tests/wp_plugin/sequence.i, line 96):
+Goal Preservation of Invariant 'ok,id_min' (file sequence.i, line 96):
 Let a = ([ y ] *^ i).
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(x) /\ is_sint32(y) /\
@@ -95,12 +95,12 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ok,id_min' (file tests/wp_plugin/sequence.i, line 96):
+Goal Establishment of Invariant 'ok,id_min' (file sequence.i, line 96):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ok,inv' (file tests/wp_plugin/sequence.i, line 98):
+Goal Preservation of Invariant 'ok,inv' (file sequence.i, line 98):
 Let a = ([ y ] *^ i).
 Let x_1 = 1 + i.
 Assume {
@@ -127,45 +127,45 @@ Prove: ([ y ] *^ x_1) = a ^ [ y ].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ok,inv' (file tests/wp_plugin/sequence.i, line 98):
+Goal Establishment of Invariant 'ok,inv' (file sequence.i, line 98):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_plugin/sequence.i, line 95):
+Goal Loop assigns (file sequence.i, line 95):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/sequence.i, line 79) in 'loops' (1/3):
+Goal Assigns (file sequence.i, line 79) in 'loops' (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/sequence.i, line 79) in 'loops' (2/3):
+Goal Assigns (file sequence.i, line 79) in 'loops' (2/3):
 Effect at line 100
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/sequence.i, line 79) in 'loops' (3/3):
+Goal Assigns (file sequence.i, line 79) in 'loops' (3/3):
 Effect at line 100
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/sequence.i, line 79) in 'loops' (1/3):
+Goal Assigns (file sequence.i, line 79) in 'loops' (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/sequence.i, line 79) in 'loops' (2/3):
+Goal Assigns (file sequence.i, line 79) in 'loops' (2/3):
 Effect at line 100
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/sequence.i, line 79) in 'loops' (3/3):
+Goal Assigns (file sequence.i, line 79) in 'loops' (3/3):
 Effect at line 100
 Prove: true.
 
@@ -348,7 +348,7 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/sequence.i, line 35) in 'no_calls':
+Goal Assigns (file sequence.i, line 35) in 'no_calls':
 Prove: true.
 
 ------------------------------------------------------------
@@ -356,12 +356,12 @@ Prove: true.
   Function sequence
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/sequence.i, line 54) in 'sequence':
+Goal Assigns (file sequence.i, line 54) in 'sequence':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/sequence.i, line 54) in 'sequence':
+Goal Assigns (file sequence.i, line 54) in 'sequence':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/stmt.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/stmt.res.oracle
index 124de2a508dcfec3122dac00f791189e6a0e4d25..9407277eb70fd95dd26996f8613fb5b5d56972b4 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/stmt.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/stmt.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/stmt.c (with preprocessing)
+[kernel] Parsing stmt.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] [CFG] Goal f_exits : Valid (Unreachable)
 [wp] [CFG] Goal g_exits : Valid (Unreachable)
@@ -15,17 +15,17 @@
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/stmt.c, line 10) in 'f':
+Goal Post-condition (file stmt.c, line 10) in 'f':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/stmt.c, line 11) in 'f':
+Goal Post-condition (file stmt.c, line 11) in 'f':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_plugin/stmt.c, line 16):
+Goal Assertion (file stmt.c, line 16):
 Prove: true.
 
 ------------------------------------------------------------
@@ -33,12 +33,12 @@ Prove: true.
   Function f with behavior default_for_stmt_2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/stmt.c, line 17) at block:
+Goal Post-condition (file stmt.c, line 17) at block:
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/stmt.c, line 21) at block:
+Goal Assigns (file stmt.c, line 21) at block:
 Prove: true.
 
 ------------------------------------------------------------
@@ -46,12 +46,12 @@ Prove: true.
   Function g
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/stmt.c, line 27) in 'g':
+Goal Post-condition (file stmt.c, line 27) in 'g':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_plugin/stmt.c, line 32):
+Goal Assertion (file stmt.c, line 32):
 Prove: true.
 
 ------------------------------------------------------------
@@ -59,7 +59,7 @@ Prove: true.
   Function h
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/stmt.c, line 40) in 'h':
+Goal Post-condition (file stmt.c, line 40) in 'h':
 Prove: true.
 
 ------------------------------------------------------------
@@ -79,11 +79,11 @@ Prove: true.
 --- Properties of Function 'f'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Exit-condition (file tests/wp_plugin/stmt.c, line 15) at block
+[  Valid  ] Exit-condition (file stmt.c, line 15) at block
             by Unreachable Annotations.
-[ Partial ] Return-condition (file tests/wp_plugin/stmt.c, line 16) at block
+[ Partial ] Return-condition (file stmt.c, line 16) at block
             By Frama-C kernel, with pending:
-             - Assertion (file tests/wp_plugin/stmt.c, line 16)
+             - Assertion (file stmt.c, line 16)
 [    -    ] Default behavior at block
             tried with Frama-C kernel.
 
@@ -91,13 +91,13 @@ Prove: true.
 --- Properties of Function 'g'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Exit-condition (file tests/wp_plugin/stmt.c, line 31) at block
+[  Valid  ] Exit-condition (file stmt.c, line 31) at block
             by Unreachable Annotations.
-[  Valid  ] Return-condition (file tests/wp_plugin/stmt.c, line 32) at block
+[  Valid  ] Return-condition (file stmt.c, line 32) at block
             by Unreachable Annotations.
-[  Valid  ] Post-condition (file tests/wp_plugin/stmt.c, line 33) at block
+[  Valid  ] Post-condition (file stmt.c, line 33) at block
             by Unreachable Annotations.
-[  Valid  ] Assigns (file tests/wp_plugin/stmt.c, line 36) at block
+[  Valid  ] Assigns (file stmt.c, line 36) at block
             by Unreachable Annotations.
 [  Valid  ] Default behavior at block
             by Frama-C kernel.
@@ -106,19 +106,19 @@ Prove: true.
 --- Properties of Function 'h'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Exit-condition (file tests/wp_plugin/stmt.c, line 43) at block
+[  Valid  ] Exit-condition (file stmt.c, line 43) at block
             by Unreachable Annotations.
-[  Valid  ] Post-condition (file tests/wp_plugin/stmt.c, line 44) at block
+[  Valid  ] Post-condition (file stmt.c, line 44) at block
             by Unreachable Annotations.
-[ Partial ] Return-condition for 'POS' (file tests/wp_plugin/stmt.c, line 48) at block
+[ Partial ] Return-condition for 'POS' (file stmt.c, line 48) at block
             By Frama-C kernel, with pending:
              - Assertion (generated)
              - Assertion (generated)
-[ Partial ] Return-condition for 'NEG' (file tests/wp_plugin/stmt.c, line 51) at block
+[ Partial ] Return-condition for 'NEG' (file stmt.c, line 51) at block
             By Frama-C kernel, with pending:
              - Assertion (generated)
              - Assertion (generated)
-[  Valid  ] Assigns (file tests/wp_plugin/stmt.c, line 53) at block
+[  Valid  ] Assigns (file stmt.c, line 53) at block
             by Unreachable Annotations.
 [ Partial ] Behavior 'NEG' at block
             By Frama-C kernel, with pending:
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/string_c.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/string_c.res.oracle
index aa233aaddc79ff44a7e2d47e4989bc411e4ac984..470d86b6e1ffc7545e10fb21bcf052ae48f9c8b9 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/string_c.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/string_c.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/string_c.c (with preprocessing)
+[kernel] Parsing string_c.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/struct.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/struct.res.oracle
index b0a83c5583c91e74870bd714cbed93b9b98d107a..e527b36a4ee56afacef4cadac4dace220bab1aec 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/struct.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/struct.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/struct.i (no preprocessing)
+[kernel] Parsing struct.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/subset.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/subset.res.oracle
index 31e97c1709501c89d62e193d7ca7071c1b030434..9e316f396118626b8997720a5bd78773caab0896 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/subset.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/subset.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/subset.i (no preprocessing)
+[kernel] Parsing subset.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function mem
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/subset.i, line 4) in 'mem':
+Goal Post-condition (file subset.i, line 4) in 'mem':
 Let x = b.base.
 Let x_1 = a.base.
 Assume {
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/subset_fopen.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/subset_fopen.res.oracle
index fde06aafdfce56ba5edb411f57ea36f78d4cec28..1ac1b33b709b1f344d3ed506ad929bb0409cf8f4 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/subset_fopen.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/subset_fopen.res.oracle
@@ -1,33 +1,33 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/subset_fopen.c (with preprocessing)
+[kernel] Parsing subset_fopen.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion 'Ok_A' (file tests/wp_plugin/subset_fopen.c, line 17):
+Goal Assertion 'Ok_A' (file subset_fopen.c, line 17):
 Assume { Type: is_sint32(i). }
 Prove: (0 <= i) /\ (i <= 9).
 
 ------------------------------------------------------------
 
-Goal Assertion 'Ok_B' (file tests/wp_plugin/subset_fopen.c, line 18):
+Goal Assertion 'Ok_B' (file subset_fopen.c, line 18):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Ok_C' (file tests/wp_plugin/subset_fopen.c, line 19):
+Goal Assertion 'Ok_C' (file subset_fopen.c, line 19):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Ok_D' (file tests/wp_plugin/subset_fopen.c, line 22):
+Goal Assertion 'Ok_D' (file subset_fopen.c, line 22):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Ok_E' (file tests/wp_plugin/subset_fopen.c, line 26):
+Goal Assertion 'Ok_E' (file subset_fopen.c, line 26):
 Assume {
   Type: is_sint32(i).
   (* Heap *)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/trig.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/trig.res.oracle
index 1f0699f38c6b96e6a614985d4f552db71e4c3982..220c0eaf0212dc0faa6205dfa71876e775517dff 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/trig.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/trig.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/trig.i (no preprocessing)
+[kernel] Parsing trig.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function foo
 ------------------------------------------------------------
 
-Goal Assertion 'ok,S' (file tests/wp_plugin/trig.i, line 35):
+Goal Assertion 'ok,S' (file trig.i, line 35):
 Let a_1 = L_concat(a, b).
 Let x = a_1.F1_MSG_size.
 Let a_2 = a_1.F1_MSG_text.
@@ -21,7 +21,7 @@ Prove: x = 10.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok,A' (file tests/wp_plugin/trig.i, line 36):
+Goal Assertion 'ok,A' (file trig.i, line 36):
 Let a_1 = L_concat(a, b).
 Let a_2 = (a.F1_MSG_text)[2].
 Let a_3 = a_1.F1_MSG_text.
@@ -39,7 +39,7 @@ Prove: a_4 = a_2.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok,B' (file tests/wp_plugin/trig.i, line 37):
+Goal Assertion 'ok,B' (file trig.i, line 37):
 Let a_1 = L_concat(a, b).
 Let a_2 = a_1.F1_MSG_text.
 Let a_3 = a_2[2].
@@ -60,7 +60,7 @@ Prove: a_6 = a_5.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition 'qed_ok' in 'fconcat'' in 'foo' at initialization of 'c' (file tests/wp_plugin/trig.i, line 34)
+Goal Instance of 'Pre-condition 'qed_ok' in 'fconcat'' in 'foo' at initialization of 'c' (file trig.i, line 34)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.0.res.oracle
index 60291308af6ae635ff1c00dd98d81a973bf7cae4..eede34e227412cdccfb55a373883a242df5fc66f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.0.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/unfold_assigns.i (no preprocessing)
+[kernel] Parsing unfold_assigns.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function ASSIGN_NO_UNFOLD_KO
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 62) in 'ASSIGN_NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 62) in 'ASSIGN_NO_UNFOLD_KO':
 Effect at line 65
 Assume {
   (* Heap *)
@@ -21,7 +21,7 @@ Prove: false.
   Function ASSIGN_NO_UNFOLD_OK
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 56) in 'ASSIGN_NO_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 56) in 'ASSIGN_NO_UNFOLD_OK':
 Effect at line 59
 Prove: true.
 
@@ -30,7 +30,7 @@ Prove: true.
   Function NO_UNFOLD_KO
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
 Call Effect at line 35
 Assume {
   (* Heap *)
@@ -42,7 +42,7 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
 Call Effect at line 35
 Assume {
   (* Heap *)
@@ -57,13 +57,13 @@ Prove: false.
   Function NO_UNFOLD_OK_1
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
+Goal Assigns (file unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
 Call Effect at line 20
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
+Goal Assigns (file unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
 Call Effect at line 20
 Prove: true.
 
@@ -72,13 +72,13 @@ Prove: true.
   Function NO_UNFOLD_OK_2
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
+Goal Assigns (file unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
 Call Effect at line 25
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
+Goal Assigns (file unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
 Call Effect at line 25
 Prove: true.
 
@@ -87,13 +87,13 @@ Prove: true.
   Function NO_UNFOLD_OK_3
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
+Goal Assigns (file unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
 Call Effect at line 30
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
+Goal Assigns (file unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
 Call Effect at line 30
 Prove: true.
 
@@ -102,7 +102,7 @@ Prove: true.
   Function USE_ASSIGN_UNFOLD_KO
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 48) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Post-condition (file unfold_assigns.i, line 48) in 'USE_ASSIGN_UNFOLD_KO':
 Let a = Load_S1_S(q, Mint_0).
 Let a_1 = Load_S1_S(q, havoc(Mint_undef_0, Mint_0, p, 2)).
 Assume {
@@ -116,7 +116,7 @@ Prove: EqS1_S(a_1, a).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
 Call Effect at line 53
 Assume {
   (* Heap *)
@@ -128,7 +128,7 @@ Prove: false.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
 Call Effect at line 53
 Assume {
   (* Heap *)
@@ -143,7 +143,7 @@ Prove: false.
   Function USE_ASSIGN_UNFOLD_OK
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 39) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Post-condition (file unfold_assigns.i, line 39) in 'USE_ASSIGN_UNFOLD_OK':
 Let a = Load_S1_S(q, Mint_0).
 Let a_1 = Load_S1_S(q, havoc(Mint_undef_0, Mint_0, p, 2)).
 Assume {
@@ -157,13 +157,13 @@ Prove: EqS1_S(a_1, a).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
 Call Effect at line 44
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
 Call Effect at line 44
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.1.res.oracle
index f681ec0f92309c15f8c0dc760963fec77f356d88..47c11530d8f3e7c46705c594a2aa433bfcebd30e 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.1.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/unfold_assigns.i (no preprocessing)
+[kernel] Parsing unfold_assigns.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function ASSIGN_NO_UNFOLD_KO
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 62) in 'ASSIGN_NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 62) in 'ASSIGN_NO_UNFOLD_KO':
 Effect at line 65
 Prove: true.
 
@@ -15,7 +15,7 @@ Prove: true.
   Function ASSIGN_NO_UNFOLD_OK
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 56) in 'ASSIGN_NO_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 56) in 'ASSIGN_NO_UNFOLD_OK':
 Effect at line 59
 Prove: true.
 
@@ -24,13 +24,13 @@ Prove: true.
   Function NO_UNFOLD_KO
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
 Call Effect at line 35
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
 Call Effect at line 35
 Prove: true.
 
@@ -39,13 +39,13 @@ Prove: true.
   Function NO_UNFOLD_OK_1
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
+Goal Assigns (file unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
 Call Effect at line 20
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
+Goal Assigns (file unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
 Call Effect at line 20
 Prove: true.
 
@@ -54,13 +54,13 @@ Prove: true.
   Function NO_UNFOLD_OK_2
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
+Goal Assigns (file unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
 Call Effect at line 25
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
+Goal Assigns (file unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
 Call Effect at line 25
 Prove: true.
 
@@ -69,13 +69,13 @@ Prove: true.
   Function NO_UNFOLD_OK_3
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
+Goal Assigns (file unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
 Call Effect at line 30
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
+Goal Assigns (file unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
 Call Effect at line 30
 Prove: true.
 
@@ -84,7 +84,7 @@ Prove: true.
   Function USE_ASSIGN_UNFOLD_KO
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 48) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Post-condition (file unfold_assigns.i, line 48) in 'USE_ASSIGN_UNFOLD_KO':
 Let a = Load_S1_S(q, Mint_0).
 Let a_1 = Load_S1_S(q, havoc(Mint_undef_0, Mint_0, p, 2)).
 Assume {
@@ -98,13 +98,13 @@ Prove: EqS1_S(a_1, a).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
 Call Effect at line 53
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
 Call Effect at line 53
 Prove: true.
 
@@ -113,7 +113,7 @@ Prove: true.
   Function USE_ASSIGN_UNFOLD_OK
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 39) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Post-condition (file unfold_assigns.i, line 39) in 'USE_ASSIGN_UNFOLD_OK':
 Let a = Load_S1_S(q, Mint_0).
 Let a_1 = Load_S1_S(q, havoc(Mint_undef_0, Mint_0, p, 2)).
 Assume {
@@ -127,13 +127,13 @@ Prove: EqS1_S(a_1, a).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
 Call Effect at line 44
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
 Call Effect at line 44
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/unroll.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/unroll.res.oracle
index 6dc9e4477f0be20ab5a90cccc8fdb9b063f53698..22a4fe35fe0a1a8290ad36ecd8d5b6ed8804fc36 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/unroll.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/unroll.res.oracle
@@ -1,9 +1,8 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/unroll.i (no preprocessing)
+[kernel] Parsing unroll.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_plugin/unroll.i:20: Warning: 
-  Missing assigns clause (assigns 'everything' instead)
+[wp] unroll.i:20: Warning: Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function unrolled_loop
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/unsafe-arrays.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/unsafe-arrays.0.res.oracle
index 0d6d70086ee9080222b0f1646488290e39cbfea4..69854700c5dbe23d5bc5df8183fb84a7cc242173 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/unsafe-arrays.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/unsafe-arrays.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/unsafe-arrays.i (no preprocessing)
+[kernel] Parsing unsafe-arrays.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/unsafe-arrays.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/unsafe-arrays.1.res.oracle
index d68704a19a61005ff259a3e364ed8c797c75a84c..fb0b6c63102bcc1581bd0002ee9d4fe8b1646a81 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/unsafe-arrays.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/unsafe-arrays.1.res.oracle
@@ -1,7 +1,7 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/unsafe-arrays.i (no preprocessing)
+[kernel] Parsing unsafe-arrays.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_plugin/unsafe-arrays.i:13: User Error: 
+[wp] unsafe-arrays.i:13: User Error: 
   Invalid infinite range (shiftfield_F1_f p_0)+(..)
 [kernel] Plug-in wp aborted: invalid user input.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/unsigned.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/unsigned.res.oracle
index e7238623044f48af8abeae9895e9a68e455001b3..914550152f5e9e69156e0baa0b76ad70f98473cb 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/unsigned.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/unsigned.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/unsigned.i (no preprocessing)
+[kernel] Parsing unsigned.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
 [wp] 1 goal scheduled
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/volatile.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/volatile.0.res.oracle
index 8f0c8d4ce8a3ca974c104502d4572ad66bf635a6..cba857e2063ec70dd88ae678ba4e25f6925111c9 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/volatile.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/volatile.0.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/volatile.i (no preprocessing)
+[kernel] Parsing volatile.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function job_assigns
 ------------------------------------------------------------
 
-Goal Assertion 'KO_WHEN_VOLATILE' (file tests/wp_plugin/volatile.i, line 15):
+Goal Assertion 'KO_WHEN_VOLATILE' (file volatile.i, line 15):
 Prove: w = 0.
 
 ------------------------------------------------------------
@@ -14,7 +14,7 @@ Prove: w = 0.
   Function job_read
 ------------------------------------------------------------
 
-Goal Assertion 'KO_WHEN_VOLATILE' (file tests/wp_plugin/volatile.i, line 21):
+Goal Assertion 'KO_WHEN_VOLATILE' (file volatile.i, line 21):
 Assume { Type: is_sint32(x). }
 Prove: x = w.
 
@@ -23,7 +23,7 @@ Prove: x = w.
   Function job_struct
 ------------------------------------------------------------
 
-Goal Assertion 'ok,dead_code' (file tests/wp_plugin/volatile.i, line 29):
+Goal Assertion 'ok,dead_code' (file volatile.i, line 29):
 Prove: true.
 
 ------------------------------------------------------------
@@ -31,7 +31,7 @@ Prove: true.
   Function job_struct_assigns
 ------------------------------------------------------------
 
-Goal Assertion 'KO_WHEN_VOLATILE' (file tests/wp_plugin/volatile.i, line 35):
+Goal Assertion 'KO_WHEN_VOLATILE' (file volatile.i, line 35):
 Prove: EqS1_st_v(w, w_1).
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/volatile.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/volatile.1.res.oracle
index 8f7b2282f202b7a6ab2c4fb7f9faa450a8594c32..484e4596c2937f86c901c339b927a1ed2048584b 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/volatile.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/volatile.1.res.oracle
@@ -1,30 +1,23 @@
 # frama-c -wp -wp-no-volatile [...]
-[kernel] Parsing tests/wp_plugin/volatile.i (no preprocessing)
+[kernel] Parsing volatile.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_plugin/volatile.i:15: Warning: 
-  unsafe volatile access to (term) l-value
-[wp] tests/wp_plugin/volatile.i:14: Warning: 
-  unsafe write-access to volatile l-value
-[wp] tests/wp_plugin/volatile.i:21: Warning: 
-  unsafe volatile access to (term) l-value
-[wp] tests/wp_plugin/volatile.i:20: Warning: 
-  unsafe read-access to volatile l-value
-[wp] tests/wp_plugin/volatile.i:35: Warning: 
-  unsafe volatile access to (term) l-value
-[wp] tests/wp_plugin/volatile.i:35: Warning: 
-  unsafe volatile access to (term) l-value
-[wp] tests/wp_plugin/volatile.i:34: Warning: 
-  unsafe write-access to volatile l-value
+[wp] volatile.i:15: Warning: unsafe volatile access to (term) l-value
+[wp] volatile.i:14: Warning: unsafe write-access to volatile l-value
+[wp] volatile.i:21: Warning: unsafe volatile access to (term) l-value
+[wp] volatile.i:20: Warning: unsafe read-access to volatile l-value
+[wp] volatile.i:35: Warning: unsafe volatile access to (term) l-value
+[wp] volatile.i:35: Warning: unsafe volatile access to (term) l-value
+[wp] volatile.i:34: Warning: unsafe write-access to volatile l-value
 ------------------------------------------------------------
   Function job_assigns
 ------------------------------------------------------------
 
-Goal Assertion 'KO_WHEN_VOLATILE' (file tests/wp_plugin/volatile.i, line 15):
-tests/wp_plugin/volatile.i:14: warning from wp:
+Goal Assertion 'KO_WHEN_VOLATILE' (file volatile.i, line 15):
+volatile.i:14: warning from wp:
  - Warning: ignore volatile attribute
    Reason: unsafe write-access to volatile l-value
-tests/wp_plugin/volatile.i:15: warning from wp:
+volatile.i:15: warning from wp:
  - Warning: ignore volatile attribute
    Reason: unsafe volatile access to (term) l-value
 Prove: true.
@@ -34,11 +27,11 @@ Prove: true.
   Function job_read
 ------------------------------------------------------------
 
-Goal Assertion 'KO_WHEN_VOLATILE' (file tests/wp_plugin/volatile.i, line 21):
-tests/wp_plugin/volatile.i:20: warning from wp:
+Goal Assertion 'KO_WHEN_VOLATILE' (file volatile.i, line 21):
+volatile.i:20: warning from wp:
  - Warning: ignore volatile attribute
    Reason: unsafe read-access to volatile l-value
-tests/wp_plugin/volatile.i:21: warning from wp:
+volatile.i:21: warning from wp:
  - Warning: ignore volatile attribute
    Reason: unsafe volatile access to (term) l-value
 Prove: true.
@@ -48,7 +41,7 @@ Prove: true.
   Function job_struct
 ------------------------------------------------------------
 
-Goal Assertion 'ok,dead_code' (file tests/wp_plugin/volatile.i, line 29):
+Goal Assertion 'ok,dead_code' (file volatile.i, line 29):
 Prove: true.
 
 ------------------------------------------------------------
@@ -56,14 +49,14 @@ Prove: true.
   Function job_struct_assigns
 ------------------------------------------------------------
 
-Goal Assertion 'KO_WHEN_VOLATILE' (file tests/wp_plugin/volatile.i, line 35):
-tests/wp_plugin/volatile.i:34: warning from wp:
+Goal Assertion 'KO_WHEN_VOLATILE' (file volatile.i, line 35):
+volatile.i:34: warning from wp:
  - Warning: ignore volatile attribute
    Reason: unsafe write-access to volatile l-value
-tests/wp_plugin/volatile.i:35: warning from wp:
+volatile.i:35: warning from wp:
  - Warning: ignore volatile attribute
    Reason: unsafe volatile access to (term) l-value
-tests/wp_plugin/volatile.i:35: warning from wp:
+volatile.i:35: warning from wp:
  - Warning: ignore volatile attribute
    Reason: unsafe volatile access to (term) l-value
 Prove: true.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/stmt.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/stmt.res.oracle
index 3a74fac104c542c05e02bcaa5acab1560cebf58a..e680fd205caf1f853548d7805358939763deccd9 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/stmt.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/stmt.res.oracle
@@ -36,19 +36,19 @@
 --- Properties of Function 'f'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file tests/wp_plugin/stmt.c, line 10)
+[  Valid  ] Post-condition (file stmt.c, line 10)
             by Wp.typed.
-[  Valid  ] Post-condition (file tests/wp_plugin/stmt.c, line 11)
+[  Valid  ] Post-condition (file stmt.c, line 11)
             by Wp.typed.
-[  Valid  ] Exit-condition (file tests/wp_plugin/stmt.c, line 15) at block
+[  Valid  ] Exit-condition (file stmt.c, line 15) at block
             by Unreachable Annotations.
-[  Valid  ] Return-condition (file tests/wp_plugin/stmt.c, line 16) at block
+[  Valid  ] Return-condition (file stmt.c, line 16) at block
             by Frama-C kernel.
-[  Valid  ] Post-condition (file tests/wp_plugin/stmt.c, line 17) at block
+[  Valid  ] Post-condition (file stmt.c, line 17) at block
             by Wp.typed.
-[  Valid  ] Assigns (file tests/wp_plugin/stmt.c, line 21) at block
+[  Valid  ] Assigns (file stmt.c, line 21) at block
             by Wp.typed.
-[  Valid  ] Assertion (file tests/wp_plugin/stmt.c, line 16)
+[  Valid  ] Assertion (file stmt.c, line 16)
             by Wp.typed.
 [  Valid  ] Default behavior at block
             by Frama-C kernel.
@@ -59,18 +59,18 @@
 --- Properties of Function 'g'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file tests/wp_plugin/stmt.c, line 27)
+[  Valid  ] Post-condition (file stmt.c, line 27)
             by Wp.typed.
-[  Valid  ] Exit-condition (file tests/wp_plugin/stmt.c, line 31) at block
+[  Valid  ] Exit-condition (file stmt.c, line 31) at block
             by Unreachable Annotations.
-[  Valid  ] Return-condition (file tests/wp_plugin/stmt.c, line 32) at block
+[  Valid  ] Return-condition (file stmt.c, line 32) at block
             by Frama-C kernel.
             by Unreachable Annotations.
-[  Valid  ] Post-condition (file tests/wp_plugin/stmt.c, line 33) at block
+[  Valid  ] Post-condition (file stmt.c, line 33) at block
             by Unreachable Annotations.
-[  Valid  ] Assigns (file tests/wp_plugin/stmt.c, line 36) at block
+[  Valid  ] Assigns (file stmt.c, line 36) at block
             by Unreachable Annotations.
-[  Valid  ] Assertion (file tests/wp_plugin/stmt.c, line 32)
+[  Valid  ] Assertion (file stmt.c, line 32)
             by Wp.typed.
 [  Valid  ] Default behavior at block
             by Frama-C kernel.
@@ -81,17 +81,17 @@
 --- Properties of Function 'h'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file tests/wp_plugin/stmt.c, line 40)
+[  Valid  ] Post-condition (file stmt.c, line 40)
             by Wp.typed.
-[  Valid  ] Exit-condition (file tests/wp_plugin/stmt.c, line 43) at block
+[  Valid  ] Exit-condition (file stmt.c, line 43) at block
             by Unreachable Annotations.
-[  Valid  ] Post-condition (file tests/wp_plugin/stmt.c, line 44) at block
+[  Valid  ] Post-condition (file stmt.c, line 44) at block
             by Unreachable Annotations.
-[  Valid  ] Return-condition for 'POS' (file tests/wp_plugin/stmt.c, line 48) at block
+[  Valid  ] Return-condition for 'POS' (file stmt.c, line 48) at block
             by Frama-C kernel.
-[  Valid  ] Return-condition for 'NEG' (file tests/wp_plugin/stmt.c, line 51) at block
+[  Valid  ] Return-condition for 'NEG' (file stmt.c, line 51) at block
             by Frama-C kernel.
-[  Valid  ] Assigns (file tests/wp_plugin/stmt.c, line 53) at block
+[  Valid  ] Assigns (file stmt.c, line 53) at block
             by Unreachable Annotations.
 [  Valid  ] Assertion (generated)
             by Wp.typed.
diff --git a/src/plugins/wp/tests/wp_plugin/rte.i b/src/plugins/wp/tests/wp_plugin/rte.i
index 65e8988e572951b8de7ff768207b7c4e88fdfa86..215fd08a9aff7d0b618f7cd12852593445f85aa7 100644
--- a/src/plugins/wp/tests/wp_plugin/rte.i
+++ b/src/plugins/wp/tests/wp_plugin/rte.i
@@ -1,5 +1,5 @@
 /* run.config
-   CMD: @frama-c@ -wp -wp-prover none -wp-share ./share -wp-msg-key shell -wp-msg-key rte
+   CMD: @frama-c@ -wp -wp-prover none -wp-share ../../../share -wp-msg-key shell -wp-msg-key rte
    OPT: -wp-rte -no-warn-invalid-bool -then -print -no-unicode
    OPT: -wp-rte -no-warn-signed-overflow -then -print -no-unicode
    OPT: -wp-rte -warn-unsigned-overflow -then -print -no-unicode
diff --git a/src/plugins/wp/tests/wp_region/oracle/annot.res.oracle b/src/plugins/wp/tests/wp_region/oracle/annot.res.oracle
index d552bd47df89c1ee23ac54de7ea541b3e6e9d95b..55ef0b8621bae490d0260cc6509e2e4f2e1979c0 100644
--- a/src/plugins/wp/tests/wp_region/oracle/annot.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/annot.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/annot.i (no preprocessing)
+[kernel] Parsing annot.i (no preprocessing)
 /* Generated by Frama-C */
 struct N {
    double v ;
diff --git a/src/plugins/wp/tests/wp_region/oracle/array1.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array1.res.oracle
index 4987dd9ae45263a17a6338e3a4cb844be4876e93..bfe8f3a721589ebe4749c24d9b4073865372fd6c 100644
--- a/src/plugins/wp/tests/wp_region/oracle/array1.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/array1.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/array1.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/array1/region/job.dot
+[kernel] Parsing array1.i (no preprocessing)
+[wp] Region Graph: result/array1/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/array2.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array2.res.oracle
index b724073ea5e6c6a7fac7738b6d831e6fc1e177ca..226d112a3f77e0f812b717886018022b34570d94 100644
--- a/src/plugins/wp/tests/wp_region/oracle/array2.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/array2.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/array2.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/array2/region/job.dot
+[kernel] Parsing array2.i (no preprocessing)
+[wp] Region Graph: result/array2/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/array3.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array3.res.oracle
index fa7682e21183bf98f749787a3ecde94f7c1b3ce3..63c3699fc16ebd52027926097fd85effdad7c7b6 100644
--- a/src/plugins/wp/tests/wp_region/oracle/array3.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/array3.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/array3.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/array3/region/job.dot
+[kernel] Parsing array3.i (no preprocessing)
+[wp] Region Graph: result/array3/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/array4.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array4.res.oracle
index f39da987941e0ffab9390a9e6e5329dcc2a9dde6..d17f3ac4e96471cf98aada61c198159cad312d98 100644
--- a/src/plugins/wp/tests/wp_region/oracle/array4.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/array4.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/array4.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/array4/region/job.dot
+[kernel] Parsing array4.i (no preprocessing)
+[wp] Region Graph: result/array4/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/array5.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array5.res.oracle
index 5a0a75703bf70121d5cebd897d7699c9d6a6ac96..7ff0c7df713684732966b0e8c780bf072a046f07 100644
--- a/src/plugins/wp/tests/wp_region/oracle/array5.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/array5.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/array5.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/array5/region/job.dot
+[kernel] Parsing array5.i (no preprocessing)
+[wp] Region Graph: result/array5/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/array6.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array6.res.oracle
index da6ccf4e0f1e820a4d240e64df242b33930b7278..cfb5b06e3a4889915d5d9a93d1e899379dfe5a1f 100644
--- a/src/plugins/wp/tests/wp_region/oracle/array6.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/array6.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/array6.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/array6/region/job.dot
+[kernel] Parsing array6.i (no preprocessing)
+[wp] Region Graph: result/array6/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/array7.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array7.res.oracle
index cb757d81d87267e4a38812b6cb8762f8489e6848..a56390ca439c41d8aadd32c10f1bee63517666a0 100644
--- a/src/plugins/wp/tests/wp_region/oracle/array7.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/array7.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/array7.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/array7/region/job.dot
+[kernel] Parsing array7.i (no preprocessing)
+[wp] Region Graph: result/array7/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/array8.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array8.res.oracle
index 83dd9d4238255784aba7772b3e57fb754865ad16..0b5cc4b06251c98b7eba9079a98b11b2c3fa13c8 100644
--- a/src/plugins/wp/tests/wp_region/oracle/array8.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/array8.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/array8.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/array8/region/job.dot
+[kernel] Parsing array8.i (no preprocessing)
+[wp] Region Graph: result/array8/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/fb_ADD.res.oracle b/src/plugins/wp/tests/wp_region/oracle/fb_ADD.res.oracle
index 2331b4aae9657c583924d185d3f0c3fb0a9b0bc8..4f9377969e73fb8a458b51de309c480ea40e8604 100644
--- a/src/plugins/wp/tests/wp_region/oracle/fb_ADD.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/fb_ADD.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/fb_ADD.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/fb_ADD/region/job.dot
+[kernel] Parsing fb_ADD.i (no preprocessing)
+[wp] Region Graph: result/fb_ADD/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/fb_SORT.res.oracle b/src/plugins/wp/tests/wp_region/oracle/fb_SORT.res.oracle
index ec1a0b83feb62c26278e26829c9a50d83687ef97..b2c9e682eb130f1d78fd2df26238e8c7922531fa 100644
--- a/src/plugins/wp/tests/wp_region/oracle/fb_SORT.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/fb_SORT.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/fb_SORT.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/fb_SORT/region/job.dot
+[kernel] Parsing fb_SORT.i (no preprocessing)
+[wp] Region Graph: result/fb_SORT/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/garbled.res.oracle b/src/plugins/wp/tests/wp_region/oracle/garbled.res.oracle
index 13973473a6739603448758d6940000363173431e..549ce7b81528639f38eeb377bd1a22b4f5fc9243 100644
--- a/src/plugins/wp/tests/wp_region/oracle/garbled.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/garbled.res.oracle
@@ -1,7 +1,7 @@
-[kernel] Parsing tests/wp_region/garbled.i (no preprocessing)
+[kernel] Parsing garbled.i (no preprocessing)
 [wp:garbled] Garbled Clusters: A=sint32 B=float32
 [wp:garbled] Garbled Clusters: A=garbled B=sint32
 [wp:garbled] Garbled Clusters: A=garbled B=float32
-[wp] Region Graph: tests/wp_region/result/garbled/region/job.dot
+[wp] Region Graph: result/garbled/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/index.res.oracle b/src/plugins/wp/tests/wp_region/oracle/index.res.oracle
index 834049467cbde15d83aba42c883878baaa71ed0f..ced8cf6f827f35e00259be4ecd5f8df9d4d9f00c 100644
--- a/src/plugins/wp/tests/wp_region/oracle/index.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/index.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/index.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/index/region/job.dot
+[kernel] Parsing index.i (no preprocessing)
+[wp] Region Graph: result/index/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/matrix.res.oracle b/src/plugins/wp/tests/wp_region/oracle/matrix.res.oracle
index fe737f1db75548cc56518bebf54a18bc070f442f..67f36e75d701ad4ff1503a2e76df709340977c2d 100644
--- a/src/plugins/wp/tests/wp_region/oracle/matrix.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/matrix.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/matrix.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/matrix/region/job.dot
+[kernel] Parsing matrix.i (no preprocessing)
+[wp] Region Graph: result/matrix/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/structarray1.res.oracle b/src/plugins/wp/tests/wp_region/oracle/structarray1.res.oracle
index eac3247d2ca75c18f6bdb8de8851ca83750f7ac4..654fe47b777f10c73d412d2247738d3783949186 100644
--- a/src/plugins/wp/tests/wp_region/oracle/structarray1.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/structarray1.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/structarray1.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/structarray1/region/job.dot
+[kernel] Parsing structarray1.i (no preprocessing)
+[wp] Region Graph: result/structarray1/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/structarray2.res.oracle b/src/plugins/wp/tests/wp_region/oracle/structarray2.res.oracle
index 178fe6a89808245f88bbd916e648129d57347505..e4d256096a1643d24d5b01dcaa994510013fa33e 100644
--- a/src/plugins/wp/tests/wp_region/oracle/structarray2.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/structarray2.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/structarray2.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/structarray2/region/job.dot
+[kernel] Parsing structarray2.i (no preprocessing)
+[wp] Region Graph: result/structarray2/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/structarray3.res.oracle b/src/plugins/wp/tests/wp_region/oracle/structarray3.res.oracle
index 1d4865e408e6511794022d8846142fd16724b46e..d05ba1bfd94ad4e63232f06127ea321e9d339290 100644
--- a/src/plugins/wp/tests/wp_region/oracle/structarray3.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/structarray3.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/structarray3.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/structarray3/region/job.dot
+[kernel] Parsing structarray3.i (no preprocessing)
+[wp] Region Graph: result/structarray3/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/structarray4.res.oracle b/src/plugins/wp/tests/wp_region/oracle/structarray4.res.oracle
index 2bc45be7e59d5d04cc65b58b30e9b86dea76af19..90b0754a9aabc1f54dde65f5cf6a540dafe0a5f4 100644
--- a/src/plugins/wp/tests/wp_region/oracle/structarray4.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/structarray4.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/structarray4.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/structarray4/region/job.dot
+[kernel] Parsing structarray4.i (no preprocessing)
+[wp] Region Graph: result/structarray4/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/oracle/swap.res.oracle b/src/plugins/wp/tests/wp_region/oracle/swap.res.oracle
index d7076d6dbc8cb0e241490c9707bd7bc5470ba1e7..38c59feeeeedc6ef501fe66b6eae6be21fc8ae6f 100644
--- a/src/plugins/wp/tests/wp_region/oracle/swap.res.oracle
+++ b/src/plugins/wp/tests/wp_region/oracle/swap.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/wp_region/swap.i (no preprocessing)
-[wp] Region Graph: tests/wp_region/result/swap/region/job.dot
+[kernel] Parsing swap.i (no preprocessing)
+[wp] Region Graph: result/swap/region/job.dot
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_region/test_config b/src/plugins/wp/tests/wp_region/test_config
index 36003c91eeff9b752b08515c756f5e0268465e56..8278412ccb48b4d2edcc71dea4d0b0d8952b1d3b 100644
--- a/src/plugins/wp/tests/wp_region/test_config
+++ b/src/plugins/wp/tests/wp_region/test_config
@@ -1,3 +1,3 @@
 CMD: @frama-c@ -no-autoload-plugins -load-module wp
-LOG: @PTEST_NAME@/region/job.dot
-OPT: -wp-prover none -wp-region -wp-msg-key dot,chunk,roots,garbled -wp-out @PTEST_DIR@/result/@PTEST_NAME@ -wp-fct job
+#LOG: @PTEST_NAME@/region/job.dot
+OPT: -wp-prover none -wp-region -wp-msg-key dot,chunk,roots,garbled -wp-out @PTEST_NAME@ -wp-fct job
diff --git a/src/plugins/wp/tests/wp_store/oracle/array.res.oracle b/src/plugins/wp/tests/wp_store/oracle/array.res.oracle
index cf476ad115dcb52548e6b69484c218d9305aab60..23aee29340f62fa8d7a161dda6255d08cdb46363 100644
--- a/src/plugins/wp/tests/wp_store/oracle/array.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle/array.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_store/array.i (no preprocessing)
+[kernel] Parsing array.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_store/oracle/natural.res.oracle b/src/plugins/wp/tests/wp_store/oracle/natural.res.oracle
index fc4518d506c71444b4bb382c2a55129ab0718b35..3bcf03b86ae10be40a1d4d653143ef8cb0129356 100644
--- a/src/plugins/wp/tests/wp_store/oracle/natural.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle/natural.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_store/natural.i (no preprocessing)
+[kernel] Parsing natural.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_store/oracle/nonaliasing.res.oracle b/src/plugins/wp/tests/wp_store/oracle/nonaliasing.res.oracle
index 0850a3c16edfbe868b78b028cfbd5ed0857e2137..287de59cd4a5c134c5ec1e5ef069280fdebccbf3 100644
--- a/src/plugins/wp/tests/wp_store/oracle/nonaliasing.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle/nonaliasing.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_store/nonaliasing.i (no preprocessing)
+[kernel] Parsing nonaliasing.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_store/oracle/struct.res.oracle b/src/plugins/wp/tests/wp_store/oracle/struct.res.oracle
index 175f393e79efeb2cd0264d214300239688680d5a..02371ba6bc5b9d804a7e8a91fe2cec9b6ea6170f 100644
--- a/src/plugins/wp/tests/wp_store/oracle/struct.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle/struct.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_store/struct.i (no preprocessing)
+[kernel] Parsing struct.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion 'qed_ok' (file tests/wp_store/struct.i, line 21):
+Goal Assertion 'qed_ok' (file struct.i, line 21):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_store/struct.i, line 10) in 'g'' in 'f' at call 'g' (file tests/wp_store/struct.i, line 20)
+Goal Instance of 'Pre-condition (file struct.i, line 10) in 'g'' in 'f' at call 'g' (file struct.i, line 20)
 :
 Let a_1 = shift_sint32(shiftfield_F1_t_tab(a), 0).
 Assume {
@@ -27,12 +27,12 @@ Prove: valid_rw(Malloc_0, a_1, 1).
   Function g
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_store/struct.i, line 11) in 'g':
+Goal Post-condition (file struct.i, line 11) in 'g':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_store/struct.i, line 12) in 'g':
+Goal Assigns (file struct.i, line 12) in 'g':
 Effect at line 15
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_tip/oracle/chunk_printing.res.oracle b/src/plugins/wp/tests/wp_tip/oracle/chunk_printing.res.oracle
index 1cb5b23e556d9e985e712eca70660864d7d9e896..4bacdb868395eb6a858b78b85f516e9b52f0b7c6 100644
--- a/src/plugins/wp/tests/wp_tip/oracle/chunk_printing.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle/chunk_printing.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp_tip/chunk_printing.i (no preprocessing)
+[kernel] Parsing chunk_printing.i (no preprocessing)
 [wp] Running WP plugin...
 [rte] annotating function main
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_tip/chunk_printing.i, line 32):
+Goal Assertion (file chunk_printing.i, line 32):
 Let x_1 = « *`v_1 »@L1.
 Let x_2 = « *`v »@L1.
 Assume {
diff --git a/src/plugins/wp/tests/wp_tip/oracle/tac_split_quantifiers.res.oracle b/src/plugins/wp/tests/wp_tip/oracle/tac_split_quantifiers.res.oracle
index a43b8e6759f42e9e7daabf709612bb09a148cb92..9fb58e428b29c49001881763094931e78f667cce 100644
--- a/src/plugins/wp/tests/wp_tip/oracle/tac_split_quantifiers.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle/tac_split_quantifiers.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_tip/tac_split_quantifiers.i (no preprocessing)
+[kernel] Parsing tac_split_quantifiers.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/array_initialized.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/array_initialized.0.res.oracle
index 6911b7211955e6ec8512f8a04d6ade0cbc60baae..fddef3a5c9cab9dd58403662be999f5b854a102b 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/array_initialized.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/array_initialized.0.res.oracle
@@ -1,14 +1,13 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/array_initialized.c (with preprocessing)
-[kernel] tests/wp_typed/array_initialized.c:13: Warning: 
-  Too many initializers for array g
+[kernel] Parsing array_initialized.c (with preprocessing)
+[kernel] array_initialized.c:13: Warning: Too many initializers for array g
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function main1
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/array_initialized.c, line 71):
+Goal Assertion (file array_initialized.c, line 71):
 Assume {
   (* Heap *)
   Type: IsArray1_sint32(g).
@@ -24,7 +23,7 @@ Prove: g[i] = 0.
   Function main2
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/array_initialized.c, line 185):
+Goal Assertion (file array_initialized.c, line 185):
 Assume {
   (* Heap *)
   Type: IsArray1_sint32(h1_0) /\ IsArray1_sint32(h2_0).
@@ -242,7 +241,7 @@ Prove: h2_0[i] = h1_0[i].
   Function main3
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/array_initialized.c, line 194):
+Goal Assertion (file array_initialized.c, line 194):
 Prove: true.
 
 ------------------------------------------------------------
@@ -250,7 +249,7 @@ Prove: true.
   Function main_pointer
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/array_initialized.c, line 283):
+Goal Assertion (file array_initialized.c, line 283):
 Assume {
   (* Heap *)
   Type: linked(Malloc_0) /\ (forall i_1 : Z. region(p[i_1].base) <= 0).
@@ -267,7 +266,7 @@ Prove: valid_rw(Malloc_0, p[i], 1).
   Function simpl
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/array_initialized.c, line 288) in 'simpl':
+Goal Post-condition (file array_initialized.c, line 288) in 'simpl':
 Let x = Mint_0[shift_sint32(t, 0)].
 Assume {
   Type: is_sint32(x).
diff --git a/src/plugins/wp/tests/wp_typed/oracle/array_initialized.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/array_initialized.1.res.oracle
index 91c35e494c27dfb6e16519f1d684da5651aa073c..439430a953cc5897be9f564294a3fd177f492e43 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/array_initialized.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/array_initialized.1.res.oracle
@@ -1,14 +1,13 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/array_initialized.c (with preprocessing)
-[kernel] tests/wp_typed/array_initialized.c:13: Warning: 
-  Too many initializers for array g
+[kernel] Parsing array_initialized.c (with preprocessing)
+[kernel] array_initialized.c:13: Warning: Too many initializers for array g
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function main1
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/array_initialized.c, line 71):
+Goal Assertion (file array_initialized.c, line 71):
 Let a = global(K_g_20).
 Assume {
   (* Goal *)
@@ -24,7 +23,7 @@ Prove: Mint_0[shift_sint32(a, i)] = 0.
   Function main2
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/array_initialized.c, line 185):
+Goal Assertion (file array_initialized.c, line 185):
 Let a = global(K_h1_26).
 Let a_1 = global(K_h2_27).
 Assume {
@@ -244,7 +243,7 @@ Prove: Mint_0[shift_sint32(a_1, i)] = Mint_0[shift_sint32(a, i)].
   Function main3
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/array_initialized.c, line 194):
+Goal Assertion (file array_initialized.c, line 194):
 Prove: true.
 
 ------------------------------------------------------------
@@ -252,7 +251,7 @@ Prove: true.
   Function main_pointer
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/array_initialized.c, line 283):
+Goal Assertion (file array_initialized.c, line 283):
 Let a = global(K_p_34).
 Assume {
   (* Heap *)
@@ -270,7 +269,7 @@ Prove: valid_rw(Malloc_0, Mptr_0[shift_PTR(a, i)], 1).
   Function simpl
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/array_initialized.c, line 288) in 'simpl':
+Goal Post-condition (file array_initialized.c, line 288) in 'simpl':
 Let x = Mint_0[shift_sint32(t, 0)].
 Assume {
   Type: is_sint32(x).
diff --git a/src/plugins/wp/tests/wp_typed/oracle/avar.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/avar.0.res.oracle
index fd7ab0c35a657ff5ba6547c8b6a7f35acc4f0b05..aa86080b5b384cca827b4b5e8fb4b453ae67317e 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/avar.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/avar.0.res.oracle
@@ -1,14 +1,14 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/avar.i (no preprocessing)
+[kernel] Parsing avar.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_typed/avar.i:4: Warning: 
+[kernel] avar.i:4: Warning: 
   No code nor implicit assigns clause for function f, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function g
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/avar.i, line 1) in 'f'' in 'g' at call 'f' (file tests/wp_typed/avar.i, line 4)
+Goal Instance of 'Pre-condition (file avar.i, line 1) in 'f'' in 'g' at call 'f' (file avar.i, line 4)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_typed/oracle/avar.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/avar.1.res.oracle
index 79830d2882daec567a83127aace0e428d09a4f14..0d402e887cd313a28e3a94ee362d33b07bf0a508 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/avar.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/avar.1.res.oracle
@@ -1,14 +1,14 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/avar.i (no preprocessing)
+[kernel] Parsing avar.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_typed/avar.i:4: Warning: 
+[kernel] avar.i:4: Warning: 
   No code nor implicit assigns clause for function f, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function g
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/avar.i, line 1) in 'f'' in 'g' at call 'f' (file tests/wp_typed/avar.i, line 4)
+Goal Instance of 'Pre-condition (file avar.i, line 1) in 'f'' in 'g' at call 'f' (file avar.i, line 4)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_typed/oracle/bug_9.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/bug_9.0.res.oracle
index 78f07a377734982e94506b88e77fcb910794fef7..910ba579a4f1d6528decb665ff401419a5647c5f 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/bug_9.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/bug_9.0.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/bug_9.c (with preprocessing)
+[kernel] Parsing bug_9.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/bug_9.c, line 14):
+Goal Assertion (file bug_9.c, line 14):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/bug_9.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/bug_9.1.res.oracle
index 4b6dba37d8e627e797ca1951231df79da442eb8f..77f2cd6ac2b2ee9d6c7cf6889e85dc82e9f552cc 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/bug_9.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/bug_9.1.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/bug_9.c (with preprocessing)
+[kernel] Parsing bug_9.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/bug_9.c, line 14):
+Goal Assertion (file bug_9.c, line 14):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/cast_fits.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/cast_fits.0.res.oracle
index 175f532ae7f266fc4435711706f0ba8423e25574..d253e6e9758ff8f66d0a608ba8d4d1dc2cd02b24 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/cast_fits.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/cast_fits.0.res.oracle
@@ -1,21 +1,21 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/cast_fits.i (no preprocessing)
+[kernel] Parsing cast_fits.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_typed/cast_fits.i:13: Warning: 
+[wp] cast_fits.i:13: Warning: 
   Cast with incompatible pointers types (source: __anonstruct_L2_2*)
      (target: sint32*)
-[wp] tests/wp_typed/cast_fits.i:54: Warning: 
+[wp] cast_fits.i:54: Warning: 
   Cast with incompatible pointers types (source: __anonunion_L8_8*)
      (target: sint32*)
-[wp] tests/wp_typed/cast_fits.i:60: Warning: 
+[wp] cast_fits.i:60: Warning: 
   Cast with incompatible pointers types (source: sint32*)
      (target: __anonunion_L8_8*)
 ------------------------------------------------------------
   Function fits1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 3) in 'fits1':
+Goal Post-condition (file cast_fits.i, line 3) in 'fits1':
 Let x = Mint_0[p].
 Let x_1 = Mint_0[shiftfield_F1_i1(p)].
 Assume {
@@ -30,7 +30,7 @@ Prove: x_1 = x.
   Function fits2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 19) in 'fits2':
+Goal Post-condition (file cast_fits.i, line 19) in 'fits2':
 Let x = Mint_0[shiftfield_F2_i2(p)].
 Let x_1 = Mint_0[shiftfield_F1_i1(shiftfield_F3_ic3(p))].
 Assume {
@@ -45,7 +45,7 @@ Prove: x_1 = x.
   Function fits3
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 27) in 'fits3':
+Goal Post-condition (file cast_fits.i, line 27) in 'fits3':
 Let x = Mint_0[shiftfield_F2_i2(p)].
 Let x_1 = Mint_0
             [shiftfield_F1_i1(shift___anonstruct_L1_1(shiftfield_F4_ic4(p),
@@ -62,7 +62,7 @@ Prove: x_1 = x.
   Function fits4
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 37) in 'fits4':
+Goal Post-condition (file cast_fits.i, line 37) in 'fits4':
 Let x = Mchar_0[shiftfield_F6_c6(p)].
 Let x_1 = Mchar_0
             [shiftfield_F3_c3(shift___anonstruct_L3_3(shiftfield_F5_ci5(p),
@@ -79,7 +79,7 @@ Prove: x_1 = x.
   Function fits5
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 45) in 'fits5':
+Goal Post-condition (file cast_fits.i, line 45) in 'fits5':
 Let x = Mint_0[p].
 Let x_1 = Mint_0[shiftfield_F7_u7(p)].
 Assume {
@@ -94,8 +94,8 @@ Prove: x_1 = x.
   Function mismatch1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 11) in 'mismatch1':
-tests/wp_typed/cast_fits.i:13: warning from Typed Model:
+Goal Post-condition (file cast_fits.i, line 11) in 'mismatch1':
+cast_fits.i:13: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: __anonstruct_L2_2*)
    (target: sint32*)
@@ -113,8 +113,8 @@ Prove: x_1 = x.
   Function mismatch2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 52) in 'mismatch2':
-tests/wp_typed/cast_fits.i:54: warning from Typed Model:
+Goal Post-condition (file cast_fits.i, line 52) in 'mismatch2':
+cast_fits.i:54: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: __anonunion_L8_8*)
    (target: sint32*)
@@ -132,8 +132,8 @@ Prove: x_1 = x.
   Function mismatch3
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 58) in 'mismatch3':
-tests/wp_typed/cast_fits.i:60: warning from Typed Model:
+Goal Post-condition (file cast_fits.i, line 58) in 'mismatch3':
+cast_fits.i:60: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: sint32*)
    (target: __anonunion_L8_8*)
diff --git a/src/plugins/wp/tests/wp_typed/oracle/cast_fits.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/cast_fits.1.res.oracle
index 0db2247f414f8cc14620db7ea3c67cd24eba1594..939b08f53249ea505bfcdeb4e2c6d55a3898ac51 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/cast_fits.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/cast_fits.1.res.oracle
@@ -1,21 +1,21 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/cast_fits.i (no preprocessing)
+[kernel] Parsing cast_fits.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_typed/cast_fits.i:13: Warning: 
+[wp] cast_fits.i:13: Warning: 
   Cast with incompatible pointers types (source: __anonstruct_L2_2*)
      (target: sint32*)
-[wp] tests/wp_typed/cast_fits.i:54: Warning: 
+[wp] cast_fits.i:54: Warning: 
   Cast with incompatible pointers types (source: __anonunion_L8_8*)
      (target: sint32*)
-[wp] tests/wp_typed/cast_fits.i:60: Warning: 
+[wp] cast_fits.i:60: Warning: 
   Cast with incompatible pointers types (source: sint32*)
      (target: __anonunion_L8_8*)
 ------------------------------------------------------------
   Function fits1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 3) in 'fits1':
+Goal Post-condition (file cast_fits.i, line 3) in 'fits1':
 Let x = Mint_0[p].
 Let x_1 = Mint_0[shiftfield_F1_i1(p)].
 Assume {
@@ -30,7 +30,7 @@ Prove: x_1 = x.
   Function fits2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 19) in 'fits2':
+Goal Post-condition (file cast_fits.i, line 19) in 'fits2':
 Let x = Mint_0[shiftfield_F2_i2(p)].
 Let x_1 = Mint_0[shiftfield_F1_i1(shiftfield_F3_ic3(p))].
 Assume {
@@ -45,7 +45,7 @@ Prove: x_1 = x.
   Function fits3
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 27) in 'fits3':
+Goal Post-condition (file cast_fits.i, line 27) in 'fits3':
 Let x = Mint_0[shiftfield_F2_i2(p)].
 Let x_1 = Mint_0
             [shiftfield_F1_i1(shift___anonstruct_L1_1(shiftfield_F4_ic4(p),
@@ -62,7 +62,7 @@ Prove: x_1 = x.
   Function fits4
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 37) in 'fits4':
+Goal Post-condition (file cast_fits.i, line 37) in 'fits4':
 Let x = Mchar_0[shiftfield_F6_c6(p)].
 Let x_1 = Mchar_0
             [shiftfield_F3_c3(shift___anonstruct_L3_3(shiftfield_F5_ci5(p),
@@ -79,7 +79,7 @@ Prove: x_1 = x.
   Function fits5
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 45) in 'fits5':
+Goal Post-condition (file cast_fits.i, line 45) in 'fits5':
 Let x = Mint_0[p].
 Let x_1 = Mint_0[shiftfield_F7_u7(p)].
 Assume {
@@ -94,8 +94,8 @@ Prove: x_1 = x.
   Function mismatch1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 11) in 'mismatch1':
-tests/wp_typed/cast_fits.i:13: warning from Typed Model:
+Goal Post-condition (file cast_fits.i, line 11) in 'mismatch1':
+cast_fits.i:13: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: __anonstruct_L2_2*)
    (target: sint32*)
@@ -113,8 +113,8 @@ Prove: x_1 = x.
   Function mismatch2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 52) in 'mismatch2':
-tests/wp_typed/cast_fits.i:54: warning from Typed Model:
+Goal Post-condition (file cast_fits.i, line 52) in 'mismatch2':
+cast_fits.i:54: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: __anonunion_L8_8*)
    (target: sint32*)
@@ -132,8 +132,8 @@ Prove: x_1 = x.
   Function mismatch3
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/cast_fits.i, line 58) in 'mismatch3':
-tests/wp_typed/cast_fits.i:60: warning from Typed Model:
+Goal Post-condition (file cast_fits.i, line 58) in 'mismatch3':
+cast_fits.i:60: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: sint32*)
    (target: __anonunion_L8_8*)
diff --git a/src/plugins/wp/tests/wp_typed/oracle/frame.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/frame.0.res.oracle
index ff1c02a4ba546326c78ca6b5c1bc43955534ced6..71c30b4c4b8bcb726174b6deca8fc6e4345af179 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/frame.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/frame.0.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/frame.i (no preprocessing)
+[kernel] Parsing frame.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function compound
 ------------------------------------------------------------
 
-Goal Assertion 'SEP' (file tests/wp_typed/frame.i, line 10):
+Goal Assertion 'SEP' (file frame.i, line 10):
 Assume {
   Type: is_sint32(k).
   (* Heap *)
@@ -19,7 +19,7 @@ Prove: (comp_0[k].F1_ptr) != global(L_m_28).
 
 ------------------------------------------------------------
 
-Goal Assertion 'RES' (file tests/wp_typed/frame.i, line 11):
+Goal Assertion 'RES' (file frame.i, line 11):
 Let a = comp_0[k].F1_ptr.
 Let a_1 = global(L_m_28).
 Let x = Mint_0[a <- 4][a_1].
diff --git a/src/plugins/wp/tests/wp_typed/oracle/frame.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/frame.1.res.oracle
index 93b726016189c4ba2b68bacb30ae8ca2fddfcbd2..9d5d618d1103a3f81ec1363f57062e3208a26e9d 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/frame.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/frame.1.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/frame.i (no preprocessing)
+[kernel] Parsing frame.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function compound
 ------------------------------------------------------------
 
-Goal Assertion 'SEP' (file tests/wp_typed/frame.i, line 10):
+Goal Assertion 'SEP' (file frame.i, line 10):
 Assume {
   Type: is_sint32(k).
   (* Heap *)
@@ -19,7 +19,7 @@ Prove: (comp_0[k].F1_ptr) != global(L_m_28).
 
 ------------------------------------------------------------
 
-Goal Assertion 'RES' (file tests/wp_typed/frame.i, line 11):
+Goal Assertion 'RES' (file frame.i, line 11):
 Let a = comp_0[k].F1_ptr.
 Let a_1 = global(L_m_28).
 Let x = Mint_0[a <- 4][a_1].
diff --git a/src/plugins/wp/tests/wp_typed/oracle/mvar.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/mvar.0.res.oracle
index c00b06312b62e50529b76e36b62185d8eeb09d9b..9329e0d434c5dbfb04fdfafb3d17c89687807415 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/mvar.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/mvar.0.res.oracle
@@ -1,14 +1,14 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/mvar.i (no preprocessing)
+[kernel] Parsing mvar.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_typed/mvar.i:14: Warning: 
+[kernel] mvar.i:14: Warning: 
   No code nor implicit assigns clause for function Write, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function Job
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/mvar.i, line 12) in 'Job':
+Goal Post-condition (file mvar.i, line 12) in 'Job':
 Assume {
   (* Heap *)
   Type: IsArray1_sint8(A).
diff --git a/src/plugins/wp/tests/wp_typed/oracle/mvar.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/mvar.1.res.oracle
index fef31f965305408e602c2e3191f7fea8c84510e2..f9d32dbb40e66f0761f13d1008f0f45420bc97a8 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/mvar.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/mvar.1.res.oracle
@@ -1,14 +1,14 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/mvar.i (no preprocessing)
+[kernel] Parsing mvar.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_typed/mvar.i:14: Warning: 
+[kernel] mvar.i:14: Warning: 
   No code nor implicit assigns clause for function Write, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function Job
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/mvar.i, line 12) in 'Job':
+Goal Post-condition (file mvar.i, line 12) in 'Job':
 Assume {
   (* Heap *)
   Type: IsArray1_sint8(A).
diff --git a/src/plugins/wp/tests/wp_typed/oracle/shift_lemma.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/shift_lemma.0.res.oracle
index 4d36bdaa42ccdc53dd00de1d58d254528811f40f..3832218916bc56f958f6e453f684d501a2d67860 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/shift_lemma.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/shift_lemma.0.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/shift_lemma.i (no preprocessing)
+[kernel] Parsing shift_lemma.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/shift_lemma.i, line 21):
+Goal Assertion (file shift_lemma.i, line 21):
 Let x = Mint_0[shiftfield_F2_s_d(p)].
 Let a = shiftfield_F2_s_u(p).
 Assume {
@@ -22,7 +22,7 @@ Prove: x = 0.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/shift_lemma.i, line 22):
+Goal Assertion (file shift_lemma.i, line 22):
 Let a = shiftfield_F2_s_u(p).
 Assume {
   Type: is_sint32(Mint_0[shiftfield_F2_s_e(p)]) /\
@@ -41,17 +41,17 @@ Prove: Mint_0[shiftfield_F1_t_c(shift_t(a, i))] = 0.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/shift_lemma.i, line 23):
+Goal Assertion (file shift_lemma.i, line 23):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/shift_lemma.i, line 24):
+Goal Assertion (file shift_lemma.i, line 24):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/shift_lemma.i, line 25):
+Goal Assertion (file shift_lemma.i, line 25):
 Let x = Mint_0[shiftfield_F2_s_e(p)].
 Assume {
   Type: is_sint32(x).
diff --git a/src/plugins/wp/tests/wp_typed/oracle/shift_lemma.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/shift_lemma.1.res.oracle
index 4b06e83a95830e9b28587ead79f408a849417783..af825a10c5bb8ef4dfd72e659a652cb2dbd7e77d 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/shift_lemma.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/shift_lemma.1.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/shift_lemma.i (no preprocessing)
+[kernel] Parsing shift_lemma.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/shift_lemma.i, line 21):
+Goal Assertion (file shift_lemma.i, line 21):
 Let x = Mint_0[shiftfield_F2_s_d(p)].
 Let a = shiftfield_F2_s_u(p).
 Assume {
@@ -22,7 +22,7 @@ Prove: x = 0.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/shift_lemma.i, line 22):
+Goal Assertion (file shift_lemma.i, line 22):
 Let a = shiftfield_F2_s_u(p).
 Assume {
   Type: is_sint32(Mint_0[shiftfield_F2_s_e(p)]) /\
@@ -41,17 +41,17 @@ Prove: Mint_0[shiftfield_F1_t_c(shift_t(a, i))] = 0.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/shift_lemma.i, line 23):
+Goal Assertion (file shift_lemma.i, line 23):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/shift_lemma.i, line 24):
+Goal Assertion (file shift_lemma.i, line 24):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/shift_lemma.i, line 25):
+Goal Assertion (file shift_lemma.i, line 25):
 Let x = Mint_0[shiftfield_F2_s_e(p)].
 Assume {
   Type: is_sint32(x).
diff --git a/src/plugins/wp/tests/wp_typed/oracle/struct_array_type.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/struct_array_type.res.oracle
index 5fcad89c14121824e5887d46d04dad71d38806bb..32e372b1fc5b9fa816fd153114efd0c27f7b17c0 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/struct_array_type.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/struct_array_type.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/struct_array_type.i (no preprocessing)
+[kernel] Parsing struct_array_type.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 [wp] 1 goal scheduled
@@ -91,7 +91,7 @@ end
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/struct_array_type.i, line 16) in 'f':
+Goal Post-condition (file struct_array_type.i, line 16) in 'f':
 Let a = t[SynchroId_0].
 Let a_1 = (a.F1_s_b)[0].
 Let a_2 = (a.F1_s_a)[0].
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.0.res.oracle
index d2e3f2a9cd72abe8c290a08496c943a44251a532..438c113a8daac098d7f4cc01116a79694a0221fb 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_alloc.i (no preprocessing)
+[kernel] Parsing unit_alloc.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -23,7 +23,7 @@ Prove: true.
   Function h
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/unit_alloc.i, line 33) in 'h':
+Goal Post-condition (file unit_alloc.i, line 33) in 'h':
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: !valid_rw(Malloc_0[P_x_40 <- 0], global(P_x_40), 1).
 
@@ -32,23 +32,23 @@ Prove: !valid_rw(Malloc_0[P_x_40 <- 0], global(P_x_40), 1).
   Function job
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/unit_alloc.i, line 15):
+Goal Assertion (file unit_alloc.i, line 15):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/unit_alloc.i, line 21):
+Goal Assertion (file unit_alloc.i, line 21):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: valid_rw(Malloc_0[L_y_25 <- 1], global(L_y_25), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/unit_alloc.i, line 22):
+Goal Assertion (file unit_alloc.i, line 22):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/unit_alloc.i, line 24):
+Goal Assertion (file unit_alloc.i, line 24):
 Let a = global(L_y_25).
 Assume {
   (* Heap *)
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.1.res.oracle
index 115e7900443a3b47594946cdc03820b159258291..c7ca5b835edc0d71505d8bfb6463af57182b6857 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/unit_alloc.i (no preprocessing)
+[kernel] Parsing unit_alloc.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -23,7 +23,7 @@ Prove: true.
   Function h
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/unit_alloc.i, line 33) in 'h':
+Goal Post-condition (file unit_alloc.i, line 33) in 'h':
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: !valid_rw(Malloc_0[P_x_40 <- 0], global(P_x_40), 1).
 
@@ -32,23 +32,23 @@ Prove: !valid_rw(Malloc_0[P_x_40 <- 0], global(P_x_40), 1).
   Function job
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/unit_alloc.i, line 15):
+Goal Assertion (file unit_alloc.i, line 15):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/unit_alloc.i, line 21):
+Goal Assertion (file unit_alloc.i, line 21):
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: valid_rw(Malloc_0[L_y_25 <- 1], global(L_y_25), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/unit_alloc.i, line 22):
+Goal Assertion (file unit_alloc.i, line 22):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/unit_alloc.i, line 24):
+Goal Assertion (file unit_alloc.i, line 24):
 Let a = global(L_y_25).
 Assume {
   (* Heap *)
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_bitwise.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_bitwise.res.oracle
index 6bddd899e5d968db9988a8569ae23c1ecafcadfd..8d65c6966da5d12f53d789715d58ea004de4cce3 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_bitwise.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_bitwise.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_bitwise.c (with preprocessing)
+[kernel] Parsing unit_bitwise.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -141,12 +141,12 @@ Prove: true
   Function band1_uchar
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 116):
+Goal Assertion 'ok' (file unit_bitwise.c, line 116):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 117):
+Goal Assertion 'ok' (file unit_bitwise.c, line 117):
 Let x = land(1, a). Assume { Type: is_uint8(a) /\ is_uint8(x). }
 Prove: 0 <= x.
 
@@ -155,12 +155,12 @@ Prove: 0 <= x.
   Function band1_uint
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 51):
+Goal Assertion 'ok' (file unit_bitwise.c, line 51):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 52):
+Goal Assertion 'ok' (file unit_bitwise.c, line 52):
 Let x = land(1, a). Assume { Type: is_uint32(a) /\ is_uint32(x). }
 Prove: 0 <= x.
 
@@ -169,12 +169,12 @@ Prove: 0 <= x.
   Function band1_ulong
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 169):
+Goal Assertion 'ok' (file unit_bitwise.c, line 169):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 170):
+Goal Assertion 'ok' (file unit_bitwise.c, line 170):
 Let x = land(1, a). Assume { Type: is_uint32(a) /\ is_uint32(x). }
 Prove: 0 <= x.
 
@@ -183,12 +183,12 @@ Prove: 0 <= x.
   Function band1_ushort
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 164):
+Goal Assertion 'ok' (file unit_bitwise.c, line 164):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 165):
+Goal Assertion 'ok' (file unit_bitwise.c, line 165):
 Let x = land(1, a). Assume { Type: is_uint16(a) /\ is_uint16(x). }
 Prove: 0 <= x.
 
@@ -211,12 +211,12 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 19):
+Goal Assertion 'ok' (file unit_bitwise.c, line 19):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ko' (file tests/wp_typed/unit_bitwise.c, line 20):
+Goal Assertion 'ko' (file unit_bitwise.c, line 20):
 Assume { Type: is_sint32(a). }
 Prove: land(281, a) <= 172.
 
@@ -370,42 +370,42 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 176):
+Goal Assertion 'ok' (file unit_bitwise.c, line 176):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 177):
+Goal Assertion 'ok' (file unit_bitwise.c, line 177):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 178):
+Goal Assertion 'ok' (file unit_bitwise.c, line 178):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 180):
+Goal Assertion 'ok' (file unit_bitwise.c, line 180):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 181):
+Goal Assertion 'ok' (file unit_bitwise.c, line 181):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 182):
+Goal Assertion 'ok' (file unit_bitwise.c, line 182):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 184):
+Goal Assertion 'ok' (file unit_bitwise.c, line 184):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'ko' (file tests/wp_typed/unit_bitwise.c, line 186):
+Goal Assertion 'ko' (file unit_bitwise.c, line 186):
 Let x = to_sint8(c). Assume { Type: is_uint8(c). }
 Prove: to_uint32(x) = x.
 
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_call.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_call.0.res.oracle
index 2b7c8292fd54200b551baba35eb0363df4096b14..7088dae230bb076c156e35ba64b86218710ae268 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_call.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_call.0.res.oracle
@@ -1,14 +1,14 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_call.i (no preprocessing)
+[kernel] Parsing unit_call.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_typed/unit_call.i:7: Warning: 
+[kernel] unit_call.i:7: Warning: 
   No code nor implicit assigns clause for function f, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function job
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/unit_call.i, line 14):
+Goal Assertion (file unit_call.i, line 14):
 Assume {
   Type: is_sint32(r_1) /\ is_sint32(r).
   (* Call 'f' *)
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_call.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_call.1.res.oracle
index 2fe4a4489865ce4a2bff1a42a3ea9d3fda75232e..96fd464c7d661aba8da4e1b6b8c8939905c3d33e 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_call.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_call.1.res.oracle
@@ -1,14 +1,14 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/unit_call.i (no preprocessing)
+[kernel] Parsing unit_call.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_typed/unit_call.i:7: Warning: 
+[kernel] unit_call.i:7: Warning: 
   No code nor implicit assigns clause for function f, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function job
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/unit_call.i, line 14):
+Goal Assertion (file unit_call.i, line 14):
 Assume {
   Type: is_sint32(r_1) /\ is_sint32(r).
   (* Call 'f' *)
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_cast.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_cast.0.res.oracle
index 280d1b5db6a8a50fb4bec3c575ffe2945408c13c..b8222c6a9e63711f4596018b136d7399ad70a120 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_cast.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_cast.0.res.oracle
@@ -1,15 +1,15 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_cast.i (no preprocessing)
+[kernel] Parsing unit_cast.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_typed/unit_cast.i:4: Warning: 
+[wp] unit_cast.i:4: Warning: 
   Cast with incompatible pointers types (source: sint32*) (target: sint8*)
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion 'OUT' (file tests/wp_typed/unit_cast.i, line 5):
-tests/wp_typed/unit_cast.i:4: warning from Typed Model:
+Goal Assertion 'OUT' (file unit_cast.i, line 5):
+unit_cast.i:4: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: sint32*) (target: sint8*)
 Let x = Mchar_0[w].
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_cast.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_cast.1.res.oracle
index 84e952f60190a0894e1608f693524f8f221ef31b..569fa012199a552edef54840ecb9189763856ed4 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_cast.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_cast.1.res.oracle
@@ -1,15 +1,15 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/unit_cast.i (no preprocessing)
+[kernel] Parsing unit_cast.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_typed/unit_cast.i:4: Warning: 
+[wp] unit_cast.i:4: Warning: 
   Cast with incompatible pointers types (source: sint32*) (target: sint8*)
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion 'OUT' (file tests/wp_typed/unit_cast.i, line 5):
-tests/wp_typed/unit_cast.i:4: warning from Typed Model:
+Goal Assertion 'OUT' (file unit_cast.i, line 5):
+unit_cast.i:4: warning from Typed Model:
  - Warning: Hide sub-term definition
    Reason: Cast with incompatible pointers types (source: sint32*) (target: sint8*)
 Let x = Mchar_0[w].
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_cst.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_cst.0.res.oracle
index f220848799ec78a5c6a29168d305db2f7347e0f8..2e55bc7c4acdb7a412baf2a660fcf34ad1871e88 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_cst.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_cst.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_cst.i (no preprocessing)
+[kernel] Parsing unit_cst.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_cst.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_cst.1.res.oracle
index ac27acaa0ddda8702954a63f3a1de2a28765810c..884e11db5d0cdbab19172762cfe36029787a0ca4 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_cst.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_cst.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/unit_cst.i (no preprocessing)
+[kernel] Parsing unit_cst.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_float.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_float.res.oracle
index 157f2dd9361584760669482fd204b616304881e9..61a5e4a85408a2b6f7549ce2995e190b274b2adf 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_float.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_float.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp -wp-model 'Typed' [...]
-[kernel] Parsing tests/wp_typed/unit_float.i (no preprocessing)
-[kernel:parser:decimal-float] tests/wp_typed/unit_float.i:21: Warning: 
+[kernel] Parsing unit_float.i (no preprocessing)
+[kernel:parser:decimal-float] unit_float.i:21: Warning: 
   Floating-point constant 0.2 is not represented exactly. Will use 0x1.999999999999ap-3.
   (warn-once: no further messages from category 'parser:decimal-float' will be emitted)
 [wp] Running WP plugin...
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_hard.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_hard.0.res.oracle
index 8c6dba5f1eb0f760cf13f4f9033e52ea88b62c73..b767ec279d1115c4bed5468ebb5d84a7c01f847b 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_hard.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_hard.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_hard.i (no preprocessing)
+[kernel] Parsing unit_hard.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_hard.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_hard.1.res.oracle
index dc71a1a475c539600e6c24eedb48fab7b55c26b2..132ab101432f439db8fb059f3ed0c3adf3e53455 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_hard.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_hard.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/unit_hard.i (no preprocessing)
+[kernel] Parsing unit_hard.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_ite.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_ite.0.res.oracle
index 508a664970f6135939d4b6e100f817a5ddf071d8..08d8e9ad8a0565bbc097f22f6b444e250ae151d9 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_ite.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_ite.0.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_ite.i (no preprocessing)
+[kernel] Parsing unit_ite.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function check
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/unit_ite.i, line 2) in 'check':
+Goal Post-condition (file unit_ite.i, line 2) in 'check':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_ite.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_ite.1.res.oracle
index c0eec98834070f47edced3f7b7288673ae2a08bc..2f7aa71d3d33574b1569f125e4c54209d0abf2e8 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_ite.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_ite.1.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/unit_ite.i (no preprocessing)
+[kernel] Parsing unit_ite.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function check
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/unit_ite.i, line 2) in 'check':
+Goal Post-condition (file unit_ite.i, line 2) in 'check':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_labels.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_labels.0.res.oracle
index f610bd6ab0f9f4e7c9c591aca024d38bdafe0449..b52708eacccc31ba227a5a8d34d96babf0028b86 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_labels.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_labels.0.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_labels.i (no preprocessing)
+[kernel] Parsing unit_labels.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function duplet
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/unit_labels.i, line 5) in 'duplet':
+Goal Post-condition (file unit_labels.i, line 5) in 'duplet':
 Let x = Mint_0[pi_0].
 Let a_1 = shift_sint32(a, x).
 Let x_1 = Mint_0[pj_0].
@@ -27,7 +27,7 @@ Prove: P_is_duplet(m, a, x, x_1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'PI' (file tests/wp_typed/unit_labels.i, line 9):
+Goal Assertion 'PI' (file unit_labels.i, line 9):
 Let x = Mint_0[pi_0].
 Let a_1 = shift_sint32(a, x).
 Let x_1 = Mint_0[pj_0].
@@ -46,7 +46,7 @@ Prove: x_2 = x.
 
 ------------------------------------------------------------
 
-Goal Assertion 'PJ' (file tests/wp_typed/unit_labels.i, line 10):
+Goal Assertion 'PJ' (file unit_labels.i, line 10):
 Let x = Mint_0[pi_0].
 Let a_1 = shift_sint32(a, x).
 Let x_1 = Mint_0[pj_0].
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_labels.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_labels.1.res.oracle
index 98b60be4d4acc85fc0c73725a7e1ca124159ed51..ed5563bc4c51388d1b74ec6e040d7b46ea7fb135 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_labels.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_labels.1.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/unit_labels.i (no preprocessing)
+[kernel] Parsing unit_labels.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function duplet
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/unit_labels.i, line 5) in 'duplet':
+Goal Post-condition (file unit_labels.i, line 5) in 'duplet':
 Assume {
   Type: is_sint32(pi_0) /\ is_sint32(pj_0).
   (* Heap *)
@@ -17,12 +17,12 @@ Prove: P_is_duplet(Mint_0[shift_sint32(a, pi_0)
 
 ------------------------------------------------------------
 
-Goal Assertion 'PI' (file tests/wp_typed/unit_labels.i, line 9):
+Goal Assertion 'PI' (file unit_labels.i, line 9):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'PJ' (file tests/wp_typed/unit_labels.i, line 10):
+Goal Assertion 'PJ' (file unit_labels.i, line 10):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_lemma.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_lemma.0.res.oracle
index 7c21a18a61a696a9dd81a12baedef66041010c81..78b83256cae4abf466777992fe0f366f76abf5f1 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_lemma.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_lemma.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_lemma.i (no preprocessing)
+[kernel] Parsing unit_lemma.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Global
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_lemma.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_lemma.1.res.oracle
index 8d72724d212dfebee9921b23f9a8f5d4a74ca81e..536685be19a4461ebbef898254745e1f9ff8e041 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_lemma.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_lemma.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/unit_lemma.i (no preprocessing)
+[kernel] Parsing unit_lemma.i (no preprocessing)
 [wp] Running WP plugin...
 ------------------------------------------------------------
   Global
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_local.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_local.0.res.oracle
index b79c6356f022c4b300687766ac2961b7bf048ea1..2385b5b0bb59402ebe7594c3a946f979625dacb0 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_local.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_local.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_local.c (with preprocessing)
+[kernel] Parsing unit_local.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_local.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_local.1.res.oracle
index f756360a105429747f220bf7b75df3e8d637a435..35ce187e1ee845a2d22daedd833dd06f5049beee 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_local.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_local.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Raw)' [...]
-[kernel] Parsing tests/wp_typed/unit_local.c (with preprocessing)
+[kernel] Parsing unit_local.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_loopscope.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_loopscope.0.res.oracle
index 5a1fdea5b33712a284f6c810143b991192fc0640..484b8538debd2933c153bb3a05de4d9a421f0ed6 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_loopscope.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_loopscope.0.res.oracle
@@ -1,19 +1,19 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_loopscope.i (no preprocessing)
+[kernel] Parsing unit_loopscope.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_typed/unit_loopscope.i:14: Warning: 
+[wp] unit_loopscope.i:14: Warning: 
   Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_typed/unit_loopscope.i, line 13):
+Goal Preservation of Invariant (file unit_loopscope.i, line 13):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_typed/unit_loopscope.i, line 13):
+Goal Establishment of Invariant (file unit_loopscope.i, line 13):
 Assume {
   (* Heap *)
   Type: (region(written_0.base) <= 0) /\ linked(Malloc_0).
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_loopscope.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_loopscope.1.res.oracle
index 9cd81cf810713b1a3524c268452769cbb34bcf1c..2082ace73480781792a239e0ec1f4ff264b80646 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_loopscope.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_loopscope.1.res.oracle
@@ -1,19 +1,19 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/unit_loopscope.i (no preprocessing)
+[kernel] Parsing unit_loopscope.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_typed/unit_loopscope.i:14: Warning: 
+[wp] unit_loopscope.i:14: Warning: 
   Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_typed/unit_loopscope.i, line 13):
+Goal Preservation of Invariant (file unit_loopscope.i, line 13):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_typed/unit_loopscope.i, line 13):
+Goal Establishment of Invariant (file unit_loopscope.i, line 13):
 Prove: false.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_matrix.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_matrix.0.res.oracle
index f3cb015dea5def8ab6a430cab921475060bcfab5..078baf8538d6797c84503ac7ce013c24f1cc2e24 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_matrix.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_matrix.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_matrix.i (no preprocessing)
+[kernel] Parsing unit_matrix.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_matrix.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_matrix.1.res.oracle
index c0f6bc8b083b00abd8b760766313095961da71ff..cef2454bc57aad86d51082815bc6b42d2f565cc1 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_matrix.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_matrix.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/unit_matrix.i (no preprocessing)
+[kernel] Parsing unit_matrix.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_string.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_string.0.res.oracle
index 09bf183361456eb884755b6f672fa5ed3444d56a..5d5c94c99bf6ed7af6130cc54e513bcc8e495364 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_string.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_string.0.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_string.i (no preprocessing)
+[kernel] Parsing unit_string.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion 'AB' (file tests/wp_typed/unit_string.i, line 11):
+Goal Assertion 'AB' (file unit_string.i, line 11):
 Prove: Str_4 != Str_3.
 
 ------------------------------------------------------------
 
-Goal Assertion 'B_valid' (file tests/wp_typed/unit_string.i, line 12):
+Goal Assertion 'B_valid' (file unit_string.i, line 12):
 Assume {
   (* Heap *)
   Type: linked(Malloc_0).
@@ -22,7 +22,7 @@ Prove: valid_rd(Malloc_0, shift_sint8(global(Str_3), 0), 3).
 
 ------------------------------------------------------------
 
-Goal Assertion 'B_end' (file tests/wp_typed/unit_string.i, line 13):
+Goal Assertion 'B_end' (file unit_string.i, line 13):
 Let a = global(Str_3).
 Let a_1 = shift_sint8(a, 3).
 Let x = Mchar_0[a_1].
@@ -39,7 +39,7 @@ Prove: (x = 0) /\ valid_rd(Malloc_0, a_1, 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'B_out' (file tests/wp_typed/unit_string.i, line 14):
+Goal Assertion 'B_out' (file unit_string.i, line 14):
 Let a = global(Str_3).
 Let a_1 = shift_sint8(a, 3).
 Assume {
@@ -56,7 +56,7 @@ Prove: !valid_rd(Malloc_0, shift_sint8(a, 4), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'B_rw' (file tests/wp_typed/unit_string.i, line 15):
+Goal Assertion 'B_rw' (file unit_string.i, line 15):
 Let a = global(Str_3).
 Let a_1 = shift_sint8(a, 3).
 Assume {
@@ -75,7 +75,7 @@ Prove: !valid_rw(Malloc_0, shift_sint8(a, 1), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'VAL' (file tests/wp_typed/unit_string.i, line 16):
+Goal Assertion 'VAL' (file unit_string.i, line 16):
 Let a = global(Str_3).
 Let a_1 = shift_sint8(a, 3).
 Assume {
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_string.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_string.1.res.oracle
index 33e37139a199e32a66d72f8398733bafe8f88bce..5a3a04c914c9b906b0010eca915a3df78614cc5f 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_string.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_string.1.res.oracle
@@ -1,17 +1,17 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/unit_string.i (no preprocessing)
+[kernel] Parsing unit_string.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assertion 'AB' (file tests/wp_typed/unit_string.i, line 11):
+Goal Assertion 'AB' (file unit_string.i, line 11):
 Prove: Str_4 != Str_3.
 
 ------------------------------------------------------------
 
-Goal Assertion 'B_valid' (file tests/wp_typed/unit_string.i, line 12):
+Goal Assertion 'B_valid' (file unit_string.i, line 12):
 Assume {
   (* Heap *)
   Type: linked(Malloc_0).
@@ -22,7 +22,7 @@ Prove: valid_rd(Malloc_0, shift_sint8(global(Str_3), 0), 3).
 
 ------------------------------------------------------------
 
-Goal Assertion 'B_end' (file tests/wp_typed/unit_string.i, line 13):
+Goal Assertion 'B_end' (file unit_string.i, line 13):
 Let a = global(Str_3).
 Let a_1 = shift_sint8(a, 3).
 Let x = Mchar_0[a_1].
@@ -39,7 +39,7 @@ Prove: (x = 0) /\ valid_rd(Malloc_0, a_1, 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'B_out' (file tests/wp_typed/unit_string.i, line 14):
+Goal Assertion 'B_out' (file unit_string.i, line 14):
 Let a = global(Str_3).
 Let a_1 = shift_sint8(a, 3).
 Assume {
@@ -56,7 +56,7 @@ Prove: !valid_rd(Malloc_0, shift_sint8(a, 4), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'B_rw' (file tests/wp_typed/unit_string.i, line 15):
+Goal Assertion 'B_rw' (file unit_string.i, line 15):
 Let a = global(Str_3).
 Let a_1 = shift_sint8(a, 3).
 Assume {
@@ -75,7 +75,7 @@ Prove: !valid_rw(Malloc_0, shift_sint8(a, 1), 1).
 
 ------------------------------------------------------------
 
-Goal Assertion 'VAL' (file tests/wp_typed/unit_string.i, line 16):
+Goal Assertion 'VAL' (file unit_string.i, line 16):
 Let a = global(Str_3).
 Let a_1 = shift_sint8(a, 3).
 Assume {
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_tset.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_tset.0.res.oracle
index fd636bbb09f5ba89b5108a7ce87a4e990a7a5b87..cc879306e51f39af99ddbbe3060026d470f57632 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_tset.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_tset.0.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/unit_tset.i (no preprocessing)
+[kernel] Parsing unit_tset.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function complex
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/unit_tset.i, line 6) in 'job'' in 'complex' at call 'job' (file tests/wp_typed/unit_tset.i, line 20)
+Goal Instance of 'Pre-condition (file unit_tset.i, line 6) in 'job'' in 'complex' at call 'job' (file unit_tset.i, line 20)
 :
 Prove: true.
 
@@ -15,7 +15,7 @@ Prove: true.
   Function complex with behavior default_for_stmt_2
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/unit_tset.i, line 19) at call 'job' (file tests/wp_typed/unit_tset.i, line 20):
+Goal Assigns (file unit_tset.i, line 19) at call 'job' (file unit_tset.i, line 20):
 Call Effect at line 20
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_tset.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_tset.1.res.oracle
index 7af88b3ded647e1a034133916ef6f2aa0e9e03c0..a7faa5fba26ed8a7dc18159bec4788dfa34ff9e8 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_tset.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_tset.1.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/unit_tset.i (no preprocessing)
+[kernel] Parsing unit_tset.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function complex
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/unit_tset.i, line 6) in 'job'' in 'complex' at call 'job' (file tests/wp_typed/unit_tset.i, line 20)
+Goal Instance of 'Pre-condition (file unit_tset.i, line 6) in 'job'' in 'complex' at call 'job' (file unit_tset.i, line 20)
 :
 Prove: true.
 
@@ -15,7 +15,7 @@ Prove: true.
   Function complex with behavior default_for_stmt_2
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/unit_tset.i, line 19) at call 'job' (file tests/wp_typed/unit_tset.i, line 20):
+Goal Assigns (file unit_tset.i, line 19) at call 'job' (file unit_tset.i, line 20):
 Call Effect at line 20
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_bitwise.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_bitwise.0.res.oracle
index 4e4f0bbf55a16a97adedf3c2357f132c3e3b91f2..b7ea3b3619611b0d36eab55744a176246226b9f4 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_bitwise.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_bitwise.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/user_bitwise.i (no preprocessing)
+[kernel] Parsing user_bitwise.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_bitwise.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_bitwise.1.res.oracle
index 8bb1f805315dbb8cf84ccfee810bfc0b1843b2f2..5e7ba69bc16679dcb3df272bf7f4e6258ec4cad8 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_bitwise.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_bitwise.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/user_bitwise.i (no preprocessing)
+[kernel] Parsing user_bitwise.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 [wp] No proof obligations
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_collect.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_collect.0.res.oracle
index 08ed2413253191c6d0e05590fbf877cfbd7cdf0b..e1e6368d2d764506d388a7674ae06a3229a2ddf4 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_collect.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_collect.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/user_collect.i (no preprocessing)
+[kernel] Parsing user_collect.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -49,7 +49,7 @@ Prove: x2_0 = v.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_collect.i, line 15) in 'job'' in 'caller' at call 'job' (file tests/wp_typed/user_collect.i, line 57)
+Goal Instance of 'Pre-condition (file user_collect.i, line 15) in 'job'' in 'caller' at call 'job' (file user_collect.i, line 57)
 :
 Assume { Type: is_sint32(k). (* Pre-condition *) Have: (0 <= k) /\ (k <= 8).
 }
@@ -57,7 +57,7 @@ Prove: k <= 9.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_collect.i, line 15) in 'job'' in 'caller' at call 'job' (file tests/wp_typed/user_collect.i, line 58)
+Goal Instance of 'Pre-condition (file user_collect.i, line 15) in 'job'' in 'caller' at call 'job' (file user_collect.i, line 58)
 :
 Let m = p[k <- v].
 Assume {
@@ -138,7 +138,7 @@ Prove: EqArray1_S1_S(10, m_1, m_2[k <- s2_0]).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_collect.i, line 26) in 'job2'' in 'caller2' at call 'job2' (file tests/wp_typed/user_collect.i, line 70)
+Goal Instance of 'Pre-condition (file user_collect.i, line 26) in 'job2'' in 'caller2' at call 'job2' (file user_collect.i, line 70)
 :
 Assume { Type: is_sint32(k). (* Pre-condition *) Have: (0 <= k) /\ (k <= 8).
 }
@@ -146,7 +146,7 @@ Prove: k <= 9.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_collect.i, line 26) in 'job2'' in 'caller2' at call 'job2' (file tests/wp_typed/user_collect.i, line 71)
+Goal Instance of 'Pre-condition (file user_collect.i, line 26) in 'job2'' in 'caller2' at call 'job2' (file user_collect.i, line 71)
 :
 Let m = q[k <- v].
 Assume {
@@ -227,7 +227,7 @@ Prove: EqArray1_S1_S(10, m_1, m_2[k <- s2_0]).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_collect.i, line 37) in 'job3'' in 'caller3' at call 'job3' (file tests/wp_typed/user_collect.i, line 83)
+Goal Instance of 'Pre-condition (file user_collect.i, line 37) in 'job3'' in 'caller3' at call 'job3' (file user_collect.i, line 83)
 :
 Assume { Type: is_sint32(k). (* Pre-condition *) Have: (0 <= k) /\ (k <= 8).
 }
@@ -235,7 +235,7 @@ Prove: k <= 9.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_collect.i, line 37) in 'job3'' in 'caller3' at call 'job3' (file tests/wp_typed/user_collect.i, line 84)
+Goal Instance of 'Pre-condition (file user_collect.i, line 37) in 'job3'' in 'caller3' at call 'job3' (file user_collect.i, line 84)
 :
 Let m = q[k <- v].
 Assume {
@@ -263,18 +263,18 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 18) in 'job' (1/3):
+Goal Assigns (file user_collect.i, line 18) in 'job' (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 18) in 'job' (2/3):
+Goal Assigns (file user_collect.i, line 18) in 'job' (2/3):
 Effect at line 22
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 18) in 'job' (3/3):
+Goal Assigns (file user_collect.i, line 18) in 'job' (3/3):
 Effect at line 22
 Prove: true.
 
@@ -293,18 +293,18 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 29) in 'job2' (1/3):
+Goal Assigns (file user_collect.i, line 29) in 'job2' (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 29) in 'job2' (2/3):
+Goal Assigns (file user_collect.i, line 29) in 'job2' (2/3):
 Effect at line 33
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 29) in 'job2' (3/3):
+Goal Assigns (file user_collect.i, line 29) in 'job2' (3/3):
 Effect at line 33
 Prove: true.
 
@@ -330,18 +330,18 @@ Prove: EqArray1_S1_S(10, m, q[k <- s]).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 40) in 'job3' (1/3):
+Goal Assigns (file user_collect.i, line 40) in 'job3' (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 40) in 'job3' (2/3):
+Goal Assigns (file user_collect.i, line 40) in 'job3' (2/3):
 Effect at line 44
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 40) in 'job3' (3/3):
+Goal Assigns (file user_collect.i, line 40) in 'job3' (3/3):
 Effect at line 45
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_collect.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_collect.1.res.oracle
index af4d14ff9c3f55f1a8c354b4777b3e80817a9bec..ac2a7f76c9282ac4f0d699087e7dbce8812b53e4 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_collect.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_collect.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/user_collect.i (no preprocessing)
+[kernel] Parsing user_collect.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -49,7 +49,7 @@ Prove: x2_0 = v.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_collect.i, line 15) in 'job'' in 'caller' at call 'job' (file tests/wp_typed/user_collect.i, line 57)
+Goal Instance of 'Pre-condition (file user_collect.i, line 15) in 'job'' in 'caller' at call 'job' (file user_collect.i, line 57)
 :
 Assume { Type: is_sint32(k). (* Pre-condition *) Have: (0 <= k) /\ (k <= 8).
 }
@@ -57,7 +57,7 @@ Prove: k <= 9.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_collect.i, line 15) in 'job'' in 'caller' at call 'job' (file tests/wp_typed/user_collect.i, line 58)
+Goal Instance of 'Pre-condition (file user_collect.i, line 15) in 'job'' in 'caller' at call 'job' (file user_collect.i, line 58)
 :
 Let m = p[k <- v].
 Assume {
@@ -138,7 +138,7 @@ Prove: EqArray1_S1_S(10, m_1, m_2[k <- s2_0]).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_collect.i, line 26) in 'job2'' in 'caller2' at call 'job2' (file tests/wp_typed/user_collect.i, line 70)
+Goal Instance of 'Pre-condition (file user_collect.i, line 26) in 'job2'' in 'caller2' at call 'job2' (file user_collect.i, line 70)
 :
 Assume { Type: is_sint32(k). (* Pre-condition *) Have: (0 <= k) /\ (k <= 8).
 }
@@ -146,7 +146,7 @@ Prove: k <= 9.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_collect.i, line 26) in 'job2'' in 'caller2' at call 'job2' (file tests/wp_typed/user_collect.i, line 71)
+Goal Instance of 'Pre-condition (file user_collect.i, line 26) in 'job2'' in 'caller2' at call 'job2' (file user_collect.i, line 71)
 :
 Let m = q[k <- v].
 Assume {
@@ -227,7 +227,7 @@ Prove: EqArray1_S1_S(10, m_1, m_2[k <- s2_0]).
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_collect.i, line 37) in 'job3'' in 'caller3' at call 'job3' (file tests/wp_typed/user_collect.i, line 83)
+Goal Instance of 'Pre-condition (file user_collect.i, line 37) in 'job3'' in 'caller3' at call 'job3' (file user_collect.i, line 83)
 :
 Assume { Type: is_sint32(k). (* Pre-condition *) Have: (0 <= k) /\ (k <= 8).
 }
@@ -235,7 +235,7 @@ Prove: k <= 9.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_collect.i, line 37) in 'job3'' in 'caller3' at call 'job3' (file tests/wp_typed/user_collect.i, line 84)
+Goal Instance of 'Pre-condition (file user_collect.i, line 37) in 'job3'' in 'caller3' at call 'job3' (file user_collect.i, line 84)
 :
 Let m = q[k <- v].
 Assume {
@@ -263,18 +263,18 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 18) in 'job' (1/3):
+Goal Assigns (file user_collect.i, line 18) in 'job' (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 18) in 'job' (2/3):
+Goal Assigns (file user_collect.i, line 18) in 'job' (2/3):
 Effect at line 22
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 18) in 'job' (3/3):
+Goal Assigns (file user_collect.i, line 18) in 'job' (3/3):
 Effect at line 22
 Prove: true.
 
@@ -293,18 +293,18 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 29) in 'job2' (1/3):
+Goal Assigns (file user_collect.i, line 29) in 'job2' (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 29) in 'job2' (2/3):
+Goal Assigns (file user_collect.i, line 29) in 'job2' (2/3):
 Effect at line 33
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 29) in 'job2' (3/3):
+Goal Assigns (file user_collect.i, line 29) in 'job2' (3/3):
 Effect at line 33
 Prove: true.
 
@@ -330,18 +330,18 @@ Prove: EqArray1_S1_S(10, m, q[k <- s]).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 40) in 'job3' (1/3):
+Goal Assigns (file user_collect.i, line 40) in 'job3' (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 40) in 'job3' (2/3):
+Goal Assigns (file user_collect.i, line 40) in 'job3' (2/3):
 Effect at line 44
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_collect.i, line 40) in 'job3' (3/3):
+Goal Assigns (file user_collect.i, line 40) in 'job3' (3/3):
 Effect at line 45
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_init.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_init.0.res.oracle
index 57d9150a815562d82288549a231d7a4054e0c40c..8df663247c2e9c441d561d00df1e3ecdb2fc96cc 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_init.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_init.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/user_init.i (no preprocessing)
+[kernel] Parsing user_init.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] [CFG] Goal init_exits : Valid (Unreachable)
 [wp] [CFG] Goal init_t1_exits : Valid (Unreachable)
@@ -11,7 +11,7 @@
   Function init
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 10) in 'init':
+Goal Post-condition (file user_init.i, line 10) in 'init':
 Let a_1 = shift_sint32(a, 0).
 Assume {
   Type: is_sint32(i) /\ is_sint32(n).
@@ -33,7 +33,7 @@ Prove: havoc(Mint_undef_0, Mint_0, a_1, i)[shift_sint32(a, i_1)] = v.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 17):
+Goal Preservation of Invariant 'Partial' (file user_init.i, line 17):
 Let a_1 = shift_sint32(a, 0).
 Let a_2 = havoc(Mint_undef_0, Mint_0, a_1, n).
 Assume {
@@ -56,12 +56,12 @@ Prove: a_2[shift_sint32(a, i) <- v][shift_sint32(a, i_1)] = v.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 17):
+Goal Establishment of Invariant 'Partial' (file user_init.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range' (file tests/wp_typed/user_init.i, line 16):
+Goal Preservation of Invariant 'Range' (file user_init.i, line 16):
 Let a_1 = shift_sint32(a, 0).
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(1 + i).
@@ -81,7 +81,7 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range' (file tests/wp_typed/user_init.i, line 16):
+Goal Establishment of Invariant 'Range' (file user_init.i, line 16):
 Prove: true.
 
 ------------------------------------------------------------
@@ -121,18 +121,18 @@ Prove: included(a_2, 1, a_1, n).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_init.i, line 9) in 'init':
+Goal Assigns (file user_init.i, line 9) in 'init':
 Effect at line 20
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 20):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 20):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 20):
+Goal Positivity of Loop variant at loop (file user_init.i, line 20):
 Prove: true.
 
 ------------------------------------------------------------
@@ -140,7 +140,7 @@ Prove: true.
   Function init_t1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 24) in 'init_t1':
+Goal Post-condition (file user_init.i, line 24) in 'init_t1':
 Assume {
   Type: is_uint32(i_1).
   (* Goal *)
@@ -156,7 +156,7 @@ Prove: t1_0[i] = v.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 32):
+Goal Preservation of Invariant 'Partial' (file user_init.i, line 32):
 Assume {
   Type: is_uint32(i).
   (* Goal *)
@@ -172,12 +172,12 @@ Prove: t1_0[i <- v][i_1] = v.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 32):
+Goal Establishment of Invariant 'Partial' (file user_init.i, line 32):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range' (file tests/wp_typed/user_init.i, line 31):
+Goal Preservation of Invariant 'Range' (file user_init.i, line 31):
 Assume {
   Type: is_uint32(i).
   (* Invariant 'Partial' *)
@@ -191,7 +191,7 @@ Prove: to_uint32(1 + i) <= 10.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range' (file tests/wp_typed/user_init.i, line 31):
+Goal Establishment of Invariant 'Range' (file user_init.i, line 31):
 Prove: true.
 
 ------------------------------------------------------------
@@ -201,19 +201,19 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_init.i, line 26) in 'init_t1' (1/2):
+Goal Assigns (file user_init.i, line 26) in 'init_t1' (1/2):
 Effect at line 35
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_init.i, line 26) in 'init_t1' (2/2):
+Goal Assigns (file user_init.i, line 26) in 'init_t1' (2/2):
 Effect at line 35
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 35):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 35):
 Assume {
   Type: is_uint32(i).
   (* Invariant 'Partial' *)
@@ -227,7 +227,7 @@ Prove: i < to_uint32(1 + i).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 35):
+Goal Positivity of Loop variant at loop (file user_init.i, line 35):
 Prove: true.
 
 ------------------------------------------------------------
@@ -235,7 +235,7 @@ Prove: true.
   Function init_t2_bis_v1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 127) in 'init_t2_bis_v1':
+Goal Post-condition (file user_init.i, line 127) in 'init_t2_bis_v1':
 Let a = global(G_t2_52).
 Assume {
   Type: is_uint32(i_2) /\ is_sint32(v).
@@ -260,12 +260,12 @@ Prove: Mint_0[shift_sint32(shift_A20_sint32(a, i), i_1)] = v.
 
 ------------------------------------------------------------
 
-Goal Exit-condition (file tests/wp_typed/user_init.i, line 129) in 'init_t2_bis_v1':
+Goal Exit-condition (file user_init.i, line 129) in 'init_t2_bis_v1':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 136):
+Goal Preservation of Invariant 'Partial' (file user_init.i, line 136):
 Let a = global(G_t2_52).
 Let a_1 = shift_A20_sint32(a, i).
 Let a_2 = shift_sint32(a_1, 0).
@@ -296,12 +296,12 @@ Prove: a_3[shift_sint32(shift_A20_sint32(a, i_1), i_2)] = Mint_undef_0[a_2].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 136):
+Goal Establishment of Invariant 'Partial' (file user_init.i, line 136):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range' (file tests/wp_typed/user_init.i, line 135):
+Goal Preservation of Invariant 'Range' (file user_init.i, line 135):
 Let a = global(G_t2_52).
 Let a_1 = shift_A20_sint32(a, i).
 Assume {
@@ -329,12 +329,12 @@ Prove: to_uint32(1 + i) <= 10.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range' (file tests/wp_typed/user_init.i, line 135):
+Goal Establishment of Invariant 'Range' (file user_init.i, line 135):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Offset' (file tests/wp_typed/user_init.i, line 141):
+Goal Assertion 'Offset' (file user_init.i, line 141):
 Prove: true.
 
 ------------------------------------------------------------
@@ -472,7 +472,7 @@ Prove: exists i_5,i_4 : Z. (i_5 <= i) /\ (i_4 <= i_1) /\ (0 <= i_5) /\
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 139):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 139):
 Let a = global(G_t2_52).
 Let a_1 = shift_A20_sint32(a, i).
 Assume {
@@ -500,18 +500,18 @@ Prove: i < to_uint32(1 + i).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 139):
+Goal Positivity of Loop variant at loop (file user_init.i, line 139):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_init.i, line 7) in 'init'' in 'init_t2_bis_v1' at call 'init' (file tests/wp_typed/user_init.i, line 140)
+Goal Instance of 'Pre-condition (file user_init.i, line 7) in 'init'' in 'init_t2_bis_v1' at call 'init' (file user_init.i, line 140)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_init.i, line 8) in 'init'' in 'init_t2_bis_v1' at call 'init' (file tests/wp_typed/user_init.i, line 140)
+Goal Instance of 'Pre-condition (file user_init.i, line 8) in 'init'' in 'init_t2_bis_v1' at call 'init' (file user_init.i, line 140)
 :
 Prove: true.
 
@@ -520,7 +520,7 @@ Prove: true.
   Function init_t2_bis_v2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 145) in 'init_t2_bis_v2':
+Goal Post-condition (file user_init.i, line 145) in 'init_t2_bis_v2':
 Let a = global(G_t2_52).
 Assume {
   Type: is_uint32(i_2) /\ is_sint32(v).
@@ -544,12 +544,12 @@ Prove: Mint_0[shift_sint32(shift_A20_sint32(a, i), i_1)] = v.
 
 ------------------------------------------------------------
 
-Goal Exit-condition (file tests/wp_typed/user_init.i, line 147) in 'init_t2_bis_v2':
+Goal Exit-condition (file user_init.i, line 147) in 'init_t2_bis_v2':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 154):
+Goal Preservation of Invariant 'Partial' (file user_init.i, line 154):
 Let a = global(G_t2_52).
 Let a_1 = shift_A20_sint32(a, i).
 Let a_2 = shift_sint32(a_1, 0).
@@ -579,12 +579,12 @@ Prove: a_3[shift_sint32(shift_A20_sint32(a, i_1), i_2)] = Mint_undef_0[a_2].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 154):
+Goal Establishment of Invariant 'Partial' (file user_init.i, line 154):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range' (file tests/wp_typed/user_init.i, line 153):
+Goal Preservation of Invariant 'Range' (file user_init.i, line 153):
 Let a = global(G_t2_52).
 Let a_1 = shift_A20_sint32(a, i).
 Assume {
@@ -611,12 +611,12 @@ Prove: to_uint32(1 + i) <= 10.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range' (file tests/wp_typed/user_init.i, line 153):
+Goal Establishment of Invariant 'Range' (file user_init.i, line 153):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Offset_i' (file tests/wp_typed/user_init.i, line 159):
+Goal Assertion 'Offset_i' (file user_init.i, line 159):
 Prove: true.
 
 ------------------------------------------------------------
@@ -745,7 +745,7 @@ Prove: exists i_5,i_4 : Z. (i_5 <= i) /\ (i_4 <= i_1) /\ (0 <= i_5) /\
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 157):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 157):
 Let a = global(G_t2_52).
 Let a_1 = shift_A20_sint32(a, i).
 Assume {
@@ -772,18 +772,18 @@ Prove: i < to_uint32(1 + i).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 157):
+Goal Positivity of Loop variant at loop (file user_init.i, line 157):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_init.i, line 7) in 'init'' in 'init_t2_bis_v2' at call 'init' (file tests/wp_typed/user_init.i, line 158)
+Goal Instance of 'Pre-condition (file user_init.i, line 7) in 'init'' in 'init_t2_bis_v2' at call 'init' (file user_init.i, line 158)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_init.i, line 8) in 'init'' in 'init_t2_bis_v2' at call 'init' (file tests/wp_typed/user_init.i, line 158)
+Goal Instance of 'Pre-condition (file user_init.i, line 8) in 'init'' in 'init_t2_bis_v2' at call 'init' (file user_init.i, line 158)
 :
 Prove: true.
 
@@ -792,7 +792,7 @@ Prove: true.
   Function init_t2_v1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 39) in 'init_t2_v1':
+Goal Post-condition (file user_init.i, line 39) in 'init_t2_v1':
 Assume {
   (* Heap *)
   Type: IsArray2_sint32(t2_1).
@@ -811,7 +811,7 @@ Prove: t2_0[i][i_1] = v.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial_i' (file tests/wp_typed/user_init.i, line 48):
+Goal Preservation of Invariant 'Partial_i' (file user_init.i, line 48):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i).
@@ -846,12 +846,12 @@ Prove: m[0] = t2_0[i_1][i_2].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial_i' (file tests/wp_typed/user_init.i, line 48):
+Goal Establishment of Invariant 'Partial_i' (file user_init.i, line 48):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range_i' (file tests/wp_typed/user_init.i, line 47):
+Goal Preservation of Invariant 'Range_i' (file user_init.i, line 47):
 Assume {
   Type: is_uint32(i).
   (* Heap *)
@@ -883,12 +883,12 @@ Prove: to_uint32(1 + i) <= 10.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range_i' (file tests/wp_typed/user_init.i, line 47):
+Goal Establishment of Invariant 'Range_i' (file user_init.i, line 47):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial_j' (file tests/wp_typed/user_init.i, line 54):
+Goal Preservation of Invariant 'Partial_j' (file user_init.i, line 54):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
@@ -927,12 +927,12 @@ Prove: m[j <- v][i_1] = v.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial_j' (file tests/wp_typed/user_init.i, line 54):
+Goal Establishment of Invariant 'Partial_j' (file user_init.i, line 54):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Previous_i' (file tests/wp_typed/user_init.i, line 55):
+Goal Preservation of Invariant 'Previous_i' (file user_init.i, line 55):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
@@ -971,12 +971,12 @@ Prove: t2_0[i <- m[j <- v]][i_1][i_2] = t2_1[i_1][i_2].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Previous_i' (file tests/wp_typed/user_init.i, line 55):
+Goal Establishment of Invariant 'Previous_i' (file user_init.i, line 55):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range_j' (file tests/wp_typed/user_init.i, line 53):
+Goal Preservation of Invariant 'Range_j' (file user_init.i, line 53):
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
   (* Heap *)
@@ -1012,17 +1012,17 @@ Prove: to_uint32(1 + j) <= 20.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range_j' (file tests/wp_typed/user_init.i, line 53):
+Goal Establishment of Invariant 'Range_j' (file user_init.i, line 53):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Last_j' (file tests/wp_typed/user_init.i, line 61):
+Goal Assertion 'Last_j' (file user_init.i, line 61):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Last_i' (file tests/wp_typed/user_init.i, line 64):
+Goal Assertion 'Last_i' (file user_init.i, line 64):
 Prove: true.
 
 ------------------------------------------------------------
@@ -1223,7 +1223,7 @@ Prove: exists i_5,i_4 : Z. (i_5 <= i) /\ (i_4 <= i_1) /\ (0 <= i_5) /\
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 51):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 51):
 Assume {
   Type: is_uint32(i).
   (* Heap *)
@@ -1255,12 +1255,12 @@ Prove: i < to_uint32(1 + i).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 51):
+Goal Positivity of Loop variant at loop (file user_init.i, line 51):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 58):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 58):
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
   (* Heap *)
@@ -1296,7 +1296,7 @@ Prove: j < to_uint32(1 + j).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 58):
+Goal Positivity of Loop variant at loop (file user_init.i, line 58):
 Prove: true.
 
 ------------------------------------------------------------
@@ -1304,7 +1304,7 @@ Prove: true.
   Function init_t2_v2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 68) in 'init_t2_v2':
+Goal Post-condition (file user_init.i, line 68) in 'init_t2_v2':
 Assume {
   (* Goal *)
   When: (0 <= i) /\ (0 <= i_1) /\ (i <= 9) /\ (i_1 <= 19).
@@ -1316,7 +1316,7 @@ Prove: t2_0[i][i_1] = v.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial_i' (file tests/wp_typed/user_init.i, line 77):
+Goal Preservation of Invariant 'Partial_i' (file user_init.i, line 77):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i).
@@ -1339,12 +1339,12 @@ Prove: m[0] = t2_0[i_1][i_2].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial_i' (file tests/wp_typed/user_init.i, line 77):
+Goal Establishment of Invariant 'Partial_i' (file user_init.i, line 77):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range_i' (file tests/wp_typed/user_init.i, line 76):
+Goal Preservation of Invariant 'Range_i' (file user_init.i, line 76):
 Assume {
   Type: is_uint32(i).
   (* Invariant 'Partial_i' *)
@@ -1364,12 +1364,12 @@ Prove: to_uint32(1 + i) <= 10.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range_i' (file tests/wp_typed/user_init.i, line 76):
+Goal Establishment of Invariant 'Range_i' (file user_init.i, line 76):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial_j' (file tests/wp_typed/user_init.i, line 83):
+Goal Preservation of Invariant 'Partial_j' (file user_init.i, line 83):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
@@ -1396,12 +1396,12 @@ Prove: m[j <- v][i_1] = v.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial_j' (file tests/wp_typed/user_init.i, line 83):
+Goal Establishment of Invariant 'Partial_j' (file user_init.i, line 83):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Previous_i' (file tests/wp_typed/user_init.i, line 84):
+Goal Preservation of Invariant 'Previous_i' (file user_init.i, line 84):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
@@ -1428,12 +1428,12 @@ Prove: t2_0[i <- m[j <- v]][i_1][i_2] = t2_1[i_1][i_2].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Previous_i' (file tests/wp_typed/user_init.i, line 84):
+Goal Establishment of Invariant 'Previous_i' (file user_init.i, line 84):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range_j' (file tests/wp_typed/user_init.i, line 82):
+Goal Preservation of Invariant 'Range_j' (file user_init.i, line 82):
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
   (* Invariant 'Partial_i' *)
@@ -1457,17 +1457,17 @@ Prove: to_uint32(1 + j) <= 20.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range_j' (file tests/wp_typed/user_init.i, line 82):
+Goal Establishment of Invariant 'Range_j' (file user_init.i, line 82):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Last_j' (file tests/wp_typed/user_init.i, line 90):
+Goal Assertion 'Last_j' (file user_init.i, line 90):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Last_i' (file tests/wp_typed/user_init.i, line 93):
+Goal Assertion 'Last_i' (file user_init.i, line 93):
 Prove: true.
 
 ------------------------------------------------------------
@@ -1608,7 +1608,7 @@ Prove: exists i_5,i_4 : Z. (i_5 <= i) /\ (i_4 <= i_1) /\ (0 <= i_5) /\
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 80):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 80):
 Assume {
   Type: is_uint32(i).
   (* Invariant 'Partial_i' *)
@@ -1628,12 +1628,12 @@ Prove: i < to_uint32(1 + i).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 80):
+Goal Positivity of Loop variant at loop (file user_init.i, line 80):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 87):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 87):
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
   (* Invariant 'Partial_i' *)
@@ -1657,7 +1657,7 @@ Prove: j < to_uint32(1 + j).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 87):
+Goal Positivity of Loop variant at loop (file user_init.i, line 87):
 Prove: true.
 
 ------------------------------------------------------------
@@ -1665,7 +1665,7 @@ Prove: true.
   Function init_t2_v3
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 99) in 'init_t2_v3':
+Goal Post-condition (file user_init.i, line 99) in 'init_t2_v3':
 Assume {
   Type: is_sint32(v).
   (* Goal *)
@@ -1678,7 +1678,7 @@ Prove: P_MemSet20(t2_0[i], 20, v).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial_i' (file tests/wp_typed/user_init.i, line 108):
+Goal Preservation of Invariant 'Partial_i' (file user_init.i, line 108):
 Assume {
   Type: IsArray1_sint32(v) /\ is_uint32(i) /\ is_sint32(v_1) /\
       IsArray1_sint32(t2_0[i]).
@@ -1698,12 +1698,12 @@ Prove: P_MemSet20(t2_0[i <- v][i_1], 20, v_1).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial_i' (file tests/wp_typed/user_init.i, line 108):
+Goal Establishment of Invariant 'Partial_i' (file user_init.i, line 108):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range_i' (file tests/wp_typed/user_init.i, line 107):
+Goal Preservation of Invariant 'Range_i' (file user_init.i, line 107):
 Assume {
   Type: IsArray1_sint32(v) /\ is_uint32(i) /\ is_sint32(v_1) /\
       IsArray1_sint32(t2_0[i]).
@@ -1721,12 +1721,12 @@ Prove: to_uint32(1 + i) <= 10.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range_i' (file tests/wp_typed/user_init.i, line 107):
+Goal Establishment of Invariant 'Range_i' (file user_init.i, line 107):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial_j' (file tests/wp_typed/user_init.i, line 114):
+Goal Preservation of Invariant 'Partial_j' (file user_init.i, line 114):
 Let m = v[j <- v_1].
 Assume {
   Type: IsArray1_sint32(v) /\ is_uint32(i) /\ is_uint32(j) /\
@@ -1749,7 +1749,7 @@ Prove: P_MemSet20(m, to_uint32(1 + j), v_1).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial_j' (file tests/wp_typed/user_init.i, line 114):
+Goal Establishment of Invariant 'Partial_j' (file user_init.i, line 114):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i) /\ is_sint32(v) /\ IsArray1_sint32(m).
@@ -1765,7 +1765,7 @@ Prove: P_MemSet20(m, 0, v).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range_j' (file tests/wp_typed/user_init.i, line 113):
+Goal Preservation of Invariant 'Range_j' (file user_init.i, line 113):
 Assume {
   Type: IsArray1_sint32(v) /\ is_uint32(i) /\ is_uint32(j) /\
       is_sint32(v_1) /\ IsArray1_sint32(t2_0[i]).
@@ -1787,17 +1787,17 @@ Prove: to_uint32(1 + j) <= 20.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range_j' (file tests/wp_typed/user_init.i, line 113):
+Goal Establishment of Invariant 'Range_j' (file user_init.i, line 113):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Last_j' (file tests/wp_typed/user_init.i, line 120):
+Goal Assertion 'Last_j' (file user_init.i, line 120):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Last_i' (file tests/wp_typed/user_init.i, line 123):
+Goal Assertion 'Last_i' (file user_init.i, line 123):
 Prove: true.
 
 ------------------------------------------------------------
@@ -1882,7 +1882,7 @@ Prove: exists i_5,i_4 : Z. (i_5 <= i) /\ (i_4 <= i_1) /\ (0 <= i_5) /\
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 111):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 111):
 Assume {
   Type: IsArray1_sint32(v) /\ is_uint32(i) /\ is_sint32(v_1) /\
       IsArray1_sint32(t2_0[i]).
@@ -1900,12 +1900,12 @@ Prove: i < to_uint32(1 + i).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 111):
+Goal Positivity of Loop variant at loop (file user_init.i, line 111):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 117):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 117):
 Assume {
   Type: IsArray1_sint32(v) /\ is_uint32(i) /\ is_uint32(j) /\
       is_sint32(v_1) /\ IsArray1_sint32(t2_0[i]).
@@ -1927,7 +1927,7 @@ Prove: j < to_uint32(1 + j).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 117):
+Goal Positivity of Loop variant at loop (file user_init.i, line 117):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_init.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_init.1.res.oracle
index 2b7c224c04f509bfa2365292aedb2e50f4dc976a..49de109ec1d567fbc7e691ee31a699d464329a9f 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_init.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_init.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/user_init.i (no preprocessing)
+[kernel] Parsing user_init.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] [CFG] Goal init_exits : Valid (Unreachable)
 [wp] [CFG] Goal init_t1_exits : Valid (Unreachable)
@@ -11,7 +11,7 @@
   Function init
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 10) in 'init':
+Goal Post-condition (file user_init.i, line 10) in 'init':
 Let a_1 = shift_sint32(a, 0).
 Assume {
   Type: is_sint32(i) /\ is_sint32(n).
@@ -33,7 +33,7 @@ Prove: havoc(Mint_undef_0, Mint_0, a_1, i)[shift_sint32(a, i_1)] = v.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 17):
+Goal Preservation of Invariant 'Partial' (file user_init.i, line 17):
 Let a_1 = shift_sint32(a, 0).
 Let a_2 = havoc(Mint_undef_0, Mint_0, a_1, n).
 Assume {
@@ -56,12 +56,12 @@ Prove: a_2[shift_sint32(a, i) <- v][shift_sint32(a, i_1)] = v.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 17):
+Goal Establishment of Invariant 'Partial' (file user_init.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range' (file tests/wp_typed/user_init.i, line 16):
+Goal Preservation of Invariant 'Range' (file user_init.i, line 16):
 Let a_1 = shift_sint32(a, 0).
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(1 + i).
@@ -81,7 +81,7 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range' (file tests/wp_typed/user_init.i, line 16):
+Goal Establishment of Invariant 'Range' (file user_init.i, line 16):
 Prove: true.
 
 ------------------------------------------------------------
@@ -121,18 +121,18 @@ Prove: included(a_2, 1, a_1, n).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_init.i, line 9) in 'init':
+Goal Assigns (file user_init.i, line 9) in 'init':
 Effect at line 20
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 20):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 20):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 20):
+Goal Positivity of Loop variant at loop (file user_init.i, line 20):
 Prove: true.
 
 ------------------------------------------------------------
@@ -140,7 +140,7 @@ Prove: true.
   Function init_t1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 24) in 'init_t1':
+Goal Post-condition (file user_init.i, line 24) in 'init_t1':
 Assume {
   Type: is_uint32(i_1).
   (* Goal *)
@@ -156,7 +156,7 @@ Prove: t1_0[i] = v.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 32):
+Goal Preservation of Invariant 'Partial' (file user_init.i, line 32):
 Assume {
   Type: is_uint32(i).
   (* Goal *)
@@ -172,12 +172,12 @@ Prove: t1_0[i <- v][i_1] = v.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 32):
+Goal Establishment of Invariant 'Partial' (file user_init.i, line 32):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range' (file tests/wp_typed/user_init.i, line 31):
+Goal Preservation of Invariant 'Range' (file user_init.i, line 31):
 Assume {
   Type: is_uint32(i).
   (* Invariant 'Partial' *)
@@ -191,7 +191,7 @@ Prove: to_uint32(1 + i) <= 10.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range' (file tests/wp_typed/user_init.i, line 31):
+Goal Establishment of Invariant 'Range' (file user_init.i, line 31):
 Prove: true.
 
 ------------------------------------------------------------
@@ -201,19 +201,19 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_init.i, line 26) in 'init_t1' (1/2):
+Goal Assigns (file user_init.i, line 26) in 'init_t1' (1/2):
 Effect at line 35
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_typed/user_init.i, line 26) in 'init_t1' (2/2):
+Goal Assigns (file user_init.i, line 26) in 'init_t1' (2/2):
 Effect at line 35
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 35):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 35):
 Assume {
   Type: is_uint32(i).
   (* Invariant 'Partial' *)
@@ -227,7 +227,7 @@ Prove: i < to_uint32(1 + i).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 35):
+Goal Positivity of Loop variant at loop (file user_init.i, line 35):
 Prove: true.
 
 ------------------------------------------------------------
@@ -235,7 +235,7 @@ Prove: true.
   Function init_t2_bis_v1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 127) in 'init_t2_bis_v1':
+Goal Post-condition (file user_init.i, line 127) in 'init_t2_bis_v1':
 Let a = global(G_t2_52).
 Assume {
   Type: is_uint32(i_2) /\ is_sint32(v).
@@ -260,12 +260,12 @@ Prove: Mint_0[shift_sint32(shift_A20_sint32(a, i), i_1)] = v.
 
 ------------------------------------------------------------
 
-Goal Exit-condition (file tests/wp_typed/user_init.i, line 129) in 'init_t2_bis_v1':
+Goal Exit-condition (file user_init.i, line 129) in 'init_t2_bis_v1':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 136):
+Goal Preservation of Invariant 'Partial' (file user_init.i, line 136):
 Let a = global(G_t2_52).
 Let a_1 = shift_A20_sint32(a, i).
 Let a_2 = shift_sint32(a_1, 0).
@@ -296,12 +296,12 @@ Prove: a_3[shift_sint32(shift_A20_sint32(a, i_1), i_2)] = Mint_undef_0[a_2].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 136):
+Goal Establishment of Invariant 'Partial' (file user_init.i, line 136):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range' (file tests/wp_typed/user_init.i, line 135):
+Goal Preservation of Invariant 'Range' (file user_init.i, line 135):
 Let a = global(G_t2_52).
 Let a_1 = shift_A20_sint32(a, i).
 Assume {
@@ -329,12 +329,12 @@ Prove: to_uint32(1 + i) <= 10.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range' (file tests/wp_typed/user_init.i, line 135):
+Goal Establishment of Invariant 'Range' (file user_init.i, line 135):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Offset' (file tests/wp_typed/user_init.i, line 141):
+Goal Assertion 'Offset' (file user_init.i, line 141):
 Prove: true.
 
 ------------------------------------------------------------
@@ -472,7 +472,7 @@ Prove: exists i_5,i_4 : Z. (i_5 <= i) /\ (i_4 <= i_1) /\ (0 <= i_5) /\
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 139):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 139):
 Let a = global(G_t2_52).
 Let a_1 = shift_A20_sint32(a, i).
 Assume {
@@ -500,18 +500,18 @@ Prove: i < to_uint32(1 + i).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 139):
+Goal Positivity of Loop variant at loop (file user_init.i, line 139):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_init.i, line 7) in 'init'' in 'init_t2_bis_v1' at call 'init' (file tests/wp_typed/user_init.i, line 140)
+Goal Instance of 'Pre-condition (file user_init.i, line 7) in 'init'' in 'init_t2_bis_v1' at call 'init' (file user_init.i, line 140)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_init.i, line 8) in 'init'' in 'init_t2_bis_v1' at call 'init' (file tests/wp_typed/user_init.i, line 140)
+Goal Instance of 'Pre-condition (file user_init.i, line 8) in 'init'' in 'init_t2_bis_v1' at call 'init' (file user_init.i, line 140)
 :
 Prove: true.
 
@@ -520,7 +520,7 @@ Prove: true.
   Function init_t2_bis_v2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 145) in 'init_t2_bis_v2':
+Goal Post-condition (file user_init.i, line 145) in 'init_t2_bis_v2':
 Let a = global(G_t2_52).
 Assume {
   Type: is_uint32(i_2) /\ is_sint32(v).
@@ -544,12 +544,12 @@ Prove: Mint_0[shift_sint32(shift_A20_sint32(a, i), i_1)] = v.
 
 ------------------------------------------------------------
 
-Goal Exit-condition (file tests/wp_typed/user_init.i, line 147) in 'init_t2_bis_v2':
+Goal Exit-condition (file user_init.i, line 147) in 'init_t2_bis_v2':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 154):
+Goal Preservation of Invariant 'Partial' (file user_init.i, line 154):
 Let a = global(G_t2_52).
 Let a_1 = shift_A20_sint32(a, i).
 Let a_2 = shift_sint32(a_1, 0).
@@ -579,12 +579,12 @@ Prove: a_3[shift_sint32(shift_A20_sint32(a, i_1), i_2)] = Mint_undef_0[a_2].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial' (file tests/wp_typed/user_init.i, line 154):
+Goal Establishment of Invariant 'Partial' (file user_init.i, line 154):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range' (file tests/wp_typed/user_init.i, line 153):
+Goal Preservation of Invariant 'Range' (file user_init.i, line 153):
 Let a = global(G_t2_52).
 Let a_1 = shift_A20_sint32(a, i).
 Assume {
@@ -611,12 +611,12 @@ Prove: to_uint32(1 + i) <= 10.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range' (file tests/wp_typed/user_init.i, line 153):
+Goal Establishment of Invariant 'Range' (file user_init.i, line 153):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Offset_i' (file tests/wp_typed/user_init.i, line 159):
+Goal Assertion 'Offset_i' (file user_init.i, line 159):
 Prove: true.
 
 ------------------------------------------------------------
@@ -745,7 +745,7 @@ Prove: exists i_5,i_4 : Z. (i_5 <= i) /\ (i_4 <= i_1) /\ (0 <= i_5) /\
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 157):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 157):
 Let a = global(G_t2_52).
 Let a_1 = shift_A20_sint32(a, i).
 Assume {
@@ -772,18 +772,18 @@ Prove: i < to_uint32(1 + i).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 157):
+Goal Positivity of Loop variant at loop (file user_init.i, line 157):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_init.i, line 7) in 'init'' in 'init_t2_bis_v2' at call 'init' (file tests/wp_typed/user_init.i, line 158)
+Goal Instance of 'Pre-condition (file user_init.i, line 7) in 'init'' in 'init_t2_bis_v2' at call 'init' (file user_init.i, line 158)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_init.i, line 8) in 'init'' in 'init_t2_bis_v2' at call 'init' (file tests/wp_typed/user_init.i, line 158)
+Goal Instance of 'Pre-condition (file user_init.i, line 8) in 'init'' in 'init_t2_bis_v2' at call 'init' (file user_init.i, line 158)
 :
 Prove: true.
 
@@ -792,7 +792,7 @@ Prove: true.
   Function init_t2_v1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 39) in 'init_t2_v1':
+Goal Post-condition (file user_init.i, line 39) in 'init_t2_v1':
 Assume {
   (* Heap *)
   Type: IsArray2_sint32(t2_1).
@@ -811,7 +811,7 @@ Prove: t2_0[i][i_1] = v.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial_i' (file tests/wp_typed/user_init.i, line 48):
+Goal Preservation of Invariant 'Partial_i' (file user_init.i, line 48):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i).
@@ -846,12 +846,12 @@ Prove: m[0] = t2_0[i_1][i_2].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial_i' (file tests/wp_typed/user_init.i, line 48):
+Goal Establishment of Invariant 'Partial_i' (file user_init.i, line 48):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range_i' (file tests/wp_typed/user_init.i, line 47):
+Goal Preservation of Invariant 'Range_i' (file user_init.i, line 47):
 Assume {
   Type: is_uint32(i).
   (* Heap *)
@@ -883,12 +883,12 @@ Prove: to_uint32(1 + i) <= 10.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range_i' (file tests/wp_typed/user_init.i, line 47):
+Goal Establishment of Invariant 'Range_i' (file user_init.i, line 47):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial_j' (file tests/wp_typed/user_init.i, line 54):
+Goal Preservation of Invariant 'Partial_j' (file user_init.i, line 54):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
@@ -927,12 +927,12 @@ Prove: m[j <- v][i_1] = v.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial_j' (file tests/wp_typed/user_init.i, line 54):
+Goal Establishment of Invariant 'Partial_j' (file user_init.i, line 54):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Previous_i' (file tests/wp_typed/user_init.i, line 55):
+Goal Preservation of Invariant 'Previous_i' (file user_init.i, line 55):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
@@ -971,12 +971,12 @@ Prove: t2_0[i <- m[j <- v]][i_1][i_2] = t2_1[i_1][i_2].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Previous_i' (file tests/wp_typed/user_init.i, line 55):
+Goal Establishment of Invariant 'Previous_i' (file user_init.i, line 55):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range_j' (file tests/wp_typed/user_init.i, line 53):
+Goal Preservation of Invariant 'Range_j' (file user_init.i, line 53):
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
   (* Heap *)
@@ -1012,17 +1012,17 @@ Prove: to_uint32(1 + j) <= 20.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range_j' (file tests/wp_typed/user_init.i, line 53):
+Goal Establishment of Invariant 'Range_j' (file user_init.i, line 53):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Last_j' (file tests/wp_typed/user_init.i, line 61):
+Goal Assertion 'Last_j' (file user_init.i, line 61):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Last_i' (file tests/wp_typed/user_init.i, line 64):
+Goal Assertion 'Last_i' (file user_init.i, line 64):
 Prove: true.
 
 ------------------------------------------------------------
@@ -1223,7 +1223,7 @@ Prove: exists i_5,i_4 : Z. (i_5 <= i) /\ (i_4 <= i_1) /\ (0 <= i_5) /\
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 51):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 51):
 Assume {
   Type: is_uint32(i).
   (* Heap *)
@@ -1255,12 +1255,12 @@ Prove: i < to_uint32(1 + i).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 51):
+Goal Positivity of Loop variant at loop (file user_init.i, line 51):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 58):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 58):
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
   (* Heap *)
@@ -1296,7 +1296,7 @@ Prove: j < to_uint32(1 + j).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 58):
+Goal Positivity of Loop variant at loop (file user_init.i, line 58):
 Prove: true.
 
 ------------------------------------------------------------
@@ -1304,7 +1304,7 @@ Prove: true.
   Function init_t2_v2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 68) in 'init_t2_v2':
+Goal Post-condition (file user_init.i, line 68) in 'init_t2_v2':
 Assume {
   (* Goal *)
   When: (0 <= i) /\ (0 <= i_1) /\ (i <= 9) /\ (i_1 <= 19).
@@ -1316,7 +1316,7 @@ Prove: t2_0[i][i_1] = v.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial_i' (file tests/wp_typed/user_init.i, line 77):
+Goal Preservation of Invariant 'Partial_i' (file user_init.i, line 77):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i).
@@ -1339,12 +1339,12 @@ Prove: m[0] = t2_0[i_1][i_2].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial_i' (file tests/wp_typed/user_init.i, line 77):
+Goal Establishment of Invariant 'Partial_i' (file user_init.i, line 77):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range_i' (file tests/wp_typed/user_init.i, line 76):
+Goal Preservation of Invariant 'Range_i' (file user_init.i, line 76):
 Assume {
   Type: is_uint32(i).
   (* Invariant 'Partial_i' *)
@@ -1364,12 +1364,12 @@ Prove: to_uint32(1 + i) <= 10.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range_i' (file tests/wp_typed/user_init.i, line 76):
+Goal Establishment of Invariant 'Range_i' (file user_init.i, line 76):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial_j' (file tests/wp_typed/user_init.i, line 83):
+Goal Preservation of Invariant 'Partial_j' (file user_init.i, line 83):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
@@ -1396,12 +1396,12 @@ Prove: m[j <- v][i_1] = v.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial_j' (file tests/wp_typed/user_init.i, line 83):
+Goal Establishment of Invariant 'Partial_j' (file user_init.i, line 83):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Previous_i' (file tests/wp_typed/user_init.i, line 84):
+Goal Preservation of Invariant 'Previous_i' (file user_init.i, line 84):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
@@ -1428,12 +1428,12 @@ Prove: t2_0[i <- m[j <- v]][i_1][i_2] = t2_1[i_1][i_2].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Previous_i' (file tests/wp_typed/user_init.i, line 84):
+Goal Establishment of Invariant 'Previous_i' (file user_init.i, line 84):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range_j' (file tests/wp_typed/user_init.i, line 82):
+Goal Preservation of Invariant 'Range_j' (file user_init.i, line 82):
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
   (* Invariant 'Partial_i' *)
@@ -1457,17 +1457,17 @@ Prove: to_uint32(1 + j) <= 20.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range_j' (file tests/wp_typed/user_init.i, line 82):
+Goal Establishment of Invariant 'Range_j' (file user_init.i, line 82):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Last_j' (file tests/wp_typed/user_init.i, line 90):
+Goal Assertion 'Last_j' (file user_init.i, line 90):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Last_i' (file tests/wp_typed/user_init.i, line 93):
+Goal Assertion 'Last_i' (file user_init.i, line 93):
 Prove: true.
 
 ------------------------------------------------------------
@@ -1608,7 +1608,7 @@ Prove: exists i_5,i_4 : Z. (i_5 <= i) /\ (i_4 <= i_1) /\ (0 <= i_5) /\
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 80):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 80):
 Assume {
   Type: is_uint32(i).
   (* Invariant 'Partial_i' *)
@@ -1628,12 +1628,12 @@ Prove: i < to_uint32(1 + i).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 80):
+Goal Positivity of Loop variant at loop (file user_init.i, line 80):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 87):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 87):
 Assume {
   Type: is_uint32(i) /\ is_uint32(j).
   (* Invariant 'Partial_i' *)
@@ -1657,7 +1657,7 @@ Prove: j < to_uint32(1 + j).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 87):
+Goal Positivity of Loop variant at loop (file user_init.i, line 87):
 Prove: true.
 
 ------------------------------------------------------------
@@ -1665,7 +1665,7 @@ Prove: true.
   Function init_t2_v3
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_init.i, line 99) in 'init_t2_v3':
+Goal Post-condition (file user_init.i, line 99) in 'init_t2_v3':
 Assume {
   Type: is_sint32(v).
   (* Goal *)
@@ -1678,7 +1678,7 @@ Prove: P_MemSet20(t2_0[i], 20, v).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial_i' (file tests/wp_typed/user_init.i, line 108):
+Goal Preservation of Invariant 'Partial_i' (file user_init.i, line 108):
 Assume {
   Type: IsArray1_sint32(v) /\ is_uint32(i) /\ is_sint32(v_1) /\
       IsArray1_sint32(t2_0[i]).
@@ -1698,12 +1698,12 @@ Prove: P_MemSet20(t2_0[i <- v][i_1], 20, v_1).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial_i' (file tests/wp_typed/user_init.i, line 108):
+Goal Establishment of Invariant 'Partial_i' (file user_init.i, line 108):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range_i' (file tests/wp_typed/user_init.i, line 107):
+Goal Preservation of Invariant 'Range_i' (file user_init.i, line 107):
 Assume {
   Type: IsArray1_sint32(v) /\ is_uint32(i) /\ is_sint32(v_1) /\
       IsArray1_sint32(t2_0[i]).
@@ -1721,12 +1721,12 @@ Prove: to_uint32(1 + i) <= 10.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range_i' (file tests/wp_typed/user_init.i, line 107):
+Goal Establishment of Invariant 'Range_i' (file user_init.i, line 107):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Partial_j' (file tests/wp_typed/user_init.i, line 114):
+Goal Preservation of Invariant 'Partial_j' (file user_init.i, line 114):
 Let m = v[j <- v_1].
 Assume {
   Type: IsArray1_sint32(v) /\ is_uint32(i) /\ is_uint32(j) /\
@@ -1749,7 +1749,7 @@ Prove: P_MemSet20(m, to_uint32(1 + j), v_1).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Partial_j' (file tests/wp_typed/user_init.i, line 114):
+Goal Establishment of Invariant 'Partial_j' (file user_init.i, line 114):
 Let m = t2_0[i].
 Assume {
   Type: is_uint32(i) /\ is_sint32(v) /\ IsArray1_sint32(m).
@@ -1765,7 +1765,7 @@ Prove: P_MemSet20(m, 0, v).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'Range_j' (file tests/wp_typed/user_init.i, line 113):
+Goal Preservation of Invariant 'Range_j' (file user_init.i, line 113):
 Assume {
   Type: IsArray1_sint32(v) /\ is_uint32(i) /\ is_uint32(j) /\
       is_sint32(v_1) /\ IsArray1_sint32(t2_0[i]).
@@ -1787,17 +1787,17 @@ Prove: to_uint32(1 + j) <= 20.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'Range_j' (file tests/wp_typed/user_init.i, line 113):
+Goal Establishment of Invariant 'Range_j' (file user_init.i, line 113):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Last_j' (file tests/wp_typed/user_init.i, line 120):
+Goal Assertion 'Last_j' (file user_init.i, line 120):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'Last_i' (file tests/wp_typed/user_init.i, line 123):
+Goal Assertion 'Last_i' (file user_init.i, line 123):
 Prove: true.
 
 ------------------------------------------------------------
@@ -1882,7 +1882,7 @@ Prove: exists i_5,i_4 : Z. (i_5 <= i) /\ (i_4 <= i_1) /\ (0 <= i_5) /\
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 111):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 111):
 Assume {
   Type: IsArray1_sint32(v) /\ is_uint32(i) /\ is_sint32(v_1) /\
       IsArray1_sint32(t2_0[i]).
@@ -1900,12 +1900,12 @@ Prove: i < to_uint32(1 + i).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 111):
+Goal Positivity of Loop variant at loop (file user_init.i, line 111):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_init.i, line 117):
+Goal Decreasing of Loop variant at loop (file user_init.i, line 117):
 Assume {
   Type: IsArray1_sint32(v) /\ is_uint32(i) /\ is_uint32(j) /\
       is_sint32(v_1) /\ IsArray1_sint32(t2_0[i]).
@@ -1927,7 +1927,7 @@ Prove: j < to_uint32(1 + j).
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_init.i, line 117):
+Goal Positivity of Loop variant at loop (file user_init.i, line 117):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_injector.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_injector.res.oracle
index b49ad5f8dddc52f47a74259da71cc92795e32b34..3e61ee834a8cfe2e33899d898b8fd2a972f2af85 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_injector.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_injector.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/user_injector.i (no preprocessing)
+[kernel] Parsing user_injector.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_rec.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_rec.0.res.oracle
index 3df342a583be2d88bfd6665c0468e1a40becb410..8f491c7404b90db7912cb8a8fdcf392e574b9fc2 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_rec.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_rec.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/user_rec.i (no preprocessing)
+[kernel] Parsing user_rec.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -22,7 +22,7 @@ Prove: let x_0 = (L_fact m_0) in
   Function F1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_rec.i, line 9) in 'F1':
+Goal Post-condition (file user_rec.i, line 9) in 'F1':
 Assume {
   Type: is_sint32(F1_0) /\ is_sint32(i) /\ is_sint32(n).
   If n <= 1
@@ -40,7 +40,7 @@ Prove: L_fact(n) = F1_0.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_typed/user_rec.i, line 15):
+Goal Preservation of Invariant (file user_rec.i, line 15):
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(1 + i) /\
       is_sint32(L_fact(i - 1)).
@@ -55,13 +55,13 @@ Prove: 0 < i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_typed/user_rec.i, line 15):
+Goal Establishment of Invariant (file user_rec.i, line 15):
 Assume { Type: is_sint32(n). (* Else *) Have: 2 <= n. }
 Prove: 0 < n.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_typed/user_rec.i, line 16):
+Goal Preservation of Invariant (file user_rec.i, line 16):
 Let x = L_fact(i - 1).
 Let x_1 = i * x.
 Assume {
@@ -78,13 +78,13 @@ Prove: x_1 = L_fact(i).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_typed/user_rec.i, line 16):
+Goal Establishment of Invariant (file user_rec.i, line 16):
 Assume { Type: is_sint32(n). (* Else *) Have: 2 <= n. }
 Prove: L_fact(1) = 1.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_typed/user_rec.i, line 17):
+Goal Loop assigns (file user_rec.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
@@ -92,7 +92,7 @@ Prove: true.
   Function F2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_rec.i, line 23) in 'F2':
+Goal Post-condition (file user_rec.i, line 23) in 'F2':
 Assume {
   Type: is_sint32(F2_0) /\ is_sint32(i) /\ is_sint32(n).
   (* Invariant 'PART' *)
@@ -106,7 +106,7 @@ Prove: L_fact(n) = F2_0.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'PART' (file tests/wp_typed/user_rec.i, line 29):
+Goal Preservation of Invariant 'PART' (file user_rec.i, line 29):
 Let x = i * p.
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(p) /\ is_sint32(1 + i) /\
@@ -122,13 +122,13 @@ Prove: if (n <= 1) then (x = 1) else (x = L_fact(i)).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'PART' (file tests/wp_typed/user_rec.i, line 29):
+Goal Establishment of Invariant 'PART' (file user_rec.i, line 29):
 Assume { Type: is_sint32(n). }
 Prove: (L_fact(1) = 1) \/ (n <= 1).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'RANGE' (file tests/wp_typed/user_rec.i, line 28):
+Goal Preservation of Invariant 'RANGE' (file user_rec.i, line 28):
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(p) /\ is_sint32(1 + i).
   (* Invariant 'PART' *)
@@ -142,13 +142,13 @@ Prove: if (n <= 1) then (i = 1) else (0 < i).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'RANGE' (file tests/wp_typed/user_rec.i, line 28):
+Goal Establishment of Invariant 'RANGE' (file user_rec.i, line 28):
 Assume { Type: is_sint32(n). }
 Prove: (0 < n) \/ (n <= 1).
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_typed/user_rec.i, line 30):
+Goal Loop assigns (file user_rec.i, line 30):
 Prove: true.
 
 ------------------------------------------------------------
@@ -156,7 +156,7 @@ Prove: true.
   Function F4
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_rec.i, line 36) in 'F4':
+Goal Post-condition (file user_rec.i, line 36) in 'F4':
 Let x = L_fact(n).
 Assume {
   Type: is_sint32(F4_0) /\ is_sint32(n) /\ is_sint32(n_1).
@@ -171,7 +171,7 @@ Prove: x = F4_0.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'NEVER' (file tests/wp_typed/user_rec.i, line 42):
+Goal Preservation of Invariant 'NEVER' (file user_rec.i, line 42):
 Let x = L_fact(n).
 Let x_1 = n_1 - 1.
 Let x_2 = n_1 * p.
@@ -189,13 +189,13 @@ Prove: if (n <= 1) then (x_2 = 1) else ((x / L_fact(x_1)) = x_2).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'NEVER' (file tests/wp_typed/user_rec.i, line 42):
+Goal Establishment of Invariant 'NEVER' (file user_rec.i, line 42):
 Let x = L_fact(n). Assume { Type: is_sint32(n). }
 Prove: ((x / x) = 1) \/ (n <= 1).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'RANGE' (file tests/wp_typed/user_rec.i, line 41):
+Goal Preservation of Invariant 'RANGE' (file user_rec.i, line 41):
 Let x = 1 + n.
 Assume {
   Type: is_sint32(n) /\ is_sint32(n_1) /\ is_sint32(p) /\ is_sint32(n_1 - 1).
@@ -210,13 +210,13 @@ Prove: if (n <= 1) then (x = n_1) else (n_1 <= x).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'RANGE' (file tests/wp_typed/user_rec.i, line 41):
+Goal Establishment of Invariant 'RANGE' (file user_rec.i, line 41):
 Assume { Type: is_sint32(n). }
 Prove: (0 < n) \/ (n <= 1).
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_typed/user_rec.i, line 43):
+Goal Loop assigns (file user_rec.i, line 43):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_rec.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_rec.1.res.oracle
index 14d0ebde9e942251adc93092bccf56baacc99dfe..e333b9257a892271c796a4c17e018bab380905e1 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_rec.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_rec.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/user_rec.i (no preprocessing)
+[kernel] Parsing user_rec.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -22,7 +22,7 @@ Prove: let x_0 = (L_fact m_0) in
   Function F1
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_rec.i, line 9) in 'F1':
+Goal Post-condition (file user_rec.i, line 9) in 'F1':
 Assume {
   Type: is_sint32(F1_0) /\ is_sint32(i) /\ is_sint32(n).
   If n <= 1
@@ -40,7 +40,7 @@ Prove: L_fact(n) = F1_0.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_typed/user_rec.i, line 15):
+Goal Preservation of Invariant (file user_rec.i, line 15):
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(1 + i) /\
       is_sint32(L_fact(i - 1)).
@@ -55,13 +55,13 @@ Prove: 0 < i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_typed/user_rec.i, line 15):
+Goal Establishment of Invariant (file user_rec.i, line 15):
 Assume { Type: is_sint32(n). (* Else *) Have: 2 <= n. }
 Prove: 0 < n.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_typed/user_rec.i, line 16):
+Goal Preservation of Invariant (file user_rec.i, line 16):
 Let x = L_fact(i - 1).
 Let x_1 = i * x.
 Assume {
@@ -78,13 +78,13 @@ Prove: x_1 = L_fact(i).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_typed/user_rec.i, line 16):
+Goal Establishment of Invariant (file user_rec.i, line 16):
 Assume { Type: is_sint32(n). (* Else *) Have: 2 <= n. }
 Prove: L_fact(1) = 1.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_typed/user_rec.i, line 17):
+Goal Loop assigns (file user_rec.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
@@ -92,7 +92,7 @@ Prove: true.
   Function F2
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_rec.i, line 23) in 'F2':
+Goal Post-condition (file user_rec.i, line 23) in 'F2':
 Assume {
   Type: is_sint32(F2_0) /\ is_sint32(i) /\ is_sint32(n).
   (* Invariant 'PART' *)
@@ -106,7 +106,7 @@ Prove: L_fact(n) = F2_0.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'PART' (file tests/wp_typed/user_rec.i, line 29):
+Goal Preservation of Invariant 'PART' (file user_rec.i, line 29):
 Let x = i * p.
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(p) /\ is_sint32(1 + i) /\
@@ -122,13 +122,13 @@ Prove: if (n <= 1) then (x = 1) else (x = L_fact(i)).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'PART' (file tests/wp_typed/user_rec.i, line 29):
+Goal Establishment of Invariant 'PART' (file user_rec.i, line 29):
 Assume { Type: is_sint32(n). }
 Prove: (L_fact(1) = 1) \/ (n <= 1).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'RANGE' (file tests/wp_typed/user_rec.i, line 28):
+Goal Preservation of Invariant 'RANGE' (file user_rec.i, line 28):
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(p) /\ is_sint32(1 + i).
   (* Invariant 'PART' *)
@@ -142,13 +142,13 @@ Prove: if (n <= 1) then (i = 1) else (0 < i).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'RANGE' (file tests/wp_typed/user_rec.i, line 28):
+Goal Establishment of Invariant 'RANGE' (file user_rec.i, line 28):
 Assume { Type: is_sint32(n). }
 Prove: (0 < n) \/ (n <= 1).
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_typed/user_rec.i, line 30):
+Goal Loop assigns (file user_rec.i, line 30):
 Prove: true.
 
 ------------------------------------------------------------
@@ -156,7 +156,7 @@ Prove: true.
   Function F4
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_rec.i, line 36) in 'F4':
+Goal Post-condition (file user_rec.i, line 36) in 'F4':
 Let x = L_fact(n).
 Assume {
   Type: is_sint32(F4_0) /\ is_sint32(n) /\ is_sint32(n_1).
@@ -171,7 +171,7 @@ Prove: x = F4_0.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'NEVER' (file tests/wp_typed/user_rec.i, line 42):
+Goal Preservation of Invariant 'NEVER' (file user_rec.i, line 42):
 Let x = L_fact(n).
 Let x_1 = n_1 - 1.
 Let x_2 = n_1 * p.
@@ -189,13 +189,13 @@ Prove: if (n <= 1) then (x_2 = 1) else ((x / L_fact(x_1)) = x_2).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'NEVER' (file tests/wp_typed/user_rec.i, line 42):
+Goal Establishment of Invariant 'NEVER' (file user_rec.i, line 42):
 Let x = L_fact(n). Assume { Type: is_sint32(n). }
 Prove: ((x / x) = 1) \/ (n <= 1).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'RANGE' (file tests/wp_typed/user_rec.i, line 41):
+Goal Preservation of Invariant 'RANGE' (file user_rec.i, line 41):
 Let x = 1 + n.
 Assume {
   Type: is_sint32(n) /\ is_sint32(n_1) /\ is_sint32(p) /\ is_sint32(n_1 - 1).
@@ -210,13 +210,13 @@ Prove: if (n <= 1) then (x = n_1) else (n_1 <= x).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'RANGE' (file tests/wp_typed/user_rec.i, line 41):
+Goal Establishment of Invariant 'RANGE' (file user_rec.i, line 41):
 Assume { Type: is_sint32(n). }
 Prove: (0 < n) \/ (n <= 1).
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_typed/user_rec.i, line 43):
+Goal Loop assigns (file user_rec.i, line 43):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_string.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_string.0.res.oracle
index f6ac9a650aea8ed15b1ca16eb05f2209f1930beb..f7a95913c819c7d70c46e9eafc7acc554cd9eb53 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_string.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_string.0.res.oracle
@@ -1,27 +1,27 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/user_string.i (no preprocessing)
+[kernel] Parsing user_string.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function strlen
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_string.i, line 23) in 'strlen':
+Goal Post-condition (file user_string.i, line 23) in 'strlen':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'BASE' (file tests/wp_typed/user_string.i, line 28):
+Goal Preservation of Invariant 'BASE' (file user_string.i, line 28):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'BASE' (file tests/wp_typed/user_string.i, line 28):
+Goal Establishment of Invariant 'BASE' (file user_string.i, line 28):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'RANGE' (file tests/wp_typed/user_string.i, line 29):
+Goal Preservation of Invariant 'RANGE' (file user_string.i, line 29):
 Let x = Mchar_0[ss_0].
 Let x_1 = s.base.
 Let a = shift_sint8(s, L_Length(Mchar_0, s)).
@@ -48,7 +48,7 @@ Prove: addr_le(s, a_1) /\ addr_le(a_1, a).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'RANGE' (file tests/wp_typed/user_string.i, line 29):
+Goal Establishment of Invariant 'RANGE' (file user_string.i, line 29):
 Assume {
   (* Heap *)
   Type: (region(s.base) <= 0) /\ linked(Malloc_0) /\ sconst(Mchar_0).
@@ -61,7 +61,7 @@ Prove: addr_le(s, s) /\ addr_le(s, shift_sint8(s, L_Length(Mchar_0, s))).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ZERO' (file tests/wp_typed/user_string.i, line 30):
+Goal Preservation of Invariant 'ZERO' (file user_string.i, line 30):
 Let x = Mchar_0[ss_0].
 Let x_1 = s.base.
 Let x_2 = s.offset.
@@ -91,12 +91,12 @@ Prove: Mchar_0[shift_sint8(s, i)] != 0.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ZERO' (file tests/wp_typed/user_string.i, line 30):
+Goal Establishment of Invariant 'ZERO' (file user_string.i, line 30):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'END' (file tests/wp_typed/user_string.i, line 37):
+Goal Assertion 'END' (file user_string.i, line 37):
 Let x = s.base.
 Let x_1 = s.offset.
 Let x_2 = ss_0.offset.
@@ -122,7 +122,7 @@ Prove: P_Length_of_str_is(Malloc_0, Mchar_0, s, x_2 - x_1).
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_typed/user_string.i, line 31):
+Goal Loop assigns (file user_string.i, line 31):
 Prove: true.
 
 ------------------------------------------------------------
@@ -139,12 +139,12 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_string.i, line 34):
+Goal Decreasing of Loop variant at loop (file user_string.i, line 34):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_string.i, line 34):
+Goal Positivity of Loop variant at loop (file user_string.i, line 34):
 Let x = Mchar_0[ss_0].
 Let x_1 = s.base.
 Let x_2 = L_Length(Mchar_0, s).
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_string.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_string.1.res.oracle
index b0256f00b0c4d77b72ad77ee1e2fd7ab3bb14df3..7cd5b2dd763946ededfaa8baa457f57c275424f1 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_string.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_string.1.res.oracle
@@ -1,27 +1,27 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/user_string.i (no preprocessing)
+[kernel] Parsing user_string.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function strlen
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_typed/user_string.i, line 23) in 'strlen':
+Goal Post-condition (file user_string.i, line 23) in 'strlen':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'BASE' (file tests/wp_typed/user_string.i, line 28):
+Goal Preservation of Invariant 'BASE' (file user_string.i, line 28):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'BASE' (file tests/wp_typed/user_string.i, line 28):
+Goal Establishment of Invariant 'BASE' (file user_string.i, line 28):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'RANGE' (file tests/wp_typed/user_string.i, line 29):
+Goal Preservation of Invariant 'RANGE' (file user_string.i, line 29):
 Let x = Mchar_0[ss_0].
 Let x_1 = s.base.
 Let a = shift_sint8(s, L_Length(Mchar_0, s)).
@@ -48,7 +48,7 @@ Prove: addr_le(s, a_1) /\ addr_le(a_1, a).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'RANGE' (file tests/wp_typed/user_string.i, line 29):
+Goal Establishment of Invariant 'RANGE' (file user_string.i, line 29):
 Assume {
   (* Heap *)
   Type: (region(s.base) <= 0) /\ linked(Malloc_0) /\ sconst(Mchar_0).
@@ -61,7 +61,7 @@ Prove: addr_le(s, s) /\ addr_le(s, shift_sint8(s, L_Length(Mchar_0, s))).
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ZERO' (file tests/wp_typed/user_string.i, line 30):
+Goal Preservation of Invariant 'ZERO' (file user_string.i, line 30):
 Let x = Mchar_0[ss_0].
 Let x_1 = s.base.
 Let x_2 = s.offset.
@@ -91,12 +91,12 @@ Prove: Mchar_0[shift_sint8(s, i)] != 0.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ZERO' (file tests/wp_typed/user_string.i, line 30):
+Goal Establishment of Invariant 'ZERO' (file user_string.i, line 30):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assertion 'END' (file tests/wp_typed/user_string.i, line 37):
+Goal Assertion 'END' (file user_string.i, line 37):
 Let x = s.base.
 Let x_1 = s.offset.
 Let x_2 = ss_0.offset.
@@ -122,7 +122,7 @@ Prove: P_Length_of_str_is(Malloc_0, Mchar_0, s, x_2 - x_1).
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_typed/user_string.i, line 31):
+Goal Loop assigns (file user_string.i, line 31):
 Prove: true.
 
 ------------------------------------------------------------
@@ -139,12 +139,12 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Decreasing of Loop variant at loop (file tests/wp_typed/user_string.i, line 34):
+Goal Decreasing of Loop variant at loop (file user_string.i, line 34):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Positivity of Loop variant at loop (file tests/wp_typed/user_string.i, line 34):
+Goal Positivity of Loop variant at loop (file user_string.i, line 34):
 Let x = Mchar_0[ss_0].
 Let x_1 = s.base.
 Let x_2 = L_Length(Mchar_0, s).
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_swap.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_swap.0.res.oracle
index ed045c6b7826dd899433716233552a553451921a..94c8583e69568e647d68e122ecdd8b55cc1b1981 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_swap.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_swap.0.res.oracle
@@ -1,23 +1,23 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/user_swap.i (no preprocessing)
+[kernel] Parsing user_swap.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/user_swap.i, line 25):
+Goal Assertion (file user_swap.i, line 25):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_swap.i, line 6) in 'swap'' in 'main' at call 'swap' (file tests/wp_typed/user_swap.i, line 24)
+Goal Instance of 'Pre-condition (file user_swap.i, line 6) in 'swap'' in 'main' at call 'swap' (file user_swap.i, line 24)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_swap.i, line 7) in 'swap'' in 'main' at call 'swap' (file tests/wp_typed/user_swap.i, line 24)
+Goal Instance of 'Pre-condition (file user_swap.i, line 7) in 'swap'' in 'main' at call 'swap' (file user_swap.i, line 24)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_swap.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_swap.1.res.oracle
index abbc64b85dacff64fa8d779ed0d10ab167bc9959..2ef511de80db5da2e249089f99693978bdec0ce3 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_swap.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_swap.1.res.oracle
@@ -1,23 +1,23 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_typed/user_swap.i (no preprocessing)
+[kernel] Parsing user_swap.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function main
 ------------------------------------------------------------
 
-Goal Assertion (file tests/wp_typed/user_swap.i, line 25):
+Goal Assertion (file user_swap.i, line 25):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_swap.i, line 6) in 'swap'' in 'main' at call 'swap' (file tests/wp_typed/user_swap.i, line 24)
+Goal Instance of 'Pre-condition (file user_swap.i, line 6) in 'swap'' in 'main' at call 'swap' (file user_swap.i, line 24)
 :
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_typed/user_swap.i, line 7) in 'swap'' in 'main' at call 'swap' (file tests/wp_typed/user_swap.i, line 24)
+Goal Instance of 'Pre-condition (file user_swap.i, line 7) in 'swap'' in 'main' at call 'swap' (file user_swap.i, line 24)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_typed/unit_bitwise.c b/src/plugins/wp/tests/wp_typed/unit_bitwise.c
index 5176553ee138ade6a1bd996abdd4581adbb575dd..f187a56c025c41eee1cd50a2222c0e60ae4a02f4 100644
--- a/src/plugins/wp/tests/wp_typed/unit_bitwise.c
+++ b/src/plugins/wp/tests/wp_typed/unit_bitwise.c
@@ -1,13 +1,13 @@
 /* run.config
+   DEPS: unit_bitwise.h
    OPT:
 */
 /* run.config_qualif
+   DEPS: unit_bitwise.h
    OPT: -wp-prop="-ko"
    OPT: -wp-prop="ko"
 */
 
-
-
 #include "unit_bitwise.h"
 //===============================================
 //-- int
diff --git a/src/plugins/wp/tests/wp_usage/oracle/caveat.0.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/caveat.0.res.oracle
index 3e32676531171339c4abaa8fc6cc16846c252ecc..ef5b64bad139c8331024efb161cef0c38df85ce6 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/caveat.0.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/caveat.0.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_usage/caveat.i (no preprocessing)
-[kernel] tests/wp_usage/caveat.i:41: Warning: 
+[kernel] Parsing caveat.i (no preprocessing)
+[kernel] caveat.i:41: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
@@ -8,7 +8,7 @@
   Function explicit
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat.i, line 28) in 'explicit':
+Goal Post-condition (file caveat.i, line 28) in 'explicit':
 Let a_1 = shiftfield_F1_S_f(a).
 Let x = Mint_0[a_1].
 Let a_2 = shiftfield_F1_S_g(a).
@@ -31,7 +31,7 @@ Prove: x_2 = x.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat.i, line 29) in 'explicit':
+Goal Post-condition (file caveat.i, line 29) in 'explicit':
 Let a_1 = shiftfield_F1_S_f(a).
 Let x = Mint_0[a_1].
 Let a_2 = shiftfield_F1_S_g(a).
@@ -54,7 +54,7 @@ Prove: x_3 = x_1.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat.i, line 30) in 'explicit':
+Goal Post-condition (file caveat.i, line 30) in 'explicit':
 Let a_1 = shiftfield_F1_S_f(a).
 Let x = Mint_0[a_1].
 Let a_2 = shiftfield_F1_S_g(a).
@@ -81,7 +81,7 @@ Prove: x_7 = x_2.
   Function implicit
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat.i, line 13) in 'implicit':
+Goal Post-condition (file caveat.i, line 13) in 'implicit':
 Let a_1 = shiftfield_F1_S_f(a).
 Let x = Mint_0[a_1].
 Let a_2 = shiftfield_F1_S_g(a).
@@ -102,7 +102,7 @@ Prove: x_2 = x.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat.i, line 14) in 'implicit':
+Goal Post-condition (file caveat.i, line 14) in 'implicit':
 Let a_1 = shiftfield_F1_S_f(a).
 Let x = Mint_0[a_1].
 Let a_2 = shiftfield_F1_S_g(a).
@@ -123,7 +123,7 @@ Prove: x_3 = x_1.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat.i, line 15) in 'implicit':
+Goal Post-condition (file caveat.i, line 15) in 'implicit':
 Let a_1 = shiftfield_F1_S_f(a).
 Let x = Mint_0[a_1].
 Let a_2 = shiftfield_F1_S_g(a).
diff --git a/src/plugins/wp/tests/wp_usage/oracle/caveat.1.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/caveat.1.res.oracle
index b4a9f732ab57d81a13ed8b594f0a2c991ce7980e..c2a4c441ca7fe3bbfdd1592fa8fd9711f9f2b6d3 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/caveat.1.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/caveat.1.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp -wp-model 'Typed (Caveat)' [...]
-[kernel] Parsing tests/wp_usage/caveat.i (no preprocessing)
-[kernel] tests/wp_usage/caveat.i:41: Warning: 
+[kernel] Parsing caveat.i (no preprocessing)
+[kernel] caveat.i:41: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 .................................................
@@ -16,17 +16,17 @@ Function observer: { a *r p q }
   Function explicit
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat.i, line 28) in 'explicit':
+Goal Post-condition (file caveat.i, line 28) in 'explicit':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat.i, line 29) in 'explicit':
+Goal Post-condition (file caveat.i, line 29) in 'explicit':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat.i, line 30) in 'explicit':
+Goal Post-condition (file caveat.i, line 30) in 'explicit':
 Prove: true.
 
 ------------------------------------------------------------
@@ -34,17 +34,17 @@ Prove: true.
   Function implicit
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat.i, line 13) in 'implicit':
+Goal Post-condition (file caveat.i, line 13) in 'implicit':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat.i, line 14) in 'implicit':
+Goal Post-condition (file caveat.i, line 14) in 'implicit':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat.i, line 15) in 'implicit':
+Goal Post-condition (file caveat.i, line 15) in 'implicit':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_usage/oracle/caveat2.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/caveat2.res.oracle
index c4439057d741e22283cc74f24ba42ade076657f5..0a50a6a8eba7bb11d114ffc897e4783e9df1df6a 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/caveat2.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/caveat2.res.oracle
@@ -1,8 +1,8 @@
 # frama-c -wp -wp-model 'Typed (Caveat)' [...]
-[kernel] Parsing tests/wp_usage/caveat2.i (no preprocessing)
+[kernel] Parsing caveat2.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_usage/caveat2.i:22: Warning: Undefined array-size (sint32[])
+[wp] caveat2.i:22: Warning: Undefined array-size (sint32[])
 ------------------------------------------------------------
   Function job
 ------------------------------------------------------------
@@ -32,7 +32,7 @@ Prove: Mint_0[shift_sint32(a, i)] = v[i].
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_usage/caveat2.i, line 21):
+Goal Preservation of Invariant (file caveat2.i, line 21):
 Assume {
   Type: is_sint32(i) /\ is_sint32(n) /\ is_sint32(1 + i).
   (* Pre-condition *)
@@ -49,13 +49,13 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_usage/caveat2.i, line 21):
+Goal Establishment of Invariant (file caveat2.i, line 21):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_usage/caveat2.i, line 22):
-tests/wp_usage/caveat2.i:22: warning from Typed Model:
+Goal Preservation of Invariant (file caveat2.i, line 22):
+caveat2.i:22: warning from Typed Model:
  - Warning: No allocation size for variable 'b'
    Reason: Undefined array-size (sint32[])
 Let a = global(G_b_26).
@@ -77,22 +77,22 @@ Prove: v[i <- Mint_0[shift_sint32(a, i)]][i_1] = Mint_0[shift_sint32(a, i_1)].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_usage/caveat2.i, line 22):
+Goal Establishment of Invariant (file caveat2.i, line 22):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/caveat2.i, line 23):
+Goal Loop assigns (file caveat2.i, line 23):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_usage/caveat2.i, line 15) in 'job' (1/2):
+Goal Assigns (file caveat2.i, line 15) in 'job' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_usage/caveat2.i, line 15) in 'job' (2/2):
+Goal Assigns (file caveat2.i, line 15) in 'job' (2/2):
 Effect at line 25
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_usage/oracle/caveat_range.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/caveat_range.res.oracle
index d15c7f73b49722c9b671268208fb84518250c69e..7b8dd0b27ee585634560b8ed91daef539e2e0c23 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/caveat_range.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/caveat_range.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Caveat)' [...]
-[kernel] Parsing tests/wp_usage/caveat_range.i (no preprocessing)
+[kernel] Parsing caveat_range.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function reset
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat_range.i, line 12) in 'reset':
+Goal Post-condition (file caveat_range.i, line 12) in 'reset':
 Let a = global(G_p_22).
 Let a_1 = havoc(Mint_undef_0, Mint_0, shift_S(a, 0), 20).
 Assume {
@@ -28,7 +28,7 @@ Prove: a_1[shiftfield_F1_S_f(shift_S(a, i))] = 1.
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/caveat_range.i, line 13) in 'reset':
+Goal Post-condition (file caveat_range.i, line 13) in 'reset':
 Let a = global(G_p_22).
 Let a_1 = havoc(Mint_undef_0, Mint_0, shift_S(a, 0), 20).
 Assume {
@@ -50,7 +50,7 @@ Prove: a_1[shiftfield_F1_S_g(shift_S(a, i))] = 2.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_usage/caveat_range.i, line 19):
+Goal Preservation of Invariant (file caveat_range.i, line 19):
 Let a = global(G_p_22).
 Let a_1 = havoc(Mint_undef_0, Mint_0, shift_S(a, 0), 20).
 Assume {
@@ -70,12 +70,12 @@ Prove: (-1) <= i.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_usage/caveat_range.i, line 19):
+Goal Establishment of Invariant (file caveat_range.i, line 19):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_usage/caveat_range.i, line 20):
+Goal Preservation of Invariant (file caveat_range.i, line 20):
 Let a = global(G_p_22).
 Let a_1 = havoc(Mint_undef_0, Mint_0, shift_S(a, 0), 20).
 Assume {
@@ -98,12 +98,12 @@ Prove: a_1[shiftfield_F1_S_f(shift_S(a, i)) <- 1]
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_usage/caveat_range.i, line 20):
+Goal Establishment of Invariant (file caveat_range.i, line 20):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant (file tests/wp_usage/caveat_range.i, line 21):
+Goal Preservation of Invariant (file caveat_range.i, line 21):
 Let a = global(G_p_22).
 Let a_1 = havoc(Mint_undef_0, Mint_0, shift_S(a, 0), 20).
 Let a_2 = shift_S(a, i).
@@ -127,29 +127,29 @@ Prove: a_1[shiftfield_F1_S_f(a_2) <- 1][shiftfield_F1_S_g(a_2) <- 2]
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant (file tests/wp_usage/caveat_range.i, line 21):
+Goal Establishment of Invariant (file caveat_range.i, line 21):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/caveat_range.i, line 22) (1/3):
+Goal Loop assigns (file caveat_range.i, line 22) (1/3):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/caveat_range.i, line 22) (2/3):
+Goal Loop assigns (file caveat_range.i, line 22) (2/3):
 Effect at line 25
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/caveat_range.i, line 22) (3/3):
+Goal Loop assigns (file caveat_range.i, line 22) (3/3):
 Effect at line 26
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_usage/caveat_range.i, line 14) in 'reset':
+Goal Assigns (file caveat_range.i, line 14) in 'reset':
 Effect at line 24
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_usage/oracle/code_spec.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/code_spec.res.oracle
index 253cb2dea90b13cb88c0b0167a7ba38061fe0693..26a99df29fdd09d8137554758f627c1dd8cf6bd6 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/code_spec.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/code_spec.res.oracle
@@ -1,9 +1,9 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_usage/code_spec.i (no preprocessing)
+[kernel] Parsing code_spec.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_usage/code_spec.i:154: Warning: 
+[kernel] code_spec.i:154: Warning: 
   No code nor implicit assigns clause for function by_addr_in_spec, generating default assigns from the prototype
-[kernel] tests/wp_usage/code_spec.i:154: Warning: 
+[kernel] code_spec.i:154: Warning: 
   No code nor implicit assigns clause for function by_array_in_spec, generating default assigns from the prototype
 .................................................
 ... Ref Usage
diff --git a/src/plugins/wp/tests/wp_usage/oracle/core.0.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/core.0.res.oracle
index 4d1ca598e10b8a792fe8628a767944ef2c5f2477..59bb37ee9ae3617796a0defdc09d1d152966bf22 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/core.0.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/core.0.res.oracle
@@ -1,20 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_usage/core.i (no preprocessing)
-[kernel] tests/wp_usage/core.i:11: Warning: 
+[kernel] Parsing core.i (no preprocessing)
+[kernel] core.i:11: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_usage/core.i:24: Warning: 
-  Missing assigns clause (assigns 'everything' instead)
-[wp] tests/wp_usage/core.i:20: Warning: 
-  Missing assigns clause (assigns 'everything' instead)
-[wp] tests/wp_usage/core.i:17: Warning: 
-  Missing assigns clause (assigns 'everything' instead)
+[wp] core.i:24: Warning: Missing assigns clause (assigns 'everything' instead)
+[wp] core.i:20: Warning: Missing assigns clause (assigns 'everything' instead)
+[wp] core.i:17: Warning: Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/core.i, line 12) in 'f':
+Goal Post-condition (file core.i, line 12) in 'f':
 Assume {
   Type: is_sint32(a) /\ is_sint32(b) /\ is_sint32(c) /\ is_sint32(x) /\
       is_sint32(x_1) /\ is_sint32(x_2) /\ is_sint32(x_3).
@@ -35,7 +32,7 @@ Prove: P_OBS(x, x_1).
   Function f with behavior default_for_stmt_15
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/core.i, line 23) at instruction (file tests/wp_usage/core.i, line 24):
+Goal Post-condition (file core.i, line 23) at instruction (file core.i, line 24):
 Prove: true.
 
 ------------------------------------------------------------
@@ -43,7 +40,7 @@ Prove: true.
   Function f with behavior default_for_stmt_4
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/core.i, line 16) at instruction (file tests/wp_usage/core.i, line 17):
+Goal Post-condition (file core.i, line 16) at instruction (file core.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
@@ -51,7 +48,7 @@ Prove: true.
   Function f with behavior default_for_stmt_9
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/core.i, line 19) at instruction (file tests/wp_usage/core.i, line 20):
+Goal Post-condition (file core.i, line 19) at instruction (file core.i, line 20):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_usage/oracle/core.1.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/core.1.res.oracle
index 337bce578f76fa1cfe3acb42bcecbd05b790507f..772b9e4940c73a287e78b2b4a1e203e28ccaaf80 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/core.1.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/core.1.res.oracle
@@ -1,20 +1,17 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_usage/core.i (no preprocessing)
-[kernel] tests/wp_usage/core.i:11: Warning: 
+[kernel] Parsing core.i (no preprocessing)
+[kernel] core.i:11: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_usage/core.i:24: Warning: 
-  Missing assigns clause (assigns 'everything' instead)
-[wp] tests/wp_usage/core.i:20: Warning: 
-  Missing assigns clause (assigns 'everything' instead)
-[wp] tests/wp_usage/core.i:17: Warning: 
-  Missing assigns clause (assigns 'everything' instead)
+[wp] core.i:24: Warning: Missing assigns clause (assigns 'everything' instead)
+[wp] core.i:20: Warning: Missing assigns clause (assigns 'everything' instead)
+[wp] core.i:17: Warning: Missing assigns clause (assigns 'everything' instead)
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/core.i, line 12) in 'f':
+Goal Post-condition (file core.i, line 12) in 'f':
 Let x_1 = 1 + x.
 Assume {
   Type: is_sint32(a) /\ is_sint32(b) /\ is_sint32(c) /\ is_sint32(x) /\
@@ -27,7 +24,7 @@ Prove: P_OBS(x, x_1).
   Function f with behavior default_for_stmt_15
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/core.i, line 23) at instruction (file tests/wp_usage/core.i, line 24):
+Goal Post-condition (file core.i, line 23) at instruction (file core.i, line 24):
 Prove: true.
 
 ------------------------------------------------------------
@@ -35,7 +32,7 @@ Prove: true.
   Function f with behavior default_for_stmt_4
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/core.i, line 16) at instruction (file tests/wp_usage/core.i, line 17):
+Goal Post-condition (file core.i, line 16) at instruction (file core.i, line 17):
 Prove: true.
 
 ------------------------------------------------------------
@@ -43,7 +40,7 @@ Prove: true.
   Function f with behavior default_for_stmt_9
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/core.i, line 19) at instruction (file tests/wp_usage/core.i, line 20):
+Goal Post-condition (file core.i, line 19) at instruction (file core.i, line 20):
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_usage/oracle/global.0.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/global.0.res.oracle
index 6bb95463d0ee683c1a109b51e4217f2d70d8a482..06074c90b13e6bda120f1f08dfc4f7353aae0ea4 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/global.0.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/global.0.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Raw)' [...]
-[kernel] Parsing tests/wp_usage/global.c (with preprocessing)
+[kernel] Parsing global.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function foo
 ------------------------------------------------------------
 
-Goal Assertion 'no_address_taken' (file tests/wp_usage/global.c, line 17):
+Goal Assertion 'no_address_taken' (file global.c, line 17):
 Let a = Mptr_0[global(P_a_23)].
 Assume {
   (* Heap *)
@@ -21,7 +21,7 @@ Prove: a != global(G_GLOBAL_20).
   Function main
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_usage/global.c, line 14) in 'foo'' in 'main' at call 'foo' (file tests/wp_usage/global.c, line 21)
+Goal Instance of 'Pre-condition (file global.c, line 14) in 'foo'' in 'main' at call 'foo' (file global.c, line 21)
 :
 Assume { (* Heap *) Type: linked(Malloc_0). }
 Prove: valid_rw(Malloc_0[L___retres_26 <- 1], global(G_GLOBAL_20), 1).
diff --git a/src/plugins/wp/tests/wp_usage/oracle/global.1.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/global.1.res.oracle
index 0243fc9b1786ecd5d354be89f6212db6e707dc29..d1dd69d4cce0ad1ffca1a1e9eee666fb3c6a351a 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/global.1.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/global.1.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed' [...]
-[kernel] Parsing tests/wp_usage/global.c (with preprocessing)
+[kernel] Parsing global.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function foo
 ------------------------------------------------------------
 
-Goal Assertion 'no_address_taken' (file tests/wp_usage/global.c, line 17):
+Goal Assertion 'no_address_taken' (file global.c, line 17):
 Prove: true.
 
 ------------------------------------------------------------
@@ -14,7 +14,7 @@ Prove: true.
   Function main
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_usage/global.c, line 14) in 'foo'' in 'main' at call 'foo' (file tests/wp_usage/global.c, line 21)
+Goal Instance of 'Pre-condition (file global.c, line 14) in 'foo'' in 'main' at call 'foo' (file global.c, line 21)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_usage/oracle/global.2.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/global.2.res.oracle
index 6d03c92ee56c2b284a167e6eb2a17091cf840e08..841ffa672f58f242a9ffa6c7141c7a376fac34f9 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/global.2.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/global.2.res.oracle
@@ -1,12 +1,12 @@
 # frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_usage/global.c (with preprocessing)
+[kernel] Parsing global.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function foo
 ------------------------------------------------------------
 
-Goal Assertion 'no_address_taken' (file tests/wp_usage/global.c, line 17):
+Goal Assertion 'no_address_taken' (file global.c, line 17):
 Prove: true.
 
 ------------------------------------------------------------
@@ -14,7 +14,7 @@ Prove: true.
   Function main
 ------------------------------------------------------------
 
-Goal Instance of 'Pre-condition (file tests/wp_usage/global.c, line 14) in 'foo'' in 'main' at call 'foo' (file tests/wp_usage/global.c, line 21)
+Goal Instance of 'Pre-condition (file global.c, line 14) in 'foo'' in 'main' at call 'foo' (file global.c, line 21)
 :
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_usage/oracle/issue-189-bis.0.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/issue-189-bis.0.res.oracle
index 2ed983d3f5f127812a72052978820e43f8fc87ae..82eba0bb6450526db1b9de1bed20dacd75fb1e15 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/issue-189-bis.0.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/issue-189-bis.0.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_usage/issue-189-bis.i (no preprocessing)
+[kernel] Parsing issue-189-bis.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
@@ -69,7 +69,7 @@ Prove: a_3[a_5] = Mint_0[a_5].
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'cpy' (file tests/wp_usage/issue-189-bis.i, line 27):
+Goal Preservation of Invariant 'cpy' (file issue-189-bis.i, line 27):
 Let a = Mptr_0[global(P_src_24)].
 Let a_1 = Mptr_0[global(P_dst_25)].
 Let a_2 = shift_uint8(a_1, 0).
@@ -101,22 +101,22 @@ Prove: a_5[shift_uint8(a, i)] = a_5[shift_uint8(a_1, i)].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'cpy' (file tests/wp_usage/issue-189-bis.i, line 27):
+Goal Establishment of Invariant 'cpy' (file issue-189-bis.i, line 27):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'dst' (file tests/wp_usage/issue-189-bis.i, line 25):
+Goal Preservation of Invariant 'dst' (file issue-189-bis.i, line 25):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'dst' (file tests/wp_usage/issue-189-bis.i, line 25):
+Goal Establishment of Invariant 'dst' (file issue-189-bis.i, line 25):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'len' (file tests/wp_usage/issue-189-bis.i, line 23):
+Goal Preservation of Invariant 'len' (file issue-189-bis.i, line 23):
 Let a = Mptr_0[global(P_src_24)].
 Let a_1 = Mptr_0[global(P_dst_25)].
 Let a_2 = shift_uint8(a_1, 0).
@@ -145,39 +145,39 @@ Prove: len_0 <= (1 + len_1).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'len' (file tests/wp_usage/issue-189-bis.i, line 23):
+Goal Establishment of Invariant 'len' (file issue-189-bis.i, line 23):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'src' (file tests/wp_usage/issue-189-bis.i, line 24):
+Goal Preservation of Invariant 'src' (file issue-189-bis.i, line 24):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'src' (file tests/wp_usage/issue-189-bis.i, line 24):
+Goal Establishment of Invariant 'src' (file issue-189-bis.i, line 24):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/issue-189-bis.i, line 26) (1/4):
+Goal Loop assigns (file issue-189-bis.i, line 26) (1/4):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/issue-189-bis.i, line 26) (2/4):
+Goal Loop assigns (file issue-189-bis.i, line 26) (2/4):
 Effect at line 32
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/issue-189-bis.i, line 26) (3/4):
+Goal Loop assigns (file issue-189-bis.i, line 26) (3/4):
 Effect at line 32
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/issue-189-bis.i, line 26) (4/4):
+Goal Loop assigns (file issue-189-bis.i, line 26) (4/4):
 Effect at line 32
 Let a = global(P_src_24).
 Let a_1 = Mptr_0[a].
@@ -211,7 +211,7 @@ Prove: (a_2 = v) \/ (a = v) \/ included(v, 1, a_4, len_0).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_usage/issue-189-bis.i, line 18) in 'memcpy_alias_vars':
+Goal Assigns (file issue-189-bis.i, line 18) in 'memcpy_alias_vars':
 Effect at line 31
 Prove: true.
 
@@ -283,7 +283,7 @@ Prove: a_3[a_5] = Mint_0[a_5].
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ok,cpy' (file tests/wp_usage/issue-189-bis.i, line 55):
+Goal Preservation of Invariant 'ok,cpy' (file issue-189-bis.i, line 55):
 Let a = Mptr_0[global(P_src_47)].
 Let a_1 = Mptr_0[global(P_dst_48)].
 Let a_2 = shift_uint8(a_1, 0).
@@ -315,22 +315,22 @@ Prove: a_5[shift_uint8(a, i)] = a_5[shift_uint8(a_1, i)].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ok,cpy' (file tests/wp_usage/issue-189-bis.i, line 55):
+Goal Establishment of Invariant 'ok,cpy' (file issue-189-bis.i, line 55):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ok,dst' (file tests/wp_usage/issue-189-bis.i, line 53):
+Goal Preservation of Invariant 'ok,dst' (file issue-189-bis.i, line 53):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ok,dst' (file tests/wp_usage/issue-189-bis.i, line 53):
+Goal Establishment of Invariant 'ok,dst' (file issue-189-bis.i, line 53):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ok,len' (file tests/wp_usage/issue-189-bis.i, line 51):
+Goal Preservation of Invariant 'ok,len' (file issue-189-bis.i, line 51):
 Let a = Mptr_0[global(P_src_47)].
 Let a_1 = Mptr_0[global(P_dst_48)].
 Let a_2 = shift_uint8(a_1, 0).
@@ -359,39 +359,39 @@ Prove: len_0 <= (1 + len_1).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ok,len' (file tests/wp_usage/issue-189-bis.i, line 51):
+Goal Establishment of Invariant 'ok,len' (file issue-189-bis.i, line 51):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ok,src' (file tests/wp_usage/issue-189-bis.i, line 52):
+Goal Preservation of Invariant 'ok,src' (file issue-189-bis.i, line 52):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ok,src' (file tests/wp_usage/issue-189-bis.i, line 52):
+Goal Establishment of Invariant 'ok,src' (file issue-189-bis.i, line 52):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/issue-189-bis.i, line 54) (1/4):
+Goal Loop assigns (file issue-189-bis.i, line 54) (1/4):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/issue-189-bis.i, line 54) (2/4):
+Goal Loop assigns (file issue-189-bis.i, line 54) (2/4):
 Effect at line 60
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/issue-189-bis.i, line 54) (3/4):
+Goal Loop assigns (file issue-189-bis.i, line 54) (3/4):
 Effect at line 60
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/issue-189-bis.i, line 54) (4/4):
+Goal Loop assigns (file issue-189-bis.i, line 54) (4/4):
 Effect at line 60
 Let a = Mptr_0[global(P_src_47)].
 Let a_1 = Mptr_0[global(P_dst_48)].
@@ -423,7 +423,7 @@ Prove: included(tmp_0, 1, a_2, len_0).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_usage/issue-189-bis.i, line 44) in 'memcpy_context_vars':
+Goal Assigns (file issue-189-bis.i, line 44) in 'memcpy_context_vars':
 Effect at line 59
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_usage/oracle/issue-189-bis.1.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/issue-189-bis.1.res.oracle
index 71a2cdaccb60d2b018b7d2eaa18b5ce4cbc57b8c..49a6eb1832fc02446f5bd11ba62067b22d25e98e 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/issue-189-bis.1.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/issue-189-bis.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_usage/issue-189-bis.i (no preprocessing)
+[kernel] Parsing issue-189-bis.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 
@@ -34,7 +34,7 @@ Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ok,cpy' (file tests/wp_usage/issue-189-bis.i, line 55):
+Goal Preservation of Invariant 'ok,cpy' (file issue-189-bis.i, line 55):
 Let a = global(G_src_47).
 Let a_1 = global(G_dst_48).
 Let a_2 = havoc(Mint_undef_0, Mint_0, shift_uint8(a_1, 0), len_0).
@@ -61,22 +61,22 @@ Prove: a_3[shift_uint8(a, i)] = a_3[shift_uint8(a_1, i)].
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ok,cpy' (file tests/wp_usage/issue-189-bis.i, line 55):
+Goal Establishment of Invariant 'ok,cpy' (file issue-189-bis.i, line 55):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ok,dst' (file tests/wp_usage/issue-189-bis.i, line 53):
+Goal Preservation of Invariant 'ok,dst' (file issue-189-bis.i, line 53):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ok,dst' (file tests/wp_usage/issue-189-bis.i, line 53):
+Goal Establishment of Invariant 'ok,dst' (file issue-189-bis.i, line 53):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ok,len' (file tests/wp_usage/issue-189-bis.i, line 51):
+Goal Preservation of Invariant 'ok,len' (file issue-189-bis.i, line 51):
 Let a = global(G_src_47).
 Let a_1 = global(G_dst_48).
 Assume {
@@ -100,39 +100,39 @@ Prove: len_0 <= (1 + len_1).
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ok,len' (file tests/wp_usage/issue-189-bis.i, line 51):
+Goal Establishment of Invariant 'ok,len' (file issue-189-bis.i, line 51):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Preservation of Invariant 'ok,src' (file tests/wp_usage/issue-189-bis.i, line 52):
+Goal Preservation of Invariant 'ok,src' (file issue-189-bis.i, line 52):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Establishment of Invariant 'ok,src' (file tests/wp_usage/issue-189-bis.i, line 52):
+Goal Establishment of Invariant 'ok,src' (file issue-189-bis.i, line 52):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/issue-189-bis.i, line 54) (1/4):
+Goal Loop assigns (file issue-189-bis.i, line 54) (1/4):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/issue-189-bis.i, line 54) (2/4):
+Goal Loop assigns (file issue-189-bis.i, line 54) (2/4):
 Effect at line 60
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/issue-189-bis.i, line 54) (3/4):
+Goal Loop assigns (file issue-189-bis.i, line 54) (3/4):
 Effect at line 60
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Loop assigns (file tests/wp_usage/issue-189-bis.i, line 54) (4/4):
+Goal Loop assigns (file issue-189-bis.i, line 54) (4/4):
 Effect at line 60
 Let a = global(G_src_47).
 Let a_1 = global(G_dst_48).
@@ -162,7 +162,7 @@ Prove: included(tmp_0, 1, a_2, len_0).
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_usage/issue-189-bis.i, line 44) in 'memcpy_context_vars':
+Goal Assigns (file issue-189-bis.i, line 44) in 'memcpy_context_vars':
 Effect at line 59
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_usage/oracle/issue-189.0.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/issue-189.0.res.oracle
index 4751ddf0b3fcf7f3884aaab3c3f154dbb485cf11..25222afd45692270c09c620c90741dd697921e71 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/issue-189.0.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/issue-189.0.res.oracle
@@ -1,18 +1,18 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_usage/issue-189.i (no preprocessing)
+[kernel] Parsing issue-189.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_usage/issue-189.i, line 14) in 'f' (1/2):
+Goal Assigns (file issue-189.i, line 14) in 'f' (1/2):
 Effect at line 17
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_usage/issue-189.i, line 14) in 'f' (2/2):
+Goal Assigns (file issue-189.i, line 14) in 'f' (2/2):
 Effect at line 18
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_usage/oracle/issue-189.1.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/issue-189.1.res.oracle
index 4b1378e938499df2a55c817f8db964445ad42230..04019923558b26c723c85065b7f96d2303ac875b 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/issue-189.1.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/issue-189.1.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Caveat)' [...]
-[kernel] Parsing tests/wp_usage/issue-189.i (no preprocessing)
+[kernel] Parsing issue-189.i (no preprocessing)
 [wp] Running WP plugin...
 .................................................
 ... Ref Usage
@@ -8,10 +8,10 @@ Init: { }
 Function f: { *ptr src idx }
 .................................................
 [wp] Warning: Missing RTE guards
-[wp] tests/wp_usage/issue-189.i:17: Warning: 
+[wp] issue-189.i:17: Warning: 
   forbidden write to variable 'src' considered in an isolated context.
   Use model 'Typed' instead or specify '-wp-unalias-vars src'
-[wp] tests/wp_usage/issue-189.i:17: User Error: 
+[wp] issue-189.i:17: User Error: 
   forbidden assigns to variable 'src' considered in an isolated context.
   Use model 'Typed' instead or specify '-wp-unalias-vars src'
 [kernel] Plug-in wp aborted: invalid user input.
diff --git a/src/plugins/wp/tests/wp_usage/oracle/issue-189.2.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/issue-189.2.res.oracle
index 0b9c5b7d7e604f10f869d9801c20aba6bed6f7ea..20ae799412b3a1868cb48c3d1d887014cfe9c094 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/issue-189.2.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/issue-189.2.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp -wp-model 'Typed (Caveat)' [...]
-[kernel] Parsing tests/wp_usage/issue-189.i (no preprocessing)
+[kernel] Parsing issue-189.i (no preprocessing)
 [wp] Running WP plugin...
 .................................................
 ... Ref Usage
@@ -12,12 +12,12 @@ Function f: { *ptr src idx }
   Function f
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_usage/issue-189.i, line 14) in 'f' (1/2):
+Goal Assigns (file issue-189.i, line 14) in 'f' (1/2):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file tests/wp_usage/issue-189.i, line 14) in 'f' (2/2):
+Goal Assigns (file issue-189.i, line 14) in 'f' (2/2):
 Effect at line 17
 Prove: true.
 
diff --git a/src/plugins/wp/tests/wp_usage/oracle/reads.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/reads.res.oracle
index 1328bbed17febcccd1e69b411df3b394601a1664..475f67de1ea00f70a931776916623c0469364988 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/reads.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/reads.res.oracle
@@ -1,7 +1,7 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_usage/reads.i (no preprocessing)
+[kernel] Parsing reads.i (no preprocessing)
 [wp] Running WP plugin...
-[kernel] tests/wp_usage/reads.i:86: Warning: 
+[kernel] reads.i:86: Warning: 
   No code nor implicit assigns clause for function recursive_usage, generating default assigns from the prototype
 .................................................
 ... Ref Usage
diff --git a/src/plugins/wp/tests/wp_usage/oracle/ref-usage-lemmas.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/ref-usage-lemmas.res.oracle
index a22e16a5c310bb1d8147af73a86dcb698042c5d4..bf8b9be6b7764394a9f814261dfb77ea6d813dbe 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/ref-usage-lemmas.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/ref-usage-lemmas.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_usage/ref-usage-lemmas.i (no preprocessing)
+[kernel] Parsing ref-usage-lemmas.i (no preprocessing)
 [wp] Running WP plugin...
 .................................................
 ... Ref Usage
@@ -13,7 +13,7 @@ Function main: { &a b __retres }
   Function main
 ------------------------------------------------------------
 
-Goal Pre-condition (file tests/wp_usage/ref-usage-lemmas.i, line 30) in 'main':
+Goal Pre-condition (file ref-usage-lemmas.i, line 30) in 'main':
 Prove: true.
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_usage/oracle/save_load.1.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/save_load.1.res.oracle
index d951b156c9db55025e7330956907cb6ac58d599d..2d9e04ed53db9fa1d74029997f430a3dab23150a 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/save_load.1.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/save_load.1.res.oracle
@@ -4,7 +4,7 @@
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/save_load.i, line 16) in 'f':
+Goal Post-condition (file save_load.i, line 16) in 'f':
 Assume {
   Type: is_sint32(a) /\ is_sint32(b) /\ is_sint32(b_1) /\ is_sint32(c).
   If c != 0
diff --git a/src/plugins/wp/tests/wp_usage/oracle/save_load.sav.res b/src/plugins/wp/tests/wp_usage/oracle/save_load.sav.res
index 5271ccf0c21234ee97e3b1d72c5c6138629e2f50..0078beeeaa7a7e6658e84641cec3ce91bf4ad321 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/save_load.sav.res
+++ b/src/plugins/wp/tests/wp_usage/oracle/save_load.sav.res
@@ -1,11 +1,11 @@
-[kernel] Parsing tests/wp_usage/save_load.i (no preprocessing)
+[kernel] Parsing save_load.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Warning: Missing RTE guards
 ------------------------------------------------------------
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_usage/save_load.i, line 16) in 'f':
+Goal Post-condition (file save_load.i, line 16) in 'f':
 Assume {
   Type: is_sint32(a) /\ is_sint32(b) /\ is_sint32(b_1) /\ is_sint32(c).
   If c != 0
diff --git a/src/plugins/wp/tests/wp_usage/oracle/valinit.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/valinit.res.oracle
index d35aef5194bd805fad29893e022944be6393fb76..fed9527bce617720b594285b2897971b0f7582ef 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/valinit.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/valinit.res.oracle
@@ -1,5 +1,5 @@
 # frama-c -wp [...]
-[kernel] Parsing tests/wp_usage/valinit.i (no preprocessing)
+[kernel] Parsing valinit.i (no preprocessing)
 [wp] Running WP plugin...
 .................................................
 ... Ref Usage
diff --git a/src/plugins/wp/tests/wp_usage/save_load.i b/src/plugins/wp/tests/wp_usage/save_load.i
index 544dae3b38c163cf97bf18d231031964ab6bc82e..899a2f72d4cb3750ba76dc5337c77d3d5eea0544 100644
--- a/src/plugins/wp/tests/wp_usage/save_load.i
+++ b/src/plugins/wp/tests/wp_usage/save_load.i
@@ -1,6 +1,6 @@
 /* run.config
-   EXECNOW: LOG save_load.sav.res LOG save_load.sav.err BIN @PTEST_NAME@.sav @frama-c@ -no-autoload-plugins -load-module wp -wp-share ./share -wp -wp-print -wp-prover none @PTEST_FILE@ -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@.sav.res 2> @PTEST_DIR@/result/@PTEST_NAME@.sav.err
-   CMD: @frama-c@ -no-autoload-plugins -load-module wp -load @PTEST_DIR@/@PTEST_NAME@.sav
+   EXECNOW: LOG save_load.sav.res LOG save_load.sav.err BIN @PTEST_NAME@.sav @frama-c@ -wp-share ../../../share -wp -wp-print -wp-prover none -save @PTEST_NAME@.sav > @PTEST_NAME@.sav.res 2> @PTEST_NAME@.sav.err
+   CMD: @frama-c@ -load %{dep:@PTEST_NAME@.sav}
    OPT: -print
    OPT: -wp -wp-prover none -wp-print
 */