From cde9885aa60acedd1dc44feff6aad5fc10973244 Mon Sep 17 00:00:00 2001
From: Julien Signoles <julien.signoles@cea.fr>
Date: Fri, 18 Jan 2013 11:28:11 +0000
Subject: [PATCH] [E-ACSL] new option -e-acsl-valid. Valid annotations are not
 translated by default anymore. [E-ACSL] code of e_acsl_assert put in e_acsl.c
 (no more in e_acsl.h)

---
 src/plugins/e-acsl/Makefile.in                |   1 +
 src/plugins/e-acsl/doc/Changelog              |   2 +
 src/plugins/e-acsl/gcc_test.sh                |   2 +-
 src/plugins/e-acsl/main.ml                    |   2 +-
 src/plugins/e-acsl/options.ml                 |  14 ++
 src/plugins/e-acsl/options.mli                |   2 +
 src/plugins/e-acsl/pre_visit.ml               | 135 +++++++++++--
 src/plugins/e-acsl/share/e-acsl/e_acsl.c      |  33 +++
 src/plugins/e-acsl/share/e-acsl/e_acsl.h      |  21 +-
 .../e-acsl-runtime/oracle/addrOf.1.res.oracle |  39 +---
 .../e-acsl-runtime/oracle/addrOf.res.oracle   |  39 +---
 .../e-acsl-runtime/oracle/arith.1.res.oracle  |  39 +---
 .../e-acsl-runtime/oracle/arith.res.oracle    |  39 +---
 .../e-acsl-runtime/oracle/array.1.res.oracle  |  39 +---
 .../e-acsl-runtime/oracle/array.res.oracle    |  39 +---
 .../e-acsl-runtime/oracle/at.1.res.oracle     |  39 +---
 .../tests/e-acsl-runtime/oracle/at.res.oracle |  39 +---
 .../oracle/bts1304.1.res.oracle               |  39 +---
 .../e-acsl-runtime/oracle/bts1304.res.oracle  |  39 +---
 .../oracle/bts1307.1.res.oracle               |  72 +------
 .../e-acsl-runtime/oracle/bts1307.res.oracle  |  72 +------
 .../oracle/bts1324.1.res.oracle               |  39 +---
 .../e-acsl-runtime/oracle/bts1324.res.oracle  |  62 +-----
 .../oracle/bts1326.1.res.oracle               |  39 +---
 .../e-acsl-runtime/oracle/bts1326.res.oracle  |  62 +-----
 .../e-acsl-runtime/oracle/cast.1.res.oracle   |  39 +---
 .../e-acsl-runtime/oracle/cast.res.oracle     |  39 +---
 .../oracle/comparison.1.res.oracle            |  41 +---
 .../oracle/comparison.res.oracle              |  39 +---
 .../e-acsl-runtime/oracle/empty.1.res.oracle  |  80 --------
 .../e-acsl-runtime/oracle/empty.res.oracle    |  80 --------
 .../e-acsl-runtime/oracle/false.1.res.oracle  |  35 ----
 .../e-acsl-runtime/oracle/false.res.oracle    |  35 ----
 .../oracle/function_contract.1.res.oracle     |  39 +---
 .../oracle/function_contract.res.oracle       |  39 +---
 .../tests/e-acsl-runtime/oracle/gen_addrOf.c  |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_addrOf2.c |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_arith.c   |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_arith2.c  |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_array.c   |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_array2.c  |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_at.c      |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_at2.c     |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_bts1304.c |  81 +-------
 .../e-acsl-runtime/oracle/gen_bts13042.c      |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_bts1307.c |  81 +-------
 .../e-acsl-runtime/oracle/gen_bts13072.c      |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_bts1324.c |  81 +-------
 .../e-acsl-runtime/oracle/gen_bts13242.c      |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_bts1326.c |  81 +-------
 .../e-acsl-runtime/oracle/gen_bts13262.c      |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_cast.c    |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_cast2.c   |  81 +-------
 .../e-acsl-runtime/oracle/gen_comparison.c    |  81 +-------
 .../e-acsl-runtime/oracle/gen_comparison2.c   |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_false.c   |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_false2.c  |  81 +-------
 .../oracle/gen_function_contract.c            |  81 +-------
 .../oracle/gen_function_contract2.c           |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_ghost.c   |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_ghost2.c  |  81 +-------
 .../oracle/gen_integer_constant.c             |  81 +-------
 .../oracle/gen_integer_constant2.c            |  81 +-------
 .../e-acsl-runtime/oracle/gen_invariant.c     |  81 +-------
 .../e-acsl-runtime/oracle/gen_invariant2.c    |  81 +-------
 .../e-acsl-runtime/oracle/gen_labeled_stmt.c  |  81 +-------
 .../e-acsl-runtime/oracle/gen_labeled_stmt2.c |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_lazy.c    |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_lazy2.c   |  81 +-------
 .../e-acsl-runtime/oracle/gen_linear_search.c |  81 +-------
 .../oracle/gen_linear_search2.c               |  81 +-------
 .../oracle/gen_literal_string.c               |  81 +-------
 .../oracle/gen_literal_string2.c              |  81 +-------
 .../e-acsl-runtime/oracle/gen_localvar.c      | 121 +++--------
 .../e-acsl-runtime/oracle/gen_localvar2.c     | 121 +++--------
 .../oracle/gen_nested_code_annot.c            |  81 +-------
 .../oracle/gen_nested_code_annot2.c           |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_not.c     |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_not2.c    |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_null.c    |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_null2.c   |  81 +-------
 .../oracle/gen_other_constants.c              |  81 +-------
 .../oracle/gen_other_constants2.c             |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_ptr.c     |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_ptr2.c    |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_quantif.c |  81 +-------
 .../e-acsl-runtime/oracle/gen_quantif2.c      |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_result.c  |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_result2.c |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_sizeof.c  |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_sizeof2.c |  81 +-------
 .../e-acsl-runtime/oracle/gen_stmt_contract.c |  81 +-------
 .../oracle/gen_stmt_contract2.c               |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_true.c    |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_true2.c   |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_typedef.c |  81 +-------
 .../e-acsl-runtime/oracle/gen_typedef2.c      |  81 +-------
 .../tests/e-acsl-runtime/oracle/gen_valid.c   | 169 ++++++----------
 .../tests/e-acsl-runtime/oracle/gen_valid2.c  | 169 ++++++----------
 .../e-acsl-runtime/oracle/gen_valid_alias.c   | 178 ++++++----------
 .../e-acsl-runtime/oracle/gen_valid_alias2.c  | 172 ++++++----------
 .../oracle/gen_valid_in_contract.c            |  81 +-------
 .../oracle/gen_valid_in_contract2.c           |  81 +-------
 .../e-acsl-runtime/oracle/ghost.1.res.oracle  |  56 +----
 .../e-acsl-runtime/oracle/ghost.res.oracle    |  54 +----
 .../oracle/integer_constant.1.res.oracle      |  39 +---
 .../oracle/integer_constant.res.oracle        |  41 +---
 .../oracle/invariant.1.res.oracle             |  41 +---
 .../oracle/invariant.res.oracle               |  41 +---
 .../oracle/labeled_stmt.1.res.oracle          |  39 +---
 .../oracle/labeled_stmt.res.oracle            |  39 +---
 .../e-acsl-runtime/oracle/lazy.1.res.oracle   |  41 +---
 .../e-acsl-runtime/oracle/lazy.res.oracle     |  39 +---
 .../oracle/linear_search.1.res.oracle         |  39 +---
 .../oracle/linear_search.res.oracle           |  41 +---
 .../oracle/literal_string.1.res.oracle        |  54 +----
 .../oracle/literal_string.res.oracle          |  56 +----
 .../oracle/localvar.1.res.oracle              |  60 +-----
 .../e-acsl-runtime/oracle/localvar.res.oracle |  60 +-----
 .../oracle/nested_code_annot.1.res.oracle     |  39 +---
 .../oracle/nested_code_annot.res.oracle       |  39 +---
 .../e-acsl-runtime/oracle/not.1.res.oracle    |  39 +---
 .../e-acsl-runtime/oracle/not.res.oracle      |  39 +---
 .../e-acsl-runtime/oracle/null.1.res.oracle   |  39 +---
 .../e-acsl-runtime/oracle/null.res.oracle     |  39 +---
 .../oracle/other_constants.1.res.oracle       |  39 +---
 .../oracle/other_constants.res.oracle         |  39 +---
 .../e-acsl-runtime/oracle/ptr.1.res.oracle    |  39 +---
 .../e-acsl-runtime/oracle/ptr.res.oracle      |  56 +----
 .../oracle/quantif.1.res.oracle               |  39 +---
 .../e-acsl-runtime/oracle/quantif.res.oracle  |  41 +---
 .../e-acsl-runtime/oracle/result.1.res.oracle |  39 +---
 .../e-acsl-runtime/oracle/result.res.oracle   |  39 +---
 .../e-acsl-runtime/oracle/sizeof.1.res.oracle |  39 +---
 .../e-acsl-runtime/oracle/sizeof.res.oracle   |  39 +---
 .../oracle/stmt_contract.1.res.oracle         |  39 +---
 .../oracle/stmt_contract.res.oracle           |  39 +---
 .../e-acsl-runtime/oracle/true.1.res.oracle   |  39 +---
 .../e-acsl-runtime/oracle/true.res.oracle     |  39 +---
 .../oracle/typedef.1.res.oracle               |  39 +---
 .../e-acsl-runtime/oracle/typedef.res.oracle  |  39 +---
 .../e-acsl-runtime/oracle/valid.1.res.oracle  |  68 +------
 .../e-acsl-runtime/oracle/valid.res.oracle    |  68 +------
 .../oracle/valid_alias.1.res.oracle           |  56 +----
 .../oracle/valid_alias.res.oracle             |  56 +----
 .../oracle/valid_in_contract.1.res.oracle     |  39 +---
 .../oracle/valid_in_contract.res.oracle       |  39 +---
 src/plugins/e-acsl/translate.ml               | 191 ++++++++++++------
 src/plugins/e-acsl/translate.mli              |  12 +-
 src/plugins/e-acsl/visit.ml                   |  23 ++-
 150 files changed, 1155 insertions(+), 8380 deletions(-)
 create mode 100644 src/plugins/e-acsl/share/e-acsl/e_acsl.c

diff --git a/src/plugins/e-acsl/Makefile.in b/src/plugins/e-acsl/Makefile.in
index 2a562538c92..f7de8fb8433 100644
--- a/src/plugins/e-acsl/Makefile.in
+++ b/src/plugins/e-acsl/Makefile.in
@@ -57,6 +57,7 @@ PLUGIN_CMO:= local_config \
 	error \
 	misc \
 	mpz \
+	init \
 	pre_analysis \
 	pre_visit \
 	env \
diff --git a/src/plugins/e-acsl/doc/Changelog b/src/plugins/e-acsl/doc/Changelog
index d1c467a50d6..e05b993de0e 100644
--- a/src/plugins/e-acsl/doc/Changelog
+++ b/src/plugins/e-acsl/doc/Changelog
@@ -15,6 +15,8 @@
 #   E-ACSL: the Whole E-ACSL plug-in
 ###############################################################################
 
+-  E-ACSL       [2013/01/09] New option -e-acsl-valid. By default, valid
+	        annotation are not translated anymore.
 -* E-ACSL       [2013/01/09] Fix bug when translating a postcondition of a
 	        function where the init state is the same than the final
 	        state (bts #!1300).
diff --git a/src/plugins/e-acsl/gcc_test.sh b/src/plugins/e-acsl/gcc_test.sh
index ceff71f7c60..44e68c2ae9a 100755
--- a/src/plugins/e-acsl/gcc_test.sh
+++ b/src/plugins/e-acsl/gcc_test.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-gcc -std=c99 -pedantic -Wall -Wno-long-long -Wno-attributes -Wno-unused-but-set-variable -fno-builtin $2 -o ./tests/e-acsl-runtime/result/gen_$1.out ./share/e-acsl/memory_model/e_acsl_bittree.c ./share/e-acsl/memory_model/e_acsl_mmodel.c ./tests/e-acsl-runtime/result/gen_$1.c -lgmp && ./tests/e-acsl-runtime/result/gen_$1.out
+gcc -std=c99 -pedantic -Wall -Wno-long-long -Wno-attributes -Wno-unused-but-set-variable -fno-builtin $2 -o ./tests/e-acsl-runtime/result/gen_$1.out ./share/e-acsl/e_acsl.c ./share/e-acsl/memory_model/e_acsl_bittree.c ./share/e-acsl/memory_model/e_acsl_mmodel.c ./tests/e-acsl-runtime/result/gen_$1.c -lgmp && ./tests/e-acsl-runtime/result/gen_$1.out
diff --git a/src/plugins/e-acsl/main.ml b/src/plugins/e-acsl/main.ml
index b3b142408d6..c0aeaed1f18 100644
--- a/src/plugins/e-acsl/main.ml
+++ b/src/plugins/e-acsl/main.ml
@@ -156,7 +156,7 @@ let predicate_to_exp =
     Translate.predicate_to_exp
 
 let add_e_acsl_library _files = 
-  if Options.must_visit () then ignore (extend_ast ())
+  if Options.must_visit () || Options.Prepare.get () then ignore (extend_ast ())
 
 let () = Cmdline.run_after_configuring_stage add_e_acsl_library
 
diff --git a/src/plugins/e-acsl/options.ml b/src/plugins/e-acsl/options.ml
index 67bd2373531..91113941139 100644
--- a/src/plugins/e-acsl/options.ml
+++ b/src/plugins/e-acsl/options.ml
@@ -55,6 +55,20 @@ module Project_name =
       let arg_name = "prj"
      end)
 
+module Valid =
+  False
+    (struct
+      let option_name = "-e-acsl-valid"
+      let help = "translate annotation which have been proven valid"
+     end)
+
+module Prepare =
+  False
+    (struct
+      let option_name = "-e-acsl-prepare"
+      let help = "prepare the AST to be directly usable by E-ACSL"
+     end)
+
 module Gmp_only =
   False
     (struct
diff --git a/src/plugins/e-acsl/options.mli b/src/plugins/e-acsl/options.mli
index 8fc37974b72..54b00d7f14c 100644
--- a/src/plugins/e-acsl/options.mli
+++ b/src/plugins/e-acsl/options.mli
@@ -26,6 +26,8 @@ include S (** implementation of Log.S for E-ACSL *)
 
 module Check: Bool
 module Run: Bool
+module Valid: Bool
+module Prepare: Bool
 module Gmp_only: Bool
 module Project_name: String
 
diff --git a/src/plugins/e-acsl/pre_visit.ml b/src/plugins/e-acsl/pre_visit.ml
index 32103d2f9e5..1fa4b0951a6 100644
--- a/src/plugins/e-acsl/pre_visit.ml
+++ b/src/plugins/e-acsl/pre_visit.ml
@@ -29,6 +29,8 @@ open Cil_types
 let fct_tbl: unit Kernel_function.Hashtbl.t = Kernel_function.Hashtbl.create 7
 let is_generated_function kf = Kernel_function.Hashtbl.mem fct_tbl kf
 
+let actions = Queue.create ()
+
 module Global: sig
   val add_logic_info: logic_info -> unit
   val mem_logic_info: logic_info -> bool
@@ -44,12 +46,48 @@ end
 
 let reset () = 
   Kernel_function.Hashtbl.clear fct_tbl;
-  Global.reset ()
+  Global.reset ();
+  Queue.clear actions
+
+(* ********************************************************************** *)
+(* Duplicating property statuses *)
+(* ********************************************************************** *)
+
+let copy_ppt old_prj new_prj old_ppt new_ppt =
+  let module P = Property_status in
+  let selection = State_selection.of_list [ P.self; Emitter.self ] in
+  let emit s l =
+    Project.on ~selection new_prj 
+      (fun s ->
+	let e = match l with [] -> assert false | e :: _ -> e in
+(*	Options.feedback "HERE %a --> %a  (%a)" Property.pretty new_ppt
+	  P.Emitted_status.pretty s Project.pretty new_prj;*)
+	if not e.P.logical_consequence then
+	  let emitter = Emitter.Usable_emitter.get e.P.emitter in
+(*	  Options.feedback "EMIT %a --> %a  (%a)" Property.pretty new_ppt
+	    P.Emitted_status.pretty s Project.pretty new_prj;*)
+	  P.emit emitter ~hyps:e.P.properties new_ppt s)
+      s
+  in
+  let copy () =
+    match Project.on ~selection old_prj P.get old_ppt with
+    | P.Never_tried -> ()
+    | P.Best(s, l) -> emit s l
+    | P.Inconsistent i ->
+      emit P.True i.P.valid;
+      emit P.False_and_reachable i.P.invalid
+  in
+  if not (Options.Valid.get ()) then Queue.add copy actions
 
 (* ********************************************************************** *)
 (* Duplicating functions *)
 (* ********************************************************************** *)
 
+let dup_spec_status old_prj kf new_kf old_spec new_spec =
+  let old_ppts = Property.ip_of_spec kf Kglobal old_spec in
+  let new_ppts = Property.ip_of_spec new_kf Kglobal new_spec in
+  List.iter2 (copy_ppt old_prj (Project.current ())) old_ppts new_ppts
+
 let dup_funspec tbl bhv spec =
   (*  Options.feedback "DUP SPEC %a" Cil.d_funspec spec;*)
   let o = object
@@ -148,25 +186,73 @@ let dup_fundec loc spec bhv kf vi new_vi =
     sspec = new_spec }, 
   return
 
-let dup_global loc spec bhv kf vi new_vi = 
+let dup_global loc old_prj spec bhv kf vi new_vi = 
   (*  Options.feedback "DUP GLOBAL %s" vi.vname;*)
   let fundec, return = dup_fundec loc spec bhv kf vi new_vi  in
   let fct = Definition(fundec, loc) in
-  let spec = fundec.sspec in
-  let kf = { fundec = fct; return_stmt = Some return; spec = spec } in
-  Kernel_function.Hashtbl.add fct_tbl kf ();
-  Globals.Functions.register kf;
-  Globals.Functions.replace_by_definition spec fundec loc;
+  let new_spec = fundec.sspec in
+  let new_kf = { fundec = fct; return_stmt = Some return; spec = new_spec } in
+  Kernel_function.Hashtbl.add fct_tbl new_kf ();
+  Globals.Functions.register new_kf;
+  Globals.Functions.replace_by_definition new_spec fundec loc;
+  Annotations.register_funspec new_kf;
+  dup_spec_status old_prj kf new_kf spec new_spec;
   GFun(fundec, loc)
 
 (* ********************************************************************** *)
 (* Visitor *)
 (* ********************************************************************** *)
 
+type position = Before_gmp | Gmp | After_gmp | Memory_model | Code
+
 class dup_functions_visitor prj = object (self)
   inherit Visitor.frama_c_copy prj
 
   val fct_tbl = Cil_datatype.Varinfo.Hashtbl.create 7
+  val mutable before_memory_model = Before_gmp
+  val mutable libc_decls = []
+
+  method private before_memory_model = match before_memory_model with
+  | Before_gmp | Gmp | After_gmp -> true
+  | Memory_model | Code -> false
+
+  method private insert_libc l =
+    match libc_decls with
+    | [] -> l
+    | _ :: _ ->
+      let res = List.fold_left (fun acc g -> g :: acc) l libc_decls in
+      libc_decls <- [];
+      res
+
+  method private dup_libc g new_g =
+    if self#before_memory_model then begin
+      libc_decls <- new_g :: libc_decls;
+      [ g ]
+    end else
+      self#insert_libc [ g; new_g ]
+
+  method private next () =
+    match before_memory_model with
+    | Before_gmp -> ()
+    | Gmp -> before_memory_model <- After_gmp
+    | After_gmp -> ()
+    | Memory_model -> before_memory_model <- Code
+    | Code -> ()
+
+  method vcode_annot a =
+    Cil.JustCopyPost
+      (fun a' ->
+	let get_ppt kf stmt a = Property.ip_of_code_annot kf stmt a in
+	let kf = Extlib.the self#current_kf in
+	let stmt = Extlib.the self#current_stmt in
+	List.iter2
+	  (fun p p' -> copy_ppt (Project.current ()) prj p p')
+	  (get_ppt kf stmt a)
+	  (get_ppt
+	     (Cil.get_kernel_function self#behavior kf) 
+	     (Cil.get_stmt self#behavior stmt)
+	     a');
+	a')
 
   method vlogic_info_decl li = 
     Global.add_logic_info li;
@@ -180,7 +266,7 @@ class dup_functions_visitor prj = object (self)
       Cil.JustCopy
 
   method vglob_aux = function
-  | GVarDecl(_, vi, loc) | GFun({ svar = vi }, loc) 
+  | GVarDecl(_, vi, loc) | GFun({ svar = vi }, loc)
       when Cil.isFunctionType vi.vtype
 	&& not (Misc.is_library_loc loc) 
 	&& not (Cil.is_builtin vi)
@@ -189,6 +275,7 @@ class dup_functions_visitor prj = object (self)
 		  (Annotations.funspec ~populate:false
 		     (Extlib.the self#current_kf)))
 	-> 
+    self#next ();
     let name = "__e_acsl_" ^ vi.vname in
     let new_vi = Project.on prj (Cil.makeGlobalVar name) vi.vtype in
     Cil_datatype.Varinfo.Hashtbl.add fct_tbl vi new_vi;
@@ -213,17 +300,36 @@ class dup_functions_visitor prj = object (self)
 	let spec = Annotations.funspec ~populate:false kf in
 	let vi_bhv = Cil.get_varinfo self#behavior vi in
 	let new_g = 
-	  Project.on prj (dup_global loc spec self#behavior kf vi_bhv) 
+	  Project.on prj
+	    (dup_global loc (Project.current ()) spec self#behavior kf vi_bhv) 
 	    new_vi 
 	in
-	[ g; new_g ]
+	self#dup_libc g new_g
       | _ -> assert false)
-  | GVarDecl(_, vi, loc) | GFun({ svar = vi }, loc) 
-      when Misc.is_library_loc loc || Cil.is_builtin vi
-	->
+  | GVarDecl(_, _, loc) | GFun(_, loc) when Misc.is_library_loc loc ->
+    (match before_memory_model with
+    | Before_gmp -> before_memory_model <- Gmp
+    | Gmp | Memory_model -> ()
+    | After_gmp -> before_memory_model <- Memory_model
+    | Code -> assert false);
+    Cil.JustCopy
+  | GVarDecl(_, vi, _) | GFun({ svar = vi }, _) when Cil.is_builtin vi ->
+    self#next ();
     Cil.JustCopy
   | _ -> 
-    Cil.DoChildren
+    self#next ();
+    Cil.DoChildrenPost self#insert_libc
+
+  method vfile _ =
+    Cil.DoChildrenPost
+      (fun f ->
+	match libc_decls with
+	| [] -> f
+	| _ :: _ -> 
+	  (* in the rare case where there is no global tagged as [Code] in the
+	     file *)
+	  f.globals <- self#insert_libc f.globals; 
+	  f)
 
   initializer reset ()
 
@@ -236,6 +342,7 @@ let dup_functions () =
       (new dup_functions_visitor)
   in
   Project.copy ~selection:(Plugin.get_selection ()) prj;
+  Queue.iter (fun f -> f ()) actions;
   prj
 
 (*
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl.c b/src/plugins/e-acsl/share/e-acsl/e_acsl.c
new file mode 100644
index 00000000000..caf0fe4d810
--- /dev/null
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl.c
@@ -0,0 +1,33 @@
+/**************************************************************************/
+/*                                                                        */
+/*  This file is part of the Frama-C's E-ACSL plug-in.                    */
+/*                                                                        */
+/*  Copyright (C) 2012                                                    */
+/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
+/*         alternatives)                                                  */
+/*                                                                        */
+/*  you can redistribute it and/or modify it under the terms of the GNU   */
+/*  Lesser General Public License as published by the Free Software       */
+/*  Foundation, version 2.1.                                              */
+/*                                                                        */
+/*  It is distributed in the hope that it will be useful,                 */
+/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
+/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
+/*  GNU Lesser General Public License for more details.                   */
+/*                                                                        */
+/*  See the GNU Lesser General Public License version 2.1                 */
+/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
+/*                                                                        */
+/**************************************************************************/
+
+#include "e_acsl.h"
+#include "stdlib.h"
+#include "stdio.h"
+
+void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line) {
+  if (! predicate) {
+    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",
+	   kind, line, pred_txt);
+    exit(1);
+  }
+}
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl.h b/src/plugins/e-acsl/share/e-acsl/e_acsl.h
index 574e0f88b5f..2fc9434a248 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl.h
@@ -27,10 +27,8 @@
 #ifndef E_ACSL
 #define E_ACSL
 
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
-
-#include "stdlib.h"
-#include "stdio.h"
+/* #include "stdlib.h" */
+/* #include "stdio.h" */
 
 /*****************************/
 /* Dedicated E-ACSL function */
@@ -38,12 +36,13 @@ void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
 
 /*@ requires predicate != 0; 
   @ assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line) {
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n", 
-	   kind, line, pred_txt); 
-    exit(1);
-  }
-}
+void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
+  __attribute__((FC_BUILTIN));/*  { */
+/*   if (! predicate) { */
+/*     printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",  */
+/* 	   kind, line, pred_txt);  */
+/*     exit(1); */
+/*   } */
+/* } */
 
 #endif
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/addrOf.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/addrOf.1.res.oracle
index a90c0158223..d021f0f1443 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/addrOf.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/addrOf.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/addrOf.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,46 +11,13 @@ tests/e-acsl-runtime/addrOf.i:7:[e-acsl] warning: E-ACSL construct `assigns clau
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/addrOf.i:9:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {0}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/addrOf.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/addrOf.res.oracle
index a90c0158223..d021f0f1443 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/addrOf.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/addrOf.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/addrOf.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,46 +11,13 @@ tests/e-acsl-runtime/addrOf.i:7:[e-acsl] warning: E-ACSL construct `assigns clau
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/addrOf.i:9:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {0}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/arith.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/arith.1.res.oracle
index 6bb9c2434ff..03b111bf991 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/arith.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/arith.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/arith.i:8:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/arith.i:8:[e-acsl] warning: E-ACSL construct `assigns claus
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/arith.i:12:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -60,7 +25,8 @@ tests/e-acsl-runtime/arith.i:12:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 tests/e-acsl-runtime/arith.i:13:[value] Assertion got status valid.
@@ -111,7 +77,6 @@ tests/e-acsl-runtime/arith.i:33:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {-3}
           y ∈ {2}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/arith.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/arith.res.oracle
index 4c9a13d0bd3..9734bcb5dc9 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/arith.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/arith.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/arith.i:8:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,41 +11,9 @@ tests/e-acsl-runtime/arith.i:8:[e-acsl] warning: E-ACSL construct `assigns claus
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/arith.i:12:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/arith.i:13:[value] Assertion got status valid.
 tests/e-acsl-runtime/arith.i:14:[value] Assertion got status valid.
 tests/e-acsl-runtime/arith.i:16:[value] Assertion got status valid.
@@ -69,7 +35,6 @@ tests/e-acsl-runtime/arith.i:33:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {-3}
           y ∈ {2}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/array.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/array.1.res.oracle
index adea4055866..40088888b62 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/array.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/array.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/array.i:10:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,51 +11,18 @@ tests/e-acsl-runtime/array.i:10:[e-acsl] warning: E-ACSL construct `assigns clau
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         T1[0..2] ∈ {0}
         T2[0..3] ∈ {0}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/array.i:12:[value] entering loop for the first time
 tests/e-acsl-runtime/array.i:13:[value] entering loop for the first time
 tests/e-acsl-runtime/array.i:15:[value] Assertion got status unknown.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/array.i:16:[value] Assertion got status unknown.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           T1[0] ∈ {0; 2}
             [1..2] ∈ {0; 1; 2}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/array.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/array.res.oracle
index 04380795548..ad34b4608db 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/array.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/array.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/array.i:10:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,41 +11,8 @@ tests/e-acsl-runtime/array.i:10:[e-acsl] warning: E-ACSL construct `assigns clau
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         T1[0..2] ∈ {0}
         T2[0..3] ∈ {0}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/array.i:12:[value] entering loop for the first time
 tests/e-acsl-runtime/array.i:13:[value] entering loop for the first time
 tests/e-acsl-runtime/array.i:15:[value] Assertion got status unknown.
@@ -58,7 +23,8 @@ tests/e-acsl-runtime/array.i:15:[value] Assertion got status unknown.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 tests/e-acsl-runtime/array.i:16:[value] Assertion got status unknown.
@@ -66,7 +32,6 @@ tests/e-acsl-runtime/array.i:16:[value] Assertion got status unknown.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           T1[0] ∈ {0; 2}
             [1..2] ∈ {0; 1; 2}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/at.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/at.1.res.oracle
index 79455836a86..321694334f3 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/at.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/at.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/at.i:43:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,40 +11,7 @@ tests/e-acsl-runtime/at.i:43:[e-acsl] warning: E-ACSL construct `assigns clause
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         A ∈ {0}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 tests/e-acsl-runtime/at.i:40:[value] Function h: postcondition got status valid.
@@ -57,7 +22,8 @@ tests/e-acsl-runtime/at.i:40:[value] Function h: postcondition got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 tests/e-acsl-runtime/at.i:40:[value] Function __e_acsl_h: postcondition got status valid.
@@ -97,7 +63,6 @@ tests/e-acsl-runtime/at.i:34:[value] Assertion got status unknown.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function f:
           A ∈ {3}
 [value] Values at end of function __e_acsl_f:
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/at.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/at.res.oracle
index 68b5ca4eacd..3e820b54484 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/at.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/at.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/at.i:43:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,44 +11,12 @@ tests/e-acsl-runtime/at.i:43:[e-acsl] warning: E-ACSL construct `assigns clause
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         A ∈ {0}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 tests/e-acsl-runtime/at.i:40:[value] Function h: postcondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/at.i:40:[value] Function __e_acsl_h: postcondition got status valid.
 tests/e-acsl-runtime/at.i:48:[value] Assertion got status valid.
 tests/e-acsl-runtime/at.i:13:[value] Assertion got status valid.
@@ -77,7 +43,6 @@ tests/e-acsl-runtime/at.i:34:[value] Assertion got status unknown.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function f:
           A ∈ {3}
 [value] Values at end of function __e_acsl_f:
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1304.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1304.1.res.oracle
index b6c9fac9601..5521dfd4c6b 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1304.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1304.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/bts1304.i:20:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/bts1304.i:20:[e-acsl] warning: E-ACSL construct `assigns cl
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 tests/e-acsl-runtime/bts1304.i:23:[value] entering loop for the first time
 [value] using specification for function __full_init
@@ -55,12 +20,12 @@ tests/e-acsl-runtime/bts1304.i:25:[value] Assertion got status unknown.
 [value] using specification for function __initialized
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:85:[value] Function __initialized: postcondition got status unknown.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:86:[value] Function __initialized: postcondition got status unknown.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function read_sensor_4:
           buf[0..11] ∈ {0} or UNINITIALIZED
 [value] Values at end of function main:
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1304.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1304.res.oracle
index b6c9fac9601..5521dfd4c6b 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1304.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1304.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/bts1304.i:20:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/bts1304.i:20:[e-acsl] warning: E-ACSL construct `assigns cl
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 tests/e-acsl-runtime/bts1304.i:23:[value] entering loop for the first time
 [value] using specification for function __full_init
@@ -55,12 +20,12 @@ tests/e-acsl-runtime/bts1304.i:25:[value] Assertion got status unknown.
 [value] using specification for function __initialized
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:85:[value] Function __initialized: postcondition got status unknown.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:86:[value] Function __initialized: postcondition got status unknown.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function read_sensor_4:
           buf[0..11] ∈ {0} or UNINITIALIZED
 [value] Values at end of function main:
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1307.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1307.1.res.oracle
index 70a29ae20ed..06739e3bcc8 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1307.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1307.1.res.oracle
@@ -5,8 +5,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
 tests/e-acsl-runtime/bts1307.i:16:[kernel] warning: Floating-point constant 0.4 is not represented exactly. Will use 0x1.999999999999ap-2. See documentation for option -warn-decimal-float
-tests/e-acsl-runtime/bts1307.i:31:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 tests/e-acsl-runtime/bts1307.i:31:[e-acsl] warning: approximating type `real' by `long double'
 tests/e-acsl-runtime/bts1307.i:13:[e-acsl] warning: missing guard for ensuring that the given integer is C-representable
 tests/e-acsl-runtime/bts1307.i:31:[e-acsl] approximating a real number by a float
@@ -18,49 +16,14 @@ tests/e-acsl-runtime/bts1307.i:25:[e-acsl] warning: missing guard for ensuring t
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 tests/e-acsl-runtime/bts1307.i:7:[value] Function __e_acsl_foo: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:8:[value] Function __e_acsl_foo: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:9:[value] Function __e_acsl_foo: precondition got status valid.
 [value] using specification for function __valid
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/bts1307.i:7:[value] Function foo: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:8:[value] Function foo: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:9:[value] Function foo: precondition got status valid.
@@ -99,7 +62,7 @@ tests/e-acsl-runtime/bts1307.i:19:[value] Function bar: precondition got status
 tests/e-acsl-runtime/bts1307.i:20:[value] Function bar: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:21:[value] Function bar: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:25:[value] Function bar, behavior UnderEstimate_Motoring: postcondition got status unknown.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:25:[value] Function __e_acsl_bar, behavior UnderEstimate_Motoring: postcondition got status unknown.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
@@ -107,39 +70,14 @@ tests/e-acsl-runtime/bts1307.i:25:[value] Function __e_acsl_bar, behavior UnderE
 [value] ====== VALUES COMPUTED ======
 [value] Values at end of function bar:
           h ∈ 0.850000023842
-[value] Values at end of function foo:
-          h ∈ 6.
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function __e_acsl_bar:
           h ∈ 0.850000023842
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
+[value] Values at end of function foo:
+          h ∈ 6.
 [value] Values at end of function __e_acsl_foo:
           h ∈ 6.
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function main:
           f ∈ 1.
           g ∈ 1.
           h ∈ 0.850000023842
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1307.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1307.res.oracle
index 73c8d5e8ee4..43b11e5eca0 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1307.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1307.res.oracle
@@ -5,8 +5,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
 tests/e-acsl-runtime/bts1307.i:16:[kernel] warning: Floating-point constant 0.4 is not represented exactly. Will use 0x1.999999999999ap-2. See documentation for option -warn-decimal-float
-tests/e-acsl-runtime/bts1307.i:31:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 tests/e-acsl-runtime/bts1307.i:31:[e-acsl] warning: approximating type `real' by `long double'
 tests/e-acsl-runtime/bts1307.i:31:[e-acsl] approximating a real number by a float
 [value] Analyzing a complete application starting at main
@@ -16,49 +14,14 @@ tests/e-acsl-runtime/bts1307.i:31:[e-acsl] approximating a real number by a floa
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 tests/e-acsl-runtime/bts1307.i:7:[value] Function __e_acsl_foo: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:8:[value] Function __e_acsl_foo: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:9:[value] Function __e_acsl_foo: precondition got status valid.
 [value] using specification for function __valid
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/bts1307.i:7:[value] Function foo: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:8:[value] Function foo: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:9:[value] Function foo: precondition got status valid.
@@ -78,7 +41,7 @@ tests/e-acsl-runtime/bts1307.i:19:[value] Function bar: precondition got status
 tests/e-acsl-runtime/bts1307.i:20:[value] Function bar: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:21:[value] Function bar: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:25:[value] Function bar, behavior UnderEstimate_Motoring: postcondition got status unknown.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/bts1307.i:25:[value] Function __e_acsl_bar, behavior UnderEstimate_Motoring: postcondition got status unknown.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
@@ -86,39 +49,14 @@ tests/e-acsl-runtime/bts1307.i:25:[value] Function __e_acsl_bar, behavior UnderE
 [value] ====== VALUES COMPUTED ======
 [value] Values at end of function bar:
           h ∈ 0.850000023842
-[value] Values at end of function foo:
-          h ∈ 6.
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function __e_acsl_bar:
           h ∈ 0.850000023842
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
+[value] Values at end of function foo:
+          h ∈ 6.
 [value] Values at end of function __e_acsl_foo:
           h ∈ 6.
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function main:
           f ∈ 1.
           g ∈ 1.
           h ∈ 0.850000023842
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1324.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1324.1.res.oracle
index 51e25f47a94..58e200cfdab 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1324.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1324.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/bts1324.i:22:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 tests/e-acsl-runtime/bts1324.i:8:[e-acsl] warning: missing guard for ensuring that the given integer is C-representable
 tests/e-acsl-runtime/bts1324.i:8:[e-acsl] warning: missing guard for ensuring that the given integer is C-representable
 [value] Analyzing a complete application starting at main
@@ -15,39 +13,6 @@ tests/e-acsl-runtime/bts1324.i:8:[e-acsl] warning: missing guard for ensuring th
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __initialize
 [value] using specification for function __full_init
@@ -83,7 +48,8 @@ tests/e-acsl-runtime/bts1324.i:15:[value] entering loop for the first time
 [value] using specification for function __delete_block
 tests/e-acsl-runtime/bts1324.i:9:[value] Function sorted, behavior yes: postcondition got status valid.
 tests/e-acsl-runtime/bts1324.i:9:[value] Function sorted, behavior yes: postcondition got status valid, but it is unknown if the behavior is active.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/bts1324.i:9:[value] Function __e_acsl_sorted, behavior yes: postcondition got status valid.
 tests/e-acsl-runtime/bts1324.i:9:[value] Function __e_acsl_sorted, behavior yes: postcondition got status valid, but it is unknown if the behavior is active.
 tests/e-acsl-runtime/bts1324.i:25:[value] Assertion got status valid.
@@ -91,7 +57,6 @@ tests/e-acsl-runtime/bts1324.i:25:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function sorted:
           b ∈ [7..15]
           __retres ∈ {1}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1324.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1324.res.oracle
index 7a18019179b..dd684a4f32d 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1324.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1324.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/bts1324.i:22:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,53 +11,18 @@ tests/e-acsl-runtime/bts1324.i:22:[e-acsl] warning: E-ACSL construct `assigns cl
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __initialize
 [value] using specification for function __full_init
 :0:[value] entering loop for the first time
 [value] using specification for function __valid_read
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/bts1324.i:15:[value] entering loop for the first time
 [value] using specification for function __delete_block
 tests/e-acsl-runtime/bts1324.i:9:[value] Function sorted, behavior yes: postcondition got status valid.
 tests/e-acsl-runtime/bts1324.i:9:[value] Function sorted, behavior yes: postcondition got status valid, but it is unknown if the behavior is active.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/bts1324.i:9:[value] Function __e_acsl_sorted, behavior yes: postcondition got status valid.
 tests/e-acsl-runtime/bts1324.i:9:[value] Function __e_acsl_sorted, behavior yes: postcondition got status valid, but it is unknown if the behavior is active.
 tests/e-acsl-runtime/bts1324.i:25:[value] Assertion got status valid.
@@ -67,24 +30,11 @@ tests/e-acsl-runtime/bts1324.i:25:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function sorted:
           b ∈ [7..15]
           __retres ∈ {1}
 [value] Values at end of function __e_acsl_sorted:
           __retres ∈ {1}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function main:
           t[0] ∈ {1}
            [1..2] ∈ {4}
@@ -92,9 +42,3 @@ tests/e-acsl-runtime/bts1324.i:25:[value] Assertion got status valid.
            [6] ∈ {7}
           n ∈ {1}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1326.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1326.1.res.oracle
index 40e7ea2c8de..1daf23cf982 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1326.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1326.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/bts1326.i:18:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/bts1326.i:18:[e-acsl] warning: E-ACSL construct `assigns cl
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __initialize
 [value] using specification for function __full_init
@@ -66,7 +31,8 @@ tests/e-acsl-runtime/bts1326.i:10:[value] Function atp_NORMAL_computeAverageAcce
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
 tests/e-acsl-runtime/bts1326.i:11:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_tdiv_q
 ./share/e-acsl/e_acsl_gmp.h:152:[value] Function __gmpz_tdiv_q: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:153:[value] Function __gmpz_tdiv_q: precondition got status valid.
@@ -80,7 +46,6 @@ tests/e-acsl-runtime/bts1326.i:10:[value] Function __e_acsl_atp_NORMAL_computeAv
 [value] ====== VALUES COMPUTED ======
 [value] Values at end of function atp_NORMAL_computeAverageAccel:
           av ∈ {3}
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function __e_acsl_atp_NORMAL_computeAverageAccel:
           av ∈ {3}
 [value] Values at end of function main:
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1326.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1326.res.oracle
index 129d6744b07..c77378cee71 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1326.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/bts1326.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/bts1326.i:18:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,53 +11,18 @@ tests/e-acsl-runtime/bts1326.i:18:[e-acsl] warning: E-ACSL construct `assigns cl
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __initialize
 [value] using specification for function __full_init
 [value] using specification for function __delete_block
 tests/e-acsl-runtime/bts1326.i:10:[value] Function atp_NORMAL_computeAverageAccel: postcondition got status valid.
 [value] using specification for function __valid_read
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __initialized
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:85:[value] Function __initialized: postcondition got status unknown.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:86:[value] Function __initialized: postcondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/bts1326.i:10:[value] Function __e_acsl_atp_NORMAL_computeAverageAccel: postcondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
@@ -67,21 +30,8 @@ tests/e-acsl-runtime/bts1326.i:10:[value] Function __e_acsl_atp_NORMAL_computeAv
 [value] ====== VALUES COMPUTED ======
 [value] Values at end of function atp_NORMAL_computeAverageAccel:
           av ∈ {3}
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function __e_acsl_atp_NORMAL_computeAverageAccel:
           av ∈ {3}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function main:
           Accel[0] ∈ {1}
                [1] ∈ {2}
@@ -90,9 +40,3 @@ tests/e-acsl-runtime/bts1326.i:10:[value] Function __e_acsl_atp_NORMAL_computeAv
                [4] ∈ {5}
           av ∈ {3}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/cast.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/cast.1.res.oracle
index 9728d1355ca..8e01e68ace6 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/cast.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/cast.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/cast.i:8:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,41 +11,9 @@ tests/e-acsl-runtime/cast.i:8:[e-acsl] warning: E-ACSL construct `assigns clause
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/cast.i:12:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/cast.i:13:[value] Assertion got status valid.
 tests/e-acsl-runtime/cast.i:15:[value] Assertion got status valid.
 tests/e-acsl-runtime/cast.i:16:[value] Assertion got status valid.
@@ -57,7 +23,6 @@ tests/e-acsl-runtime/cast.i:20:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {0}
           y ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/cast.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/cast.res.oracle
index f58e65687ab..3c2854ced95 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/cast.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/cast.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/cast.i:8:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 tests/e-acsl-runtime/cast.i:19:[e-acsl] warning: missing guard for ensuring that the given integer is C-representable
 tests/e-acsl-runtime/cast.i:20:[e-acsl] warning: missing guard for ensuring that the given integer is C-representable
 [value] Analyzing a complete application starting at main
@@ -15,39 +13,6 @@ tests/e-acsl-runtime/cast.i:20:[e-acsl] warning: missing guard for ensuring that
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/cast.i:12:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -56,7 +21,8 @@ tests/e-acsl-runtime/cast.i:12:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 tests/e-acsl-runtime/cast.i:13:[value] Assertion got status valid.
@@ -78,7 +44,6 @@ tests/e-acsl-runtime/cast.i:20:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {0}
           y ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/comparison.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/comparison.1.res.oracle
index 1e5122056c5..72c15623f82 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/comparison.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/comparison.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/comparison.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/comparison.i:7:[e-acsl] warning: E-ACSL construct `assigns
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/comparison.i:9:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -54,7 +19,8 @@ tests/e-acsl-runtime/comparison.i:9:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 tests/e-acsl-runtime/comparison.i:10:[value] Assertion got status valid.
@@ -64,7 +30,7 @@ tests/e-acsl-runtime/comparison.i:12:[value] Assertion got status valid.
 [value] using specification for function __full_init
 [value] using specification for function __literal_string
 tests/e-acsl-runtime/comparison.i:14:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/comparison.i:17:[value] Assertion got status valid.
 tests/e-acsl-runtime/comparison.i:18:[value] Assertion got status valid.
 tests/e-acsl-runtime/comparison.i:19:[value] Assertion got status valid.
@@ -87,7 +53,6 @@ tests/e-acsl-runtime/comparison.i:29:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {0}
           y ∈ {1}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/comparison.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/comparison.res.oracle
index af3f353d37a..54117400b74 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/comparison.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/comparison.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/comparison.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,41 +11,9 @@ tests/e-acsl-runtime/comparison.i:7:[e-acsl] warning: E-ACSL construct `assigns
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/comparison.i:9:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/comparison.i:10:[value] Assertion got status valid.
 tests/e-acsl-runtime/comparison.i:11:[value] Assertion got status valid.
 tests/e-acsl-runtime/comparison.i:12:[value] Assertion got status valid.
@@ -71,7 +37,6 @@ tests/e-acsl-runtime/comparison.i:29:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {0}
           y ∈ {1}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/empty.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/empty.1.res.oracle
index c504e721e8e..259a6350af3 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/empty.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/empty.1.res.oracle
@@ -4,11 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-[e-acsl] warning: cannot find entry point `main'.
-                  Please use option `-main' for specifying a valid entry point.
-                  The generated program may be incomplete.
-./share/e-acsl/memory_model/e_acsl_mmodel.h:97:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 /* Generated by Frama-C */
 struct __anonstruct___mpz_struct_1 {
    int _mp_alloc ;
@@ -18,47 +13,9 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -70,41 +27,4 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/empty.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/empty.res.oracle
index c504e721e8e..259a6350af3 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/empty.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/empty.res.oracle
@@ -4,11 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-[e-acsl] warning: cannot find entry point `main'.
-                  Please use option `-main' for specifying a valid entry point.
-                  The generated program may be incomplete.
-./share/e-acsl/memory_model/e_acsl_mmodel.h:97:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 /* Generated by Frama-C */
 struct __anonstruct___mpz_struct_1 {
    int _mp_alloc ;
@@ -18,47 +13,9 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -70,41 +27,4 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/false.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/false.1.res.oracle
index 1263c09ba90..0d60a4fa8a3 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/false.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/false.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/false.i:6:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/false.i:6:[e-acsl] warning: E-ACSL construct `assigns claus
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/false.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/false.res.oracle
index 1263c09ba90..0d60a4fa8a3 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/false.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/false.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/false.i:6:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/false.i:6:[e-acsl] warning: E-ACSL construct `assigns claus
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/function_contract.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/function_contract.1.res.oracle
index 88ece1edfe2..9a15aa210e4 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/function_contract.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/function_contract.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/function_contract.i:77:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,41 +11,8 @@ tests/e-acsl-runtime/function_contract.i:77:[e-acsl] warning: E-ACSL construct `
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         X ∈ {0}
         Y ∈ {2}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/function_contract.i:10:[value] Function f: postcondition got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -56,7 +21,8 @@ tests/e-acsl-runtime/function_contract.i:10:[value] Function f: postcondition go
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 tests/e-acsl-runtime/function_contract.i:10:[value] Function __e_acsl_f: postcondition got status valid.
@@ -114,7 +80,6 @@ tests/e-acsl-runtime/function_contract.i:74:[value] Function __e_acsl_n, behavio
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function f:
           X ∈ {1}
 [value] Values at end of function __e_acsl_f:
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/function_contract.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/function_contract.res.oracle
index 21d780a0ec3..f6c58b9a2d2 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/function_contract.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/function_contract.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/function_contract.i:77:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,43 +11,11 @@ tests/e-acsl-runtime/function_contract.i:77:[e-acsl] warning: E-ACSL construct `
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         X ∈ {0}
         Y ∈ {2}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/function_contract.i:10:[value] Function f: postcondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/function_contract.i:10:[value] Function __e_acsl_f: postcondition got status valid.
 tests/e-acsl-runtime/function_contract.i:14:[value] Function g: postcondition got status valid.
 tests/e-acsl-runtime/function_contract.i:15:[value] Function g: postcondition got status valid.
@@ -98,7 +64,6 @@ tests/e-acsl-runtime/function_contract.i:74:[value] Function __e_acsl_n, behavio
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function f:
           X ∈ {1}
 [value] Values at end of function __e_acsl_f:
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_addrOf.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_addrOf.c
index 08269dc7739..e24b8adc9c4 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_addrOf.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_addrOf.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_addrOf2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_addrOf2.c
index 08269dc7739..e24b8adc9c4 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_addrOf2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_addrOf2.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_arith.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_arith.c
index 36828769ac1..f889a1c65b5 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_arith.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_arith.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_arith2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_arith2.c
index 1cd5aadb8ea..643edc815bc 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_arith2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_arith2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -139,7 +102,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_tdiv_r(__mpz_struct * /*[1]*
  */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_com(__mpz_struct * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -151,43 +119,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_array.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_array.c
index cf55d540f4a..7a3cc34a35c 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_array.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_array.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int T1[3];
 int T2[4];
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_array2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_array2.c
index 5244f340f5a..8786085b570 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_array2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_array2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -64,7 +27,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -76,43 +44,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int T1[3];
 int T2[4];
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_at.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_at.c
index 4536b3b179f..77f933edf60 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_at.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_at.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_at2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_at2.c
index 5fed9fc1a63..22c3f1c7be7 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_at2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_at2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -88,7 +51,12 @@ extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1
 extern  __attribute__((__FC_BUILTIN__)) void __gmpz_add(__mpz_struct * /*[1]*/ z1,
                                                         __mpz_struct const * /*[1]*/ z2,
                                                         __mpz_struct const * /*[1]*/ z3);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -100,43 +68,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1304.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1304.c
index 87280acdb30..e5f9c08c385 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1304.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1304.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 struct msgA {
    int type ;
    int a[2] ;
@@ -63,7 +26,12 @@ union msg {
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = 32767UL;
 extern int __fc_heap_status;
@@ -75,43 +43,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13042.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13042.c
index 87280acdb30..e5f9c08c385 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13042.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13042.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 struct msgA {
    int type ;
    int a[2] ;
@@ -63,7 +26,12 @@ union msg {
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = 32767UL;
 extern int __fc_heap_status;
@@ -75,43 +43,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1307.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1307.c
index b4075000120..f82fe81ad7f 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1307.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1307.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13072.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13072.c
index 7c4de181742..43518e2d60b 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13072.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13072.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -91,7 +54,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_tdiv_q(__mpz_struct * /*[1]*
 /*@ requires \valid(z);
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) unsigned long __gmpz_get_ui(__mpz_struct const * /*[1]*/ z);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -103,43 +71,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1324.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1324.c
index 7600b3752d9..44ca54b620f 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1324.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1324.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13242.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13242.c
index fe5ba715347..622c6821c20 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13242.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13242.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -98,7 +61,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_sub(__mpz_struct * /*[1]*/ z
 /*@ requires \valid(z);
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) unsigned long __gmpz_get_ui(__mpz_struct const * /*[1]*/ z);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -110,43 +78,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1326.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1326.c
index 91df7a2c5f6..02986f6f7f5 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1326.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts1326.c
@@ -7,48 +7,16 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 typedef int ArrayInt[5];
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -60,43 +28,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13262.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13262.c
index ef0f98e3ae8..ae53eba25f3 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13262.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_bts13262.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 typedef int ArrayInt[5];
 /*@
 model __mpz_struct { ℤ n };
@@ -89,7 +52,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_add(__mpz_struct * /*[1]*/ z
 extern  __attribute__((__FC_BUILTIN__)) void __gmpz_tdiv_q(__mpz_struct * /*[1]*/ z1,
                                                            __mpz_struct const * /*[1]*/ z2,
                                                            __mpz_struct const * /*[1]*/ z3);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -101,43 +69,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_cast.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_cast.c
index ad3fd2d2173..07fd91eb6b6 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_cast.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_cast.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_cast2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_cast2.c
index b1b7f934dc4..e17011d7204 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_cast2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_cast2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -86,7 +49,12 @@ extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1
 /*@ requires \valid(z);
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) unsigned long __gmpz_get_ui(__mpz_struct const * /*[1]*/ z);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -98,43 +66,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_comparison.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_comparison.c
index 6d0db9ae9b7..211434bd5c1 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_comparison.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_comparison.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_comparison2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_comparison2.c
index 284cc121a5f..9fe74c5a73c 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_comparison2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_comparison2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -77,7 +40,12 @@ extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1
  */
 extern  __attribute__((__FC_BUILTIN__)) void __gmpz_neg(__mpz_struct * /*[1]*/ z1,
                                                         __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -89,43 +57,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_false.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_false.c
index 9cf63397be4..75701e28201 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_false.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_false.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_false2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_false2.c
index 9cf63397be4..75701e28201 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_false2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_false2.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_function_contract.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_function_contract.c
index ff3a1b18a07..e24a97bf803 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_function_contract.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_function_contract.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int X = 0;
 int Y = 2;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_function_contract2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_function_contract2.c
index f98194d2553..ddb6d072d3c 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_function_contract2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_function_contract2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -79,7 +42,12 @@ extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1
 extern  __attribute__((__FC_BUILTIN__)) void __gmpz_add(__mpz_struct * /*[1]*/ z1,
                                                         __mpz_struct const * /*[1]*/ z2,
                                                         __mpz_struct const * /*[1]*/ z3);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -91,43 +59,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int X = 0;
 int Y = 2;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ghost.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ghost.c
index 32e1d4c7ef4..05a0dbb8dfe 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ghost.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ghost.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ghost2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ghost2.c
index 54327077180..ac5467cedb8 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ghost2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ghost2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -64,7 +27,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -76,43 +44,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_integer_constant.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_integer_constant.c
index 7c29af70ea7..0d4d2ef8f14 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_integer_constant.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_integer_constant.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -65,7 +28,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -77,43 +45,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_integer_constant2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_integer_constant2.c
index af74867ce9c..e9f662e150f 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_integer_constant2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_integer_constant2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -74,7 +37,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -86,43 +54,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_invariant.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_invariant.c
index 4387db8c8d8..3fdad215557 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_invariant.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_invariant.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_invariant2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_invariant2.c
index 70d1d5fc903..3571287f3f6 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_invariant2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_invariant2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -64,7 +27,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -76,43 +44,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_labeled_stmt.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_labeled_stmt.c
index 2bf8b521887..fa82bce1f18 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_labeled_stmt.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_labeled_stmt.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int X = 0;
 /*@ ensures X ≡ 3; */
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_labeled_stmt2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_labeled_stmt2.c
index 48f0e7aaba1..4a966ec7429 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_labeled_stmt2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_labeled_stmt2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -64,7 +27,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -76,43 +44,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int X = 0;
 /*@ ensures X ≡ 3; */
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_lazy.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_lazy.c
index ee03c2a5c8c..6ab79079f70 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_lazy.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_lazy.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_lazy2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_lazy2.c
index 94c9ae0ce34..ac7f86207ba 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_lazy2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_lazy2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -88,7 +51,12 @@ extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1
 extern  __attribute__((__FC_BUILTIN__)) void __gmpz_tdiv_q(__mpz_struct * /*[1]*/ z1,
                                                            __mpz_struct const * /*[1]*/ z2,
                                                            __mpz_struct const * /*[1]*/ z3);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -100,43 +68,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_linear_search.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_linear_search.c
index 79862af6413..c0835270520 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_linear_search.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_linear_search.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int A[10];
 /*@ requires ∀ int i; 0 ≤ i ∧ i < 9 ⇒ A[i] ≤ A[i+1];
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_linear_search2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_linear_search2.c
index 5979d15e783..1513e9137d2 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_linear_search2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_linear_search2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -89,7 +52,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_add(__mpz_struct * /*[1]*/ z
 /*@ requires \valid(z);
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) unsigned long __gmpz_get_ui(__mpz_struct const * /*[1]*/ z);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -101,43 +69,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int A[10];
 /*@ requires ∀ ℤ i; 0 ≤ i ∧ i < 9 ⇒ A[i] ≤ A[i+1];
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c
index a6af5802133..93197bf6f26 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string2.c
index a4ad121b4fd..b8c6ebcf4cf 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -64,7 +27,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -76,43 +44,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_localvar.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_localvar.c
index db9b9625c64..5f69b40ead3 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_localvar.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_localvar.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 struct list {
    int element ;
    struct list *next ;
@@ -51,7 +14,12 @@ struct list {
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -85,6 +53,23 @@ axiomatic
     disjoint behaviors no_allocation, allocation;
  */
 extern void *__malloc(size_t size);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
+                                                            size_t size);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __delete_block(void *ptr);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __full_init(void *ptr);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) int __valid(void *ptr, size_t size);
+/*@ ensures \result ≡ 0 ∨ \result ≡ 1;
+    ensures
+      \result ≡ 1 ⇒ \initialized((char *)\old(ptr)+(0..\old(size)-1));
+    assigns \nothing;
+ */
+extern  __attribute__((__FC_BUILTIN__)) int __initialized(void *ptr,
+                                                          size_t size);
+extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 /*@ assigns __fc_heap_status;
     assigns __fc_heap_status \from size, __fc_heap_status;
     assigns \result \from size, __fc_heap_status;
@@ -109,64 +94,16 @@ extern void *__malloc(size_t size);
 void *__e_acsl_malloc(size_t size)
 {
   void *__retres;
+  __store_block((void *)(& __retres),4U);
+  __store_block((void *)(& size),4U);
+  __full_init((void *)(& size));
+  __full_init((void *)(& __retres));
   __retres = __malloc(size);
+  __delete_block((void *)(& size));
+  __delete_block((void *)(& __retres));
   return __retres;
 }
 
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
-                                                            size_t size);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __delete_block(void *ptr);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __full_init(void *ptr);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) int __valid(void *ptr, size_t size);
-/*@ ensures \result ≡ 0 ∨ \result ≡ 1;
-    ensures
-      \result ≡ 1 ⇒ \initialized((char *)\old(ptr)+(0..\old(size)-1));
-    assigns \nothing;
- */
-extern  __attribute__((__FC_BUILTIN__)) int __initialized(void *ptr,
-                                                          size_t size);
-extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 struct list *add(struct list *l, int i)
 {
   struct list *new;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_localvar2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_localvar2.c
index db9b9625c64..5f69b40ead3 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_localvar2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_localvar2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 struct list {
    int element ;
    struct list *next ;
@@ -51,7 +14,12 @@ struct list {
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -85,6 +53,23 @@ axiomatic
     disjoint behaviors no_allocation, allocation;
  */
 extern void *__malloc(size_t size);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
+                                                            size_t size);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __delete_block(void *ptr);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __full_init(void *ptr);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) int __valid(void *ptr, size_t size);
+/*@ ensures \result ≡ 0 ∨ \result ≡ 1;
+    ensures
+      \result ≡ 1 ⇒ \initialized((char *)\old(ptr)+(0..\old(size)-1));
+    assigns \nothing;
+ */
+extern  __attribute__((__FC_BUILTIN__)) int __initialized(void *ptr,
+                                                          size_t size);
+extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 /*@ assigns __fc_heap_status;
     assigns __fc_heap_status \from size, __fc_heap_status;
     assigns \result \from size, __fc_heap_status;
@@ -109,64 +94,16 @@ extern void *__malloc(size_t size);
 void *__e_acsl_malloc(size_t size)
 {
   void *__retres;
+  __store_block((void *)(& __retres),4U);
+  __store_block((void *)(& size),4U);
+  __full_init((void *)(& size));
+  __full_init((void *)(& __retres));
   __retres = __malloc(size);
+  __delete_block((void *)(& size));
+  __delete_block((void *)(& __retres));
   return __retres;
 }
 
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
-                                                            size_t size);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __delete_block(void *ptr);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __full_init(void *ptr);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) int __valid(void *ptr, size_t size);
-/*@ ensures \result ≡ 0 ∨ \result ≡ 1;
-    ensures
-      \result ≡ 1 ⇒ \initialized((char *)\old(ptr)+(0..\old(size)-1));
-    assigns \nothing;
- */
-extern  __attribute__((__FC_BUILTIN__)) int __initialized(void *ptr,
-                                                          size_t size);
-extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 struct list *add(struct list *l, int i)
 {
   struct list *new;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_nested_code_annot.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_nested_code_annot.c
index 0f44b25324c..af9f9a3d0e8 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_nested_code_annot.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_nested_code_annot.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_nested_code_annot2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_nested_code_annot2.c
index eb30aa13a8c..2948e2d0b5e 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_nested_code_annot2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_nested_code_annot2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -64,7 +27,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -76,43 +44,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_not.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_not.c
index a73d5e248dc..8daf6db6a4c 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_not.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_not.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_not2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_not2.c
index 6a45688ca54..d7d81a06a0c 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_not2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_not2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -64,7 +27,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -76,43 +44,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_null.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_null.c
index 22910973cbe..c47670dcaff 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_null.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_null.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_null2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_null2.c
index 22910973cbe..c47670dcaff 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_null2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_null2.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_other_constants.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_other_constants.c
index dc8b98b498f..9e35861b83f 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_other_constants.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_other_constants.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 enum bool {
     false = 0,
     true = 1
@@ -51,7 +14,12 @@ enum bool {
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -63,43 +31,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_other_constants2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_other_constants2.c
index 327e9251a42..907acc47f49 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_other_constants2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_other_constants2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 enum bool {
     false = 0,
     true = 1
@@ -68,7 +31,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -80,43 +48,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr.c
index 7bcca098e82..d3384424575 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr2.c
index 97cb14f9d51..8c00086959d 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -109,7 +72,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_tdiv_q(__mpz_struct * /*[1]*
 /*@ requires \valid(z);
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) unsigned long __gmpz_get_ui(__mpz_struct const * /*[1]*/ z);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -121,43 +89,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_quantif.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_quantif.c
index e154510eedd..c79e327e569 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_quantif.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_quantif.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_quantif2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_quantif2.c
index e9b54e0bbb0..347d17dd809 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_quantif2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_quantif2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -113,7 +76,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_tdiv_q(__mpz_struct * /*[1]*
 extern  __attribute__((__FC_BUILTIN__)) void __gmpz_tdiv_r(__mpz_struct * /*[1]*/ z1,
                                                            __mpz_struct const * /*[1]*/ z2,
                                                            __mpz_struct const * /*[1]*/ z3);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -125,43 +93,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_result.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_result.c
index 8077187aee8..4f3bacf311f 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_result.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_result.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 /*@ ensures \result ≡ (int)(\old(x)-\old(x)); */
 int f(int x)
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_result2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_result2.c
index 12df9034eb8..fef96167f9b 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_result2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_result2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -82,7 +45,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_sub(__mpz_struct * /*[1]*/ z
 /*@ requires \valid(z);
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) unsigned long __gmpz_get_ui(__mpz_struct const * /*[1]*/ z);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -94,43 +62,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 /*@ ensures \result ≡ (int)(\old(x)-\old(x)); */
 int f(int x)
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_sizeof.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_sizeof.c
index 9a956d67f35..865255dd6cc 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_sizeof.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_sizeof.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_sizeof2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_sizeof2.c
index dac4254919f..4fcf6fd3eb5 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_sizeof2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_sizeof2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -64,7 +27,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -76,43 +44,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stmt_contract.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stmt_contract.c
index 0def67134dd..bd5607e553d 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stmt_contract.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stmt_contract.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stmt_contract2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stmt_contract2.c
index 0f1c3552175..42daaf77b17 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stmt_contract2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stmt_contract2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -79,7 +42,12 @@ extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1
 extern  __attribute__((__FC_BUILTIN__)) void __gmpz_add(__mpz_struct * /*[1]*/ z1,
                                                         __mpz_struct const * /*[1]*/ z2,
                                                         __mpz_struct const * /*[1]*/ z3);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -91,43 +59,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_true.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_true.c
index c3c9949899a..3712a2482bc 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_true.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_true.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_true2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_true2.c
index c3c9949899a..3712a2482bc 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_true2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_true2.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -59,43 +27,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_typedef.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_typedef.c
index 7b9b2a13396..a4ab15b4e81 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_typedef.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_typedef.c
@@ -7,48 +7,16 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 typedef unsigned char uint8;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -60,43 +28,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_typedef2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_typedef2.c
index 366d2b6863b..034bab5df81 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_typedef2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_typedef2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 typedef unsigned char uint8;
 /*@
 model __mpz_struct { ℤ n };
@@ -74,7 +37,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -86,43 +54,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid.c
index 23a9709e041..63a53391292 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -81,6 +49,43 @@ axiomatic
     disjoint behaviors no_allocation, allocation;
  */
 extern void *__malloc(size_t size);
+/*@ assigns __fc_heap_status;
+    assigns __fc_heap_status \from __fc_heap_status;
+    frees p;
+    
+    behavior deallocation:
+      assumes p ≢ \null;
+      requires \freeable(p);
+      ensures \allocable(\old(p));
+      assigns __fc_heap_status;
+      assigns __fc_heap_status \from __fc_heap_status;
+    
+    behavior no_deallocation:
+      assumes p ≡ \null;
+      assigns \nothing;
+      allocates \nothing;
+    
+    complete behaviors no_deallocation, deallocation;
+    disjoint behaviors no_deallocation, deallocation;
+ */
+extern void __free(void *p);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
+                                                            size_t size);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __delete_block(void *ptr);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __full_init(void *ptr);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) int __valid(void *ptr, size_t size);
+/*@ ensures \result ≡ 0 ∨ \result ≡ 1;
+    ensures
+      \result ≡ 1 ⇒ \initialized((char *)\old(ptr)+(0..\old(size)-1));
+    assigns \nothing;
+ */
+extern  __attribute__((__FC_BUILTIN__)) int __initialized(void *ptr,
+                                                          size_t size);
+extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 /*@ assigns __fc_heap_status;
     assigns __fc_heap_status \from size, __fc_heap_status;
     assigns \result \from size, __fc_heap_status;
@@ -105,30 +110,16 @@ extern void *__malloc(size_t size);
 void *__e_acsl_malloc(size_t size)
 {
   void *__retres;
+  __store_block((void *)(& __retres),4U);
+  __store_block((void *)(& size),4U);
+  __full_init((void *)(& size));
+  __full_init((void *)(& __retres));
   __retres = __malloc(size);
+  __delete_block((void *)(& size));
+  __delete_block((void *)(& __retres));
   return __retres;
 }
 
-/*@ assigns __fc_heap_status;
-    assigns __fc_heap_status \from __fc_heap_status;
-    frees p;
-    
-    behavior deallocation:
-      assumes p ≢ \null;
-      requires \freeable(p);
-      ensures \allocable(\old(p));
-      assigns __fc_heap_status;
-      assigns __fc_heap_status \from __fc_heap_status;
-    
-    behavior no_deallocation:
-      assumes p ≡ \null;
-      assigns \nothing;
-      allocates \nothing;
-    
-    complete behaviors no_deallocation, deallocation;
-    disjoint behaviors no_deallocation, deallocation;
- */
-extern void __free(void *p);
 /*@ assigns __fc_heap_status;
     assigns __fc_heap_status \from __fc_heap_status;
     frees p;
@@ -151,65 +142,16 @@ extern void __free(void *p);
 void __e_acsl_free(void *p)
 {
   int __e_acsl_at;
+  __store_block((void *)(& p),4U);
+  __full_init((void *)(& p));
+  __store_block((void *)(& __e_acsl_at),4U);
+  __full_init((void *)(& __e_acsl_at));
   __e_acsl_at = p != (void *)0;
   __free(p);
+  __delete_block((void *)(& p));
   return;
 }
 
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
-                                                            size_t size);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __delete_block(void *ptr);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __full_init(void *ptr);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) int __valid(void *ptr, size_t size);
-/*@ ensures \result ≡ 0 ∨ \result ≡ 1;
-    ensures
-      \result ≡ 1 ⇒ \initialized((char *)\old(ptr)+(0..\old(size)-1));
-    assigns \nothing;
- */
-extern  __attribute__((__FC_BUILTIN__)) int __initialized(void *ptr,
-                                                          size_t size);
-extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int *X;
 /*@ requires \valid(x);
     ensures \valid(\result); */
@@ -252,6 +194,7 @@ int *f(int *x)
 int *__e_acsl_f(int *x)
 {
   int *__retres;
+  __store_block((void *)(& __retres),4U);
   {
     int __e_acsl_valid;
     __store_block((void *)(& x),4U);
@@ -259,6 +202,7 @@ int *__e_acsl_f(int *x)
     __e_acsl_valid = __valid((void *)x,sizeof(int));
     e_acsl_assert(__e_acsl_valid,(char *)"Precondition",(char *)"\\valid(x)",
                   15);
+    __full_init((void *)(& __retres));
     __retres = f(x);
   }
   {
@@ -267,6 +211,7 @@ int *__e_acsl_f(int *x)
     e_acsl_assert(__e_acsl_valid_2,(char *)"Postcondition",
                   (char *)"\\valid(\\result)",16);
     __delete_block((void *)(& x));
+    __delete_block((void *)(& __retres));
     return __retres;
   }
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid2.c
index 23a9709e041..63a53391292 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid2.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -81,6 +49,43 @@ axiomatic
     disjoint behaviors no_allocation, allocation;
  */
 extern void *__malloc(size_t size);
+/*@ assigns __fc_heap_status;
+    assigns __fc_heap_status \from __fc_heap_status;
+    frees p;
+    
+    behavior deallocation:
+      assumes p ≢ \null;
+      requires \freeable(p);
+      ensures \allocable(\old(p));
+      assigns __fc_heap_status;
+      assigns __fc_heap_status \from __fc_heap_status;
+    
+    behavior no_deallocation:
+      assumes p ≡ \null;
+      assigns \nothing;
+      allocates \nothing;
+    
+    complete behaviors no_deallocation, deallocation;
+    disjoint behaviors no_deallocation, deallocation;
+ */
+extern void __free(void *p);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
+                                                            size_t size);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __delete_block(void *ptr);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __full_init(void *ptr);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) int __valid(void *ptr, size_t size);
+/*@ ensures \result ≡ 0 ∨ \result ≡ 1;
+    ensures
+      \result ≡ 1 ⇒ \initialized((char *)\old(ptr)+(0..\old(size)-1));
+    assigns \nothing;
+ */
+extern  __attribute__((__FC_BUILTIN__)) int __initialized(void *ptr,
+                                                          size_t size);
+extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 /*@ assigns __fc_heap_status;
     assigns __fc_heap_status \from size, __fc_heap_status;
     assigns \result \from size, __fc_heap_status;
@@ -105,30 +110,16 @@ extern void *__malloc(size_t size);
 void *__e_acsl_malloc(size_t size)
 {
   void *__retres;
+  __store_block((void *)(& __retres),4U);
+  __store_block((void *)(& size),4U);
+  __full_init((void *)(& size));
+  __full_init((void *)(& __retres));
   __retres = __malloc(size);
+  __delete_block((void *)(& size));
+  __delete_block((void *)(& __retres));
   return __retres;
 }
 
-/*@ assigns __fc_heap_status;
-    assigns __fc_heap_status \from __fc_heap_status;
-    frees p;
-    
-    behavior deallocation:
-      assumes p ≢ \null;
-      requires \freeable(p);
-      ensures \allocable(\old(p));
-      assigns __fc_heap_status;
-      assigns __fc_heap_status \from __fc_heap_status;
-    
-    behavior no_deallocation:
-      assumes p ≡ \null;
-      assigns \nothing;
-      allocates \nothing;
-    
-    complete behaviors no_deallocation, deallocation;
-    disjoint behaviors no_deallocation, deallocation;
- */
-extern void __free(void *p);
 /*@ assigns __fc_heap_status;
     assigns __fc_heap_status \from __fc_heap_status;
     frees p;
@@ -151,65 +142,16 @@ extern void __free(void *p);
 void __e_acsl_free(void *p)
 {
   int __e_acsl_at;
+  __store_block((void *)(& p),4U);
+  __full_init((void *)(& p));
+  __store_block((void *)(& __e_acsl_at),4U);
+  __full_init((void *)(& __e_acsl_at));
   __e_acsl_at = p != (void *)0;
   __free(p);
+  __delete_block((void *)(& p));
   return;
 }
 
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
-                                                            size_t size);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __delete_block(void *ptr);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __full_init(void *ptr);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) int __valid(void *ptr, size_t size);
-/*@ ensures \result ≡ 0 ∨ \result ≡ 1;
-    ensures
-      \result ≡ 1 ⇒ \initialized((char *)\old(ptr)+(0..\old(size)-1));
-    assigns \nothing;
- */
-extern  __attribute__((__FC_BUILTIN__)) int __initialized(void *ptr,
-                                                          size_t size);
-extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int *X;
 /*@ requires \valid(x);
     ensures \valid(\result); */
@@ -252,6 +194,7 @@ int *f(int *x)
 int *__e_acsl_f(int *x)
 {
   int *__retres;
+  __store_block((void *)(& __retres),4U);
   {
     int __e_acsl_valid;
     __store_block((void *)(& x),4U);
@@ -259,6 +202,7 @@ int *__e_acsl_f(int *x)
     __e_acsl_valid = __valid((void *)x,sizeof(int));
     e_acsl_assert(__e_acsl_valid,(char *)"Precondition",(char *)"\\valid(x)",
                   15);
+    __full_init((void *)(& __retres));
     __retres = f(x);
   }
   {
@@ -267,6 +211,7 @@ int *__e_acsl_f(int *x)
     e_acsl_assert(__e_acsl_valid_2,(char *)"Postcondition",
                   (char *)"\\valid(\\result)",16);
     __delete_block((void *)(& x));
+    __delete_block((void *)(& __retres));
     return __retres;
   }
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_alias.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_alias.c
index 9b75085391d..2e5860a5324 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_alias.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_alias.c
@@ -7,47 +7,15 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -81,6 +49,49 @@ axiomatic
     disjoint behaviors no_allocation, allocation;
  */
 extern void *__malloc(size_t size);
+/*@ assigns __fc_heap_status;
+    assigns __fc_heap_status \from __fc_heap_status;
+    frees p;
+    
+    behavior deallocation:
+      assumes p ≢ \null;
+      requires \freeable(p);
+      ensures \allocable(\old(p));
+      assigns __fc_heap_status;
+      assigns __fc_heap_status \from __fc_heap_status;
+    
+    behavior no_deallocation:
+      assumes p ≡ \null;
+      assigns \nothing;
+      allocates \nothing;
+    
+    complete behaviors no_deallocation, deallocation;
+    disjoint behaviors no_deallocation, deallocation;
+ */
+extern void __free(void *p);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
+                                                            size_t size);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __delete_block(void *ptr);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __initialize(void *ptr,
+                                                          size_t size);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __full_init(void *ptr);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) int __valid(void *ptr, size_t size);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) int __valid_read(void *ptr,
+                                                         size_t size);
+/*@ ensures \result ≡ 0 ∨ \result ≡ 1;
+    ensures
+      \result ≡ 1 ⇒ \initialized((char *)\old(ptr)+(0..\old(size)-1));
+    assigns \nothing;
+ */
+extern  __attribute__((__FC_BUILTIN__)) int __initialized(void *ptr,
+                                                          size_t size);
+extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 /*@ assigns __fc_heap_status;
     assigns __fc_heap_status \from size, __fc_heap_status;
     assigns \result \from size, __fc_heap_status;
@@ -105,30 +116,16 @@ extern void *__malloc(size_t size);
 void *__e_acsl_malloc(size_t size)
 {
   void *__retres;
+  __store_block((void *)(& __retres),4U);
+  __store_block((void *)(& size),4U);
+  __full_init((void *)(& size));
+  __full_init((void *)(& __retres));
   __retres = __malloc(size);
+  __delete_block((void *)(& size));
+  __delete_block((void *)(& __retres));
   return __retres;
 }
 
-/*@ assigns __fc_heap_status;
-    assigns __fc_heap_status \from __fc_heap_status;
-    frees p;
-    
-    behavior deallocation:
-      assumes p ≢ \null;
-      requires \freeable(p);
-      ensures \allocable(\old(p));
-      assigns __fc_heap_status;
-      assigns __fc_heap_status \from __fc_heap_status;
-    
-    behavior no_deallocation:
-      assumes p ≡ \null;
-      assigns \nothing;
-      allocates \nothing;
-    
-    complete behaviors no_deallocation, deallocation;
-    disjoint behaviors no_deallocation, deallocation;
- */
-extern void __free(void *p);
 /*@ assigns __fc_heap_status;
     assigns __fc_heap_status \from __fc_heap_status;
     frees p;
@@ -151,71 +148,16 @@ extern void __free(void *p);
 void __e_acsl_free(void *p)
 {
   int __e_acsl_at;
+  __store_block((void *)(& p),4U);
+  __full_init((void *)(& p));
+  __store_block((void *)(& __e_acsl_at),4U);
+  __full_init((void *)(& __e_acsl_at));
   __e_acsl_at = p != (void *)0;
   __free(p);
+  __delete_block((void *)(& p));
   return;
 }
 
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
-                                                            size_t size);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __delete_block(void *ptr);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __initialize(void *ptr,
-                                                          size_t size);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __full_init(void *ptr);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) int __valid(void *ptr, size_t size);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) int __valid_read(void *ptr,
-                                                         size_t size);
-/*@ ensures \result ≡ 0 ∨ \result ≡ 1;
-    ensures
-      \result ≡ 1 ⇒ \initialized((char *)\old(ptr)+(0..\old(size)-1));
-    assigns \nothing;
- */
-extern  __attribute__((__FC_BUILTIN__)) int __initialized(void *ptr,
-                                                          size_t size);
-extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
   int __retres;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_alias2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_alias2.c
index e18ec3a72e8..c60ce412c1c 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_alias2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_alias2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 /*@
 model __mpz_struct { ℤ n };
 */
@@ -64,7 +27,12 @@ extern  __attribute__((__FC_BUILTIN__)) void __gmpz_clear(__mpz_struct * /*[1]*/
     assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) int __gmpz_cmp(__mpz_struct const * /*[1]*/ z1,
                                                        __mpz_struct const * /*[1]*/ z2);
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -98,6 +66,46 @@ axiomatic
     disjoint behaviors no_allocation, allocation;
  */
 extern void *__malloc(size_t size);
+/*@ assigns __fc_heap_status;
+    assigns __fc_heap_status \from __fc_heap_status;
+    frees p;
+    
+    behavior deallocation:
+      assumes p ≢ \null;
+      requires \freeable(p);
+      ensures \allocable(\old(p));
+      assigns __fc_heap_status;
+      assigns __fc_heap_status \from __fc_heap_status;
+    
+    behavior no_deallocation:
+      assumes p ≡ \null;
+      assigns \nothing;
+      allocates \nothing;
+    
+    complete behaviors no_deallocation, deallocation;
+    disjoint behaviors no_deallocation, deallocation;
+ */
+extern void __free(void *p);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
+                                                            size_t size);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __delete_block(void *ptr);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __initialize(void *ptr,
+                                                          size_t size);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void __full_init(void *ptr);
+/*@ assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) int __valid(void *ptr, size_t size);
+/*@ ensures \result ≡ 0 ∨ \result ≡ 1;
+    ensures
+      \result ≡ 1 ⇒ \initialized((char *)\old(ptr)+(0..\old(size)-1));
+    assigns \nothing;
+ */
+extern  __attribute__((__FC_BUILTIN__)) int __initialized(void *ptr,
+                                                          size_t size);
+extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 /*@ assigns __fc_heap_status;
     assigns __fc_heap_status \from size, __fc_heap_status;
     assigns \result \from size, __fc_heap_status;
@@ -122,30 +130,16 @@ extern void *__malloc(size_t size);
 void *__e_acsl_malloc(size_t size)
 {
   void *__retres;
+  __store_block((void *)(& __retres),4U);
+  __store_block((void *)(& size),4U);
+  __full_init((void *)(& size));
+  __full_init((void *)(& __retres));
   __retres = __malloc(size);
+  __delete_block((void *)(& size));
+  __delete_block((void *)(& __retres));
   return __retres;
 }
 
-/*@ assigns __fc_heap_status;
-    assigns __fc_heap_status \from __fc_heap_status;
-    frees p;
-    
-    behavior deallocation:
-      assumes p ≢ \null;
-      requires \freeable(p);
-      ensures \allocable(\old(p));
-      assigns __fc_heap_status;
-      assigns __fc_heap_status \from __fc_heap_status;
-    
-    behavior no_deallocation:
-      assumes p ≡ \null;
-      assigns \nothing;
-      allocates \nothing;
-    
-    complete behaviors no_deallocation, deallocation;
-    disjoint behaviors no_deallocation, deallocation;
- */
-extern void __free(void *p);
 /*@ assigns __fc_heap_status;
     assigns __fc_heap_status \from __fc_heap_status;
     frees p;
@@ -168,68 +162,16 @@ extern void __free(void *p);
 void __e_acsl_free(void *p)
 {
   int __e_acsl_at;
+  __store_block((void *)(& p),4U);
+  __full_init((void *)(& p));
+  __store_block((void *)(& __e_acsl_at),4U);
+  __full_init((void *)(& __e_acsl_at));
   __e_acsl_at = p != (void *)0;
   __free(p);
+  __delete_block((void *)(& p));
   return;
 }
 
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
-                                                            size_t size);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __delete_block(void *ptr);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __initialize(void *ptr,
-                                                          size_t size);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) void __full_init(void *ptr);
-/*@ assigns \nothing; */
-extern  __attribute__((__FC_BUILTIN__)) int __valid(void *ptr, size_t size);
-/*@ ensures \result ≡ 0 ∨ \result ≡ 1;
-    ensures
-      \result ≡ 1 ⇒ \initialized((char *)\old(ptr)+(0..\old(size)-1));
-    assigns \nothing;
- */
-extern  __attribute__((__FC_BUILTIN__)) int __initialized(void *ptr,
-                                                          size_t size);
-extern  __attribute__((__FC_BUILTIN__)) void __clean(void);
 int main(void)
 {
   int __retres;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_in_contract.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_in_contract.c
index 1aa14a85979..4fa37e04a9e 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_in_contract.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_in_contract.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 struct list {
    int element ;
    struct list *next ;
@@ -51,7 +14,12 @@ struct list {
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -63,43 +31,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_in_contract2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_in_contract2.c
index 1aa14a85979..4fa37e04a9e 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_in_contract2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_in_contract2.c
@@ -7,43 +7,6 @@ struct __anonstruct___mpz_struct_1 {
 typedef struct __anonstruct___mpz_struct_1 __mpz_struct;
 typedef __mpz_struct ( __attribute__((__FC_BUILTIN__)) mpz_t)[1];
 typedef unsigned int size_t;
-typedef unsigned int ino_t;
-typedef unsigned int gid_t;
-typedef unsigned int uid_t;
-typedef long time_t;
-typedef unsigned int blkcnt_t;
-typedef unsigned int blksize_t;
-typedef unsigned int dev_t;
-typedef unsigned int mode_t;
-typedef unsigned int nlink_t;
-typedef unsigned int off_t;
-struct stat {
-   dev_t st_dev ;
-   ino_t st_ino ;
-   mode_t st_mode ;
-   nlink_t st_nlink ;
-   uid_t st_uid ;
-   gid_t st_gid ;
-   dev_t st_rdev ;
-   off_t st_size ;
-   time_t st_atime ;
-   time_t st_mtime ;
-   time_t st_ctime ;
-   blksize_t st_blksize ;
-   blkcnt_t st_blocks ;
-   char *__fc_real_data ;
-   int __fc_real_data_max_size ;
-};
-struct __fc_FILE {
-   unsigned int __fc_stdio_id ;
-   unsigned int __fc_maxsz ;
-   unsigned int __fc_writepos ;
-   unsigned int __fc_readpos ;
-   int __fc_is_a_socket ;
-   int __fc_mode ;
-   struct stat *__fc_inode ;
-};
-typedef struct __fc_FILE FILE;
 struct list {
    int element ;
    struct list *next ;
@@ -51,7 +14,12 @@ struct list {
 /*@
 model __mpz_struct { ℤ n };
 */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line);
+/*@ requires predicate ≢ 0;
+    assigns \nothing; */
+extern  __attribute__((__FC_BUILTIN__)) void e_acsl_assert(int predicate,
+                                                           char *kind,
+                                                           char *pred_txt,
+                                                           int line);
 int __fc_random_counter __attribute__((__unused__));
 unsigned long const __fc_rand_max = (unsigned long)32767;
 extern int __fc_heap_status;
@@ -63,43 +31,6 @@ axiomatic
   
   }
  */
-/*@ ensures \false;
-    assigns \nothing; */
-extern void exit(int status);
-/*@ ensures \false;
-    assigns \nothing; */
-void __e_acsl_exit(int status)
-{
-  exit(status);
-  e_acsl_assert(0,(char *)"Postcondition",(char *)"\\false",180);
-  return;
-}
-
-extern FILE *__fc_stdout;
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-extern int printf(char const *format , ...);
-/*@ assigns *__fc_stdout;
-    assigns *__fc_stdout \from *(format+(..)); */
-int __e_acsl_printf(char const *format , ...)
-{
-  int __retres;
-  __retres = printf(format);
-  return __retres;
-}
-
-/*@ requires predicate ≢ 0;
-    assigns \nothing; */
-void e_acsl_assert(int predicate, char *kind, char *pred_txt, int line)
-{
-  if (! predicate) {
-    printf("%s failed at line %d.\nThe failing predicate is:\n%s.\n",kind,
-           line,pred_txt);
-    exit(1);
-  }
-  return;
-}
-
 /*@ assigns \nothing; */
 extern  __attribute__((__FC_BUILTIN__)) void *__store_block(void *ptr,
                                                             size_t size);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ghost.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ghost.1.res.oracle
index ae8c5c387d3..b934a77a7d0 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ghost.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ghost.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/ghost.i:13:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,76 +11,28 @@ tests/e-acsl-runtime/ghost.i:13:[e-acsl] warning: E-ACSL construct `assigns clau
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         G ∈ {0}
         P ∈ {0}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 [value] using specification for function __initialize
 [value] using specification for function __valid_read
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __valid
 tests/e-acsl-runtime/ghost.i:17:[value] Assertion got status valid.
 [value] using specification for function __initialized
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:85:[value] Function __initialized: postcondition got status unknown.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:86:[value] Function __initialized: postcondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 [value] using specification for function __delete_block
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
 [value] Values at end of function e_acsl_global_init:
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function main:
           G ∈ {1}
           P ∈ {{ &G }}
           Q ∈ {{ &G }}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ghost.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ghost.res.oracle
index 34c00dd8394..bf57bb9e07f 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ghost.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ghost.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/ghost.i:13:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,49 +11,14 @@ tests/e-acsl-runtime/ghost.i:13:[e-acsl] warning: E-ACSL construct `assigns clau
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         G ∈ {0}
         P ∈ {0}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 [value] using specification for function __initialize
 [value] using specification for function __valid_read
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __valid
 tests/e-acsl-runtime/ghost.i:17:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_si
@@ -73,21 +36,8 @@ tests/e-acsl-runtime/ghost.i:17:[value] Assertion got status valid.
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
 [value] Values at end of function e_acsl_global_init:
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function main:
           G ∈ {1}
           P ∈ {{ &G }}
           Q ∈ {{ &G }}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/integer_constant.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/integer_constant.1.res.oracle
index 2d6dea028b7..ce0718ec03e 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/integer_constant.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/integer_constant.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/integer_constant.i:6:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/integer_constant.i:6:[e-acsl] warning: E-ACSL construct `as
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/integer_constant.i:8:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -54,7 +19,8 @@ tests/e-acsl-runtime/integer_constant.i:8:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 tests/e-acsl-runtime/integer_constant.i:10:[value] Assertion got status valid.
@@ -68,7 +34,6 @@ tests/e-acsl-runtime/integer_constant.i:13:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {1}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/integer_constant.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/integer_constant.res.oracle
index 424c776eeee..50a32dfb715 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/integer_constant.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/integer_constant.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/integer_constant.i:6:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,41 +11,9 @@ tests/e-acsl-runtime/integer_constant.i:6:[e-acsl] warning: E-ACSL construct `as
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/integer_constant.i:8:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/integer_constant.i:10:[value] Assertion got status valid.
 tests/e-acsl-runtime/integer_constant.i:11:[value] Assertion got status valid.
 tests/e-acsl-runtime/integer_constant.i:13:[value] Assertion got status valid.
@@ -58,14 +24,13 @@ tests/e-acsl-runtime/integer_constant.i:13:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {1}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/invariant.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/invariant.1.res.oracle
index ecf6a0249b9..1af4c10cbf5 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/invariant.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/invariant.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/invariant.i:6:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/invariant.i:6:[e-acsl] warning: E-ACSL construct `assigns c
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/invariant.i:8:[value] entering loop for the first time
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -54,16 +19,16 @@ tests/e-acsl-runtime/invariant.i:8:[value] entering loop for the first time
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status invalid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status invalid.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/invariant.i:10:[value] warning: 2's complement assumed for overflow
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ [--..--]
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/invariant.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/invariant.res.oracle
index e7204ad5e01..2caf050c382 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/invariant.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/invariant.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/invariant.i:6:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,48 +11,15 @@ tests/e-acsl-runtime/invariant.i:6:[e-acsl] warning: E-ACSL construct `assigns c
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/invariant.i:8:[value] entering loop for the first time
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/invariant.i:10:[value] warning: 2's complement assumed for overflow
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ [--..--]
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/labeled_stmt.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/labeled_stmt.1.res.oracle
index 0b573d71389..b018c2e0644 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/labeled_stmt.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/labeled_stmt.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/labeled_stmt.i:10:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,40 +11,7 @@ tests/e-acsl-runtime/labeled_stmt.i:10:[e-acsl] warning: E-ACSL construct `assig
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         X ∈ {0}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/labeled_stmt.i:12:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -55,7 +20,8 @@ tests/e-acsl-runtime/labeled_stmt.i:12:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 tests/e-acsl-runtime/labeled_stmt.i:9:[value] Function __e_acsl_main: postcondition got status valid.
@@ -64,7 +30,6 @@ tests/e-acsl-runtime/labeled_stmt.i:9:[value] Function __e_acsl_main: postcondit
 tests/e-acsl-runtime/labeled_stmt.i:9:[value] Function main: postcondition got status valid.
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function __e_acsl_main:
           X ∈ {3}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/labeled_stmt.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/labeled_stmt.res.oracle
index c7a0ae631e6..727335d478c 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/labeled_stmt.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/labeled_stmt.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/labeled_stmt.i:10:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,49 +11,16 @@ tests/e-acsl-runtime/labeled_stmt.i:10:[e-acsl] warning: E-ACSL construct `assig
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         X ∈ {0}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/labeled_stmt.i:12:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/labeled_stmt.i:9:[value] Function __e_acsl_main: postcondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 tests/e-acsl-runtime/labeled_stmt.i:9:[value] Function main: postcondition got status valid.
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function __e_acsl_main:
           X ∈ {3}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/lazy.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/lazy.1.res.oracle
index 73794ef8c7c..92032908f5a 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/lazy.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/lazy.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/lazy.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/lazy.i:7:[e-acsl] warning: E-ACSL construct `assigns clause
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/lazy.i:11:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -56,13 +21,14 @@ tests/e-acsl-runtime/lazy.i:11:[value] Assertion got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/lazy.i:12:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init
 ./share/e-acsl/e_acsl_gmp.h:36:[value] Function __gmpz_init: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:37:[value] Function __gmpz_init: postcondition got status valid.
 tests/e-acsl-runtime/lazy.i:12:[value] Assertion got status invalid (stopping propagation).
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/lazy.i:13:[value] Assertion got status valid.
 tests/e-acsl-runtime/lazy.i:14:[value] Assertion got status valid.
 tests/e-acsl-runtime/lazy.i:14:[value] Assertion got status invalid (stopping propagation).
@@ -87,7 +53,6 @@ tests/e-acsl-runtime/lazy.i:30:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {0}
           y ∈ {1}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/lazy.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/lazy.res.oracle
index 3f999884711..3e11d30909a 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/lazy.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/lazy.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/lazy.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,41 +11,9 @@ tests/e-acsl-runtime/lazy.i:7:[e-acsl] warning: E-ACSL construct `assigns clause
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/lazy.i:11:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/lazy.i:12:[value] Assertion got status valid.
 tests/e-acsl-runtime/lazy.i:13:[value] Assertion got status valid.
 tests/e-acsl-runtime/lazy.i:14:[value] Assertion got status valid.
@@ -67,7 +33,6 @@ tests/e-acsl-runtime/lazy.i:30:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {0}
           y ∈ {1}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/linear_search.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/linear_search.1.res.oracle
index 0732e845a19..fa739dba61d 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/linear_search.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/linear_search.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/linear_search.i:27:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 tests/e-acsl-runtime/linear_search.i:27:[e-acsl] warning: E-ACSL construct `loop invariant' is not yet supported. Ignoring annotation.
 tests/e-acsl-runtime/linear_search.i:9:[e-acsl] warning: missing guard for ensuring that the given integer is C-representable
 tests/e-acsl-runtime/linear_search.i:9:[e-acsl] warning: missing guard for ensuring that the given integer is C-representable
@@ -18,40 +16,7 @@ tests/e-acsl-runtime/linear_search.i:14:[e-acsl] warning: missing guard for ensu
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         A[0..9] ∈ {0}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/linear_search.i:30:[value] entering loop for the first time
 tests/e-acsl-runtime/linear_search.i:9:[value] Function __e_acsl_search: precondition got status unknown.
 [value] using specification for function __gmpz_init
@@ -78,7 +43,8 @@ tests/e-acsl-runtime/linear_search.i:9:[kernel] warning: accessing out of bounds
 ./share/e-acsl/e_acsl_gmp.h:132:[value] Function __gmpz_add: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:133:[value] Function __gmpz_add: precondition got status valid.
 tests/e-acsl-runtime/linear_search.i:9:[kernel] warning: accessing out of bounds index [0..4294967295]. assert __e_acsl_3 < 10;
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 :0:[value] entering loop for the first time
 tests/e-acsl-runtime/linear_search.i:14:[kernel] warning: accessing out of bounds index [0..4294967295]. assert __e_acsl_j_4 < 10;
 tests/e-acsl-runtime/linear_search.i:11:[kernel] warning: accessing out of bounds index [0..4294967295]. assert __e_acsl_j_2 < 10;
@@ -104,7 +70,6 @@ tests/e-acsl-runtime/linear_search.i:36:[value] Assertion got status unknown.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function search:
           k ∈ [0..10]
           __retres ∈ {0; 1}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/linear_search.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/linear_search.res.oracle
index a5001c18878..b2b284acf24 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/linear_search.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/linear_search.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/linear_search.i:27:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 tests/e-acsl-runtime/linear_search.i:27:[e-acsl] warning: E-ACSL construct `loop invariant' is not yet supported. Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
@@ -14,45 +12,13 @@ tests/e-acsl-runtime/linear_search.i:27:[e-acsl] warning: E-ACSL construct `loop
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         A[0..9] ∈ {0}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/linear_search.i:30:[value] entering loop for the first time
 tests/e-acsl-runtime/linear_search.i:9:[value] Function __e_acsl_search: precondition got status unknown.
 tests/e-acsl-runtime/linear_search.i:9:[value] entering loop for the first time
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 :0:[value] entering loop for the first time
 tests/e-acsl-runtime/linear_search.i:9:[value] Function search: precondition got status unknown.
 tests/e-acsl-runtime/linear_search.i:19:[value] Loop invariant got status valid.
@@ -72,7 +38,6 @@ tests/e-acsl-runtime/linear_search.i:36:[value] Assertion got status unknown.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function search:
           k ∈ [0..10]
           __retres ∈ {0; 1}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/literal_string.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/literal_string.1.res.oracle
index 3a77618d0e8..1880102e599 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/literal_string.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/literal_string.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/literal_string.i:31:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,7 +11,6 @@ tests/e-acsl-runtime/literal_string.i:31:[e-acsl] warning: E-ACSL construct `ass
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         T ∈ {0}
         G ∈ {0}
         S ∈ {0}
@@ -21,38 +18,6 @@ tests/e-acsl-runtime/literal_string.i:31:[e-acsl] warning: E-ACSL construct `ass
         IDX ∈ {1}
         G2 ∈ {2}
         U ∈ {{ "baz" }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 [value] using specification for function __literal_string
@@ -64,7 +29,8 @@ tests/e-acsl-runtime/literal_string.i:24:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 tests/e-acsl-runtime/literal_string.i:25:[value] Assertion got status valid.
@@ -73,9 +39,6 @@ tests/e-acsl-runtime/literal_string.i:25:[value] Assertion got status valid.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:86:[value] Function __initialized: postcondition got status valid.
 tests/e-acsl-runtime/literal_string.i:26:[value] Assertion got status valid.
 [value] using specification for function __valid_read
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
 tests/e-acsl-runtime/literal_string.i:27:[value] Assertion got status valid.
 [value] using specification for function __valid
 [value] using specification for function __delete_block
@@ -87,22 +50,9 @@ tests/e-acsl-runtime/literal_string.i:27:[value] Assertion got status valid.
           T ∈ {{ "bar" }}
           S ∈ {{ "foo" }}
           S2 ∈ {{ "foo2" }}
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function main:
           T ∈ {{ "bar" }}
           S ∈ {{ "foo" }}
           S2 ∈ {{ "foo2" }}
           SS ∈ {{ "ss" }}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/literal_string.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/literal_string.res.oracle
index 11fc0812cba..3b960071b74 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/literal_string.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/literal_string.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/literal_string.i:31:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,7 +11,6 @@ tests/e-acsl-runtime/literal_string.i:31:[e-acsl] warning: E-ACSL construct `ass
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         T ∈ {0}
         G ∈ {0}
         S ∈ {0}
@@ -21,48 +18,14 @@ tests/e-acsl-runtime/literal_string.i:31:[e-acsl] warning: E-ACSL construct `ass
         IDX ∈ {1}
         G2 ∈ {2}
         U ∈ {{ "baz" }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 [value] using specification for function __literal_string
 tests/e-acsl-runtime/literal_string.i:24:[value] Assertion got status valid.
 [value] using specification for function __valid_read
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/literal_string.i:25:[value] Assertion got status valid.
 [value] using specification for function __initialized
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:85:[value] Function __initialized: postcondition got status unknown.
@@ -79,22 +42,9 @@ tests/e-acsl-runtime/literal_string.i:27:[value] Assertion got status valid.
           T ∈ {{ "bar" }}
           S ∈ {{ "foo" }}
           S2 ∈ {{ "foo2" }}
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function main:
           T ∈ {{ "bar" }}
           S ∈ {{ "foo" }}
           S2 ∈ {{ "foo2" }}
           SS ∈ {{ "ss" }}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/localvar.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/localvar.1.res.oracle
index 6367503cf72..2532921538e 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/localvar.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/localvar.1.res.oracle
@@ -18,41 +18,9 @@ tests/e-acsl-runtime/localvar.c:26:[e-acsl] warning: E-ACSL construct `logic fun
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
+[value] using specification for function __delete_block
 FRAMAC_SHARE/libc/stdlib.h:127:[value] Function __e_acsl_malloc, behavior allocation: postcondition got status unknown.
 FRAMAC_SHARE/libc/stdlib.h:127:[value] Function __e_acsl_malloc, behavior allocation: postcondition got status unknown, but it is unknown if the behavior is active.
 FRAMAC_SHARE/libc/stdlib.h:132:[value] Function __e_acsl_malloc, behavior no_allocation: postcondition got status invalid.
@@ -62,11 +30,8 @@ tests/e-acsl-runtime/localvar.c:20:[value] Assertion got status valid.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:85:[value] Function __initialized: postcondition got status unknown.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:86:[value] Function __initialized: postcondition got status valid.
 [value] using specification for function __valid
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
-[value] using specification for function __delete_block
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
@@ -74,22 +39,9 @@ FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status i
 [value] Values at end of function __e_acsl_malloc:
           __fc_heap_status ∈ [--..--]
           __retres ∈ {{ &Frama_C_alloc ; &Frama_C_alloc_0 }}
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function add:
           __fc_heap_status ∈ [--..--]
           new ∈ {{ &Frama_C_alloc ; &Frama_C_alloc_0 }}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
           Frama_C_alloc[bits 0 to 31] ∈ {4}
                        [4..7] ∈ {0}
           Frama_C_alloc_0[bits 0 to 31] ∈ {7} or UNINITIALIZED
@@ -98,12 +50,6 @@ FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status i
           __fc_heap_status ∈ [--..--]
           l ∈ {{ &Frama_C_alloc_0 }}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
           Frama_C_alloc[bits 0 to 31] ∈ {4}
                        [4..7] ∈ {0}
           Frama_C_alloc_0[bits 0 to 31] ∈ {7}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/localvar.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/localvar.res.oracle
index 6367503cf72..2532921538e 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/localvar.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/localvar.res.oracle
@@ -18,41 +18,9 @@ tests/e-acsl-runtime/localvar.c:26:[e-acsl] warning: E-ACSL construct `logic fun
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
+[value] using specification for function __delete_block
 FRAMAC_SHARE/libc/stdlib.h:127:[value] Function __e_acsl_malloc, behavior allocation: postcondition got status unknown.
 FRAMAC_SHARE/libc/stdlib.h:127:[value] Function __e_acsl_malloc, behavior allocation: postcondition got status unknown, but it is unknown if the behavior is active.
 FRAMAC_SHARE/libc/stdlib.h:132:[value] Function __e_acsl_malloc, behavior no_allocation: postcondition got status invalid.
@@ -62,11 +30,8 @@ tests/e-acsl-runtime/localvar.c:20:[value] Assertion got status valid.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:85:[value] Function __initialized: postcondition got status unknown.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:86:[value] Function __initialized: postcondition got status valid.
 [value] using specification for function __valid
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
-[value] using specification for function __delete_block
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
@@ -74,22 +39,9 @@ FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status i
 [value] Values at end of function __e_acsl_malloc:
           __fc_heap_status ∈ [--..--]
           __retres ∈ {{ &Frama_C_alloc ; &Frama_C_alloc_0 }}
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function add:
           __fc_heap_status ∈ [--..--]
           new ∈ {{ &Frama_C_alloc ; &Frama_C_alloc_0 }}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
           Frama_C_alloc[bits 0 to 31] ∈ {4}
                        [4..7] ∈ {0}
           Frama_C_alloc_0[bits 0 to 31] ∈ {7} or UNINITIALIZED
@@ -98,12 +50,6 @@ FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status i
           __fc_heap_status ∈ [--..--]
           l ∈ {{ &Frama_C_alloc_0 }}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
           Frama_C_alloc[bits 0 to 31] ∈ {4}
                        [4..7] ∈ {0}
           Frama_C_alloc_0[bits 0 to 31] ∈ {7}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/nested_code_annot.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/nested_code_annot.1.res.oracle
index aa18019534b..f0fffe2690d 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/nested_code_annot.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/nested_code_annot.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/nested_code_annot.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/nested_code_annot.i:7:[e-acsl] warning: E-ACSL construct `a
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/nested_code_annot.i:9:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -54,14 +19,14 @@ tests/e-acsl-runtime/nested_code_annot.i:9:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {2}
           y ∈ {1}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/nested_code_annot.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/nested_code_annot.res.oracle
index bf94567299a..f5c6c432357 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/nested_code_annot.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/nested_code_annot.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/nested_code_annot.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,46 +11,13 @@ tests/e-acsl-runtime/nested_code_annot.i:7:[e-acsl] warning: E-ACSL construct `a
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/nested_code_annot.i:9:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {2}
           y ∈ {1}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/not.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/not.1.res.oracle
index 9dfad5c4bae..c9f3cc70a84 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/not.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/not.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/not.i:6:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/not.i:6:[e-acsl] warning: E-ACSL construct `assigns clause
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/not.i:8:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -54,14 +19,14 @@ tests/e-acsl-runtime/not.i:8:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {0}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/not.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/not.res.oracle
index 9177bb719fd..d5f6d7b9025 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/not.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/not.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/not.i:6:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,46 +11,13 @@ tests/e-acsl-runtime/not.i:6:[e-acsl] warning: E-ACSL construct `assigns clause
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/not.i:8:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {0}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/null.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/null.1.res.oracle
index f9dc2b70312..371b62417bb 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/null.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/null.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/null.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,45 +11,12 @@ tests/e-acsl-runtime/null.i:7:[e-acsl] warning: E-ACSL construct `assigns clause
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/null.i:8:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/null.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/null.res.oracle
index f9dc2b70312..371b62417bb 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/null.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/null.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/null.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,45 +11,12 @@ tests/e-acsl-runtime/null.i:7:[e-acsl] warning: E-ACSL construct `assigns clause
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/null.i:8:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/other_constants.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/other_constants.1.res.oracle
index 1ebed3a7d23..6b4c8cf5841 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/other_constants.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/other_constants.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/other_constants.i:9:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/other_constants.i:9:[e-acsl] warning: E-ACSL construct `ass
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/other_constants.i:12:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -54,7 +19,8 @@ tests/e-acsl-runtime/other_constants.i:12:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 tests/e-acsl-runtime/other_constants.i:13:[value] Assertion got status valid.
@@ -62,6 +28,5 @@ tests/e-acsl-runtime/other_constants.i:13:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/other_constants.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/other_constants.res.oracle
index d690da39b5c..f4c37212166 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/other_constants.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/other_constants.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/other_constants.i:9:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,46 +11,13 @@ tests/e-acsl-runtime/other_constants.i:9:[e-acsl] warning: E-ACSL construct `ass
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/other_constants.i:12:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/other_constants.i:13:[value] Assertion got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr.1.res.oracle
index d3eed126763..ef6df0abeb8 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/ptr.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 tests/e-acsl-runtime/ptr.i:16:[e-acsl] warning: missing guard for ensuring that the given integer is C-representable
 tests/e-acsl-runtime/ptr.i:20:[e-acsl] warning: missing guard for ensuring that the given integer is C-representable
 [value] Analyzing a complete application starting at main
@@ -15,39 +13,6 @@ tests/e-acsl-runtime/ptr.i:20:[e-acsl] warning: missing guard for ensuring that
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 [value] using specification for function __initialize
@@ -59,7 +24,8 @@ tests/e-acsl-runtime/ptr.i:13:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 tests/e-acsl-runtime/ptr.i:14:[value] Assertion got status valid.
@@ -102,7 +68,6 @@ tests/e-acsl-runtime/ptr.i:27:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {1}
           t[0] ∈ {2}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr.res.oracle
index 764d40e27a3..912ccbc4553 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/ptr.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/ptr.i:7:[e-acsl] warning: E-ACSL construct `assigns clause
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 [value] using specification for function __initialize
@@ -54,11 +19,9 @@ tests/e-acsl-runtime/ptr.i:13:[value] Assertion got status valid.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:85:[value] Function __initialized: postcondition got status unknown.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:86:[value] Function __initialized: postcondition got status valid.
 [value] using specification for function __valid_read
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/ptr.i:14:[value] Assertion got status valid.
 tests/e-acsl-runtime/ptr.i:15:[value] Assertion got status valid.
 tests/e-acsl-runtime/ptr.i:16:[value] Assertion got status valid.
@@ -75,13 +38,6 @@ tests/e-acsl-runtime/ptr.i:27:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function main:
           x ∈ {1}
           t[0] ∈ {2}
@@ -89,9 +45,3 @@ tests/e-acsl-runtime/ptr.i:27:[value] Assertion got status valid.
            [2] ∈ {5}
           p ∈ {{ &t + {8} }}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/quantif.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/quantif.1.res.oracle
index c51f4b706c4..1f5abacd1cb 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/quantif.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/quantif.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/quantif.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/quantif.i:7:[e-acsl] warning: E-ACSL construct `assigns cla
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/quantif.i:11:[value] Assertion got status unknown.
 [value] using specification for function __gmpz_init
 ./share/e-acsl/e_acsl_gmp.h:36:[value] Function __gmpz_init: precondition got status valid.
@@ -67,7 +32,8 @@ tests/e-acsl-runtime/quantif.i:11:[value] entering loop for the first time
 ./share/e-acsl/e_acsl_gmp.h:131:[value] Function __gmpz_add: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:132:[value] Function __gmpz_add: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:133:[value] Function __gmpz_add: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/quantif.i:12:[value] Assertion got status unknown.
 tests/e-acsl-runtime/quantif.i:12:[value] entering loop for the first time
 tests/e-acsl-runtime/quantif.i:13:[value] Assertion got status unknown.
@@ -99,6 +65,5 @@ tests/e-acsl-runtime/quantif.i:28:[value] Assertion got status valid.
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/quantif.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/quantif.res.oracle
index 63da3024e40..9fd8aefc047 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/quantif.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/quantif.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/quantif.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,42 +11,10 @@ tests/e-acsl-runtime/quantif.i:7:[e-acsl] warning: E-ACSL construct `assigns cla
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/quantif.i:11:[value] Assertion got status unknown.
 tests/e-acsl-runtime/quantif.i:11:[value] entering loop for the first time
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/quantif.i:12:[value] Assertion got status unknown.
 tests/e-acsl-runtime/quantif.i:12:[value] entering loop for the first time
 tests/e-acsl-runtime/quantif.i:13:[value] Assertion got status unknown.
@@ -57,7 +23,7 @@ tests/e-acsl-runtime/quantif.i:14:[value] Assertion got status unknown.
 tests/e-acsl-runtime/quantif.i:14:[value] entering loop for the first time
 tests/e-acsl-runtime/quantif.i:18:[value] Assertion got status unknown.
 tests/e-acsl-runtime/quantif.i:18:[value] entering loop for the first time
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/quantif.i:23:[value] Assertion got status unknown.
 tests/e-acsl-runtime/quantif.i:23:[value] entering loop for the first time
 tests/e-acsl-runtime/quantif.i:27:[value] Assertion got status unknown.
@@ -67,6 +33,5 @@ tests/e-acsl-runtime/quantif.i:28:[value] entering loop for the first time
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/result.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/result.1.res.oracle
index 1d7063ba4f9..39e9b9abd3e 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/result.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/result.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/result.i:26:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 tests/e-acsl-runtime/result.i:7:[e-acsl] warning: missing guard for ensuring that the given integer is C-representable
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
@@ -14,40 +12,7 @@ tests/e-acsl-runtime/result.i:7:[e-acsl] warning: missing guard for ensuring tha
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         Y ∈ {1}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/result.i:7:[value] Function f: postcondition got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -65,7 +30,8 @@ tests/e-acsl-runtime/result.i:7:[value] Function f: postcondition got status val
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 tests/e-acsl-runtime/result.i:7:[value] Function __e_acsl_f: postcondition got status valid.
@@ -77,7 +43,6 @@ tests/e-acsl-runtime/result.i:23:[value] Function __e_acsl_h: postcondition got
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function f:
           x ∈ {0}
 [value] Values at end of function __e_acsl_f:
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/result.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/result.res.oracle
index 824c8062436..2a5b9d17c2f 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/result.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/result.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/result.i:26:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,42 +11,10 @@ tests/e-acsl-runtime/result.i:26:[e-acsl] warning: E-ACSL construct `assigns cla
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         Y ∈ {1}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/result.i:7:[value] Function f: postcondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/result.i:7:[value] Function __e_acsl_f: postcondition got status valid.
 tests/e-acsl-runtime/result.i:18:[value] Function g: postcondition got status valid.
 tests/e-acsl-runtime/result.i:18:[value] Function __e_acsl_g: postcondition got status valid.
@@ -58,7 +24,6 @@ tests/e-acsl-runtime/result.i:23:[value] Function __e_acsl_h: postcondition got
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function f:
           x ∈ {0}
 [value] Values at end of function __e_acsl_f:
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/sizeof.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/sizeof.1.res.oracle
index c8f2f62baa7..67bafd226b5 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/sizeof.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/sizeof.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/sizeof.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/sizeof.i:7:[e-acsl] warning: E-ACSL construct `assigns clau
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/sizeof.i:10:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -54,14 +19,14 @@ tests/e-acsl-runtime/sizeof.i:10:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {1}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/sizeof.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/sizeof.res.oracle
index 483f8352982..d5ec3e33111 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/sizeof.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/sizeof.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/sizeof.i:7:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,46 +11,13 @@ tests/e-acsl-runtime/sizeof.i:7:[e-acsl] warning: E-ACSL construct `assigns clau
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/sizeof.i:10:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {1}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/stmt_contract.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/stmt_contract.1.res.oracle
index 84d457657ff..73de386fe3a 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/stmt_contract.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/stmt_contract.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/stmt_contract.i:6:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/stmt_contract.i:6:[e-acsl] warning: E-ACSL construct `assig
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:63:[value] Function __gmpz_init_set_si: postcondition got status valid.
@@ -53,7 +18,8 @@ tests/e-acsl-runtime/stmt_contract.i:6:[e-acsl] warning: E-ACSL construct `assig
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 [value] using specification for function __gmpz_init
@@ -67,7 +33,6 @@ tests/e-acsl-runtime/stmt_contract.i:6:[e-acsl] warning: E-ACSL construct `assig
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {7}
           y ∈ {2}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/stmt_contract.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/stmt_contract.res.oracle
index e76922a317b..45d4eed7abe 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/stmt_contract.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/stmt_contract.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/stmt_contract.i:6:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,45 +11,12 @@ tests/e-acsl-runtime/stmt_contract.i:6:[e-acsl] warning: E-ACSL construct `assig
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {7}
           y ∈ {2}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/true.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/true.1.res.oracle
index 59358720c33..75bcede8d87 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/true.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/true.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/true.i:6:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,46 +11,13 @@ tests/e-acsl-runtime/true.i:6:[e-acsl] warning: E-ACSL construct `assigns clause
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/true.i:10:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {1}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/true.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/true.res.oracle
index 59358720c33..75bcede8d87 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/true.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/true.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/true.i:6:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,46 +11,13 @@ tests/e-acsl-runtime/true.i:6:[e-acsl] warning: E-ACSL construct `assigns clause
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/true.i:10:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {1}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/typedef.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/typedef.1.res.oracle
index 5e941e7fc1d..c73050626bb 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/typedef.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/typedef.1.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/typedef.i:9:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,39 +11,6 @@ tests/e-acsl-runtime/typedef.i:9:[e-acsl] warning: E-ACSL construct `assigns cla
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/typedef.i:11:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_ui
 ./share/e-acsl/e_acsl_gmp.h:52:[value] Function __gmpz_init_set_ui: precondition got status valid.
@@ -58,14 +23,14 @@ tests/e-acsl-runtime/typedef.i:11:[value] Assertion got status valid.
 [value] using specification for function __gmpz_cmp
 ./share/e-acsl/e_acsl_gmp.h:115:[value] Function __gmpz_cmp: precondition got status valid.
 ./share/e-acsl/e_acsl_gmp.h:116:[value] Function __gmpz_cmp: precondition got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 ./share/e-acsl/e_acsl_gmp.h:105:[value] Function __gmpz_clear: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {0}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/typedef.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/typedef.res.oracle
index d4a76433bbc..545f1cf9c8b 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/typedef.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/typedef.res.oracle
@@ -4,8 +4,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel_api.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
-tests/e-acsl-runtime/typedef.i:9:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -13,46 +11,13 @@ tests/e-acsl-runtime/typedef.i:9:[e-acsl] warning: E-ACSL construct `assigns cla
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 tests/e-acsl-runtime/typedef.i:11:[value] Assertion got status valid.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function main:
           x ∈ {0}
           __retres ∈ {0}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid.1.res.oracle
index 0195228f9ad..83ee837d55a 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid.1.res.oracle
@@ -20,40 +20,7 @@ tests/e-acsl-runtime/valid.c:25:[e-acsl] warning: E-ACSL construct `\allocate' i
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         X ∈ {0}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 tests/e-acsl-runtime/valid.c:27:[value] Assertion got status valid.
@@ -69,7 +36,9 @@ tests/e-acsl-runtime/valid.c:27:[kernel] warning: completely indeterminate value
 tests/e-acsl-runtime/valid.c:27:[value] Non-termination in evaluation of function call expression argument
         (void *)b
 [value] using specification for function __valid
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function __delete_block
 FRAMAC_SHARE/libc/stdlib.h:127:[value] Function __e_acsl_malloc, behavior allocation: postcondition got status unknown.
 FRAMAC_SHARE/libc/stdlib.h:127:[value] Function __e_acsl_malloc, behavior allocation: postcondition got status unknown, but it is unknown if the behavior is active.
 FRAMAC_SHARE/libc/stdlib.h:132:[value] Function __e_acsl_malloc, behavior no_allocation: postcondition got status invalid.
@@ -85,9 +54,6 @@ tests/e-acsl-runtime/valid.c:31:[kernel] warning: accessing uninitialized left-v
 tests/e-acsl-runtime/valid.c:31:[kernel] warning: completely indeterminate value in b.
 tests/e-acsl-runtime/valid.c:31:[value] Non-termination in evaluation of function call expression argument
         (void *)b
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
 tests/e-acsl-runtime/valid.c:15:[value] Function __e_acsl_f: precondition got status valid.
 tests/e-acsl-runtime/valid.c:15:[value] Function f: precondition got status valid.
 tests/e-acsl-runtime/valid.c:19:[value] Assertion got status valid.
@@ -95,9 +61,8 @@ tests/e-acsl-runtime/valid.c:19:[kernel] warning: accessing uninitialized left-v
 tests/e-acsl-runtime/valid.c:19:[kernel] warning: completely indeterminate value in y.
 tests/e-acsl-runtime/valid.c:19:[value] Non-termination in evaluation of function call expression argument
         (void *)y
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/valid.c:21:[value] Assertion got status valid.
-[value] using specification for function __delete_block
 tests/e-acsl-runtime/valid.c:16:[value] Function f: postcondition got status valid.
 tests/e-acsl-runtime/valid.c:16:[value] Function __e_acsl_f: postcondition got status valid.
 tests/e-acsl-runtime/valid.c:33:[value] Assertion got status valid.
@@ -119,31 +84,12 @@ tests/e-acsl-runtime/valid.c:37:[value] Non-termination in evaluation of functio
           __fc_heap_status ∈ [--..--]
           __retres ∈ {{ &Frama_C_alloc }}
 [value] Values at end of function e_acsl_global_init:
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 tests/e-acsl-runtime/valid.c:19:[value] Non-termination in evaluation of function call expression argument
         (void *)y
 [value] Values at end of function f:
           y ∈ {{ &n }}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function __e_acsl_f:
           __retres ∈ {{ &n }}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 tests/e-acsl-runtime/valid.c:27:[value] Non-termination in evaluation of function call expression argument
         (void *)a
 tests/e-acsl-runtime/valid.c:27:[value] Non-termination in evaluation of function call expression argument
@@ -161,9 +107,3 @@ tests/e-acsl-runtime/valid.c:37:[value] Non-termination in evaluation of functio
           b ∈ {{ &n }}
           n ∈ {0}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid.res.oracle
index 0195228f9ad..83ee837d55a 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid.res.oracle
@@ -20,40 +20,7 @@ tests/e-acsl-runtime/valid.c:25:[e-acsl] warning: E-ACSL construct `\allocate' i
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
         X ∈ {0}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 tests/e-acsl-runtime/valid.c:27:[value] Assertion got status valid.
@@ -69,7 +36,9 @@ tests/e-acsl-runtime/valid.c:27:[kernel] warning: completely indeterminate value
 tests/e-acsl-runtime/valid.c:27:[value] Non-termination in evaluation of function call expression argument
         (void *)b
 [value] using specification for function __valid
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
+[value] using specification for function __delete_block
 FRAMAC_SHARE/libc/stdlib.h:127:[value] Function __e_acsl_malloc, behavior allocation: postcondition got status unknown.
 FRAMAC_SHARE/libc/stdlib.h:127:[value] Function __e_acsl_malloc, behavior allocation: postcondition got status unknown, but it is unknown if the behavior is active.
 FRAMAC_SHARE/libc/stdlib.h:132:[value] Function __e_acsl_malloc, behavior no_allocation: postcondition got status invalid.
@@ -85,9 +54,6 @@ tests/e-acsl-runtime/valid.c:31:[kernel] warning: accessing uninitialized left-v
 tests/e-acsl-runtime/valid.c:31:[kernel] warning: completely indeterminate value in b.
 tests/e-acsl-runtime/valid.c:31:[value] Non-termination in evaluation of function call expression argument
         (void *)b
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
 tests/e-acsl-runtime/valid.c:15:[value] Function __e_acsl_f: precondition got status valid.
 tests/e-acsl-runtime/valid.c:15:[value] Function f: precondition got status valid.
 tests/e-acsl-runtime/valid.c:19:[value] Assertion got status valid.
@@ -95,9 +61,8 @@ tests/e-acsl-runtime/valid.c:19:[kernel] warning: accessing uninitialized left-v
 tests/e-acsl-runtime/valid.c:19:[kernel] warning: completely indeterminate value in y.
 tests/e-acsl-runtime/valid.c:19:[value] Non-termination in evaluation of function call expression argument
         (void *)y
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/valid.c:21:[value] Assertion got status valid.
-[value] using specification for function __delete_block
 tests/e-acsl-runtime/valid.c:16:[value] Function f: postcondition got status valid.
 tests/e-acsl-runtime/valid.c:16:[value] Function __e_acsl_f: postcondition got status valid.
 tests/e-acsl-runtime/valid.c:33:[value] Assertion got status valid.
@@ -119,31 +84,12 @@ tests/e-acsl-runtime/valid.c:37:[value] Non-termination in evaluation of functio
           __fc_heap_status ∈ [--..--]
           __retres ∈ {{ &Frama_C_alloc }}
 [value] Values at end of function e_acsl_global_init:
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 tests/e-acsl-runtime/valid.c:19:[value] Non-termination in evaluation of function call expression argument
         (void *)y
 [value] Values at end of function f:
           y ∈ {{ &n }}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 [value] Values at end of function __e_acsl_f:
           __retres ∈ {{ &n }}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 tests/e-acsl-runtime/valid.c:27:[value] Non-termination in evaluation of function call expression argument
         (void *)a
 tests/e-acsl-runtime/valid.c:27:[value] Non-termination in evaluation of function call expression argument
@@ -161,9 +107,3 @@ tests/e-acsl-runtime/valid.c:37:[value] Non-termination in evaluation of functio
           b ∈ {{ &n }}
           n ∈ {0}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_alias.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_alias.1.res.oracle
index f01b2cad31e..cbdc8e37bab 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_alias.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_alias.1.res.oracle
@@ -20,39 +20,6 @@ tests/e-acsl-runtime/valid_alias.c:10:[e-acsl] warning: E-ACSL construct `\alloc
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 tests/e-acsl-runtime/valid_alias.c:12:[value] Assertion got status valid.
@@ -67,7 +34,9 @@ tests/e-acsl-runtime/valid_alias.c:12:[kernel] warning: accessing uninitialized
 tests/e-acsl-runtime/valid_alias.c:12:[kernel] warning: completely indeterminate value in b.
 tests/e-acsl-runtime/valid_alias.c:12:[value] Non-termination in evaluation of function call expression argument
         (void *)b
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function __delete_block
 FRAMAC_SHARE/libc/stdlib.h:127:[value] Function __e_acsl_malloc, behavior allocation: postcondition got status unknown.
 FRAMAC_SHARE/libc/stdlib.h:127:[value] Function __e_acsl_malloc, behavior allocation: postcondition got status unknown, but it is unknown if the behavior is active.
 FRAMAC_SHARE/libc/stdlib.h:132:[value] Function __e_acsl_malloc, behavior no_allocation: postcondition got status invalid.
@@ -76,10 +45,7 @@ FRAMAC_SHARE/libc/stdlib.h:132:[value] Function __e_acsl_malloc, behavior no_all
 tests/e-acsl-runtime/valid_alias.c:16:[value] Assertion got status valid.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:86:[value] Function __initialized: postcondition got status valid.
 [value] using specification for function __valid
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/valid_alias.c:17:[value] Assertion got status valid.
 [value] using specification for function __valid_read
 FRAMAC_SHARE/libc/stdlib.h:142:[value] Function __e_acsl_free, behavior deallocation: precondition got status unknown.
@@ -93,7 +59,6 @@ tests/e-acsl-runtime/valid_alias.c:19:[kernel] warning: accessing left-value b t
 tests/e-acsl-runtime/valid_alias.c:19:[kernel] warning: completely indeterminate value in b.
 tests/e-acsl-runtime/valid_alias.c:19:[value] Non-termination in evaluation of function call expression argument
         (void *)b
-[value] using specification for function __delete_block
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
@@ -103,13 +68,6 @@ tests/e-acsl-runtime/valid_alias.c:19:[value] Non-termination in evaluation of f
 [value] Values at end of function __e_acsl_malloc:
           __fc_heap_status ∈ [--..--]
           __retres ∈ {{ &Frama_C_alloc }}
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 tests/e-acsl-runtime/valid_alias.c:12:[value] Non-termination in evaluation of function call expression argument
         (void *)a
 tests/e-acsl-runtime/valid_alias.c:12:[value] Non-termination in evaluation of function call expression argument
@@ -124,10 +82,4 @@ tests/e-acsl-runtime/valid_alias.c:19:[value] Non-termination in evaluation of f
           b ∈ ESCAPINGADDR
           n ∈ {0}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
           Frama_C_alloc[0..3] ∈ UNINITIALIZED
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_alias.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_alias.res.oracle
index 773f57e75c8..4f1c0b0742f 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_alias.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_alias.res.oracle
@@ -20,39 +20,6 @@ tests/e-acsl-runtime/valid_alias.c:10:[e-acsl] warning: E-ACSL construct `\alloc
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 tests/e-acsl-runtime/valid_alias.c:12:[value] Assertion got status valid.
@@ -67,7 +34,9 @@ tests/e-acsl-runtime/valid_alias.c:12:[kernel] warning: accessing uninitialized
 tests/e-acsl-runtime/valid_alias.c:12:[kernel] warning: completely indeterminate value in b.
 tests/e-acsl-runtime/valid_alias.c:12:[value] Non-termination in evaluation of function call expression argument
         (void *)b
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function __delete_block
 FRAMAC_SHARE/libc/stdlib.h:127:[value] Function __e_acsl_malloc, behavior allocation: postcondition got status unknown.
 FRAMAC_SHARE/libc/stdlib.h:127:[value] Function __e_acsl_malloc, behavior allocation: postcondition got status unknown, but it is unknown if the behavior is active.
 FRAMAC_SHARE/libc/stdlib.h:132:[value] Function __e_acsl_malloc, behavior no_allocation: postcondition got status invalid.
@@ -76,10 +45,7 @@ FRAMAC_SHARE/libc/stdlib.h:132:[value] Function __e_acsl_malloc, behavior no_all
 tests/e-acsl-runtime/valid_alias.c:16:[value] Assertion got status valid.
 ./share/e-acsl/memory_model/e_acsl_mmodel.h:86:[value] Function __initialized: postcondition got status valid.
 [value] using specification for function __valid
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status unknown.
-[value] using specification for function printf
-[value] using specification for function exit
-FRAMAC_SHARE/libc/stdlib.h:180:[value] Function exit: postcondition got status invalid.
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/valid_alias.c:17:[value] Assertion got status valid.
 [value] using specification for function __gmpz_init_set_si
 ./share/e-acsl/e_acsl_gmp.h:61:[value] Function __gmpz_init_set_si: precondition got status valid.
@@ -101,7 +67,6 @@ tests/e-acsl-runtime/valid_alias.c:19:[kernel] warning: accessing left-value b t
 tests/e-acsl-runtime/valid_alias.c:19:[kernel] warning: completely indeterminate value in b.
 tests/e-acsl-runtime/valid_alias.c:19:[value] Non-termination in evaluation of function call expression argument
         (void *)b
-[value] using specification for function __delete_block
 [value] using specification for function __clean
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
@@ -111,13 +76,6 @@ tests/e-acsl-runtime/valid_alias.c:19:[value] Non-termination in evaluation of f
 [value] Values at end of function __e_acsl_malloc:
           __fc_heap_status ∈ [--..--]
           __retres ∈ {{ &Frama_C_alloc }}
-[value] Values at end of function e_acsl_assert:
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
 tests/e-acsl-runtime/valid_alias.c:12:[value] Non-termination in evaluation of function call expression argument
         (void *)a
 tests/e-acsl-runtime/valid_alias.c:12:[value] Non-termination in evaluation of function call expression argument
@@ -132,10 +90,4 @@ tests/e-acsl-runtime/valid_alias.c:19:[value] Non-termination in evaluation of f
           b ∈ ESCAPINGADDR
           n ∈ {0}
           __retres ∈ {0}
-          S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                       [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                       [--..--]
-                       [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
           Frama_C_alloc[0..3] ∈ UNINITIALIZED
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_in_contract.1.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_in_contract.1.res.oracle
index d2d43162a8c..89f874a864f 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_in_contract.1.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_in_contract.1.res.oracle
@@ -5,8 +5,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
 [kernel] preprocessing with "gcc -C -E -I.  -IFRAMAC_SHARE/libc -IFRAMAC_SHARE/libc tests/e-acsl-runtime/valid_in_contract.c"
-tests/e-acsl-runtime/valid_in_contract.c:33:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -14,39 +12,6 @@ tests/e-acsl-runtime/valid_in_contract.c:33:[e-acsl] warning: E-ACSL construct `
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 [value] using specification for function __valid
@@ -60,7 +25,8 @@ tests/e-acsl-runtime/valid_in_contract.c:21:[value] Non-termination in evaluatio
 tests/e-acsl-runtime/valid_in_contract.c:18:[value] Function f, behavior B1: postcondition got status valid.
 tests/e-acsl-runtime/valid_in_contract.c:22:[value] Function f, behavior B2: postcondition got status valid.
 tests/e-acsl-runtime/valid_in_contract.c:22:[value] Function f, behavior B2: postcondition got status valid, but it is unknown if the behavior is active.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/valid_in_contract.c:18:[value] Function __e_acsl_f, behavior B1: postcondition got status valid.
 tests/e-acsl-runtime/valid_in_contract.c:22:[value] Function __e_acsl_f, behavior B2: postcondition got status valid.
 tests/e-acsl-runtime/valid_in_contract.c:22:[value] Function __e_acsl_f, behavior B2: postcondition got status valid, but it is unknown if the behavior is active.
@@ -68,7 +34,6 @@ tests/e-acsl-runtime/valid_in_contract.c:22:[value] Function __e_acsl_f, behavio
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function f:
           __retres ∈ {0}
 tests/e-acsl-runtime/valid_in_contract.c:21:[value] Non-termination in evaluation of function call expression argument
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_in_contract.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_in_contract.res.oracle
index d2d43162a8c..89f874a864f 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_in_contract.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_in_contract.res.oracle
@@ -5,8 +5,6 @@
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_bittree.h"
 [kernel] preprocessing with "gcc -C -E -I. -I./share/e-acsl  -IFRAMAC_SHARE/libc -IFRAMAC_SHARE/libc ./share/e-acsl/memory_model/e_acsl_mmodel.h"
 [kernel] preprocessing with "gcc -C -E -I.  -IFRAMAC_SHARE/libc -IFRAMAC_SHARE/libc tests/e-acsl-runtime/valid_in_contract.c"
-tests/e-acsl-runtime/valid_in_contract.c:33:[e-acsl] warning: E-ACSL construct `assigns clause in behavior' is not yet supported.
-                  Ignoring annotation.
 [value] Analyzing a complete application starting at main
 [value] Computing initial state
 [value] Initial state computed
@@ -14,39 +12,6 @@ tests/e-acsl-runtime/valid_in_contract.c:33:[e-acsl] warning: E-ACSL construct `
         __fc_random_counter ∈ {0}
         __fc_rand_max ∈ {32767}
         __fc_heap_status ∈ [--..--]
-        __fc_stdout ∈ {{ NULL ; &S___fc_stdout }}
-        S___fc_stdout[0]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [0].__fc_inode ∈ {{ NULL ; &S___fc_inode_0_S___fc_stdout }}
-                     [1]{.__fc_stdio_id; .__fc_maxsz; .__fc_writepos; .__fc_readpos; .__fc_is_a_socket; .__fc_mode; } ∈
-                     [--..--]
-                     [1].__fc_inode ∈ {{ NULL ; &S___fc_inode_1_S___fc_stdout }}
-        S___fc_inode_0_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_0_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_0_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_0_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_inode_1_S___fc_stdout[0]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; } ∈
-                                    [--..--]
-                                    [0].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_0_S___fc_inode_1_S___fc_stdout }}
-                                    {[0].__fc_real_data_max_size; [1]{.st_dev; .st_ino; .st_mode; .st_nlink; .st_uid; .st_gid; .st_rdev; .st_size; .st_atime; .st_mtime; .st_ctime; .st_blksize; .st_blocks; }; } ∈
-                                    [--..--]
-                                    [1].__fc_real_data ∈
-                                    {{ NULL ;
-                                       &S___fc_real_data_1_S___fc_inode_1_S___fc_stdout }}
-                                    [1].__fc_real_data_max_size ∈ [--..--]
-        S___fc_real_data_0_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
-        S___fc_real_data_1_S___fc_inode_1_S___fc_stdout[0..1] ∈ [--..--]
 [value] using specification for function __store_block
 [value] using specification for function __full_init
 [value] using specification for function __valid
@@ -60,7 +25,8 @@ tests/e-acsl-runtime/valid_in_contract.c:21:[value] Non-termination in evaluatio
 tests/e-acsl-runtime/valid_in_contract.c:18:[value] Function f, behavior B1: postcondition got status valid.
 tests/e-acsl-runtime/valid_in_contract.c:22:[value] Function f, behavior B2: postcondition got status valid.
 tests/e-acsl-runtime/valid_in_contract.c:22:[value] Function f, behavior B2: postcondition got status valid, but it is unknown if the behavior is active.
-./share/e-acsl/e_acsl.h:39:[value] Function e_acsl_assert: precondition got status valid.
+[value] using specification for function e_acsl_assert
+./share/e-acsl/e_acsl.h:37:[value] Function e_acsl_assert: precondition got status valid.
 tests/e-acsl-runtime/valid_in_contract.c:18:[value] Function __e_acsl_f, behavior B1: postcondition got status valid.
 tests/e-acsl-runtime/valid_in_contract.c:22:[value] Function __e_acsl_f, behavior B2: postcondition got status valid.
 tests/e-acsl-runtime/valid_in_contract.c:22:[value] Function __e_acsl_f, behavior B2: postcondition got status valid, but it is unknown if the behavior is active.
@@ -68,7 +34,6 @@ tests/e-acsl-runtime/valid_in_contract.c:22:[value] Function __e_acsl_f, behavio
 [kernel] warning: Neither code nor specification for function __clean, generating default assigns from the prototype
 [value] done for function main
 [value] ====== VALUES COMPUTED ======
-[value] Values at end of function e_acsl_assert:
 [value] Values at end of function f:
           __retres ∈ {0}
 tests/e-acsl-runtime/valid_in_contract.c:21:[value] Non-termination in evaluation of function call expression argument
diff --git a/src/plugins/e-acsl/translate.ml b/src/plugins/e-acsl/translate.ml
index 88fae220e6e..b41a410e5d0 100644
--- a/src/plugins/e-acsl/translate.ml
+++ b/src/plugins/e-acsl/translate.ml
@@ -635,7 +635,7 @@ let get_rte =
     (Datatype.func3 Kernel_function.ty Stmt.ty Exp.ty 
        (let module L = Datatype.List(Code_annotation) in L.ty))
 
-let rec translate_named_predicate kf ?(rte=true) env p =
+let rec translate_named_predicate kf _kinstr ?(rte=true) env p =
   Typing.type_named_predicate ~must_clear:rte p;
   let e, env = named_predicate_to_exp kf env p in
   assert (Typ.equal (Cil.typeOf e) Cil.intType);
@@ -651,7 +651,7 @@ and rte_to_exp kf env e =
     (fun env a -> match a.annot_content with
     | AAssert(_, p) -> 
       handle_error
-	(fun env -> translate_named_predicate kf ~rte:false env p)
+	(fun env -> translate_named_predicate kf (Kstmt stmt) ~rte:false env p)
 	env
     | _ -> assert false)
     env
@@ -659,20 +659,41 @@ and rte_to_exp kf env e =
 
 let () = Quantif.rte_to_exp_ref := rte_to_exp
 
-let translate_preconditions kf env behaviors =
+let original_project_ref = ref Project_skeleton.dummy
+let set_original_project p = original_project_ref := p
+
+let must_translate ppt = 
+  let selection =
+    State_selection.of_list [ Property_status.self; Options.Valid.self ]
+  in
+  Project.on ~selection 
+    !original_project_ref
+    (fun ppt ->
+      Options.feedback "%a --> %a (%a)" Property.pretty ppt 
+	Property_status.pretty (Property_status.get ppt) Project.pretty
+	(Project.current ());
+      match Property_status.get ppt with
+      | Property_status.Best(Property_status.True, _) -> Options.Valid.get ()
+      | _ -> true)
+    ppt
+
+let translate_preconditions kf kinstr env behaviors =
   let env = Env.set_annotation_kind env Misc.Precondition in
   let do_behavior env b = 
     let assumes_pred = assumes_predicate b in
     List.fold_left
       (fun env p ->
 	let do_it env =
-	  let loc = p.ip_loc in
-	  let p = 
-	    Logic_const.pimplies
-	      ~loc
-	      (assumes_pred, Logic_const.unamed ~loc p.ip_content)
-	  in
-	  translate_named_predicate kf env p
+	  if must_translate (Property.ip_of_requires kf kinstr b p) then
+	    let loc = p.ip_loc in
+	    let p = 
+	      Logic_const.pimplies
+		~loc
+		(assumes_pred, Logic_const.unamed ~loc p.ip_content)
+	    in
+	    translate_named_predicate kf kinstr env p
+	  else
+	    env
 	in
 	handle_error do_it env)
       env
@@ -680,91 +701,131 @@ let translate_preconditions kf env behaviors =
   in 
   List.fold_left do_behavior env behaviors
 
-let translate_postconditions kf env behaviors =
+let translate_postconditions kf kinstr env behaviors =
   let env = Env.set_annotation_kind env Misc.Postcondition in
-  (* generate one guard by postcondition of each behavior *)
+      (* generate one guard by postcondition of each behavior *)
   let do_behavior env b = 
     let assumes_pred = assumes_predicate b in
     List.fold_left
-      (fun env (t, p) ->
-	let env =
-	  handle_error
-	    (fun env ->
-	      if b.b_assigns <> WritesAny then 
-		not_yet env "assigns clause in behavior";
-	      if b.b_extended <> [] then 
-		not_yet env "grammar extensions in behavior";
-	      env)
-	    env
-	in
-	let do_it env =
-	  match t with
-	  | Normal -> 
-	    let loc = p.ip_loc in
-	    let p = p.ip_content in
-	    let p = 
-	      Logic_const.pimplies 
-		~loc
-		(Logic_const.pold ~loc assumes_pred, Logic_const.unamed ~loc p) 
-	    in
-	    translate_named_predicate kf env p
-	  | Exits | Breaks | Continues | Returns ->
-	    not_yet env "@[abnormal termination case in behavior@]"
-	in
-	handle_error do_it env)
+      (fun env (t, p as post) ->
+	if must_translate (Property.ip_of_ensures kf kinstr b post) then
+	  let env =
+	    handle_error
+	      (fun env ->
+		if b.b_assigns <> WritesAny then 
+		  not_yet env "assigns clause in behavior";
+		if b.b_extended <> [] then 
+		  not_yet env "grammar extensions in behavior";
+		env)
+	      env
+	  in
+	  let do_it env =
+	    match t with
+	    | Normal -> 
+	      let loc = p.ip_loc in
+	      let p = p.ip_content in
+	      let p = 
+		Logic_const.pimplies 
+		  ~loc
+		  (Logic_const.pold ~loc assumes_pred, 
+		   Logic_const.unamed ~loc p) 
+	      in
+	      translate_named_predicate kf kinstr env p
+	    | Exits | Breaks | Continues | Returns ->
+	      not_yet env "@[abnormal termination case in behavior@]"
+	  in
+	  handle_error do_it env
+	else env)
       env
       b.b_post_cond
   in 
   List.fold_left do_behavior env behaviors
 
-let translate_pre_spec kf env spec =
+let translate_pre_spec kf kinstr env spec =
   let convert_unsupported_clauses env =
-    if spec.spec_variant <> None then not_yet env "variant clause";
-    if spec.spec_terminates <> None then not_yet env "terminates clause";
-    if spec.spec_complete_behaviors <> [] then 
-      not_yet env "complete behavior";
-    if spec.spec_disjoint_behaviors <> [] then 
-      not_yet env "disjoint behavior";
+    Extlib.may
+      (fun v ->
+	if must_translate (Property.ip_of_decreases kf kinstr v) then
+	  not_yet env "variant clause")
+      spec.spec_variant;
+    Extlib.may
+      (fun t ->
+	if must_translate (Property.ip_of_terminates kf kinstr t) then
+	  not_yet env "terminates clause")
+      spec.spec_terminates;
+    (match spec.spec_complete_behaviors with
+    | [] -> ()
+    | l ->
+      List.iter
+	(fun l ->
+	  if must_translate (Property.ip_of_complete kf kinstr l) then
+	    not_yet env "complete behavior")
+	l);
+    (match spec.spec_disjoint_behaviors with
+    | [] -> ()
+    | l ->
+      List.iter
+	(fun l ->
+	  if must_translate (Property.ip_of_disjoint kf kinstr l) then
+	    not_yet env "disjoint behavior")
+	l);
     env
   in
   let env = handle_error convert_unsupported_clauses env in
   handle_error
-    (fun env -> translate_preconditions kf env spec.spec_behavior) 
+    (fun env -> translate_preconditions kf kinstr env spec.spec_behavior) 
     env
 
-let translate_post_spec kf env spec = 
+let translate_post_spec kf kinstr env spec = 
   handle_error
-    (fun env -> translate_postconditions kf env spec.spec_behavior) 
+    (fun env -> translate_postconditions kf kinstr env spec.spec_behavior) 
     env
 
-let translate_pre_code_annotation kf env annot =
+let translate_pre_code_annotation kf stmt env annot =
   let convert env = match annot.annot_content with
     | AAssert(l, p) | AInvariant(l, false (* invariant as assertion *), p) 
 	as a -> 
-      let kind = match a with 
-	| AAssert _ -> Misc.Assertion
-	| AInvariant _ -> Misc.Invariant
-	| _ -> assert false
-      in
-      let env = Env.set_annotation_kind env kind in
-      if l <> [] then 
-	not_yet env "@[assertions applied only on some behaviors@]";
-      translate_named_predicate kf env p
+      if must_translate (Property.ip_of_code_annot_single kf stmt annot)
+      then
+	let kind = match a with 
+	  | AAssert _ -> Misc.Assertion
+	  | AInvariant _ -> Misc.Invariant
+	  | _ -> assert false
+	in
+	let env = Env.set_annotation_kind env kind in
+	if l <> [] then 
+	  not_yet env "@[assertions applied only on some behaviors@]";
+	translate_named_predicate kf (Kstmt stmt) env p
+      else
+	env
     | AStmtSpec(l, spec) ->
       if l <> [] then 
         not_yet env "@[statement contract applied only on some behaviors@]";
-      translate_pre_spec kf env spec ;
-    | AInvariant(_, b, _) -> assert b; not_yet env "loop invariant"
-    | AVariant _ -> not_yet env "variant"
-    | AAssigns _ -> not_yet env "assigns"
-    | AAllocation _ -> not_yet env "allocation"
+      translate_pre_spec kf (Kstmt stmt) env spec ;
+    | AInvariant(_, b, _) -> 
+      assert b;
+      if must_translate (Property.ip_of_code_annot_single kf stmt annot)
+      then not_yet env "loop invariant"
+      else env
+    | AVariant _ ->
+      if must_translate (Property.ip_of_code_annot_single kf stmt annot)
+      then not_yet env "variant"
+      else env
+    | AAssigns _ ->
+      if must_translate (Property.ip_of_code_annot_single kf stmt annot)
+      then not_yet env "assigns"
+      else env
+    | AAllocation _ ->
+      if must_translate (Property.ip_of_code_annot_single kf stmt annot)
+      then not_yet env "allocation"
+      else env
     | APragma _ -> not_yet env "pragma"
   in
   handle_error convert env
 
-let translate_post_code_annotation kf env annot =
+let translate_post_code_annotation kf stmt env annot =
   let convert env = match annot.annot_content with
-    | AStmtSpec(_, spec) -> translate_post_spec kf env spec
+    | AStmtSpec(_, spec) -> translate_post_spec kf (Kstmt stmt) env spec
     | AAssert _ 
     | AInvariant _ 
     | AVariant _
diff --git a/src/plugins/e-acsl/translate.mli b/src/plugins/e-acsl/translate.mli
index 00bf26bf5a3..9034bbe9665 100644
--- a/src/plugins/e-acsl/translate.mli
+++ b/src/plugins/e-acsl/translate.mli
@@ -26,17 +26,19 @@ open Cil_types
     statement (if any) for runtime assertion checking. This C statements are
     part of the resulting environment. *)
 
-val translate_pre_spec: kernel_function -> Env.t -> funspec -> Env.t
-val translate_post_spec: kernel_function -> Env.t -> funspec -> Env.t
+val translate_pre_spec: kernel_function -> kinstr -> Env.t -> funspec -> Env.t
+val translate_post_spec: kernel_function -> kinstr -> Env.t -> funspec -> Env.t
 val translate_pre_code_annotation: 
-  kernel_function -> Env.t -> code_annotation -> Env.t
+  kernel_function -> stmt -> Env.t -> code_annotation -> Env.t
 val translate_post_code_annotation: 
-  kernel_function -> Env.t -> code_annotation -> Env.t
+  kernel_function -> stmt -> Env.t -> code_annotation -> Env.t
 val translate_named_predicate: 
-  kernel_function -> ?rte:bool -> Env.t -> predicate named -> Env.t
+  kernel_function -> kinstr -> ?rte:bool -> Env.t -> predicate named -> Env.t
 
 val predicate_to_exp: kernel_function -> predicate named -> exp
 
+val set_original_project: Project.t -> unit
+
 (*
 Local Variables:
 compile-command: "make"
diff --git a/src/plugins/e-acsl/visit.ml b/src/plugins/e-acsl/visit.ml
index 6002970d09f..51d5e9fdecf 100644
--- a/src/plugins/e-acsl/visit.ml
+++ b/src/plugins/e-acsl/visit.ml
@@ -404,7 +404,7 @@ you must call function `%s' by yourself"
 	let env = allocate_function env kf in
 	(* translate the precondition of the function *)
 	if Pre_visit.is_generated_function (Extlib.the self#current_kf) then
-	  Project.on prj (Translate.translate_pre_spec kf env) !funspec
+	  Project.on prj (Translate.translate_pre_spec kf Kglobal env) !funspec
 	else
 	  env
       else
@@ -419,7 +419,10 @@ you must call function `%s' by yourself"
 	    Cil.visitCilCodeAnnotation (self :> Cil.cilVisitor) old_a
 	  in
 	  let env = 
-	    Project.on prj (Translate.translate_pre_code_annotation kf env) a 
+	    Project.on
+	      prj
+	      (Translate.translate_pre_code_annotation kf stmt env)
+	      a 
 	  in
 	  env, a :: new_annots)
 	(Cil.get_original_stmt self#behavior stmt)
@@ -439,7 +442,8 @@ you must call function `%s' by yourself"
 	  List.fold_left
 	    (fun env a -> match a.annot_content with
 	    | AAssert(_, p) ->
-	      Translate.translate_named_predicate kf ~rte:false env p
+	      Translate.translate_named_predicate
+		kf (Kstmt stmt) ~rte:false env p
 	    | _ -> assert false)
 	    env
 	    rtes
@@ -469,7 +473,8 @@ you must call function `%s' by yourself"
 	Project.on
 	  prj
 	  (List.fold_right
-	     (fun a env -> Translate.translate_post_code_annotation kf env a)
+	     (fun a env -> 
+	       Translate.translate_post_code_annotation kf stmt env a)
 	     new_annots)
 	  env
       in
@@ -482,7 +487,10 @@ you must call function `%s' by yourself"
 	  (* also handle the postcondition of the function and clear the env *)
 	  let env = 
 	    if Pre_visit.is_generated_function (Extlib.the self#current_kf) then
-	      Project.on prj (Translate.translate_post_spec kf env) !funspec 
+	      Project.on
+		prj
+		(Translate.translate_post_spec kf Kglobal env) 
+		!funspec 
 	    else
 	      env
 	  in
@@ -497,7 +505,7 @@ you must call function `%s' by yourself"
 	    | [] -> assert false (* return is here *)
 	    | ret :: l ->
 	      let delete_stmts =
-		Globals.Vars.fold
+		Globals.Vars.fold_in_file_order
 		  (fun vi _ acc -> 
 		    if Pre_analysis.must_model_vi vi then 
 		      let vi = Cil.get_varinfo self#behavior vi in
@@ -621,7 +629,8 @@ you must call function `%s' by yourself"
 
   initializer 
     Misc.reset ();
-    self#reset_env ()
+    self#reset_env ();
+    Translate.set_original_project (Project.current ())
 
 end
 
-- 
GitLab