diff --git a/headers/header_spec.txt b/headers/header_spec.txt
index 6bd4c09e5beff8bddfe10223d583621181e647ea..49b3adf9b90b65dbe542d7b4b9e58ca91bb59925 100644
--- a/headers/header_spec.txt
+++ b/headers/header_spec.txt
@@ -1543,6 +1543,8 @@ src/plugins/wp/Vset.ml: CEA_WP
 src/plugins/wp/Vset.mli: CEA_WP
 src/plugins/wp/Warning.ml: CEA_WP
 src/plugins/wp/Warning.mli: CEA_WP
+src/plugins/wp/Why3Provers.ml: CEA_WP
+src/plugins/wp/Why3Provers.mli: CEA_WP
 src/plugins/wp/Wp.mli: .ignore
 src/plugins/wp/WpTac.ml: CEA_WP
 src/plugins/wp/WpTac.mli: CEA_WP
diff --git a/src/plugins/wp/Changelog b/src/plugins/wp/Changelog
index 3bad8897f23076dec075a49c3cff6dffd7acac9d..46d91b13189d1f9670263c60c7a74b57391745d0 100644
--- a/src/plugins/wp/Changelog
+++ b/src/plugins/wp/Changelog
@@ -20,10 +20,12 @@
 #   <Prover>: prover
 ###############################################################################
 
+- WP	      [2019/09/12] New cache mechanism for why3 provers, see -wp-cache option
 - WP          [2019/06/27] Improving Cint simplifier and quantifier introduction
 o WP          [2019/06/27] Using the new API of Qed
 o Qed         [2019/06/27] Changes into the API in order to get a more secure way to manipulate quantifiers and binding
 - Qed         [2019/05/09] Transforms some boolean quantifications into let constructs
+
 ##########################
 Plugin WP 19.0 (Potassium)
 ##########################
diff --git a/src/plugins/wp/GuiConfig.ml b/src/plugins/wp/GuiConfig.ml
index 349477b535176e375105087936f23b1e3a5e1aa0..7974c19d95c5687637e2efec6d721f0dde723458 100644
--- a/src/plugins/wp/GuiConfig.ml
+++ b/src/plugins/wp/GuiConfig.ml
@@ -62,7 +62,7 @@ class enabled key =
         let cmdline = Wp_parameters.Provers.get () in
         let selection = List.fold_left
             (fun acc e ->
-               match VCS.Why3_prover.find_opt e with
+               match Why3Provers.find_opt e with
                | None-> acc
                | Some p -> Why3.Whyconf.Sprover.add p acc)
             settings cmdline
@@ -97,7 +97,7 @@ class dp_chooser
       Why3.Whyconf.Mprover.find dp selected
 
     method private entry dp =
-      let text = VCS.Why3_prover.title dp in
+      let text = Why3Provers.title dp in
       let sw = new Widget.switch () in
       let lb = new Widget.label ~align:`Left ~text () in
       sw#set (self#lookup dp) ;
@@ -119,7 +119,7 @@ class dp_chooser
 
     method private detect () =
       begin
-        self#configure (VCS.Why3_prover.provers_set ());
+        self#configure (Why3Provers.provers_set ());
       end
 
     method private apply () =
@@ -131,7 +131,7 @@ class dp_chooser
            selected)
 
     method run () =
-      let dps = VCS.Why3_prover.provers_set () in
+      let dps = Why3Provers.provers_set () in
       let sel = enabled#get in
       selected <- Why3.Whyconf.Mprover.merge
           (fun _ avail enab ->
@@ -163,16 +163,16 @@ type mprover =
   | NONE
   | ERGO
   | COQ
-  | WHY of VCS.Why3_prover.t
+  | WHY of Why3Provers.t
 
 class dp_button () =
   let render = function
     | NONE -> "(none)"
     | ERGO -> "Alt-Ergo (native)"
     | COQ -> "Coq (native)"
-    | WHY p when VCS.Why3_prover.has_shortcut p "alt-ergo" ->
+    | WHY p when Why3Provers.has_shortcut p "alt-ergo" ->
         "Alt-Ergo (why3)"
-    | WHY dp -> VCS.Why3_prover.title dp in
+    | WHY dp -> Why3Provers.title dp in
   let select = function
     | ERGO -> VCS.NativeAltErgo
     | COQ -> VCS.NativeCoq
@@ -186,7 +186,7 @@ class dp_button () =
         | Some (VCS.NativeAltErgo|VCS.Tactical) -> ERGO
         | Some VCS.NativeCoq -> COQ
         | Some (VCS.Why3 p) ->
-            if Why3.Whyconf.Sprover.mem p (VCS.Why3_prover.provers_set ())
+            if Why3.Whyconf.Sprover.mem p (Why3Provers.provers_set ())
             then WHY p
             else import others
   in
@@ -202,7 +202,7 @@ class dp_button () =
     method update () =
       (* called in polling mode *)
       begin
-        let avl = VCS.Why3_prover.provers_set () in
+        let avl = Why3Provers.provers_set () in
         if Why3.Whyconf.Sprover.equal avl dps then
           begin
             dps <- avl ;
diff --git a/src/plugins/wp/GuiProof.ml b/src/plugins/wp/GuiProof.ml
index 58acb6cefb502103b10fc79c45905b722d9e932e..d352290613b8d9a8e3a4553afd3d71f27b34aae3 100644
--- a/src/plugins/wp/GuiProof.ml
+++ b/src/plugins/wp/GuiProof.ml
@@ -194,10 +194,10 @@ class printer (text : Wtext.text) =
             | `Proof ->
                 text#printf "@{<it>Existing Script (navigate to explore)@}@."
             | `Script ->
-                text#printf "[File '%s']@." (ProofSession.filename wpo) ;
+                text#printf "[%a]@." ProofSession.pp_goal wpo ;
                 text#printf "@{<it>Existing Script (replay to explore)@}@."
             | `Saved ->
-                text#printf "[File '%s']@." (ProofSession.filename wpo) ;
+                text#printf "[%a]@." ProofSession.pp_goal wpo ;
                 text#printf "@{<it>Saved Script (replay to load)@}@."
             | `None ->
                 text#printf "@{<it>No Script@}@."
diff --git a/src/plugins/wp/Makefile.in b/src/plugins/wp/Makefile.in
index e44b38377560709a5fc5c40d21ddbe01c7b34970..700675e62b85cd73ce33bf43d4dad80af0525a23 100644
--- a/src/plugins/wp/Makefile.in
+++ b/src/plugins/wp/Makefile.in
@@ -62,6 +62,7 @@ PLUGIN_CMO:= \
 	rformat wprop \
 	wp_parameters wp_error \
 	dyncall ctypes clabels \
+	Why3Provers \
 	Context Warning MemoryContext wpContext \
 	LogicUsage RefUsage \
 	cil2cfg normAtLabels wpPropId mcfg \
diff --git a/src/plugins/wp/ProofSession.ml b/src/plugins/wp/ProofSession.ml
index fd05196b6587927b46a8f31001942597a2f9d401..7c24fa9e7d9b2e6741d42ff775534390bc125ec5 100644
--- a/src/plugins/wp/ProofSession.ml
+++ b/src/plugins/wp/ProofSession.ml
@@ -29,12 +29,17 @@ type status =
 
 let files : (string,status) Hashtbl.t = Hashtbl.create 32
 
-let filename ?(legacy=false) wpo =
+let filename wpo =
+  let d = Wp_parameters.get_session_dir "script" in
+  Printf.sprintf "%s/%s.json" d wpo.po_gid
+
+let legacies wpo =
   let m = WpContext.MODEL.id wpo.po_model in
   let d = Wp_parameters.get_session_dir m in
-  Printf.sprintf "%s/%s.json" d (if legacy then wpo.po_leg else wpo.po_gid)
-
-let pretty fmt wpo = Format.pp_print_string fmt (filename wpo)
+  List.map (Printf.sprintf "%s/%s.json" d) [
+    wpo.po_gid ;
+    wpo.po_leg ;
+  ]
 
 let status wpo =
   let f = filename wpo in
@@ -42,13 +47,22 @@ let status wpo =
   with Not_found ->
     let status =
       if Sys.file_exists f then Script f else
-        let f' = filename ~legacy:true wpo in
-        if Sys.file_exists f' then
-          ( Wp_parameters.warning ~current:false
-              "Deprecated script for '%s'" wpo.po_sid ;
-            Deprecated f' )
-        else NoScript in
-    Hashtbl.add files f status ; status
+        try
+          let f' = List.find Sys.file_exists (legacies wpo) in
+          Wp_parameters.warning ~current:false
+            "Deprecated script for '%s' (use prover tip to upgrade)" wpo.po_sid ;
+          Deprecated f'
+        with Not_found -> NoScript
+    in Hashtbl.add files f status ; status
+
+let pp_file fmt s = Filepath.Normalized.(pretty fmt (of_string s))
+
+let pp_status fmt = function
+  | NoScript -> Format.pp_print_string fmt "no script file"
+  | Script f -> Format.fprintf fmt "script '%a'" pp_file f
+  | Deprecated f -> Format.fprintf fmt "script '%a' (deprecated)" pp_file f
+
+let pp_goal fmt wpo = pp_status fmt (status wpo)
 
 let exists wpo =
   match status wpo with NoScript -> false | Script _ | Deprecated _ -> true
diff --git a/src/plugins/wp/ProofSession.mli b/src/plugins/wp/ProofSession.mli
index 1387357f27ae30e98cd0b8da4f52d81bf22f022d..c2648b07c3655f6016b9039edec4d7d43dfcef0c 100644
--- a/src/plugins/wp/ProofSession.mli
+++ b/src/plugins/wp/ProofSession.mli
@@ -20,8 +20,16 @@
 (*                                                                        *)
 (**************************************************************************)
 
-val pretty : Format.formatter -> Wpo.t -> unit
-val filename : ?legacy:bool -> Wpo.t -> string
+type status =
+  | NoScript
+  | Script of string
+  | Deprecated of string
+
+val pp_status : Format.formatter -> status -> unit
+val pp_goal : Format.formatter -> Wpo.t -> unit
+
+val status : Wpo.t -> status
+
 val exists : Wpo.t -> bool
 val save : Wpo.t -> Json.t -> unit
 val load : Wpo.t -> Json.t
diff --git a/src/plugins/wp/ProverWhy3.ml b/src/plugins/wp/ProverWhy3.ml
index cbe30c4322b4f0163a74ed4e948e638252ecff31..8e212b42b0c27d5fc02750d6d5e3274c24c9fed7 100644
--- a/src/plugins/wp/ProverWhy3.ml
+++ b/src/plugins/wp/ProverWhy3.ml
@@ -20,6 +20,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
+(* Allow type-desambiguation for symbols *)
 [@@@ warning "-40-42"]
 
 let dkey = Wp_parameters.register_category "prover"
@@ -33,24 +34,22 @@ let option_import = LogicBuiltins.create_option
     (fun ~driver_dir:_ x -> x)
     "why3" "import"
 
-let config = VCS.why3_config
-
 module Env = WpContext.Index(struct
     include Datatype.Unit
     type key = unit
     type data = Why3.Env.env
   end)
 
-let get_why3_env =
-  Env.memoize (fun () ->
-      let config = Lazy.force config in
+let get_why3_env = Env.memoize
+    begin fun () ->
+      let config = Why3Provers.config () in
       let main = Why3.Whyconf.get_main config in
       let ld =
         (WpContext.directory ())::
         (Wp_parameters.Share.file "why3")::
         (Why3.Whyconf.loadpath main) in
       Why3.Env.create_env ld
-    )
+    end
 
 type context = {
   mutable th : Why3.Theory.theory_uc;
@@ -71,6 +70,9 @@ type convert = {
 let specific_equalities: Lang.For_export.specific_equality list ref =
   ref [Vlist.specialize_eq_list]
 
+let add_specific_equality ~for_tau ~mk_new_eq =
+  specific_equalities := { for_tau; mk_new_eq }::!specific_equalities
+
 (** get symbols *)
 
 let get_ls ~cnv ~f ~l ~p =
@@ -937,10 +939,13 @@ class visitor (ctx:context) c =
 
   end
 
+(* -------------------------------------------------------------------------- *)
+(* --- Goal Compilation                                                   --- *)
+(* -------------------------------------------------------------------------- *)
 
 let goal_id = (Why3.Decl.create_prsymbol (Why3.Ident.id_fresh "wp_goal"))
 
-let why3_of_qed ~id ~title ~name ?axioms t =
+let prove_goal ~id ~title ~name ?axioms t =
   (* Format.printf "why3_of_qed start@."; *)
   let goal = Definitions.cluster ~id ~title () in
   let ctx = empty_context name in
@@ -961,22 +966,20 @@ let why3_of_qed ~id ~title ~name ?axioms t =
   if Wp_parameters.has_print_generated () then begin
     let th_uc_tmp = Why3.Theory.add_decl ~warn:false ctx.th decl in
     let th_tmp    = Why3.Theory.close_theory th_uc_tmp in
-    Wp_parameters.debug ~dkey:Wp_parameters.cat_print_generated "%a" Why3.Pretty.print_theory th_tmp
+    Wp_parameters.debug ~dkey:Wp_parameters.cat_print_generated "%a"
+      Why3.Pretty.print_theory th_tmp
   end;
   th, decl
 
-(** Prover call *)
-
 let prove_prop ?axioms ~pid ~prop =
   let id = WpPropId.get_propid pid in
   let title = Pretty_utils.to_string WpPropId.pretty pid in
   let name = "WP" in
-  let th, decl = why3_of_qed ?axioms ~id ~title ~name prop in
+  let th, decl = prove_goal ?axioms ~id ~title ~name prop in
   let t = None in
   let t = Why3.Task.use_export t th in
   Why3.Task.add_decl t decl
 
-
 let task_of_wpo wpo =
   let pid = wpo.Wpo.po_pid in
   match wpo.Wpo.po_formula with
@@ -993,113 +996,311 @@ let task_of_wpo wpo =
       let axioms = Some(lemma.l_cluster,depends) in
       prove_prop ~pid ~prop ?axioms
 
-let altergo_step_limit = Str.regexp "^Steps limit reached:"
+(* -------------------------------------------------------------------------- *)
+(* --- Prover Task                                                        --- *)
+(* -------------------------------------------------------------------------- *)
 
-let call_prover ~timeout ~steplimit prover task wpo =
-  let steplimit = match steplimit with Some 0 -> None | _ -> steplimit in
-  let config = Lazy.force config in
+let prover_task prover task =
   let env = get_why3_env () in
+  let config = Why3Provers.config () in
   let prover_config = Why3.Whyconf.get_prover_config config prover in
-  let command = Why3.Whyconf.get_complete_command prover_config ~with_steps:(steplimit<>None) in
-  let drv =
-    Why3.Whyconf.load_driver (Why3.Whyconf.get_main config) env prover_config.driver prover_config.extra_drivers in
-  let limit =
-    let def = Why3.Call_provers.empty_limit in
-    { def with
-      Why3.Call_provers.limit_time = Why3.Opt.get_def def.limit_time timeout;
-      Why3.Call_provers.limit_steps = Why3.Opt.get_def def.limit_time steplimit;
-    } in
+  let drv = Why3.Whyconf.load_driver (Why3.Whyconf.get_main config)
+      env prover_config.driver prover_config.extra_drivers in
   let remove_for_prover =
     if prover.prover_name = "Alt-Ergo"
     then Filter_axioms.remove_for_altergo
     else Filter_axioms.remove_for_why3
   in
-  let trans = Why3.Trans.seq [remove_for_prover; Filter_axioms.trans; Filter_axioms.def_into_axiom] in
+  let trans = Why3.Trans.seq [
+      remove_for_prover;
+      Filter_axioms.trans;
+      Filter_axioms.def_into_axiom
+    ] in
   let task =
     if prover.prover_name = "Coq"
     then task
-    else Why3.Trans.apply trans task in
-  let task = Why3.Driver.prepare_task drv task in
-  let file = Wpo.DISK.file_goal ~pid:wpo.Wpo.po_pid ~model:wpo.Wpo.po_model ~prover:(VCS.Why3 prover) in
-  (* This printing is currently just for debugging *)
-  let _ = Command.print_file file (fun fmt -> Why3.Driver.print_task_prepared drv fmt task) in
-  if Wp_parameters.Check.get ()
-  then (** Why3 typed checked the task during its build *)
-    Task.return VCS.checked
-  else
-    let call =
-      Why3.Driver.prove_task_prepared ~command ~limit drv task in
-    Wp_parameters.debug ~dkey
-      "@[@[Why3 run prover %a with %i timeout %i steplimit@]@]@."
-      Why3.Whyconf.print_prover prover (Why3.Opt.get_def (-1) timeout) (Why3.Opt.get_def (-1) steplimit);
-    let ping _ (* why3 seems not to be able to kill a started prover *) =
-      match Why3.Call_provers.query_call call with
-      | NoUpdates
-      | ProverStarted -> Task.Yield
-      | InternalFailure exn ->
-          Task.Return (Task.Result (VCS.failed (Format.asprintf "%a" Why3.Exn_printer.exn_printer exn)))
-      | ProverInterrupted -> Task.Return (Task.Result (VCS.failed "interrupted"))
-      | ProverFinished pr ->
-          let r = match pr.pr_answer with
-            | Timeout -> VCS.timeout (int_of_float pr.pr_time)
-            | Valid -> VCS.result ~time:pr.pr_time ~steps:pr.pr_steps VCS.Valid
-            | Invalid -> VCS.result ~time:pr.pr_time ~steps:pr.pr_steps VCS.Invalid
-            | OutOfMemory -> VCS.failed "out of memory"
-            | StepLimitExceeded -> VCS.stepout
-            | Unknown _ -> VCS.unknown
-            | Failure s -> VCS.failed s
-            | HighFailure ->
-                let alt_ergo_hack = prover.prover_name = "Alt-Ergo" &&
-                                    Str.string_match altergo_step_limit pr.pr_output 0
-                in
-                if alt_ergo_hack then VCS.stepout
-                else VCS.failed "Unknown error"
-          in
-          Wp_parameters.debug ~dkey
-            "@[@[Why3 result for %a:@] @[%a@] and @[%a@]@."
-            Why3.Whyconf.print_prover prover
-            (* why3 1.3 (Why3.Call_provers.print_prover_result ~json_model:false) pr *)
-            (Why3.Call_provers.print_prover_result) pr
-            VCS.pp_result r;
-          Task.Return (Task.Result r)
-    in
-    Task.async ping
+    else Why3.Trans.apply trans task
+  in
+  drv , prover_config , Why3.Driver.prepare_task drv task
 
-let add_specific_equality ~for_tau ~mk_new_eq =
-  specific_equalities := { for_tau; mk_new_eq }::!specific_equalities
+(* -------------------------------------------------------------------------- *)
+(* --- Prover Call                                                        --- *)
+(* -------------------------------------------------------------------------- *)
 
-let version = Why3.Config.version
+let altergo_step_limit = Str.regexp "^Steps limit reached:"
+
+let call_prover ~timeout ~steplimit drv prover prover_config task =
+  let steps = match steplimit with Some 0 -> None | _ -> steplimit in
+  let limit =
+    let def = Why3.Call_provers.empty_limit in
+    { def with
+      Why3.Call_provers.limit_time = Why3.Opt.get_def def.limit_time timeout;
+      Why3.Call_provers.limit_steps = Why3.Opt.get_def def.limit_time steps;
+    } in
+  let command = Why3.Whyconf.get_complete_command prover_config
+      ~with_steps:(steps<>None) in
+  let call =
+    Why3.Driver.prove_task_prepared ~command ~limit drv task in
+  Wp_parameters.debug ~dkey "Why3 run prover %a with %i timeout %i steps@."
+    Why3.Whyconf.print_prover prover
+    (Why3.Opt.get_def (-1) timeout)
+    (Why3.Opt.get_def (-1) steps);
+  let ping _ (* why3 seems not to be able to kill a started prover *) =
+    match Why3.Call_provers.query_call call with
+    | NoUpdates
+    | ProverStarted -> Task.Yield
+    | InternalFailure exn ->
+        let msg = Format.asprintf "%a" Why3.Exn_printer.exn_printer exn in
+        Task.Return (Task.Result (VCS.failed msg))
+    | ProverInterrupted ->
+        Task.Return (Task.Result (VCS.failed "interrupted"))
+    | ProverFinished pr ->
+        let r = match pr.pr_answer with
+          | Timeout -> VCS.timeout (int_of_float pr.pr_time)
+          | Valid -> VCS.result ~time:pr.pr_time ~steps:pr.pr_steps VCS.Valid
+          | Invalid -> VCS.result ~time:pr.pr_time ~steps:pr.pr_steps VCS.Invalid
+          | OutOfMemory -> VCS.failed "out of memory"
+          | StepLimitExceeded -> VCS.result ?steps VCS.Stepout
+          | Unknown _ -> VCS.unknown
+          | Failure s -> VCS.failed s
+          | HighFailure ->
+              let alt_ergo_hack =
+                prover.prover_name = "Alt-Ergo" &&
+                Str.string_match altergo_step_limit pr.pr_output 0
+              in
+              if alt_ergo_hack then VCS.result ?steps VCS.Stepout
+              else VCS.failed "Unknown error"
+        in
+        Wp_parameters.debug ~dkey
+          "@[@[Why3 result for %a:@] @[%a@] and @[%a@]@."
+          Why3.Whyconf.print_prover prover
+          (* why3 1.3 (Why3.Call_provers.print_prover_result ~json_model:false) pr *)
+          (Why3.Call_provers.print_prover_result) pr
+          VCS.pp_result r;
+        Task.Return (Task.Result r)
+  in
+  Task.async ping
+
+(* -------------------------------------------------------------------------- *)
+(* --- Cache Management                                                   --- *)
+(* -------------------------------------------------------------------------- *)
+
+type mode = NoCache | Update | Replay | Rebuild | Offline | Cleanup
+
+let hits = ref 0
+let miss = ref 0
+let removed = ref 0
+let cleanup = Hashtbl.create 0
+(* used entries, never to be reset since cleanup is performed at exit *)
+
+let get_hits () = !hits
+let get_miss () = !miss
+let get_removed () = !removed
+
+let mark_cache ~mode hash =
+  if mode = Cleanup then Hashtbl.replace cleanup hash ()
+
+let cleanup_cache ~mode =
+  if mode = Cleanup && (!hits > 0 || !miss > 0) then
+    let dir = Wp_parameters.get_session_dir "cache" in
+    try
+      if Sys.is_directory dir then
+        Array.iter
+          (fun f ->
+             if Filename.check_suffix f ".json" then
+               let hash = Filename.chop_suffix f ".json" in
+               if not (Hashtbl.mem cleanup hash) then
+                 begin
+                   incr removed ;
+                   Extlib.safe_remove (Printf.sprintf "%s/%s" dir f) ;
+                 end
+          ) (Sys.readdir dir) ;
+    with Unix.Unix_error _ as exn ->
+      Wp_parameters.failure "Can not cleanup cache (%s)"
+        (Printexc.to_string exn)
+
+(* -------------------------------------------------------------------------- *)
+(* --- Cache Management                                                   --- *)
+(* -------------------------------------------------------------------------- *)
+
+let parse_mode ~origin ~fallback = function
+  | "none" -> NoCache
+  | "update" -> Update
+  | "replay" -> Replay
+  | "rebuild" -> Rebuild
+  | "offline" -> Offline
+  | "cleanup" -> Cleanup
+  | "" -> raise Not_found
+  | m ->
+      Wp_parameters.warning ~current:false
+        "Unknown %s mode %S (use %s instead)" origin m fallback ;
+      raise Not_found
+
+module MODE = WpContext.StaticGenerator(Datatype.Unit)
+    (struct
+      type key = unit
+      type data = mode
+      let name = "Wp.Cache.mode"
+      let compile () =
+        try
+          let origin = "FRAMAC_WP_CACHE" in
+          parse_mode ~origin ~fallback:"-wp-cache" (Sys.getenv origin)
+        with Not_found ->
+        try
+          parse_mode ~origin:"-wp-cache" ~fallback:"'none'"
+            (Wp_parameters.Cache.get())
+        with Not_found ->
+          if Wp_parameters.Session.Dir_name.is_set ()
+          then Update else NoCache
+    end)
+
+let get_mode = MODE.get
+
+let task_hash wpo drv prover task =
+  lazy
+    begin
+      let file = Wpo.DISK.file_goal
+          ~pid:wpo.Wpo.po_pid
+          ~model:wpo.Wpo.po_model
+          ~prover:(VCS.Why3 prover) in
+      let _ = Command.print_file file
+          begin fun fmt ->
+            Format.fprintf fmt "(* WP Task for Prover %s *)@\n"
+              (Why3Provers.print prover) ;
+            Why3.Driver.print_task_prepared drv fmt task ;
+          end
+      in Digest.file file |> Digest.to_hex
+    end
+
+let time_fits time = function
+  | None | Some 0 -> true
+  | Some limit -> time <= float limit
+
+let steps_fits steps = function
+  | None | Some 0 -> true
+  | Some limit -> steps <= limit
+
+let time_seized time = function
+  | None | Some 0 -> false
+  | Some limit -> float limit <= time
+
+let steps_seized steps steplimit =
+  steps <> 0 &&
+  match steplimit with
+  | None | Some 0 -> false
+  | Some limit -> limit <= steps
+
+let promote ~timeout ~steplimit (res : VCS.result) =
+  match res.verdict with
+  | VCS.NoResult | VCS.Computing _ | VCS.Checked -> VCS.no_result
+  | VCS.Failed -> res
+  | VCS.Invalid | VCS.Valid | VCS.Unknown ->
+      if not (steps_fits res.prover_steps steplimit) then
+        { res with verdict = Stepout }
+      else
+      if not (time_fits res.prover_time timeout) then
+        { res with verdict = Timeout }
+      else res
+  | VCS.Timeout | VCS.Stepout ->
+      if steps_seized res.prover_steps steplimit then
+        { res with verdict = Stepout }
+      else
+      if time_seized res.prover_time timeout then
+        { res with verdict = Timeout }
+      else (* can be run a longer time or widely *)
+        VCS.no_result
+
+let get_cache_result ~mode hash =
+  match mode with
+  | NoCache | Rebuild -> VCS.no_result
+  | Update | Cleanup | Replay | Offline ->
+      let dir = Wp_parameters.get_session_dir "cache" in
+      let hash = Lazy.force hash in
+      let file = Printf.sprintf "%s/%s.json" dir hash in
+      if not (Sys.file_exists file) then VCS.no_result
+      else
+        try
+          mark_cache ~mode hash ;
+          Json.load_file file |> ProofScript.result_of_json
+        with err ->
+          Wp_parameters.failure ~once:true "invalid cache entry (%s)"
+            (Printexc.to_string err) ;
+          VCS.no_result
+
+let set_cache_result ~mode hash prover result =
+  match mode with
+  | NoCache | Replay | Offline -> ()
+  | Rebuild | Update | Cleanup ->
+      let dir = Wp_parameters.get_session_dir "cache" in
+      let hash = Lazy.force hash in
+      let file = Printf.sprintf "%s/%s.json" dir hash in
+      try
+        mark_cache ~mode hash ;
+        ProofScript.json_of_result (VCS.Why3 prover) result
+        |> Json.save_file file
+      with err ->
+        Wp_parameters.failure ~once:true "can not update cache (%s)"
+          (Printexc.to_string err)
+
+let is_trivial (t : Why3.Task.task) =
+  let goal = Why3.Task.task_goal_fmla t in
+  Why3.Term.t_equal goal Why3.Term.t_true
+
+(* -------------------------------------------------------------------------- *)
+(* --- Prove WPO                                                          --- *)
+(* -------------------------------------------------------------------------- *)
 
 let prove ?timeout ?steplimit ~prover wpo =
   try
-    let do_ () =
-      let task = task_of_wpo wpo in
-      if Wp_parameters.Generate.get ()
-      then if Wp_parameters.Check.get ()
-        then Task.return VCS.checked
-        else Task.return VCS.no_result
-      else call_prover ~timeout ~steplimit prover task wpo
-    in
-    WpContext.on_context (Wpo.get_context wpo) do_ ()
+    WpContext.on_context (Wpo.get_context wpo)
+      begin fun () ->
+        (* Always generate common task *)
+        let task = task_of_wpo wpo in
+        if Wp_parameters.Check.get ()
+        then Task.return VCS.checked (* Why3 tasks are type-checked *)
+        else
+        if Wp_parameters.Generate.get ()
+        then Task.return VCS.no_result (* Only generate *)
+        else
+          let drv , config , task = prover_task prover task in
+          if false && is_trivial task then
+            Task.return VCS.valid
+          else
+            let mode = get_mode () in
+            match mode with
+            | NoCache ->
+                call_prover ~timeout ~steplimit drv prover config task
+            | Offline ->
+                let hash = task_hash wpo drv prover task in
+                let result = get_cache_result ~mode hash |> VCS.cached in
+                if VCS.is_verdict result then incr hits else incr miss ;
+                Task.return result
+            | Update | Replay | Rebuild | Cleanup ->
+                let hash = task_hash wpo drv prover task in
+                let result =
+                  get_cache_result ~mode hash
+                  |> promote ~timeout ~steplimit |> VCS.cached in
+                if VCS.is_verdict result
+                then
+                  begin
+                    incr hits ;
+                    Task.return result
+                  end
+                else
+                  begin
+                    incr miss ;
+                    Task.finally
+                      (call_prover ~timeout ~steplimit drv prover config task)
+                      (function
+                        | Task.Result result when VCS.is_verdict result ->
+                            set_cache_result ~mode hash prover result
+                        | _ -> ())
+                  end
+      end ()
   with exn ->
     let bt = Printexc.get_raw_backtrace () in
     Wp_parameters.fatal "Error in why3:%a@.%s@."
       Why3.Exn_printer.exn_printer exn
       (Printexc.raw_backtrace_to_string bt)
 
-let parse_why3_options =
-  let todo = ref true in
-  fun () ->
-    if !todo then begin
-      let args = Array.of_list ("why3"::Wp_parameters.WhyFlags.get ()) in
-      begin try
-          Arg.parse_argv ~current:(ref 0) args
-            (Why3.Debug.Args.[desc_debug;desc_debug_all;desc_debug_list])
-            (fun _ -> raise (Arg.Help "Unknown why3 option"))
-            "Why3 options"
-        with Arg.Bad s -> Wp_parameters.abort "%s" s
-      end;
-      ignore (Why3.Debug.Args.option_list ());
-      Why3.Debug.Args.set_flags_selected ();
-      todo := false
-    end
+(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/wp/ProverWhy3.mli b/src/plugins/wp/ProverWhy3.mli
index 4325d11117e6c5920d61c9ebebf4bb594afa14f9..e107c669a1514fc99be25823adee3dc9c7eaf2c6 100644
--- a/src/plugins/wp/ProverWhy3.mli
+++ b/src/plugins/wp/ProverWhy3.mli
@@ -24,11 +24,18 @@ val add_specific_equality:
   for_tau:(Lang.tau -> bool) ->
   mk_new_eq:Lang.F.binop ->
   unit
-(** equality used in the goal, simpler to prove than polymorphic equality *)
+(** Equality used in the goal, simpler to prove than polymorphic equality *)
 
-val version : string
-
-val prove : ?timeout:int -> ?steplimit:int -> prover:VCS.Why3_prover.t -> Wpo.t -> VCS.result Task.task
+val prove : ?timeout:int -> ?steplimit:int -> prover:Why3Provers.t ->
+  Wpo.t -> VCS.result Task.task
 (** Return NoResult if it is already proved by Qed *)
 
-val parse_why3_options : unit -> unit
+type mode = NoCache | Update | Replay | Rebuild | Offline | Cleanup
+val get_mode : unit -> mode
+val get_hits : unit -> int
+val get_miss : unit -> int
+val get_removed : unit -> int
+
+val cleanup_cache : mode:mode -> unit
+
+(**************************************************************************)
diff --git a/src/plugins/wp/VCS.ml b/src/plugins/wp/VCS.ml
index 6f05aaeaa80b225700cd0a60651aa1c18ce1addf..adeabe58e0df3e40b73e6b6169db14ecca0ab92d 100644
--- a/src/plugins/wp/VCS.ml
+++ b/src/plugins/wp/VCS.ml
@@ -21,80 +21,17 @@
 (**************************************************************************)
 
 (* -------------------------------------------------------------------------- *)
-(* --- Provers                                                            --- *)
+(* --- Prover Results                                                     --- *)
 (* -------------------------------------------------------------------------- *)
 
 let dkey_no_time_info = Wp_parameters.register_category "no-time-info"
 let dkey_no_step_info = Wp_parameters.register_category "no-step-info"
 let dkey_no_goals_info = Wp_parameters.register_category "no-goals-info"
+let dkey_no_cache_info = Wp_parameters.register_category "no-cache-info"
 let dkey_success_only = Wp_parameters.register_category "success-only"
 
-let why3_config =
-  lazy begin
-    try
-      Why3.Whyconf.read_config None
-    with exn ->
-      Wp_parameters.abort "%a" Why3.Exn_printer.exn_printer exn
-  end
-
-module Why3_prover = struct
-  type t = Why3.Whyconf.prover
-
-  let find_opt   : string -> t option = fun s ->
-    try
-      let config = Lazy.force why3_config in
-      let filter = Why3.Whyconf.parse_filter_prover s in
-      let filter = Why3.Whyconf.filter_prover_with_shortcut config filter in
-      Some ((Why3.Whyconf.filter_one_prover config filter).Why3.Whyconf.prover)
-    with
-    | (Why3.Whyconf.ProverNotFound _ | Why3.Whyconf.ParseFilterProver _ | Why3.Whyconf.ProverAmbiguity _ ) ->
-        None
-
-  let find   : ?donotfail:unit -> string -> t = fun ?donotfail s ->
-    try
-      try
-        let config = Lazy.force why3_config in
-        let filter = Why3.Whyconf.parse_filter_prover s in
-        let filter = Why3.Whyconf.filter_prover_with_shortcut config filter in
-        (Why3.Whyconf.filter_one_prover config filter).Why3.Whyconf.prover
-      with
-      | Why3.Whyconf.ProverNotFound _ as exn when donotfail <> None ->
-          Wp_parameters.warning ~once:true "%a" Why3.Exn_printer.exn_printer exn;
-          (** from Why3.Whyconf.parse_filter_prover *)
-          let sl = Why3.Strings.rev_split ',' s in
-          (* reverse order *)
-          let prover_name, prover_version, prover_altern =
-            match sl with
-            | [name] -> name,"",""
-            | [version;name] -> name,version,""
-            | [altern;version;name] -> name,version,altern
-            | _ -> raise (Why3.Whyconf.ParseFilterProver s) in
-          { Why3.Whyconf.prover_name; Why3.Whyconf.prover_version; Why3.Whyconf.prover_altern }
-    with
-    | (Why3.Whyconf.ProverNotFound _ | Why3.Whyconf.ParseFilterProver _ | Why3.Whyconf.ProverAmbiguity _ ) as exn ->
-        Wp_parameters.abort "%a" Why3.Exn_printer.exn_printer exn
-
-  let print   : t -> string = Why3.Whyconf.prover_parseable_format
-  let title   : t -> string = fun p -> Pretty_utils.sfprintf "%a" Why3.Whyconf.print_prover p
-  let compare : t -> t -> int = Why3.Whyconf.Prover.compare
-  let get_config () : Why3.Whyconf.config = (Lazy.force why3_config)
-  let provers () : t list =
-    Why3.Whyconf.Mprover.keys (Why3.Whyconf.get_provers (get_config ()))
-  let provers_set () : Why3.Whyconf.Sprover.t =
-    Why3.Whyconf.Mprover.domain (Why3.Whyconf.get_provers (get_config ()))
-  let is_available p =
-    Why3.Whyconf.Mprover.mem p (Why3.Whyconf.get_provers (get_config ()))
-
-  let has_shortcut p s =
-    match Why3.Wstdlib.Mstr.find_opt s
-            (Why3.Whyconf.get_prover_shortcuts (get_config ())) with
-    | None -> false
-    | Some p' -> Why3.Whyconf.Prover.equal p p'
-
-end
-
 type prover =
-  | Why3 of Why3_prover.t (* Prover via WHY *)
+  | Why3 of Why3Provers.t (* Prover via WHY *)
   | NativeAltErgo (* Direct Alt-Ergo *)
   | NativeCoq     (* Direct Coq and Coqide *)
   | Qed           (* Qed Solver *)
@@ -113,10 +50,14 @@ type language =
 let prover_of_name = function
   | "" | "none" -> None
   | "qed" | "Qed" -> Some Qed
-  | "coq" | "coqide" -> Some NativeCoq
-  | "alt-ergo" | "altgr-ergo" -> Some (Why3 (Why3_prover.find "alt-ergo"))
-  | "native:alt-ergo" | "native:altgr-ergo" -> Some NativeAltErgo
-  | "native:coq" | "native:coqide" -> Some NativeCoq
+  | "alt-ergo" | "altgr-ergo" -> Some (Why3 (Why3Provers.find "alt-ergo"))
+  | "native-alt-ergo" | "native-altgr-ergo"
+  | "native:alt-ergo" | "native:altgr-ergo"
+    -> Some NativeAltErgo
+  | "coq" | "coqide"
+  | "native-coq" | "native-coqide"
+  | "native:coq" | "native:coqide"
+    -> Some NativeCoq
   | "script" -> Some Tactical
   | "tip" -> Some Tactical
   | "why3" -> Some (Why3 { Why3.Whyconf.prover_name = "why3";
@@ -125,18 +66,18 @@ let prover_of_name = function
   | s ->
       match Extlib.string_del_prefix "why3:" s with
       | Some "" -> None
-      | Some s' -> Some (Why3 (Why3_prover.find s'))
-      | None -> Some (Why3 (Why3_prover.find s))
+      | Some s' -> Some (Why3 (Why3Provers.find s'))
+      | None -> Some (Why3 (Why3Provers.find s))
 
 let name_of_prover = function
-  | Why3 s -> "why3:" ^ (Why3_prover.print s)
+  | Why3 s -> "why3:" ^ (Why3Provers.print s)
   | NativeAltErgo -> "alt-ergo"
   | NativeCoq -> "coq"
   | Qed -> "qed"
   | Tactical -> "script"
 
 let title_of_prover = function
-  | Why3 s -> (Why3_prover.title s)
+  | Why3 s -> Why3Provers.title s
   | NativeAltErgo -> "Alt-Ergo"
   | NativeCoq -> "Coq"
   | Qed -> "Qed"
@@ -162,7 +103,7 @@ let sanitize_why3 s =
   Buffer.contents buffer
 
 let filename_for_prover = function
-  | Why3 s -> sanitize_why3 (Why3_prover.print s)
+  | Why3 s -> sanitize_why3 (Why3Provers.print s)
   | NativeAltErgo -> "Alt-Ergo"
   | NativeCoq -> "Coq"
   | Qed -> "Qed"
@@ -182,7 +123,8 @@ let language_of_prover_name = function
 
 let mode_of_prover_name = function
   | "coqedit" -> EditMode
-  | "coqide" | "altgr-ergo" | "tactical" -> FixMode
+  | "coqide" | "native-coqide" | "native:coqide"
+  | "altgr-ergo" | "tactical" -> FixMode
   | _ -> BatchMode
 
 let is_auto = function
@@ -203,16 +145,16 @@ let cmp_prover p q =
   | NativeCoq , NativeCoq -> 0
   | NativeCoq , _ -> (-1)
   | _ , NativeCoq -> 1
-  | Why3 p , Why3 q -> Why3_prover.compare p q
+  | Why3 p , Why3 q -> Why3Provers.compare p q
 
 let pp_prover fmt = function
   | NativeAltErgo -> Format.pp_print_string fmt "Alt-Ergo (Native)"
   | NativeCoq -> Format.pp_print_string fmt "Coq (Native)"
   | Why3 smt ->
       if Wp_parameters.debug_atleast 1 then
-        Format.fprintf fmt "Why:%s" (Why3_prover.print smt)
+        Format.fprintf fmt "Why:%s" (Why3Provers.print smt)
       else
-        Format.pp_print_string fmt (Why3_prover.title smt)
+        Format.pp_print_string fmt (Why3Provers.title smt)
   | Qed -> Format.fprintf fmt "Qed"
   | Tactical -> Format.pp_print_string fmt "Tactical"
 
@@ -272,6 +214,7 @@ type verdict =
 
 type result = {
   verdict : verdict ;
+  cached : bool ;
   solver_time : float ;
   prover_time : float ;
   prover_steps : int ;
@@ -323,9 +266,10 @@ let autofit r =
   time_fits r.prover_time &&
   step_fits r.prover_steps
 
-let result ?(solver=0.0) ?(time=0.0) ?(steps=0) verdict =
+let result ?(cached=false) ?(solver=0.0) ?(time=0.0) ?(steps=0) verdict =
   {
     verdict ;
+    cached = cached ;
     solver_time = solver ;
     prover_time = time ;
     prover_steps = steps ;
@@ -339,10 +283,11 @@ let checked = result Checked
 let invalid = result Invalid
 let unknown = result Unknown
 let timeout t = result ~time:(float t) Timeout
-let stepout = result Stepout
+let stepout n = result ~steps:n Stepout
 let computing kill = result (Computing kill)
 let failed ?pos msg = {
   verdict = Failed ;
+  cached = false ;
   solver_time = 0.0 ;
   prover_time = 0.0 ;
   prover_steps = 0 ;
@@ -350,6 +295,8 @@ let failed ?pos msg = {
   prover_errmsg = msg ;
 }
 
+let cached r = if is_verdict r then { r with cached=true } else r
+
 let kfailed ?pos msg = Pretty_utils.ksfprintf (failed ?pos) msg
 
 let perfo extended dkey = extended || not (Wp_parameters.has_dkey dkey)
@@ -364,15 +311,17 @@ let pp_perf ~extended fmt r =
     then Format.fprintf fmt " (%a)" Rformat.pp_time t ;
     let s = r.prover_steps in
     if s > 0 && perfo extended dkey_no_step_info
-    then Format.fprintf fmt " (%d)" s
+    then Format.fprintf fmt " (%d)" s ;
+    if r.cached && perfo extended dkey_no_cache_info
+    then Format.fprintf fmt " (cached)" ;
   end
 
 let pp_res ~extended fmt r =
   match r.verdict with
   | NoResult -> Format.pp_print_string fmt (if extended then "No Result" else "-")
-  | Invalid -> Format.pp_print_string fmt "Invalid"
   | Computing _ -> Format.pp_print_string fmt "Computing"
   | Checked -> Format.fprintf fmt "Typechecked"
+  | Invalid -> Format.pp_print_string fmt "Invalid"
   | Valid when Wp_parameters.has_dkey dkey_success_only ->
       Format.pp_print_string fmt "Valid"
   | (Timeout|Stepout|Unknown) when Wp_parameters.has_dkey dkey_success_only ->
@@ -417,6 +366,7 @@ let merge r1 r2 =
   let err = if r1.prover_errmsg <> "" then r1 else r2 in
   {
     verdict = combine r1.verdict r2.verdict ;
+    cached = r1.cached && r2.cached ;
     solver_time = max r1.solver_time r2.solver_time ;
     prover_time = max r1.prover_time r2.prover_time ;
     prover_steps = max r1.prover_steps r2.prover_steps ;
diff --git a/src/plugins/wp/VCS.mli b/src/plugins/wp/VCS.mli
index 0b753f34975bef35c69dc66191c317a0f613928b..873c4c621140519c1278ce5a85ebc936b9c3a5e4 100644
--- a/src/plugins/wp/VCS.mli
+++ b/src/plugins/wp/VCS.mli
@@ -26,37 +26,8 @@
 
 (** {2 Prover} *)
 
-module Why3_prover: sig
-  type t = Why3.Whyconf.prover
-
-  val find: ?donotfail:unit -> string -> t
-  (** Find the why3 prover with the given name.
-      If it can't be found and donotfail is chosen, a
-      prover with the given name and version is used instead
-      Raises exception when the string doesn't corresponds to a prover filter
-  *)
-
-  val find_opt: string -> t option
-  (** Try to find the why3 prover with the given name. *)
-
-  val provers : unit -> t list
-  val provers_set: unit -> Why3.Whyconf.Sprover.t
-
-  val print : t -> string
-  val title : t -> string
-
-  val compare : t -> t -> int
-
-  val has_shortcut : t -> string -> bool
-  (** check if a prover has a given shortcut *)
-
-  val get_config: unit -> Why3.Whyconf.config
-
-  val is_available : t -> bool
-end
-
 type prover =
-  | Why3 of Why3_prover.t (* Prover via WHY *)
+  | Why3 of Why3Provers.t (* Prover via WHY *)
   | NativeAltErgo (* Direct Alt-Ergo *)
   | NativeCoq     (* Direct Coq and Coqide *)
   | Qed           (* Qed Solver *)
@@ -102,7 +73,6 @@ type config = {
   stepout : int option ;
 }
 
-
 val current : unit -> config (** Current parameters *)
 val default : config (** all None *)
 
@@ -124,6 +94,7 @@ type verdict =
 
 type result = {
   verdict : verdict ;
+  cached : bool ;
   solver_time : float ;
   prover_time : float ;
   prover_steps : int ;
@@ -136,12 +107,14 @@ val valid : result
 val checked : result
 val invalid : result
 val unknown : result
-val stepout : result
+val stepout : int -> result
 val timeout : int -> result
 val computing : (unit -> unit) -> result
 val failed : ?pos:Lexing.position -> string -> result
 val kfailed : ?pos:Lexing.position -> ('a,Format.formatter,unit,result) format4 -> 'a
-val result : ?solver:float -> ?time:float -> ?steps:int -> verdict -> result
+val cached : result -> result (** only for true verdicts *)
+
+val result : ?cached:bool -> ?solver:float -> ?time:float -> ?steps:int -> verdict -> result
 
 val is_auto : prover -> bool
 val is_verdict : result -> bool
@@ -160,8 +133,5 @@ val best : result list -> result
 val dkey_no_time_info: Wp_parameters.category
 val dkey_no_step_info: Wp_parameters.category
 val dkey_no_goals_info: Wp_parameters.category
+val dkey_no_cache_info: Wp_parameters.category
 val dkey_success_only: Wp_parameters.category
-
-(** {2 Why3} *)
-
-val why3_config: Why3.Whyconf.config Lazy.t
diff --git a/src/plugins/wp/Why3Provers.ml b/src/plugins/wp/Why3Provers.ml
new file mode 100644
index 0000000000000000000000000000000000000000..1bb6c8bd1834057ffb792bfb0ba0a0f1d03cf659
--- /dev/null
+++ b/src/plugins/wp/Why3Provers.ml
@@ -0,0 +1,114 @@
+(**************************************************************************)
+(*                                                                        *)
+(*  This file is part of WP plug-in of Frama-C.                           *)
+(*                                                                        *)
+(*  Copyright (C) 2007-2019                                               *)
+(*    CEA (Commissariat a l'energie atomique et aux energies              *)
+(*         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).            *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* -------------------------------------------------------------------------- *)
+(* --- Why3 Config & Provers                                              --- *)
+(* -------------------------------------------------------------------------- *)
+
+let cfg = lazy
+  begin
+    try
+      Why3.Whyconf.read_config None
+    with exn ->
+      Wp_parameters.abort "%a" Why3.Exn_printer.exn_printer exn
+  end
+
+let version = Why3.Config.version
+let config () = Lazy.force cfg
+
+let configure =
+  let todo = ref true in
+  begin fun () ->
+    if !todo then
+      begin
+        let args = Array.of_list ("why3"::Wp_parameters.WhyFlags.get ()) in
+        begin try
+            Arg.parse_argv ~current:(ref 0) args
+              (Why3.Debug.Args.[desc_debug;desc_debug_all;desc_debug_list])
+              (fun _ -> raise (Arg.Help "Unknown why3 option"))
+              "Why3 options"
+          with Arg.Bad s -> Wp_parameters.abort "%s" s
+        end;
+        ignore (Why3.Debug.Args.option_list ());
+        Why3.Debug.Args.set_flags_selected ();
+        todo := false
+      end
+  end
+
+type t = Why3.Whyconf.prover
+
+let find_opt s =
+  try
+    let config = Lazy.force cfg in
+    let filter = Why3.Whyconf.parse_filter_prover s in
+    let filter = Why3.Whyconf.filter_prover_with_shortcut config filter in
+    Some ((Why3.Whyconf.filter_one_prover config filter).Why3.Whyconf.prover)
+  with
+  | Why3.Whyconf.ProverNotFound _
+  | Why3.Whyconf.ParseFilterProver _
+  | Why3.Whyconf.ProverAmbiguity _  ->
+      None
+
+let find ?donotfail s =
+  try
+    try
+      let config = Lazy.force cfg in
+      let filter = Why3.Whyconf.parse_filter_prover s in
+      let filter = Why3.Whyconf.filter_prover_with_shortcut config filter in
+      (Why3.Whyconf.filter_one_prover config filter).Why3.Whyconf.prover
+    with
+    | Why3.Whyconf.ProverNotFound _ as exn when donotfail <> None ->
+        Wp_parameters.warning ~once:true "%a" Why3.Exn_printer.exn_printer exn;
+        (** from Why3.Whyconf.parse_filter_prover *)
+        let sl = Why3.Strings.rev_split ',' s in
+        (* reverse order *)
+        let prover_name, prover_version, prover_altern =
+          match sl with
+          | [name] -> name,"",""
+          | [version;name] -> name,version,""
+          | [altern;version;name] -> name,version,altern
+          | _ -> raise (Why3.Whyconf.ParseFilterProver s) in
+        { Why3.Whyconf.prover_name; Why3.Whyconf.prover_version; Why3.Whyconf.prover_altern }
+  with
+  | ( Why3.Whyconf.ProverNotFound _
+    | Why3.Whyconf.ParseFilterProver _
+    | Why3.Whyconf.ProverAmbiguity _ ) as exn ->
+      Wp_parameters.abort "%a" Why3.Exn_printer.exn_printer exn
+
+let print = Why3.Whyconf.prover_parseable_format
+let title p = Pretty_utils.sfprintf "%a" Why3.Whyconf.print_prover p
+let compare = Why3.Whyconf.Prover.compare
+
+let provers () =
+  Why3.Whyconf.Mprover.keys (Why3.Whyconf.get_provers (config ()))
+
+let provers_set () : Why3.Whyconf.Sprover.t =
+  Why3.Whyconf.Mprover.domain (Why3.Whyconf.get_provers (config ()))
+
+let is_available p =
+  Why3.Whyconf.Mprover.mem p (Why3.Whyconf.get_provers (config ()))
+
+let has_shortcut p s =
+  match Why3.Wstdlib.Mstr.find_opt s
+          (Why3.Whyconf.get_prover_shortcuts (config ())) with
+  | None -> false
+  | Some p' -> Why3.Whyconf.Prover.equal p p'
diff --git a/src/plugins/wp/Why3Provers.mli b/src/plugins/wp/Why3Provers.mli
new file mode 100644
index 0000000000000000000000000000000000000000..a68eeb567d8caab7089bd8d82af71bfbfb7c1a25
--- /dev/null
+++ b/src/plugins/wp/Why3Provers.mli
@@ -0,0 +1,41 @@
+(**************************************************************************)
+(*                                                                        *)
+(*  This file is part of WP plug-in of Frama-C.                           *)
+(*                                                                        *)
+(*  Copyright (C) 2007-2019                                               *)
+(*    CEA (Commissariat a l'energie atomique et aux energies              *)
+(*         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).            *)
+(*                                                                        *)
+(**************************************************************************)
+
+val version : string
+val config : unit -> Why3.Whyconf.config
+val configure : unit -> unit
+
+type t = Why3.Whyconf.prover
+
+val find_opt : string -> t option
+val find : ?donotfail:unit -> string -> t
+
+val print : t -> string
+val title : t -> string
+val compare : t -> t -> int
+
+val provers : unit -> t list
+val provers_set : unit -> Why3.Whyconf.Sprover.t
+val is_available : t -> bool
+val has_shortcut : t -> string -> bool
+
+(**************************************************************************)
diff --git a/src/plugins/wp/doc/manual/wp_plugin.tex b/src/plugins/wp/doc/manual/wp_plugin.tex
index b20427d8549f8af88dcb751ba51374eb1940ea54..1adc2340ce98b37731b01dfb86985be407be87b3 100644
--- a/src/plugins/wp/doc/manual/wp_plugin.tex
+++ b/src/plugins/wp/doc/manual/wp_plugin.tex
@@ -283,6 +283,8 @@ This mode is well suited for replaying a proof bench, by using a combination of
 
 The \verb+tip+ prover is similar, except that it never runs sub-goals that are known to be stuck but updates the proof scripts on success or when an automated proof fails. Using the \verb+tip+ prover is less time consuming and eventually prepares new scripts for failed proofs to be edited later under the TIP.
 
+Notice that, as soon as you have setup a wp-session directory, you benefit from cache facilities to speedup your proofs. Consult Section~\ref{wp-cache} for details.
+
 \clearpage
 A typical proof session consists then in the following stages:
 
@@ -1153,6 +1155,8 @@ However, to use \textsf{Alt-Ergo 2.0.0} \emph{via} \textsf{Why-3}, you shall use
 the native support of \textsf{Alt-Ergo} prover. Finally, since \textsf{Why-3} also provides the alias
 \verb+altergo+ for this prover, \verb+-wp-prover altergo+ will also run it \emph{via} \textsf{Why-3}.
 
+Notice that \textsf{Why-3} provers benefit from a cache management when used in combination with a \textsf{WP}-session, see Section~\ref{wp-cache} for more details.
+
 %% \paragraph{Sessions.}
 %% Your \textsf{Why3} session is saved in the \texttt{"project.session"}
 %% sub-directory of \texttt{-wp-out}. You may run
@@ -1364,6 +1368,36 @@ by a link (`\user{link};'). The available tags are depicted on figure~\ref{wp-dr
 \end{figure}
 
 \clearpage
+\subsection{Proof Cache}
+\label{wp-cache}
+
+Running provers have a cost in terms of memory and CPU resources. When working
+interactively or incrementally, it is often the case where most proof obligations remain unchanged
+from one \textsf{WP} execution to the other. To reduce this costs, a cache of prover results can be used
+and stored in your session.
+
+The cache can only be used with \textsf{Why-3} provers, it does not work with native \textsf{Alt-Ergo} and \textsf{Coq} provers. There are different ways of using the cache, depending on your precise needs.
+The main option to control cache usage is \verb+-wp-cache+, documented below:
+
+\begin{description}
+\item[\tt -wp-cache <mode>] selects the cache mode to use with why3 provers. The default mode is \verb'update' if \verb+-wp-session+ is set, and \verb+none+ otherwize. The cache entries
+are stored in the session directory, which would be \verb+./frama-c/wp/cache+ by default.
+\end{description}
+
+The available cache modes are described below:
+\begin{description}
+\item [\tt -wp-cache update]: use cache entries or run the provers, and store new results in the cache. This mode is useful when you are working interactively : proofs can be partial and volatile, and you want to accumulate and keep as much previous results as you can.
+\item [\tt -wp-cache cleanup]: same as \verb+update+ mode but at the end of \textsf{Frama-C} execution, any cache entry that was not used nor updated will be deleted. This mode shall be only used when you want to cleanup your cache with old useless entries, typically at the end of an interactive session.
+\item [\tt -wp-cache replay]: same as \verb+update+ mode but new results are \emph{not} stored in the cache. This mode is useful for continuous integration, when you are not sure your cache is complete but don't want to modify it.
+\item [\tt -wp-cache offline]: similar to \verb+replay+ mode but cache entries are the unique source of results. Provers are never run and missing cache entries would result in a «~Failed~» verdict. This mode is useful to fasten continuous integration and enforcing cache completeness.
+\item [\tt -wp-cache rebuild]: force prover execution and store all results in the cache. Previous results will be replaced with new onces, but entries for non relevant proofs would be kept and you might need a cleanup stage after. This mode is useful when you modify you why3 or prover installation and you don't want to reuse your previous cache entries.
+\item [\tt -wp-cache none]: do not use nor modify cache entries; provers are run normally. This option must be used if you have a session set and you don't want to use the cache, since the default is mode \verb+update+ in this case. But you probably always to benefit from a cache when you have an (interactive) session.
+\end{description}
+
+When using cache with a non-\verb+offline+ mode, time and steps limits recorded in the cache are compared to the command line settings to produce meaningful and consistent results. Hence, if you provide more time or more steps from the command line than before, the prover would be run again. If you provide less or equal limits, the cache entries are reused, but \textsf{WP} still report the cached time and step limits to inform you of your previous attempts. For instance, if you have in the cache a « Valid » entry with time 12.4s and re-run it with a timeout of 5s, you will have a « Timeout » result with time 12.4s printed on the console.
+
+Cached result are indicated on the standard output. You might also have additional information with \verb+-wp-msg-key cache+ or you might silent them with \verb+-wp-msg-key no-cache-info+.
+
 \section{Plug-in Developer Interface}
 \label{wp-api}
 
diff --git a/src/plugins/wp/register.ml b/src/plugins/wp/register.ml
index 641359887d9438f08d426b381c62f7790180c784..29f760ae9ee6aec093df4f4c94a50864a65e5601 100644
--- a/src/plugins/wp/register.ml
+++ b/src/plugins/wp/register.ml
@@ -201,6 +201,7 @@ type pstat = {
   mutable proved : int ;
   mutable unknown : int ;
   mutable interrupted : int ;
+  mutable incache : int ;
   mutable failed : int ;
   mutable n_time : int ;   (* nbr of measured times *)
   mutable a_time : float ; (* sum of measured times *)
@@ -239,6 +240,7 @@ let get_pstat p =
       interrupted = 0 ;
       failed = 0 ;
       steps = 0 ;
+      incache = 0 ;
       n_time = 0 ;
       a_time = 0.0 ;
       u_time = 0.0 ;
@@ -297,6 +299,7 @@ let do_progress goal msg =
 let do_wpo_stat goal prover res =
   let s = get_pstat prover in
   let open VCS in
+  if res.cached then s.incache <- succ s.incache ;
   match res.verdict with
   | Checked | NoResult | Computing _ | Invalid | Unknown ->
       s.unknown <- succ s.unknown
@@ -329,23 +332,17 @@ let do_wpo_result goal prover res =
       do_wpo_stat goal prover res ;
     end
 
-let do_why3_result goal prover res =
-  if VCS.is_verdict res then
-    begin
-      do_wpo_stat goal prover res ;
-      let open VCS in
-      if res.verdict <> Valid then
-        Wp_parameters.result
-          "[%a] Goal %s : %a"
-          VCS.pp_prover prover (Wpo.get_gid goal)
-          VCS.pp_result res ;
-    end
-
 let do_wpo_success goal s =
   if not (Wp_parameters.Check.get ()) then
-    match s with
-    | None ->
-        if not (Wp_parameters.Generate.get ()) then
+    if Wp_parameters.Generate.get () then
+      match s with
+      | None -> ()
+      | Some prover ->
+          Wp_parameters.feedback ~ontty:`Silent
+            "[%a] Goal %s : Valid" VCS.pp_prover prover (Wpo.get_gid goal)
+    else
+      match s with
+      | None ->
           begin
             match Wpo.get_results goal with
             | [p,r] ->
@@ -363,9 +360,16 @@ let do_wpo_success goal s =
                       ) pres ;
                   end
           end
-    | Some prover ->
-        Wp_parameters.feedback ~ontty:`Silent
-          "[%a] Goal %s : Valid" VCS.pp_prover prover (Wpo.get_gid goal)
+      | Some (VCS.Tactical as p) ->
+          Wp_parameters.feedback ~ontty:`Silent
+            "[%a] Goal %s : Valid"
+            VCS.pp_prover p (Wpo.get_gid goal)
+      | Some p ->
+          let r = Wpo.get_result goal p in
+          Wp_parameters.feedback ~ontty:`Silent
+            "[%a] Goal %s : %a"
+            VCS.pp_prover p (Wpo.get_gid goal)
+            VCS.pp_result r
 
 let do_report_time fmt s =
   begin
@@ -414,6 +418,8 @@ let do_report_stopped fmt s =
         Format.fprintf fmt " (interrupted: %d)" s.interrupted ;
       if s.unknown > 0 then
         Format.fprintf fmt " (unknown: %d)" s.unknown ;
+      if s.incache > 0 then
+        Format.fprintf fmt " (cached: %d)" s.incache ;
     end
 
 let do_report_prover_stats pp_prover fmt (p,s) =
@@ -434,18 +440,17 @@ let do_report_scheduled () =
       let plural = if !exercised > 1 then "s" else "" in
       Wp_parameters.result "%d goal%s generated" !exercised plural
     else
-      begin
-        let proved = GOALS.cardinal !proved in
-        Wp_parameters.result "%t"
-          (fun fmt ->
-             Format.fprintf fmt "Proved goals: %4d / %d@\n" proved !scheduled ;
-             Pretty_utils.pp_items
-               ~min:12 ~align:`Left
-               ~title:(fun (prover,_) -> VCS.title_of_prover prover)
-               ~iter:(fun f -> PM.iter (fun p s -> f (p,s)) !provers)
-               ~pp_title:(fun fmt a -> Format.fprintf fmt "%s:" a)
-               ~pp_item:do_report_prover_stats fmt) ;
-      end
+      let proved = GOALS.cardinal !proved in
+      Wp_parameters.result "%t"
+        begin fun fmt ->
+          Format.fprintf fmt "Proved goals: %4d / %d@\n" proved !scheduled ;
+          Pretty_utils.pp_items
+            ~min:12 ~align:`Left
+            ~title:(fun (prover,_) -> VCS.title_of_prover prover)
+            ~iter:(fun f -> PM.iter (fun p s -> f (p,s)) !provers)
+            ~pp_title:(fun fmt a -> Format.fprintf fmt "%s:" a)
+            ~pp_item:do_report_prover_stats fmt ;
+        end
 
 let do_list_scheduled_result () =
   begin
@@ -453,6 +458,58 @@ let do_list_scheduled_result () =
     clear_scheduled () ;
   end
 
+(* ------------------------------------------------------------------------ *)
+(* ---  Caching                                                         --- *)
+(* ------------------------------------------------------------------------ *)
+
+let dkey_cache = Wp_parameters.register_category "cache"
+
+let do_report_cache_usage mode =
+  let hits = ProverWhy3.get_hits () in
+  let miss = ProverWhy3.get_miss () in
+  let removed = ProverWhy3.get_removed () in
+  if hits <= 0 && miss <= 0 then
+    Wp_parameters.result "[Cache] not used"
+  else
+    Wp_parameters.result "[Cache]%t"
+      begin fun fmt ->
+        let sep = ref " " in
+        let pp_cache fmt n job =
+          if n > 0 then
+            ( Format.fprintf fmt "%s%s:%d" !sep job n ; sep := ", " ) in
+        match mode with
+        | ProverWhy3.NoCache -> ()
+        | ProverWhy3.Replay ->
+            pp_cache fmt hits "found" ;
+            pp_cache fmt miss "missed" ;
+            Format.pp_print_newline fmt () ;
+        | ProverWhy3.Offline ->
+            pp_cache fmt hits "found" ;
+            pp_cache fmt miss "failed" ;
+            Format.pp_print_newline fmt () ;
+        | ProverWhy3.Update ->
+            pp_cache fmt hits "found" ;
+            pp_cache fmt miss "updated" ;
+            Format.pp_print_newline fmt () ;
+        | ProverWhy3.Cleanup ->
+            pp_cache fmt hits "found" ;
+            pp_cache fmt miss "missed" ;
+            pp_cache fmt removed "removed" ;
+            Format.pp_print_newline fmt () ;
+        | ProverWhy3.Rebuild ->
+            pp_cache fmt (hits+miss) "updated" ;
+            Format.pp_print_newline fmt () ;
+      end
+
+(* registered at frama-c (normal) exit *)
+let do_cache_cleanup () =
+  begin
+    let mode = ProverWhy3.get_mode () in
+    ProverWhy3.cleanup_cache ~mode ;
+    if Wp_parameters.has_dkey dkey_cache
+    then do_report_cache_usage mode ;
+  end
+
 (* ------------------------------------------------------------------------ *)
 (* ---  Proving                                                         --- *)
 (* ------------------------------------------------------------------------ *)
@@ -558,8 +615,7 @@ let compute_auto ~mode =
                  "Strategy -wp-auto '%s' unknown (ignored)." id
         ) auto ;
       mode.auto <- List.rev mode.auto ;
-      if mode.auto <> [] then
-        ( mode.tactical <- true ; mode.update <- true ) ;
+      if mode.auto <> [] then mode.tactical <- true ;
     end
 
 let do_update_session mode iter =
@@ -810,9 +866,9 @@ let pp_wp_parameters fmt =
     then Format.pp_print_string fmt " -wp-no-prune" ;
     if Wp_parameters.Split.get () then Format.pp_print_string fmt " -wp-split" ;
     let tm = Wp_parameters.Timeout.get () in
-    if tm > 10 then Format.fprintf fmt " -wp-timeout %d" tm ;
+    if tm <> 10 then Format.fprintf fmt " -wp-timeout %d" tm ;
     let st = Wp_parameters.Steps.get () in
-    if tm > 10 then Format.fprintf fmt " -wp-steps %d" st ;
+    if st > 0 then Format.fprintf fmt " -wp-steps %d" st ;
     if not (Kernel.SignedOverflow.get ()) then
       Format.pp_print_string fmt " -no-warn-signed-overflow" ;
     if Kernel.UnsignedOverflow.get () then
@@ -834,16 +890,16 @@ let () = Cmdline.run_after_setting_files
        if Wp_parameters.has_dkey dkey_shell then
          Log.print_on_output pp_wp_parameters)
 
-let () = Cmdline.run_after_configuring_stage ProverWhy3.parse_why3_options
+let () = Cmdline.run_after_configuring_stage Why3Provers.configure
 
 let do_prover_detect () =
   if not !Config.is_gui && Wp_parameters.Detect.get () then
-    let provers = VCS.Why3_prover.provers () in
+    let provers = Why3Provers.provers () in
     if provers = [] then
       Wp_parameters.result "No Why3 provers detected."
     else
       let open Why3.Whyconf in
-      let shortcuts = get_prover_shortcuts (VCS.Why3_prover.get_config ()) in
+      let shortcuts = get_prover_shortcuts (Why3Provers.config ()) in
       List.iter
         (fun p ->
            Wp_parameters.result "Prover %10s %-10s %s [%t%a]"
@@ -857,40 +913,9 @@ let do_prover_detect () =
         ) provers
 
 (* ------------------------------------------------------------------------ *)
-(* ---  Main Entry Point                                                --- *)
+(* ---  Main Entry Points                                               --- *)
 (* ------------------------------------------------------------------------ *)
 
-(*
-(* This filter can be changed to make exceptions interrupting
-   the sequence immediately *)
-let catch_exn (_:exn) =
-  not (Wp_parameters.has_dkey "raised")
-
-(* This order can be changed *)
-let reraised_exn (first:exn) (_last:exn) = Some first
-
-(* Don't use Extlib.try_finally:
-   No exception is used for control here.
-   Backtrace is dumped here for debugging purpose.
-   We just record one of the raised exceptions (to be raised again),
-   while ensuring all tasks are finally executed. *)
-let protect err job =
-  try job ()
-  with e when catch_exn e ->
-    let b = Printexc.get_raw_backtrace () in
-    Wp_parameters.failure "%s@\n%s"
-      (Printexc.to_string e)
-      (Printexc.raw_backtrace_to_string b) ;
-    match !err with
-    | None -> err := Some e
-    | Some previous -> err := reraised_exn previous e
-
-let sequence jobs =
-  let err = ref None in
-  List.iter (protect err) jobs ;
-  match !err with None -> () | Some e -> raise e
-*)
-
 let rec try_sequence jobs () = match jobs with
   | [] -> ()
   | head :: tail ->
@@ -921,4 +946,7 @@ let main = sequence [
     (fun () -> Wp_parameters.debug ~dkey:job_key "Stop WP plugin...@.") ;
   ]
 
+let () = Cmdline.at_normal_exit do_cache_cleanup
 let () = Db.Main.extend main
+
+(* ------------------------------------------------------------------------ *)
diff --git a/src/plugins/wp/share/wp.driver b/src/plugins/wp/share/wp.driver
index a14b3702ffc32e1ad33dd031ac38724ca1d0ed72..271c470da94179003bfc30a861aa583070eb56e7 100644
--- a/src/plugins/wp/share/wp.driver
+++ b/src/plugins/wp/share/wp.driver
@@ -151,7 +151,6 @@ why3.import += "real.PowerReal" ;
 coq.file += "coqwp:int/Exponentiation.v" ;
 coq.file += "coqwp:int/Power.v" ;
 coq.file += "coqwp:real/PowerReal.v" ;
-altergo.file += "ergo/int.Exponentiation.mlw" ;
 altergo.file += "ergo/int.Power.mlw" ;
 altergo.file += "ergo/real.PowerReal.mlw" ;
 
diff --git a/src/plugins/wp/tests/native.report b/src/plugins/wp/tests/native.report
new file mode 100644
index 0000000000000000000000000000000000000000..9bbb9d7afd12b171c4808da76b1c1c3864c8d346
--- /dev/null
+++ b/src/plugins/wp/tests/native.report
@@ -0,0 +1,11 @@
+@CONSOLE
+@ZERO "  - "
+@HEAD
+@CHAPTER
+-------------------------------------------------------------
+%chapter  &18:  WP &26: Alt-Ergo (Native) &42: Total &51:Success
+@SECTION
+%name &18:%wp &24: %{native-alt-ergo} %range &42:%total &51: %success%%
+@TAIL
+-------------------------------------------------------------
+@END
diff --git a/src/plugins/wp/tests/test_config_qualif b/src/plugins/wp/tests/test_config_qualif
index a7498045f8f16179023fc8d32b488e906df1a4ad..838af174f9304c7c29ae2f637aecb8f9b77290eb 100644
--- a/src/plugins/wp/tests/test_config_qualif
+++ b/src/plugins/wp/tests/test_config_qualif
@@ -1,3 +1,3 @@
-CMD: @frama-c@ -no-autoload-plugins -load-module wp -wp -wp-par 1 -wp-steps 1500 -wp-timeout 45 -wp-share ./share -wp-msg-key shell,success-only -wp-report-json @PTEST_DIR@/oracle@PTEST_CONFIG@/@PTEST_NAME@.@PTEST_NUMBER@.report.json:@PTEST_DIR@/result@PTEST_CONFIG@/@PTEST_NAME@.@PTEST_NUMBER@.report.json -wp-report tests/qualif.report -wp-out @PTEST_DIR@/result@PTEST_CONFIG@/@PTEST_NAME@.@PTEST_NUMBER@.out @PTEST_FILE@
+CMD: @frama-c@ -no-autoload-plugins -load-module wp -wp -wp-par 1 -wp-share ./share -wp-msg-key shell,success-only -wp-report-json @PTEST_DIR@/oracle@PTEST_CONFIG@/@PTEST_NAME@.@PTEST_NUMBER@.report.json:@PTEST_DIR@/result@PTEST_CONFIG@/@PTEST_NAME@.@PTEST_NUMBER@.report.json -wp-report tests/qualif.report -wp-session @PTEST_DIR@/oracle@PTEST_CONFIG@/@PTEST_NAME@.@PTEST_NUMBER@.session -wp-cache offline @PTEST_FILE@
 LOG: @PTEST_NAME@.@PTEST_NUMBER@.report.json
 OPT:
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/sharing.0.session/cache/581afbf7dec3e6ca7cfa496b2276fc75.json b/src/plugins/wp/tests/wp/oracle_qualif/sharing.0.session/cache/581afbf7dec3e6ca7cfa496b2276fc75.json
new file mode 100644
index 0000000000000000000000000000000000000000..24fe2dc1d30aa8c6d1fabf8318def2ae8f9d4fdd
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/sharing.0.session/cache/581afbf7dec3e6ca7cfa496b2276fc75.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.2396,
+  "steps": 35 }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/sharing.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/sharing.res.oracle
index 1af0a4978ea76984ab04a079184ecaa68cc9f61c..29c9c66f579e875d06ee174d2c67109ac9dd0506 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/sharing.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/sharing.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp/sharing.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/0fc0c87545f218082b029769b99f3cbb.json b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/0fc0c87545f218082b029769b99f3cbb.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/0fc0c87545f218082b029769b99f3cbb.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/21d803410dbbfd70cdb668492467b60e.json b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/21d803410dbbfd70cdb668492467b60e.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/21d803410dbbfd70cdb668492467b60e.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/6ebbb9ba0d75ceab60327c5edfcba19f.json b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/6ebbb9ba0d75ceab60327c5edfcba19f.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/6ebbb9ba0d75ceab60327c5edfcba19f.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/72bbc5126a5242466cbb895cebf6027f.json b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/72bbc5126a5242466cbb895cebf6027f.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/72bbc5126a5242466cbb895cebf6027f.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/c637f422de13d8e95f7a1a89edea67c2.json b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/c637f422de13d8e95f7a1a89edea67c2.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d38fde3c77075a83a94897ee6fb6eb566967ada
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/c637f422de13d8e95f7a1a89edea67c2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0138,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/dd70bd3d9b6ee92aba6887c09808a980.json b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/dd70bd3d9b6ee92aba6887c09808a980.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/dd70bd3d9b6ee92aba6887c09808a980.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/e77f1bc90faed3c7ee344a6487f26e51.json b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/e77f1bc90faed3c7ee344a6487f26e51.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/e77f1bc90faed3c7ee344a6487f26e51.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/eedbbd1cdf64aa6012b869697f66f2b1.json b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/eedbbd1cdf64aa6012b869697f66f2b1.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/eedbbd1cdf64aa6012b869697f66f2b1.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/faf120d58a951fa6145839b46c1df0a7.json b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/faf120d58a951fa6145839b46c1df0a7.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.0.session/cache/faf120d58a951fa6145839b46c1df0a7.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.res.oracle
index 13b5a090e324472be712d4732fd5b278e6d4cc62..ee7e3d8c42bb797918eae2acffced0f9b937cab3 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp/stmtcompiler_test.i (no preprocessing)
 [kernel] tests/wp/stmtcompiler_test.i:136: Warning: 
   Body of function if_assert falls-through. Adding a return statement
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test_rela.0.session/cache/8bf6a3f121519d7863ac34c9cb097dba.json b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test_rela.0.session/cache/8bf6a3f121519d7863ac34c9cb097dba.json
new file mode 100644
index 0000000000000000000000000000000000000000..75d005aa7fb9125a568125bc895626130ce402d5
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test_rela.0.session/cache/8bf6a3f121519d7863ac34c9cb097dba.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0473,
+  "steps": 175 }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test_rela.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test_rela.res.oracle
index 23141b87e966b27e9d81d6feeec83fdabf24c317..2867ef1ce9fac2398e511c7b2daaddba89f5b162 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test_rela.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test_rela.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp/stmtcompiler_test_rela.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.res.oracle
index 8ef82489efb80a0b5a3bc45ed959a8781414c934..e7058249e0382a76ed77d2d61f82540675ecff40 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp [...]
+# frama-c -wp -wp-timeout 1 [...]
 [kernel] Parsing tests/wp/wp_behav.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/2c21c483e6514092e4297c8c7c7f5c27.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/2c21c483e6514092e4297c8c7c7f5c27.json
new file mode 100644
index 0000000000000000000000000000000000000000..f125ac9ec4dcdfc73907c1aa0fa82bc5a962510f
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/2c21c483e6514092e4297c8c7c7f5c27.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0136,
+  "steps": 8 }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/2f1b7133d8eb145b63e2eb498c04d03d.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/2f1b7133d8eb145b63e2eb498c04d03d.json
new file mode 100644
index 0000000000000000000000000000000000000000..852d81aab273985772cb5b7d655f3f996ee7db5d
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/2f1b7133d8eb145b63e2eb498c04d03d.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 1. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/36a0dd93457388b6c6c84312921f068a.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/36a0dd93457388b6c6c84312921f068a.json
new file mode 100644
index 0000000000000000000000000000000000000000..852d81aab273985772cb5b7d655f3f996ee7db5d
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/36a0dd93457388b6c6c84312921f068a.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 1. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/afa6e44ddb6ea474a65613aec1f876dc.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/afa6e44ddb6ea474a65613aec1f876dc.json
new file mode 100644
index 0000000000000000000000000000000000000000..f68a9abe83553df8cd9f596e2a5844b20cca8ef1
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/afa6e44ddb6ea474a65613aec1f876dc.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0111,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/c23fba7e5fe63bc7e55fd7ea9b88cbe9.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/c23fba7e5fe63bc7e55fd7ea9b88cbe9.json
new file mode 100644
index 0000000000000000000000000000000000000000..852d81aab273985772cb5b7d655f3f996ee7db5d
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.session/cache/c23fba7e5fe63bc7e55fd7ea9b88cbe9.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 1. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.res.oracle
index 5f62257e35df9f7486ce5e9014d03c72e861fe8c..3cd8c9dc87ef1fecab861c4a376920f4b9ef4b5a 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp/wp_behav.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/0fb970e5c6ab3888a204139d3cd2b997.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/0fb970e5c6ab3888a204139d3cd2b997.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/0fb970e5c6ab3888a204139d3cd2b997.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/11ff8a4041ea06001123f69473d6be27.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/11ff8a4041ea06001123f69473d6be27.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/11ff8a4041ea06001123f69473d6be27.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/757b09ca6b9492a26cc4218a6f427fb3.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/757b09ca6b9492a26cc4218a6f427fb3.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/757b09ca6b9492a26cc4218a6f427fb3.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/8f2ec7b0ccefab812d364dabe9f39174.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/8f2ec7b0ccefab812d364dabe9f39174.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/8f2ec7b0ccefab812d364dabe9f39174.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/ab1bfbbefdd06631a6280e248d23e12c.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/ab1bfbbefdd06631a6280e248d23e12c.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.1.session/cache/ab1bfbbefdd06631a6280e248d23e12c.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.0.session/cache/e780596669cdd012782072be66d12e4b.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.0.session/cache/e780596669cdd012782072be66d12e4b.json
new file mode 100644
index 0000000000000000000000000000000000000000..8fe8cd8eeab2d23ac6fc78fa1e2f7aa1c52ecc5b
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.0.session/cache/e780596669cdd012782072be66d12e4b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0141,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.res.oracle
index da92bd060d15c52022f318aa3661baed6105fb70..ef2759505d0f467a32589a8044f365c13b5c479f 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp/wp_call_pre.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_eqb.0.session/cache/7fee9fe07f256d953327c9088c7a94c0.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_eqb.0.session/cache/7fee9fe07f256d953327c9088c7a94c0.json
new file mode 100644
index 0000000000000000000000000000000000000000..19bedd11b4f1bb5bddeed4062928651721740d82
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_eqb.0.session/cache/7fee9fe07f256d953327c9088c7a94c0.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0097,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_eqb.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_eqb.res.oracle
index f52504145b9fc163aaf39a9866281cefde1009d1..bdf16d02cb822648ab909aaf2cb644ae3a2b0bc7 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_eqb.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_eqb.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp/wp_eqb.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.0.session/cache/1528cf42525a01f3944e99e556354442.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.0.session/cache/1528cf42525a01f3944e99e556354442.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.0.session/cache/1528cf42525a01f3944e99e556354442.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.0.session/cache/51575c7e603242f75c27b4c733019a3a.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.0.session/cache/51575c7e603242f75c27b4c733019a3a.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.0.session/cache/51575c7e603242f75c27b4c733019a3a.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.0.session/cache/c23fba7e5fe63bc7e55fd7ea9b88cbe9.json b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.0.session/cache/c23fba7e5fe63bc7e55fd7ea9b88cbe9.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.0.session/cache/c23fba7e5fe63bc7e55fd7ea9b88cbe9.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.res.oracle
index 38dfb47769eeb1b9d12d6e16f6ea3038caced551..e0fba0eeebb5307fb82cf55a12fd2c2e16573800 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Hoare' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Hoare' [...]
 [kernel] Parsing tests/wp/wp_strategy.c (with preprocessing)
 [rte] annotating function bts0513
 [rte] annotating function bts0513_bis
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.res.oracle
index 181bf2a9fbc801af1b7c5c180d9c588ce3664f70..c423c72e13275ee12e1bdb02d896209543471042 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/arith.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.session/cache/22e8af89bab02c0376d0b76de0783ced.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.session/cache/22e8af89bab02c0376d0b76de0783ced.json
new file mode 100644
index 0000000000000000000000000000000000000000..004a045ce64e9001f7956412dcfc1fd15e11e234
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.session/cache/22e8af89bab02c0376d0b76de0783ced.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0297,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.session/cache/25352f9b51b5b51a92cd738b531b5cdf.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.session/cache/25352f9b51b5b51a92cd738b531b5cdf.json
new file mode 100644
index 0000000000000000000000000000000000000000..7df40143eb1ea3b8c34526e8602cbb998eaaca80
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.session/cache/25352f9b51b5b51a92cd738b531b5cdf.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0309,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.session/cache/eee79396f30abd45df8aaaa33f0bd73c.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.session/cache/eee79396f30abd45df8aaaa33f0bd73c.json
new file mode 100644
index 0000000000000000000000000000000000000000..948a3f2a27f289ba61ab502a1be19c403128d239
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.0.session/cache/eee79396f30abd45df8aaaa33f0bd73c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.028,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.1.res.oracle
index 22512c43596e59f57a7705dd602bcb75262e4cf8..e6f6bea9c6837fbe4e1acf05de0816079a05e4d9 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/arith.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.1.session/cache/0312839fb550e7a57a51a6de0c8a6d84.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.1.session/cache/0312839fb550e7a57a51a6de0c8a6d84.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/arith.1.session/cache/0312839fb550e7a57a51a6de0c8a6d84.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assign_array.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assign_array.res.oracle
index a532ef8d1cf5f449215c792de3edbfe8cdaa43c7..26d8e212c80f0473f2c48a77399cc126f5bef18f 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assign_array.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assign_array.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/assign_array.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.0.session/cache/0bb9326e4269583224fb2770b016800a.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.0.session/cache/0bb9326e4269583224fb2770b016800a.json
new file mode 100644
index 0000000000000000000000000000000000000000..b7ec5dc5562aaacac06a746574e7bb648a79246e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.0.session/cache/0bb9326e4269583224fb2770b016800a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0255,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.0.session/cache/27425d7dcb17564821b7f51bacad4897.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.0.session/cache/27425d7dcb17564821b7f51bacad4897.json
new file mode 100644
index 0000000000000000000000000000000000000000..336d4fedacf7636aa6bfa109fb295aeb0bb8bd70
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.0.session/cache/27425d7dcb17564821b7f51bacad4897.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0289,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.0.session/cache/9eee7a2ae5de6a1ff5a8b4e995114dbc.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.0.session/cache/9eee7a2ae5de6a1ff5a8b4e995114dbc.json
new file mode 100644
index 0000000000000000000000000000000000000000..c0b08c925b447e0866839d9c6dab0b663bb6e1ca
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.0.session/cache/9eee7a2ae5de6a1ff5a8b4e995114dbc.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0214,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.res.oracle
index 36a8e376b7408fea0f930f27b25d8136d8d71244..97318c56ec4ac5f12cc340cddbaff42b4b941a02 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_path.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/assigns_path.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.res.oracle
index 64c7d444dc045b089f594634841e43b7f2788ba4..db587673eacdddb3440b7b8425edaf73d39783ea 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/assigns_range.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/51be20ba77a29823228730006ea17235.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/51be20ba77a29823228730006ea17235.json
new file mode 100644
index 0000000000000000000000000000000000000000..5f4b5e0421655403864ffa87e35682952e1357e4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/51be20ba77a29823228730006ea17235.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0136,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/71b8977e0240d06ce312ec58fd2cebe2.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/71b8977e0240d06ce312ec58fd2cebe2.json
new file mode 100644
index 0000000000000000000000000000000000000000..2a3a84a5b3e82215ca5a1515ee62f50140e9a7ad
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/71b8977e0240d06ce312ec58fd2cebe2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0116,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/7ef721ab5f79fd73a875a1100883ff5a.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/7ef721ab5f79fd73a875a1100883ff5a.json
new file mode 100644
index 0000000000000000000000000000000000000000..e9ae0cee5ac14a215bebd5f2d9b226e372e40a43
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/7ef721ab5f79fd73a875a1100883ff5a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0119,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/84f093e6097df47f748e4706e4b385ff.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/84f093e6097df47f748e4706e4b385ff.json
new file mode 100644
index 0000000000000000000000000000000000000000..e151ea2b3327b06120b4c52cfc494254e9291157
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/84f093e6097df47f748e4706e4b385ff.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0145,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/ebb4a8c6f3fc630f681a9fa5a848cc32.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/ebb4a8c6f3fc630f681a9fa5a848cc32.json
new file mode 100644
index 0000000000000000000000000000000000000000..45855daf2926d84488b86023b5ee09122ff85027
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.0.session/cache/ebb4a8c6f3fc630f681a9fa5a848cc32.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0141,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.res.oracle
index 64e97d8799e637cf957808bd06d8e7f3eeb7217d..740d097ec798cbd2d89caf8208b429bcce99090c 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/assigns_range.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.session/cache/09d5c02631d5ca87b084ca3e64dc38d1.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.session/cache/09d5c02631d5ca87b084ca3e64dc38d1.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.session/cache/09d5c02631d5ca87b084ca3e64dc38d1.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.session/cache/801fd980d7f251786363b0010fdb0d7c.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.session/cache/801fd980d7f251786363b0010fdb0d7c.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.session/cache/801fd980d7f251786363b0010fdb0d7c.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.session/cache/c77d39c9e3d9f3a0a1a2eba86ddf32bb.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.session/cache/c77d39c9e3d9f3a0a1a2eba86ddf32bb.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigns_range.1.session/cache/c77d39c9e3d9f3a0a1a2eba86ddf32bb.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/18272cbcbacbdee3afc9f607c0898da8.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/18272cbcbacbdee3afc9f607c0898da8.json
new file mode 100644
index 0000000000000000000000000000000000000000..f74798a850447311f4ad19d1d153e0bc718af55a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/18272cbcbacbdee3afc9f607c0898da8.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0318,
+  "steps": 32 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/bbb29605b3f16a545b51b5890bef9c4d.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/bbb29605b3f16a545b51b5890bef9c4d.json
new file mode 100644
index 0000000000000000000000000000000000000000..eadc6f8ecb0c615679e0d27a2d5ab2e6bb3d60d4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/bbb29605b3f16a545b51b5890bef9c4d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.035,
+  "steps": 45 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/c22b2b7de2cf2f354d9edafa47d34589.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/c22b2b7de2cf2f354d9edafa47d34589.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/c22b2b7de2cf2f354d9edafa47d34589.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/d40fe249206bb99bb022dc99c31f13c3.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/d40fe249206bb99bb022dc99c31f13c3.json
new file mode 100644
index 0000000000000000000000000000000000000000..14ae4896c5e36940906cce1cf5ae5de1cbe52b24
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/d40fe249206bb99bb022dc99c31f13c3.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0504,
+  "steps": 70 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/d82134accee9fa37acc671a4193d9c28.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/d82134accee9fa37acc671a4193d9c28.json
new file mode 100644
index 0000000000000000000000000000000000000000..322a5f6f3ed39d1a80c0c137082e16704481cbb5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/d82134accee9fa37acc671a4193d9c28.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.021,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/ebcd5db6abab43ea6e440b41c61de767.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/ebcd5db6abab43ea6e440b41c61de767.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/ebcd5db6abab43ea6e440b41c61de767.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/fa6ed598f056631f9bfaf5af5363a26b.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/fa6ed598f056631f9bfaf5af5363a26b.json
new file mode 100644
index 0000000000000000000000000000000000000000..f9a484c74305aa72de6bec22962968bd8276a675
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.0.session/cache/fa6ed598f056631f9bfaf5af5363a26b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0216,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.res.oracle
index 736e31a325f5fe26f4c6d63955528caff10fed60..a3493e036614f668d01b6b95a1002daeeadc1c45 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/axioms.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/axioms.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/base_offset.0.session/cache/31b7327f039e0b07f5212fb83a9e9e89.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/base_offset.0.session/cache/31b7327f039e0b07f5212fb83a9e9e89.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/base_offset.0.session/cache/31b7327f039e0b07f5212fb83a9e9e89.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/base_offset.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/base_offset.res.oracle
index 1af5465d13154a5483b11d033f0559997d780615..0ce1be644f70ca422444f04aeaae79657bc9ef53 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/base_offset.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/base_offset.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/base_offset.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.0.session/cache/1ecbe0b41a07f6fd2241aff3258cd377.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.0.session/cache/1ecbe0b41a07f6fd2241aff3258cd377.json
new file mode 100644
index 0000000000000000000000000000000000000000..59bffa2fc3d72f105a4e38cee4abca36cd4c024a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.0.session/cache/1ecbe0b41a07f6fd2241aff3258cd377.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.016,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.0.session/cache/22c1313f9df2b9bda80d2bb8c4d175fc.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.0.session/cache/22c1313f9df2b9bda80d2bb8c4d175fc.json
new file mode 100644
index 0000000000000000000000000000000000000000..5a0c518a6c360b49c31014425886cf612da5ea65
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.0.session/cache/22c1313f9df2b9bda80d2bb8c4d175fc.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0106,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.0.session/cache/4fc19b7c827e48214e31ff4f16d7a060.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.0.session/cache/4fc19b7c827e48214e31ff4f16d7a060.json
new file mode 100644
index 0000000000000000000000000000000000000000..ef756bd2b5a622a7441e1843fce782b872d7ca1f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.0.session/cache/4fc19b7c827e48214e31ff4f16d7a060.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0087,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.0.session/cache/7aa1ae97b0ddd96dc9a92948a21d089d.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.0.session/cache/7aa1ae97b0ddd96dc9a92948a21d089d.json
new file mode 100644
index 0000000000000000000000000000000000000000..c51630a609ad721be04ad11398c8241fbc6ead4e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.0.session/cache/7aa1ae97b0ddd96dc9a92948a21d089d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0352,
+  "steps": 26 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.res.oracle
index bcb6ca0c309bce06e75c6a2cb14755c8276fc028..23321ffd00c9408ab3d574a7d35bde27b552c618 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/bitwise.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise2.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise2.res.oracle
index 48fb4714a1f9e26815faeff51fb4f090a88f56f9..c76035e0829a7223ddc7e12af46569768e18b708 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise2.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/bitwise2.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/block_length.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/block_length.res.oracle
index cf0946ede61699d19535943cacdfac9b59bcd40f..e4be1fdb79ccfe9502fe242b015f23b500c1ce33 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/block_length.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/block_length.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/block_length.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.0.session/cache/720b1b51dec0a3fbd5b6f5f8d3f5d6f9.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.0.session/cache/720b1b51dec0a3fbd5b6f5f8d3f5d6f9.json
new file mode 100644
index 0000000000000000000000000000000000000000..b49f040e534ed0cf908f364141d1d8437df8bc85
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.0.session/cache/720b1b51dec0a3fbd5b6f5f8d3f5d6f9.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 5 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.res.oracle
index bf4efdc83af91b0df0b941fec22ca0391dc3a19a..a6187ffba8d271b4d3bcf2909f86ea99967f9282 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/checks.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 5 [...]
+# frama-c -wp -wp-steps 5 [...]
 [kernel] Parsing tests/wp_acsl/checks.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.res.oracle
index c4b1a1c2873fa09e1c505ff9995670f712850a1c..cfee3c57e18aa4132b2f2988923bcc530e4e2961 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/classify_float.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.session/cache/0b96e48ee127a1425284f14d35224e5e.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.session/cache/0b96e48ee127a1425284f14d35224e5e.json
new file mode 100644
index 0000000000000000000000000000000000000000..449f8c0af0c906e0323713bbe759547b536aa5b1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.session/cache/0b96e48ee127a1425284f14d35224e5e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.022,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.session/cache/377b1ddc5cd0851120f14ebc55cb07a4.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.session/cache/377b1ddc5cd0851120f14ebc55cb07a4.json
new file mode 100644
index 0000000000000000000000000000000000000000..d6c86333333ed141941cf30ab9a9313667feebf9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.session/cache/377b1ddc5cd0851120f14ebc55cb07a4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0221,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.session/cache/9a3235da49aa1f5332c48d29cb5e4f60.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.session/cache/9a3235da49aa1f5332c48d29cb5e4f60.json
new file mode 100644
index 0000000000000000000000000000000000000000..e151ea2b3327b06120b4c52cfc494254e9291157
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.session/cache/9a3235da49aa1f5332c48d29cb5e4f60.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0145,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.res.oracle
index b9250d09987006efcb9071ccdfde0f38903b725c..1c0f3f3f388045d820787e6f640a6480a9742c5d 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/classify_float.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.session/cache/0b96e48ee127a1425284f14d35224e5e.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.session/cache/0b96e48ee127a1425284f14d35224e5e.json
new file mode 100644
index 0000000000000000000000000000000000000000..97c59d659c67c16b0f1eae919137749af0057d92
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.session/cache/0b96e48ee127a1425284f14d35224e5e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0213,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.session/cache/377b1ddc5cd0851120f14ebc55cb07a4.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.session/cache/377b1ddc5cd0851120f14ebc55cb07a4.json
new file mode 100644
index 0000000000000000000000000000000000000000..22a94416cb115d8934334b753fbfc383f6fdcf7c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.session/cache/377b1ddc5cd0851120f14ebc55cb07a4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0168,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.session/cache/9a3235da49aa1f5332c48d29cb5e4f60.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.session/cache/9a3235da49aa1f5332c48d29cb5e4f60.json
new file mode 100644
index 0000000000000000000000000000000000000000..3c91cd3d0186ae7d9a21a9c33fb7b598408f39e9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.1.session/cache/9a3235da49aa1f5332c48d29cb5e4f60.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0215,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.2.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.2.res.oracle
index 0162e0980a3e712138d309ac460ef90a84ee9ced..7ddef8f6c1163e7ec87114454f625be52a78fe2f 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.2.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/classify_float.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/01f6142393c61d0b4d78fdebfa54f289.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/01f6142393c61d0b4d78fdebfa54f289.json
new file mode 100644
index 0000000000000000000000000000000000000000..5a69ee487cfb2584afe0e5d6f59b437e6dd33dcb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/01f6142393c61d0b4d78fdebfa54f289.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0114,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/0a1563f5c57f0dc1e442b67ae3481600.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/0a1563f5c57f0dc1e442b67ae3481600.json
new file mode 100644
index 0000000000000000000000000000000000000000..470bac1738a50303693ebbc20c9778a249c67fc8
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/0a1563f5c57f0dc1e442b67ae3481600.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0091,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/0e04b6829dbff9839c263060c47505ff.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/0e04b6829dbff9839c263060c47505ff.json
new file mode 100644
index 0000000000000000000000000000000000000000..6285c790af0b73595f78b30ced5d7faca4b8e903
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/0e04b6829dbff9839c263060c47505ff.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0072,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/1c0a18bd9dc3d4937d9da8bc4c97a590.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/1c0a18bd9dc3d4937d9da8bc4c97a590.json
new file mode 100644
index 0000000000000000000000000000000000000000..be8daf2e0139459830580e76709551af6697e0b3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/1c0a18bd9dc3d4937d9da8bc4c97a590.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0095,
+  "steps": 5 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/1e62e5ef01b026e0509b1f15b23edf82.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/1e62e5ef01b026e0509b1f15b23edf82.json
new file mode 100644
index 0000000000000000000000000000000000000000..28cd44fd0dd0e3b375e83053f4f06682b0b6d2bd
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/1e62e5ef01b026e0509b1f15b23edf82.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0079,
+  "steps": 28 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/240319af067db756838425ec03ce9c5e.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/240319af067db756838425ec03ce9c5e.json
new file mode 100644
index 0000000000000000000000000000000000000000..1e0b38dadb9effda4488b941af22a3c18f28a2d3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/240319af067db756838425ec03ce9c5e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0105,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/2ba0eb90ccbc289c4443c4c14a513f41.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/2ba0eb90ccbc289c4443c4c14a513f41.json
new file mode 100644
index 0000000000000000000000000000000000000000..2c6147bc0da4f95ac1ec67594089f553b4b46e35
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/2ba0eb90ccbc289c4443c4c14a513f41.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0091,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/36ba31ce017a23e3de44dfa8f021b045.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/36ba31ce017a23e3de44dfa8f021b045.json
new file mode 100644
index 0000000000000000000000000000000000000000..acf2b7f875407c1bb57e04b85b5f78a885c8f9c1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/36ba31ce017a23e3de44dfa8f021b045.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0104,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/3802694f8e50b26a879fa5235dea90dd.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/3802694f8e50b26a879fa5235dea90dd.json
new file mode 100644
index 0000000000000000000000000000000000000000..e6ecf362a0e530f26f84d78aabf7c7ff78ca0220
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/3802694f8e50b26a879fa5235dea90dd.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.013,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/38c5c28a40dc96dd26f3c2dbffb7cf2c.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/38c5c28a40dc96dd26f3c2dbffb7cf2c.json
new file mode 100644
index 0000000000000000000000000000000000000000..49d64ebd48c9c33f1edcf6a5b5c6dbb3e07d981c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/38c5c28a40dc96dd26f3c2dbffb7cf2c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0205,
+  "steps": 57 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/3de87c93437108089c3fc3d147a110bf.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/3de87c93437108089c3fc3d147a110bf.json
new file mode 100644
index 0000000000000000000000000000000000000000..4ca29833533bca78f2e21b6e5886565013e137d0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/3de87c93437108089c3fc3d147a110bf.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.009,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/4042531f6f0428250d20692ed68e7695.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/4042531f6f0428250d20692ed68e7695.json
new file mode 100644
index 0000000000000000000000000000000000000000..6b69c5044d9619d2a175402785c103b9589856ad
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/4042531f6f0428250d20692ed68e7695.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0103,
+  "steps": 5 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/40e5fd92406791c46a253a74b782a4ee.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/40e5fd92406791c46a253a74b782a4ee.json
new file mode 100644
index 0000000000000000000000000000000000000000..8615c4cb7ff089105c8d52a23f516bf676fccf5a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/40e5fd92406791c46a253a74b782a4ee.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0113,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/4fdf63524b5ce8bccf960e205c26c1c6.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/4fdf63524b5ce8bccf960e205c26c1c6.json
new file mode 100644
index 0000000000000000000000000000000000000000..f9e6f2f347f6becc382771579c9aacda2dbf623b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/4fdf63524b5ce8bccf960e205c26c1c6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0077,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/552dc3412bb2994bb70538c2ef90e116.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/552dc3412bb2994bb70538c2ef90e116.json
new file mode 100644
index 0000000000000000000000000000000000000000..0db76fbffbbd977ad9e039306e4b960cb7e0c70e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/552dc3412bb2994bb70538c2ef90e116.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0067,
+  "steps": 8 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/56badc38ebd11f85561b19682f3baaf5.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/56badc38ebd11f85561b19682f3baaf5.json
new file mode 100644
index 0000000000000000000000000000000000000000..2de63fa9ff50ec989feb7d6bb3b2048a842e6128
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/56badc38ebd11f85561b19682f3baaf5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0247,
+  "steps": 179 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/5bb8802cd33529e793ecb4ce980c8758.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/5bb8802cd33529e793ecb4ce980c8758.json
new file mode 100644
index 0000000000000000000000000000000000000000..66657150e32c1eec6985a2f067650a88cfdfc582
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/5bb8802cd33529e793ecb4ce980c8758.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0063,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/66a24739918528d1d446c1d39100e1b5.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/66a24739918528d1d446c1d39100e1b5.json
new file mode 100644
index 0000000000000000000000000000000000000000..5e3082bfca5aad560227b1b95eb15e276297d54f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/66a24739918528d1d446c1d39100e1b5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0129,
+  "steps": 29 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/7dc9e2f1ca9f3c88e718c9e1b00aea08.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/7dc9e2f1ca9f3c88e718c9e1b00aea08.json
new file mode 100644
index 0000000000000000000000000000000000000000..ad7f6771826cce6a391f13b6e6578fa8be164e16
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/7dc9e2f1ca9f3c88e718c9e1b00aea08.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0109,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/86081a9e69583a62b5e630f412c34a48.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/86081a9e69583a62b5e630f412c34a48.json
new file mode 100644
index 0000000000000000000000000000000000000000..e51d6fb7cef01fd9a306781581577191f226a71f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/86081a9e69583a62b5e630f412c34a48.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.007,
+  "steps": 8 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/8fcb381b63da5f4e9aca0d7a8f9e0b98.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/8fcb381b63da5f4e9aca0d7a8f9e0b98.json
new file mode 100644
index 0000000000000000000000000000000000000000..c275e5556037641be1542717e6e07462dd2c8c31
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/8fcb381b63da5f4e9aca0d7a8f9e0b98.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0086,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/b15e16b9c49e317f124993589d536cb3.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/b15e16b9c49e317f124993589d536cb3.json
new file mode 100644
index 0000000000000000000000000000000000000000..f5fb1cef13296ed258a7b827f18cb06db10de02c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/b15e16b9c49e317f124993589d536cb3.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0122,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/c13fe2015b075f0e203350c84fc3f1c6.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/c13fe2015b075f0e203350c84fc3f1c6.json
new file mode 100644
index 0000000000000000000000000000000000000000..a069b9d02ac71e1770fc35f1e84924476d33060c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/c13fe2015b075f0e203350c84fc3f1c6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0154,
+  "steps": 27 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/c21539213e6c5259862fd7389b7b271e.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/c21539213e6c5259862fd7389b7b271e.json
new file mode 100644
index 0000000000000000000000000000000000000000..cd90d02a03544d05f29546489fa1025e1f0e62cc
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/c21539213e6c5259862fd7389b7b271e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0105,
+  "steps": 8 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/e73151b5fb353f0fb6d7b0d07028da48.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/e73151b5fb353f0fb6d7b0d07028da48.json
new file mode 100644
index 0000000000000000000000000000000000000000..ae1a3ffb0d9a24b8ee726b19d99a276fca9ee57e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/e73151b5fb353f0fb6d7b0d07028da48.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0124,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/ef23f172217b73fca0708f1eeea72bfa.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/ef23f172217b73fca0708f1eeea72bfa.json
new file mode 100644
index 0000000000000000000000000000000000000000..27c43859f63cf606a65fb1f865286af501b555c4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/ef23f172217b73fca0708f1eeea72bfa.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0113,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/f2efaa910a22ef83281aed6b33892862.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/f2efaa910a22ef83281aed6b33892862.json
new file mode 100644
index 0000000000000000000000000000000000000000..38e879d8be3ea21b775f0394056cc96169055c7f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/f2efaa910a22ef83281aed6b33892862.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0082,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/fb4cac2192648dd647b2cfd761097a13.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/fb4cac2192648dd647b2cfd761097a13.json
new file mode 100644
index 0000000000000000000000000000000000000000..4018388a1b852be79d88625eb1bb28493d159124
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/fb4cac2192648dd647b2cfd761097a13.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0101,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/fd50b32bedc05c1d4407ec0d91baae91.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/fd50b32bedc05c1d4407ec0d91baae91.json
new file mode 100644
index 0000000000000000000000000000000000000000..d4dbaaf180c49bba46e82fe885651a3c85274d5a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/fd50b32bedc05c1d4407ec0d91baae91.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0122,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/fd5aae34d94298825cde6ebc3782886a.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/fd5aae34d94298825cde6ebc3782886a.json
new file mode 100644
index 0000000000000000000000000000000000000000..65ed5f578473bc4b4d34afcd5dd8cac66d940c95
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/fd5aae34d94298825cde6ebc3782886a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0086,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/fe38c06e404e254e28944da9cfb91669.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/fe38c06e404e254e28944da9cfb91669.json
new file mode 100644
index 0000000000000000000000000000000000000000..54871fa31664cc3a2ac8ca9bac87465f5aa208f2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.0.session/cache/fe38c06e404e254e28944da9cfb91669.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0149,
+  "steps": 37 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.res.oracle
index 6c52f44f79d5903f974c160d9c930c4d105cbcb0..96ac43f85256d5d1199e0cd7f65fc6b699e5e656 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/cnf.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/cnf.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/ctor.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/ctor.res.oracle
index 28838da6b6bf90e3686624a9eecf7e0745fea9f8..98b954ee53146f9cd5c34796c9663f6f5ee9292f 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/ctor.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/ctor.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/ctor.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.res.oracle
index 129596332719e69acdb8b69587b890364126cd9c..fe8628eb6a8133631411fb58b3daf5d73348eb8d 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/div_mod.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/44bfcd84497c1c379bc0b02525bc51ec.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/44bfcd84497c1c379bc0b02525bc51ec.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ea961ab14f1f0c5961ced876119e7fa963695ce
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/44bfcd84497c1c379bc0b02525bc51ec.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0157,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/479f1bfb29d85f65371b04c1a243f4e3.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/479f1bfb29d85f65371b04c1a243f4e3.json
new file mode 100644
index 0000000000000000000000000000000000000000..dd07c3cd82e4cacb1dcc543efa31e26a916ebc2d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/479f1bfb29d85f65371b04c1a243f4e3.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0157,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/4b9760bdd31f7e65841794504859d1e2.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/4b9760bdd31f7e65841794504859d1e2.json
new file mode 100644
index 0000000000000000000000000000000000000000..91c9b842a92bcafff9dcac2d8f39401deb8961de
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/4b9760bdd31f7e65841794504859d1e2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0156,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json
new file mode 100644
index 0000000000000000000000000000000000000000..62b0c92ef50b75ce8259ad867891fb9d5be82d72
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0073,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/6110c80065036f515b029169c819ef30.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/6110c80065036f515b029169c819ef30.json
new file mode 100644
index 0000000000000000000000000000000000000000..911345a28732970f0efb5d8fa79c854f9d502bef
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/6110c80065036f515b029169c819ef30.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0108,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/74a8a8ffa4b4e9177b600ddb8bfb9700.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/74a8a8ffa4b4e9177b600ddb8bfb9700.json
new file mode 100644
index 0000000000000000000000000000000000000000..808e3e406e898644e670f528b81f91fe1d74b893
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/74a8a8ffa4b4e9177b600ddb8bfb9700.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0114,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/7d858dfd91200ecf83a156407ab6df41.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/7d858dfd91200ecf83a156407ab6df41.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ea961ab14f1f0c5961ced876119e7fa963695ce
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/7d858dfd91200ecf83a156407ab6df41.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0157,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/7f46ccdf53adb7491436d4ec9cacd70b.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/7f46ccdf53adb7491436d4ec9cacd70b.json
new file mode 100644
index 0000000000000000000000000000000000000000..8a202ae6005ceeabbdac83d46366142bba942983
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/7f46ccdf53adb7491436d4ec9cacd70b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0177,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/9749dd5f15852dceee737755a7f829b3.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/9749dd5f15852dceee737755a7f829b3.json
new file mode 100644
index 0000000000000000000000000000000000000000..4e6dc9a6a528011b1203b984e57118c99ea5d034
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/9749dd5f15852dceee737755a7f829b3.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0176,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/cbc69af7ff44dae806eb363d47e2f0c9.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/cbc69af7ff44dae806eb363d47e2f0c9.json
new file mode 100644
index 0000000000000000000000000000000000000000..4d89793c49d788f2811eb7503d6c5fc25a7f09ac
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/cbc69af7ff44dae806eb363d47e2f0c9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.017,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/d7903440b39a1276f7555554baa19daa.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/d7903440b39a1276f7555554baa19daa.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ea961ab14f1f0c5961ced876119e7fa963695ce
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/d7903440b39a1276f7555554baa19daa.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0157,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/f22ea2eb3e900d6144ad40c3d082f288.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/f22ea2eb3e900d6144ad40c3d082f288.json
new file mode 100644
index 0000000000000000000000000000000000000000..eee5ba759f5bb45722616e8d78d7454d5b6c6f8a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/f22ea2eb3e900d6144ad40c3d082f288.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0121,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/f82e8f548cffbe0189a8fe63d2166368.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/f82e8f548cffbe0189a8fe63d2166368.json
new file mode 100644
index 0000000000000000000000000000000000000000..5973938db2ae6833c8c439a296f56259eca86e26
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.0.session/cache/f82e8f548cffbe0189a8fe63d2166368.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0126,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.res.oracle
index 92c78b1d82867cf7a86825f82d7416236d1e1fe9..3b1a448537a55b7456126c7507f6869579f89f91 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/div_mod.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/44bfcd84497c1c379bc0b02525bc51ec.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/44bfcd84497c1c379bc0b02525bc51ec.json
new file mode 100644
index 0000000000000000000000000000000000000000..3d53c5477c3d6a9773951d0ca066360d217c173a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/44bfcd84497c1c379bc0b02525bc51ec.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.011,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/479f1bfb29d85f65371b04c1a243f4e3.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/479f1bfb29d85f65371b04c1a243f4e3.json
new file mode 100644
index 0000000000000000000000000000000000000000..c2eb3590224438c1340499acfc0ed7e2b30e53e4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/479f1bfb29d85f65371b04c1a243f4e3.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0171,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/4b9760bdd31f7e65841794504859d1e2.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/4b9760bdd31f7e65841794504859d1e2.json
new file mode 100644
index 0000000000000000000000000000000000000000..a0bd2e776fa324cf9a36c46f0131fe630320eede
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/4b9760bdd31f7e65841794504859d1e2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0106,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json
new file mode 100644
index 0000000000000000000000000000000000000000..d4521bf658410456b221da82fc1cecffe7c4c900
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0087,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/6110c80065036f515b029169c819ef30.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/6110c80065036f515b029169c819ef30.json
new file mode 100644
index 0000000000000000000000000000000000000000..91c9b842a92bcafff9dcac2d8f39401deb8961de
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/6110c80065036f515b029169c819ef30.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0156,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/74a8a8ffa4b4e9177b600ddb8bfb9700.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/74a8a8ffa4b4e9177b600ddb8bfb9700.json
new file mode 100644
index 0000000000000000000000000000000000000000..93e503e5906bce19517b53e0b7d2dc5ecac25816
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/74a8a8ffa4b4e9177b600ddb8bfb9700.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0128,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/7d858dfd91200ecf83a156407ab6df41.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/7d858dfd91200ecf83a156407ab6df41.json
new file mode 100644
index 0000000000000000000000000000000000000000..91c9b842a92bcafff9dcac2d8f39401deb8961de
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/7d858dfd91200ecf83a156407ab6df41.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0156,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/7f46ccdf53adb7491436d4ec9cacd70b.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/7f46ccdf53adb7491436d4ec9cacd70b.json
new file mode 100644
index 0000000000000000000000000000000000000000..4c6a3ed132f60b4fb3df0fadfe0d2a0789fcb1e2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/7f46ccdf53adb7491436d4ec9cacd70b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0143,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/9749dd5f15852dceee737755a7f829b3.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/9749dd5f15852dceee737755a7f829b3.json
new file mode 100644
index 0000000000000000000000000000000000000000..d98ea4ae10fe7b8757d52c710ffe40a364930551
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/9749dd5f15852dceee737755a7f829b3.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0234,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/cbc69af7ff44dae806eb363d47e2f0c9.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/cbc69af7ff44dae806eb363d47e2f0c9.json
new file mode 100644
index 0000000000000000000000000000000000000000..aaeb734a0befb8858d27d161c755743b6ce76ab0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/cbc69af7ff44dae806eb363d47e2f0c9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0163,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/d7903440b39a1276f7555554baa19daa.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/d7903440b39a1276f7555554baa19daa.json
new file mode 100644
index 0000000000000000000000000000000000000000..24a02d2638c97b6effacda9f47354aa71b229099
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/d7903440b39a1276f7555554baa19daa.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0166,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/f22ea2eb3e900d6144ad40c3d082f288.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/f22ea2eb3e900d6144ad40c3d082f288.json
new file mode 100644
index 0000000000000000000000000000000000000000..e7ade1e8511c1b063f9c667bb3dcabcf09148734
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/f22ea2eb3e900d6144ad40c3d082f288.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0113,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/f82e8f548cffbe0189a8fe63d2166368.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/f82e8f548cffbe0189a8fe63d2166368.json
new file mode 100644
index 0000000000000000000000000000000000000000..c8cac88c1e9165294e7e0a06df95e6a609ca4932
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.1.session/cache/f82e8f548cffbe0189a8fe63d2166368.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0096,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.res.oracle
index b0357286139124d289affbd8a1cfbb96cb586d17..90d4a24c060502e14ac081e29d432198699961a8 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/div_mod.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.session/cache/7e3da19219501629671643d84602636b.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.session/cache/7e3da19219501629671643d84602636b.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.session/cache/7e3da19219501629671643d84602636b.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.session/cache/d6668302c907360822639074896e6cf8.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.session/cache/d6668302c907360822639074896e6cf8.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/div_mod.2.session/cache/d6668302c907360822639074896e6cf8.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.0.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.0.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json
new file mode 100644
index 0000000000000000000000000000000000000000..65ed5f578473bc4b4d34afcd5dd8cac66d940c95
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.0.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0086,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.0.session/cache/9d34e1b8df5fccf6e523d0308ec54b9e.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.0.session/cache/9d34e1b8df5fccf6e523d0308ec54b9e.json
new file mode 100644
index 0000000000000000000000000000000000000000..d4521bf658410456b221da82fc1cecffe7c4c900
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.0.session/cache/9d34e1b8df5fccf6e523d0308ec54b9e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0087,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.res.oracle
index a8ae2141cef39017e807d4c8e8f0f805bfd447ec..8a4506b88c4a87d8e13a03c7e04048e9fa5b3b67 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/e_imply.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/e_imply.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/29f844e0252b436c115005bccb6bd46b.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/29f844e0252b436c115005bccb6bd46b.json
new file mode 100644
index 0000000000000000000000000000000000000000..6596a75aa55a8f9a15e81b59cd4adc09b49e7fc7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/29f844e0252b436c115005bccb6bd46b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0162,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/30399c40583302217a5c153235924ad2.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/30399c40583302217a5c153235924ad2.json
new file mode 100644
index 0000000000000000000000000000000000000000..18e65bccf30b91315f1717f1ae33acd5b54c0951
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/30399c40583302217a5c153235924ad2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0163,
+  "steps": 7 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/76c29bfe8c97d224189a63098e1c3c95.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/76c29bfe8c97d224189a63098e1c3c95.json
new file mode 100644
index 0000000000000000000000000000000000000000..609af3bb00c636c971e0d35e348d5300d6da2022
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/76c29bfe8c97d224189a63098e1c3c95.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0146,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/a8e5608996545756ebaec6753de5c6c1.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/a8e5608996545756ebaec6753de5c6c1.json
new file mode 100644
index 0000000000000000000000000000000000000000..355773d8cbc5928daab5f9c6b8356918283034fe
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/a8e5608996545756ebaec6753de5c6c1.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0188,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/d23ae2e368db89350200d5d69bb722ec.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/d23ae2e368db89350200d5d69bb722ec.json
new file mode 100644
index 0000000000000000000000000000000000000000..39791baac37419e709789c2e9bf566dd023e8ac3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.0.session/cache/d23ae2e368db89350200d5d69bb722ec.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.023,
+  "steps": 24 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.res.oracle
index 33fc1d116f1788f68acc4287368217261f4794a4..44350c644f69765746b27c877f44e83609fe27f7 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/equal.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/10d9f6592ee2fd950288ebe6f5d3f531.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/10d9f6592ee2fd950288ebe6f5d3f531.json
new file mode 100644
index 0000000000000000000000000000000000000000..6398d92d9fb643cd605746efcc2cf2329b9f6316
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/10d9f6592ee2fd950288ebe6f5d3f531.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0258,
+  "steps": 27 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/317a8e39d81b6285d8bb0a46918b062e.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/317a8e39d81b6285d8bb0a46918b062e.json
new file mode 100644
index 0000000000000000000000000000000000000000..dd423451b6d09a59444b8d54684e3280664be4a3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/317a8e39d81b6285d8bb0a46918b062e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0304,
+  "steps": 38 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/356edd7331c75234f303e6d3096f70c5.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/356edd7331c75234f303e6d3096f70c5.json
new file mode 100644
index 0000000000000000000000000000000000000000..528aea298a9a7415589ed0572f61b4805eb85654
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/356edd7331c75234f303e6d3096f70c5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0229,
+  "steps": 25 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/4344a1e4fc5a0418ca737c0a7be93591.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/4344a1e4fc5a0418ca737c0a7be93591.json
new file mode 100644
index 0000000000000000000000000000000000000000..847d98da7488a8cd2d96db7744f3d13145df95e6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/4344a1e4fc5a0418ca737c0a7be93591.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0178,
+  "steps": 38 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/45d5efa0014745864b946de074271fe4.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/45d5efa0014745864b946de074271fe4.json
new file mode 100644
index 0000000000000000000000000000000000000000..d4b7fe805254098991bdab5d09700a8a8c5897da
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/45d5efa0014745864b946de074271fe4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0273,
+  "steps": 38 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/ba0b494f917626e21536de68be663206.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/ba0b494f917626e21536de68be663206.json
new file mode 100644
index 0000000000000000000000000000000000000000..0330e00898c734b517b9a50295d6dddcb013ea5f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/ba0b494f917626e21536de68be663206.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0224,
+  "steps": 38 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/ccae408301168be91c5c0bd2b0aeccb4.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/ccae408301168be91c5c0bd2b0aeccb4.json
new file mode 100644
index 0000000000000000000000000000000000000000..6993e34bc9301826f59ebad629c8bc0faa35bfe8
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/ccae408301168be91c5c0bd2b0aeccb4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0282,
+  "steps": 25 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/d6fabea34373ebdadaabe35c24d5d844.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/d6fabea34373ebdadaabe35c24d5d844.json
new file mode 100644
index 0000000000000000000000000000000000000000..cd2e87b0386735cba2460a28ac615f914879a741
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/d6fabea34373ebdadaabe35c24d5d844.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0258,
+  "steps": 25 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/d82e5a28f648497c89374602499307fa.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/d82e5a28f648497c89374602499307fa.json
new file mode 100644
index 0000000000000000000000000000000000000000..d83a1a83c1c683e853d2f1aa5d7b5833cdef38f0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/d82e5a28f648497c89374602499307fa.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0211,
+  "steps": 25 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/d892b55ce1a00109c8dacf9303c5e094.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/d892b55ce1a00109c8dacf9303c5e094.json
new file mode 100644
index 0000000000000000000000000000000000000000..96ea63a834f5236a8c95b698e2fbcdf35122496e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/d892b55ce1a00109c8dacf9303c5e094.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0232,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/e2c485bb5df33638440d4e418cb2f845.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/e2c485bb5df33638440d4e418cb2f845.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/e2c485bb5df33638440d4e418cb2f845.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/e69df22f86875c4d3aa937b1aabbe6de.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/e69df22f86875c4d3aa937b1aabbe6de.json
new file mode 100644
index 0000000000000000000000000000000000000000..770a394688be728ac4b9e2c49dc680533e6e4271
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/e69df22f86875c4d3aa937b1aabbe6de.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0274,
+  "steps": 25 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/ed1bfb911114eb90d99266280ea72387.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/ed1bfb911114eb90d99266280ea72387.json
new file mode 100644
index 0000000000000000000000000000000000000000..d9cfb735843f773edbc65085a26454c94a43be8c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/ed1bfb911114eb90d99266280ea72387.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0199,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/f8043e3845e19b26c1e940b241828ea5.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/f8043e3845e19b26c1e940b241828ea5.json
new file mode 100644
index 0000000000000000000000000000000000000000..31dc56889168960f0321bc0ecc00be042ddc62e9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.session/cache/f8043e3845e19b26c1e940b241828ea5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0253,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.res.oracle
index 221c3d19676482e436c62cdb72ddac35ad214815..d4667be0f775c7c7cb950e02ab0ad5ef4916f0ad 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/float_compare.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/funvar_inv.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/funvar_inv.res.oracle
index bdbccbefae2dc1d36143ee499d4df726b3f31ba2..c77722b1f2eef4a7176512ab01afbe8a9bc04105 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/funvar_inv.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/funvar_inv.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_acsl/funvar_inv.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/implicit_enum_cast.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/implicit_enum_cast.res.oracle
index 9623ee6b44e66705547a0bfbec2404db511a80be..c8fc8cbcd728e8755a88b9e67d175cb07f2ee5b5 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/implicit_enum_cast.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/implicit_enum_cast.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/implicit_enum_cast.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.0.session/cache/c84282884407d8b312dc1b674cbe8aaa.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.0.session/cache/c84282884407d8b312dc1b674cbe8aaa.json
new file mode 100644
index 0000000000000000000000000000000000000000..a2dd5cfce36950e87ef833d1916508755b663743
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.0.session/cache/c84282884407d8b312dc1b674cbe8aaa.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0177,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.0.session/cache/eff2b9bd2f173b980e8e1b5dcdbaa5bb.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.0.session/cache/eff2b9bd2f173b980e8e1b5dcdbaa5bb.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.0.session/cache/eff2b9bd2f173b980e8e1b5dcdbaa5bb.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.res.oracle
index 81dd069d35a8761f1807ebab8f5a5aa6e6538aaa..b30c056e391d2408120147e0b4681dfcf273c1b6 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/init_label.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.res.oracle
index 8e07203beb342c7e94c6952f4a32eb84ecea1a6c..32404156c7eb17d85dcfa3361748de3405ebe715 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/init_value.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/1266a11568fc6ce4527751fb9f0bfc00.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/1266a11568fc6ce4527751fb9f0bfc00.json
new file mode 100644
index 0000000000000000000000000000000000000000..5b9bac54877ca8c74504564e9a329c8cdc20a5d1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/1266a11568fc6ce4527751fb9f0bfc00.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0143,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/28ebee21bdc49b87750703c03cc83798.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/28ebee21bdc49b87750703c03cc83798.json
new file mode 100644
index 0000000000000000000000000000000000000000..0387be38555e6492ecddb3d437704ff02722d07b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/28ebee21bdc49b87750703c03cc83798.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0158,
+  "steps": 36 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/4841a6604ba903a9ba49400c68c2e73f.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/4841a6604ba903a9ba49400c68c2e73f.json
new file mode 100644
index 0000000000000000000000000000000000000000..2e866b443bf10ba06f9a812f61e21485821b066d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/4841a6604ba903a9ba49400c68c2e73f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0065,
+  "steps": 7 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/90e3000618dadd5adbcbdf38d9879d27.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/90e3000618dadd5adbcbdf38d9879d27.json
new file mode 100644
index 0000000000000000000000000000000000000000..80b27169d044d9daa28b98b20efc7697d61d98dc
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/90e3000618dadd5adbcbdf38d9879d27.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0256,
+  "steps": 106 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/9b0ec3f827a2dfbdd38a8306b140191e.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/9b0ec3f827a2dfbdd38a8306b140191e.json
new file mode 100644
index 0000000000000000000000000000000000000000..88024c09aa41ee0a2e15193eb3bec3ac3462c32e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.session/cache/9b0ec3f827a2dfbdd38a8306b140191e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0067,
+  "steps": 7 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.res.oracle
index 8a569a28b306946259357fa9a5f801ca4555f325..d448c6b3d8f9a82d4b152a996130a390d98f411a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/init_value.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/0835185dd71c7d1c718720d74a3ada10.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/0835185dd71c7d1c718720d74a3ada10.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/0835185dd71c7d1c718720d74a3ada10.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/2320083088fc84e76dc56f8d32a050b2.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/2320083088fc84e76dc56f8d32a050b2.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/2320083088fc84e76dc56f8d32a050b2.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/2bf48ccc1394e38ad5c0acfd4573068a.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/2bf48ccc1394e38ad5c0acfd4573068a.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/2bf48ccc1394e38ad5c0acfd4573068a.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/3ea2bffb31441a0ad6dd94f94352da21.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/3ea2bffb31441a0ad6dd94f94352da21.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/3ea2bffb31441a0ad6dd94f94352da21.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/53494c07d4ab866af097d757c756acc2.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/53494c07d4ab866af097d757c756acc2.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/53494c07d4ab866af097d757c756acc2.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/5a1b4b09d644d4023654862eb30b6a74.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/5a1b4b09d644d4023654862eb30b6a74.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/5a1b4b09d644d4023654862eb30b6a74.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/6617079c456c6ecdbc088dfb43e1a05a.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/6617079c456c6ecdbc088dfb43e1a05a.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/6617079c456c6ecdbc088dfb43e1a05a.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/6fd2c09f2259cb10e5973da49efb691a.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/6fd2c09f2259cb10e5973da49efb691a.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/6fd2c09f2259cb10e5973da49efb691a.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/8593898c80b2f1f893d2111cd88fc898.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/8593898c80b2f1f893d2111cd88fc898.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/8593898c80b2f1f893d2111cd88fc898.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/912f7fe924733b72a8c62f519277c3bc.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/912f7fe924733b72a8c62f519277c3bc.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/912f7fe924733b72a8c62f519277c3bc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/94aa4eb49e58d0e0de082241117282c9.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/94aa4eb49e58d0e0de082241117282c9.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/94aa4eb49e58d0e0de082241117282c9.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/a1cb57bb989678a2e21ae7c8e499ab5a.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/a1cb57bb989678a2e21ae7c8e499ab5a.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.session/cache/a1cb57bb989678a2e21ae7c8e499ab5a.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value_mem.0.session/cache/22897f38fca9d1f1cd1837f1350d4499.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value_mem.0.session/cache/22897f38fca9d1f1cd1837f1350d4499.json
new file mode 100644
index 0000000000000000000000000000000000000000..bae3da127cbd881ecd10c973b23f6aea0154f5b8
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value_mem.0.session/cache/22897f38fca9d1f1cd1837f1350d4499.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0232,
+  "steps": 36 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value_mem.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value_mem.res.oracle
index 519128a270eb42f08122a8b30e7f79af7e3fa19c..46b74f8ec7075f532ea44274b60247e65329b1da 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value_mem.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value_mem.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/init_value_mem.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/intbool.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/intbool.res.oracle
index 65099e7692bbd9ee01f239c49af97914ed4ca9b7..0185197bcefb8378d37866f7c7ca70cfc3ee5b7a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/intbool.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/intbool.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/intbool.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.0.res.oracle
index cf4c863ff128b2ddc33e1da0a9fac6d138b01675..5d5625435246e5fe972f5410a7fb34b07cbfe082 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/label_escape.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.1.res.oracle
index f80035a90951a4ccddeffbb25a4668ff842c36b0..876ff1d2ac0b070d51b22d26f22c0ca756c3ac3e 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/label_escape.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.1.session/cache/f326c24c69a19b34d04e78fb2c67f80d.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.1.session/cache/f326c24c69a19b34d04e78fb2c67f80d.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/label_escape.1.session/cache/f326c24c69a19b34d04e78fb2c67f80d.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/090dcbb7243fc5374efafdaf37e519bb.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/090dcbb7243fc5374efafdaf37e519bb.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/090dcbb7243fc5374efafdaf37e519bb.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/0f239620c3c1b66b8468a3f1020f5471.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/0f239620c3c1b66b8468a3f1020f5471.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/0f239620c3c1b66b8468a3f1020f5471.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/3fb4d0dcf9fda952e324462b078cf07e.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/3fb4d0dcf9fda952e324462b078cf07e.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/3fb4d0dcf9fda952e324462b078cf07e.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/47212b097d7a57e437c6007c537e0914.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/47212b097d7a57e437c6007c537e0914.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/47212b097d7a57e437c6007c537e0914.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/deb52da9b678582b8c3439b66ad3fea5.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/deb52da9b678582b8c3439b66ad3fea5.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/deb52da9b678582b8c3439b66ad3fea5.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/e141038c0739ebf644c02fbfab4bc16c.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/e141038c0739ebf644c02fbfab4bc16c.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/e141038c0739ebf644c02fbfab4bc16c.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/e1f6d3a532c8a83649031c67d6f02c37.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/e1f6d3a532c8a83649031c67d6f02c37.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/e1f6d3a532c8a83649031c67d6f02c37.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/e9ddcbfe8eae150dadeb9e43baa64aa4.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/e9ddcbfe8eae150dadeb9e43baa64aa4.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.0.session/cache/e9ddcbfe8eae150dadeb9e43baa64aa4.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.res.oracle
index 8351bc41d1447a9f839ace58671e8d9855d542d7..68a296dd46dbd97ec6b6cfe215de2c1a76f2a45b 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/logic.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/logic.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/0f63c1954a7d6baa2f8da8e60a928530.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/0f63c1954a7d6baa2f8da8e60a928530.json
new file mode 100644
index 0000000000000000000000000000000000000000..3a833c748bb617f5128e66449c4f14169d1e81f1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/0f63c1954a7d6baa2f8da8e60a928530.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0225,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/903d890ca7aeec177776404726fb9e34.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/903d890ca7aeec177776404726fb9e34.json
new file mode 100644
index 0000000000000000000000000000000000000000..7d927d607321e92b45d2791ab0178b8ff1169d4c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/903d890ca7aeec177776404726fb9e34.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0572,
+  "steps": 75 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/a8cfe2cc9d4446b768f13c185b5ae88f.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/a8cfe2cc9d4446b768f13c185b5ae88f.json
new file mode 100644
index 0000000000000000000000000000000000000000..6ae4ae1271adccc4ea9fa58988b7e170466fad5b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/a8cfe2cc9d4446b768f13c185b5ae88f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0225,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/c1429295f69a4db013f8d8d413ca0851.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/c1429295f69a4db013f8d8d413ca0851.json
new file mode 100644
index 0000000000000000000000000000000000000000..1cbf76d54eb5faa7e11391ff41a57050b0375820
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/c1429295f69a4db013f8d8d413ca0851.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.4748,
+  "steps": 360 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/eb1487e9e86602ca063f756b4584adda.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/eb1487e9e86602ca063f756b4584adda.json
new file mode 100644
index 0000000000000000000000000000000000000000..1a3ca2d95a8615d31630ac8afa6ed37983052f62
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.0.session/cache/eb1487e9e86602ca063f756b4584adda.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0206,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.res.oracle
index e382296ef4659598f2f04c2aad341883dab4b19c..2410421196075407c564baeb1a827c8694077563 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/looplabels.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/looplabels.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.0.session/cache/431464c40dcbd394a0782b002a273b0c.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.0.session/cache/431464c40dcbd394a0782b002a273b0c.json
new file mode 100644
index 0000000000000000000000000000000000000000..3d47b0e8731220c31af071ad67c11d404b98e06e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.0.session/cache/431464c40dcbd394a0782b002a273b0c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0158,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.0.session/cache/4e785c9f5d5c5edf9cfd90e8b7186840.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.0.session/cache/4e785c9f5d5c5edf9cfd90e8b7186840.json
new file mode 100644
index 0000000000000000000000000000000000000000..fbf9c9ebd55bca9dac3d647daa4815901ff9e183
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.0.session/cache/4e785c9f5d5c5edf9cfd90e8b7186840.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0161,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.res.oracle
index b5788d4ee54512314f2b7e8fc5534d60567eafce..f0976611dcc0e19acde3048476db2c4f3ee0d10b 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/null.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/null.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.res.oracle
index 7c110cb79dfc4f4bee8218a36d1cc681bb9a7d66..3638dce1955a4a1e48b6bb9237273cc1e6f39f75 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_acsl/pointer.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/011e5f52d70fa0086a654148080a4fe9.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/011e5f52d70fa0086a654148080a4fe9.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/011e5f52d70fa0086a654148080a4fe9.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/29bd54364c6cbab6b5edf958e89561f6.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/29bd54364c6cbab6b5edf958e89561f6.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/29bd54364c6cbab6b5edf958e89561f6.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/5292c3d3c867034980a3690da72406f0.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/5292c3d3c867034980a3690da72406f0.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/5292c3d3c867034980a3690da72406f0.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/608256dd483458fbd63dc7eb8aa06df2.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/608256dd483458fbd63dc7eb8aa06df2.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/608256dd483458fbd63dc7eb8aa06df2.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/6dadeba4671262b2ad4067da798f0a23.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/6dadeba4671262b2ad4067da798f0a23.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/6dadeba4671262b2ad4067da798f0a23.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/9fc972b0f872f2d9d78708d1d3f86f83.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/9fc972b0f872f2d9d78708d1d3f86f83.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.session/cache/9fc972b0f872f2d9d78708d1d3f86f83.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.res.oracle
index 205d8ead9ed263acf0de6837793376e9ebbc9015..9d969ebd5f4bdf3fd4692d79f7e8fb2dccb5657d 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/pointer.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/011e5f52d70fa0086a654148080a4fe9.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/011e5f52d70fa0086a654148080a4fe9.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/011e5f52d70fa0086a654148080a4fe9.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/29bd54364c6cbab6b5edf958e89561f6.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/29bd54364c6cbab6b5edf958e89561f6.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/29bd54364c6cbab6b5edf958e89561f6.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/5292c3d3c867034980a3690da72406f0.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/5292c3d3c867034980a3690da72406f0.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/5292c3d3c867034980a3690da72406f0.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/608256dd483458fbd63dc7eb8aa06df2.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/608256dd483458fbd63dc7eb8aa06df2.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/608256dd483458fbd63dc7eb8aa06df2.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/6dadeba4671262b2ad4067da798f0a23.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/6dadeba4671262b2ad4067da798f0a23.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/6dadeba4671262b2ad4067da798f0a23.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/9fc972b0f872f2d9d78708d1d3f86f83.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/9fc972b0f872f2d9d78708d1d3f86f83.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.session/cache/9fc972b0f872f2d9d78708d1d3f86f83.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/post_result.0.session/cache/3ed898ae35ca655f3ace9c43ba4407d1.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/post_result.0.session/cache/3ed898ae35ca655f3ace9c43ba4407d1.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/post_result.0.session/cache/3ed898ae35ca655f3ace9c43ba4407d1.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/post_result.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/post_result.res.oracle
index 5ab98f1194f58b1e337fba22e51d2b34b94f636e..de5309578551a504b2adc8cfd99786a20cc2183a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/post_result.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/post_result.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/post_result.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.res.oracle
index 627cd3b588edbaaa492f369db0c98e0d60c804ba..f834bdff41e501342d70558f49388212a63d2df2 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/precedence.i (no preprocessing)
 [kernel:annot-error] tests/wp_acsl/precedence.i:90: Warning: 
   unexpected token ';'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.session/cache/ef707c0bb275753bd2194c2a2f336344.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.session/cache/ef707c0bb275753bd2194c2a2f336344.json
new file mode 100644
index 0000000000000000000000000000000000000000..851779ecc30f9b5e539727d095b93ea250b441e0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.session/cache/ef707c0bb275753bd2194c2a2f336344.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0101,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.res.oracle
index 14de3dc9b9971cbe838ada5d33d0b82302b24d23..ccc22350c9f1603f24f41856ea07e37191374e86 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/precedence.i (no preprocessing)
 [kernel:annot-error] tests/wp_acsl/precedence.i:90: Warning: 
   unexpected token ';'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/016ce89e9b8b999b7bf425d0ee1e7116.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/016ce89e9b8b999b7bf425d0ee1e7116.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/016ce89e9b8b999b7bf425d0ee1e7116.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/04f4761f14fb3a54c3035d0b417bffd8.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/04f4761f14fb3a54c3035d0b417bffd8.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/04f4761f14fb3a54c3035d0b417bffd8.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/09c00cfae051f3b27e37f365250df44e.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/09c00cfae051f3b27e37f365250df44e.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/09c00cfae051f3b27e37f365250df44e.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/1481641686b389e08b15e043cb5bef91.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/1481641686b389e08b15e043cb5bef91.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/1481641686b389e08b15e043cb5bef91.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/1e04ebe21430dd8643cb3e4dad797b6b.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/1e04ebe21430dd8643cb3e4dad797b6b.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/1e04ebe21430dd8643cb3e4dad797b6b.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/2ab1808813f8d43d0488d16425a46f39.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/2ab1808813f8d43d0488d16425a46f39.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/2ab1808813f8d43d0488d16425a46f39.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/2ce0bee40cbc8ad442d39d6cf05ada0d.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/2ce0bee40cbc8ad442d39d6cf05ada0d.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/2ce0bee40cbc8ad442d39d6cf05ada0d.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/2d078f164dc8273dcdd1f06ef1b97f9f.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/2d078f164dc8273dcdd1f06ef1b97f9f.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/2d078f164dc8273dcdd1f06ef1b97f9f.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/3030f52742527d2fcb9fc935a40fdbec.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/3030f52742527d2fcb9fc935a40fdbec.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/3030f52742527d2fcb9fc935a40fdbec.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/303fd6534adc78b34dd66abc242bee2c.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/303fd6534adc78b34dd66abc242bee2c.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/303fd6534adc78b34dd66abc242bee2c.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/32696eb870a9c92d67a124bfca3c99c5.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/32696eb870a9c92d67a124bfca3c99c5.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/32696eb870a9c92d67a124bfca3c99c5.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/332151f277e19559e7bc7b0e33c592fc.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/332151f277e19559e7bc7b0e33c592fc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/332151f277e19559e7bc7b0e33c592fc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/36b7c4424bad8308393bae14b4ad8d83.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/36b7c4424bad8308393bae14b4ad8d83.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/36b7c4424bad8308393bae14b4ad8d83.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/37810e32c8adc217bca1893d56dd0d3c.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/37810e32c8adc217bca1893d56dd0d3c.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/37810e32c8adc217bca1893d56dd0d3c.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/42a23cf63801c6b924ac9c3fba58f28b.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/42a23cf63801c6b924ac9c3fba58f28b.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/42a23cf63801c6b924ac9c3fba58f28b.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/69e728a4ee84c1719a3c19171f6f72ca.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/69e728a4ee84c1719a3c19171f6f72ca.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/69e728a4ee84c1719a3c19171f6f72ca.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/6bc1171b7f8d4e25fb74810d66d09a5a.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/6bc1171b7f8d4e25fb74810d66d09a5a.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/6bc1171b7f8d4e25fb74810d66d09a5a.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/71534ba44a0c80435ba49a794c00a63f.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/71534ba44a0c80435ba49a794c00a63f.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/71534ba44a0c80435ba49a794c00a63f.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/74737c07a7ea74b64c5c92754c917319.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/74737c07a7ea74b64c5c92754c917319.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/74737c07a7ea74b64c5c92754c917319.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/7e9f5aec43f44bd30a69eb1d4bd91519.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/7e9f5aec43f44bd30a69eb1d4bd91519.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/7e9f5aec43f44bd30a69eb1d4bd91519.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/7f5cdd85335b91c16f75c45c0ded5dac.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/7f5cdd85335b91c16f75c45c0ded5dac.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/7f5cdd85335b91c16f75c45c0ded5dac.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/82ae98ac3f92a8b0606d357a4a184a09.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/82ae98ac3f92a8b0606d357a4a184a09.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/82ae98ac3f92a8b0606d357a4a184a09.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/8345bb3cca3fbd801c1cd5733ef5df08.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/8345bb3cca3fbd801c1cd5733ef5df08.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/8345bb3cca3fbd801c1cd5733ef5df08.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/8e223e013f54ae81184a122d353ce342.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/8e223e013f54ae81184a122d353ce342.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/8e223e013f54ae81184a122d353ce342.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/9b397ed7034430ce10a317951e11139c.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/9b397ed7034430ce10a317951e11139c.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/9b397ed7034430ce10a317951e11139c.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/9cd975d66b99841ef6a0b73ce9e1850a.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/9cd975d66b99841ef6a0b73ce9e1850a.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/9cd975d66b99841ef6a0b73ce9e1850a.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/9d72f3e01192bff65d3d09f0a1a2b434.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/9d72f3e01192bff65d3d09f0a1a2b434.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/9d72f3e01192bff65d3d09f0a1a2b434.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/9fb6579178e19e693e7fbb52c17de5e5.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/9fb6579178e19e693e7fbb52c17de5e5.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/9fb6579178e19e693e7fbb52c17de5e5.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/a5f6f9ceafa7c53d9d28b7201ca5f910.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/a5f6f9ceafa7c53d9d28b7201ca5f910.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/a5f6f9ceafa7c53d9d28b7201ca5f910.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/c036ae99793ecc9acb6b535dd2d1005c.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/c036ae99793ecc9acb6b535dd2d1005c.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/c036ae99793ecc9acb6b535dd2d1005c.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/c639d7ade787dbfa6c8e3ac0deab407b.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/c639d7ade787dbfa6c8e3ac0deab407b.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/c639d7ade787dbfa6c8e3ac0deab407b.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/d041292fc36e216def97c3254eb01974.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/d041292fc36e216def97c3254eb01974.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/d041292fc36e216def97c3254eb01974.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/db8621fbde219e817cc89e61a12fb844.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/db8621fbde219e817cc89e61a12fb844.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/db8621fbde219e817cc89e61a12fb844.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/e40be544e57a231fd175961172f5a7fa.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/e40be544e57a231fd175961172f5a7fa.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/e40be544e57a231fd175961172f5a7fa.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/e7ecca8d08437e06bec751fec7df3d79.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/e7ecca8d08437e06bec751fec7df3d79.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/e7ecca8d08437e06bec751fec7df3d79.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/fba9006cb323657285278f3f151270b4.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/fba9006cb323657285278f3f151270b4.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/fba9006cb323657285278f3f151270b4.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/fef57be462b7432acaace8d983f9c64e.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/fef57be462b7432acaace8d983f9c64e.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.session/cache/fef57be462b7432acaace8d983f9c64e.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/range.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/range.res.oracle
index 8dc5e9a29d334ee81f52fe481c67d4e12e88f8df..e4a282e1d29b0a4e56f064a7ae5ee2c8dad95856 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/range.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/range.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/range.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.res.oracle
index a5a0d165b2fcc5e4407cc78023da2acb7191884d..23f22eec01d795099982854a854e3feee8a1b598 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/reads.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.session/cache/088f4361e7220d82c4aac3de0d54e9c0.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.session/cache/088f4361e7220d82c4aac3de0d54e9c0.json
new file mode 100644
index 0000000000000000000000000000000000000000..40ebb7e38f50f83e2d8753079502b97caec4e0fc
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.session/cache/088f4361e7220d82c4aac3de0d54e9c0.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0178,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.session/cache/9b8ec49fe4b770ed766cffeca06e26ba.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.session/cache/9b8ec49fe4b770ed766cffeca06e26ba.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.session/cache/9b8ec49fe4b770ed766cffeca06e26ba.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.session/cache/a7c19062a3a1ba781245090093cae159.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.session/cache/a7c19062a3a1ba781245090093cae159.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.session/cache/a7c19062a3a1ba781245090093cae159.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.session/cache/e056ff14ff3f3a31e1d259539c614fb4.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.session/cache/e056ff14ff3f3a31e1d259539c614fb4.json
new file mode 100644
index 0000000000000000000000000000000000000000..dc81afeb65bf616f5f245cd8f62129ba2beaf32e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.session/cache/e056ff14ff3f3a31e1d259539c614fb4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0154,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.res.oracle
index c40c87ec26c562b10a814447525a01bcd96dc71b..5d02297a0fa5979f13297e3f703bbfcf16fe7e3e 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/reads.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.session/cache/12175c96080c5e14983d37f17a405001.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.session/cache/12175c96080c5e14983d37f17a405001.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.session/cache/12175c96080c5e14983d37f17a405001.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.session/cache/a3d2f9ea9936fb5a5daf720f2390125e.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.session/cache/a3d2f9ea9936fb5a5daf720f2390125e.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.session/cache/a3d2f9ea9936fb5a5daf720f2390125e.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.session/cache/dec49417e6eaea97560cc7370af29e03.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.session/cache/dec49417e6eaea97560cc7370af29e03.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.session/cache/dec49417e6eaea97560cc7370af29e03.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.res.oracle
index 54d7726924e42e3fa643a2f44fad0ccb13ac1143..9871b438a59866e9ef6750ea63f66395effab7b8 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/record.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.session/cache/41f3fc78840b8c11a76649f0b924b629.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.session/cache/41f3fc78840b8c11a76649f0b924b629.json
new file mode 100644
index 0000000000000000000000000000000000000000..87f0e4ad87494a42da897938da32b504c336a6b3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.session/cache/41f3fc78840b8c11a76649f0b924b629.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0108,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.session/cache/46e19b7d03b33707aaeca4b14b58c682.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.session/cache/46e19b7d03b33707aaeca4b14b58c682.json
new file mode 100644
index 0000000000000000000000000000000000000000..0c6b9a5f95e42e72bbeb2da3aea096c8e86677dd
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.0.session/cache/46e19b7d03b33707aaeca4b14b58c682.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0163,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.1.res.oracle
index 1132c478b4b53d0eb424cf3990ff7bd18e191eef..e503585628857667622ce4428d71bdd27acd821a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/record.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.1.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.1.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/record.1.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/04736580fb1226122258d72b0db18b1c.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/04736580fb1226122258d72b0db18b1c.json
new file mode 100644
index 0000000000000000000000000000000000000000..a92a1cd4b586a02b1e3ac860208dcf9e738b3bc2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/04736580fb1226122258d72b0db18b1c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0279,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/04d277b0189801d4f62511a2ab403876.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/04d277b0189801d4f62511a2ab403876.json
new file mode 100644
index 0000000000000000000000000000000000000000..3773480c939edd37ca296650f35ae898718f38c8
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/04d277b0189801d4f62511a2ab403876.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0287,
+  "steps": 31 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/1810ee3e876059ed91b3364dadef0514.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/1810ee3e876059ed91b3364dadef0514.json
new file mode 100644
index 0000000000000000000000000000000000000000..ecf411bd181c7a55186ae7a27bd81c7f3cf4811c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/1810ee3e876059ed91b3364dadef0514.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0393,
+  "steps": 44 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/1acff11b2d0792af6d82f30fec359c77.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/1acff11b2d0792af6d82f30fec359c77.json
new file mode 100644
index 0000000000000000000000000000000000000000..c2b7eb213dd5f38307ad14b77bc05fd2946c4297
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/1acff11b2d0792af6d82f30fec359c77.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0602,
+  "steps": 63 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/2b6ad3215a88bf1a97361c2a6a548186.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/2b6ad3215a88bf1a97361c2a6a548186.json
new file mode 100644
index 0000000000000000000000000000000000000000..be3cfb02bb28ccb926890de1262e95640c2e0521
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/2b6ad3215a88bf1a97361c2a6a548186.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0432,
+  "steps": 46 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/63680574867f4524c193e581c4e99eab.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/63680574867f4524c193e581c4e99eab.json
new file mode 100644
index 0000000000000000000000000000000000000000..799c1d87905d1f89d0d8a3af5f696e79be84b225
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/63680574867f4524c193e581c4e99eab.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.022,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/6c40717c6a3db07364d11c549ccc8b8e.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/6c40717c6a3db07364d11c549ccc8b8e.json
new file mode 100644
index 0000000000000000000000000000000000000000..75f167629d9c2e78b38eab46346ed1d8b8832b88
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/6c40717c6a3db07364d11c549ccc8b8e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0164,
+  "steps": 48 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/95ff51261b0bee522dfdaedbe5332136.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/95ff51261b0bee522dfdaedbe5332136.json
new file mode 100644
index 0000000000000000000000000000000000000000..7db92d401f8fd4e5362880d3885f7d079ab0cca0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/95ff51261b0bee522dfdaedbe5332136.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0247,
+  "steps": 29 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/a9c64d50a502a33e86bf9c24d3534330.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/a9c64d50a502a33e86bf9c24d3534330.json
new file mode 100644
index 0000000000000000000000000000000000000000..d41a8e1c7a065892409df8a83d90e7f0b5545cb1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/a9c64d50a502a33e86bf9c24d3534330.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0207,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/e4e1431d753b9fc612caefb5e0d2f17c.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/e4e1431d753b9fc612caefb5e0d2f17c.json
new file mode 100644
index 0000000000000000000000000000000000000000..541337882202e6ae9ec011530d162927de4d27cf
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.0.session/cache/e4e1431d753b9fc612caefb5e0d2f17c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0221,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.res.oracle
index 384bd75e15532b9f91c12bd7c7e4ebe703d2590a..1ffb95b1d5eedc17adfce94425529a197de8fe27 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/simpl_is_type.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.0.session/cache/0c70acd19fe913cf00d8d5b7f63540bb.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.0.session/cache/0c70acd19fe913cf00d8d5b7f63540bb.json
new file mode 100644
index 0000000000000000000000000000000000000000..38e879d8be3ea21b775f0394056cc96169055c7f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.0.session/cache/0c70acd19fe913cf00d8d5b7f63540bb.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0082,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.0.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.0.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json
new file mode 100644
index 0000000000000000000000000000000000000000..d6f6d72c53b397b686f611763f07ce2fc4fdf560
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.0.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0084,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.res.oracle
index 498f74657dc77b70ba8f42508ead5d6e541a1dc6..8c9276a68e7cd532699f57d5ff1744c882c1e493 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/sizeof.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/sizeof.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.0.res.oracle
index da7fdb385c1caa6a7a18b1470ce1181936ce9d75..074954472b7d674670a9feb82dfa40bb94731dcc 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Caveat)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Caveat)' [...]
 [kernel] Parsing tests/wp_acsl/struct_use_case.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.0.session/cache/75e686a8c0da1561f5008f979b188b6d.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.0.session/cache/75e686a8c0da1561f5008f979b188b6d.json
new file mode 100644
index 0000000000000000000000000000000000000000..8b4de03413ca539ea76e50446f22cd397f06a9b8
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.0.session/cache/75e686a8c0da1561f5008f979b188b6d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0157,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.res.oracle
index 5313181afd3f7ced8c164c6b67d6d2c960405094..628c2eb2f84538cc4b72501f9beac24804ac3dd0 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Caveat)' -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-model 'Typed (Caveat)' -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/struct_use_case.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.session/cache/0e21c0bd5123ab46e918c741bc7e0a87.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.session/cache/0e21c0bd5123ab46e918c741bc7e0a87.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.session/cache/0e21c0bd5123ab46e918c741bc7e0a87.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.session/cache/d7ed670240fade4912b282fbeb66481b.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.session/cache/d7ed670240fade4912b282fbeb66481b.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/struct_use_case.1.session/cache/d7ed670240fade4912b282fbeb66481b.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.0.session/cache/329cc0ac6eb2e52eee8c4c5535959d47.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.0.session/cache/329cc0ac6eb2e52eee8c4c5535959d47.json
new file mode 100644
index 0000000000000000000000000000000000000000..a11c56b6cee9087f59261563ff4194e573d22545
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.0.session/cache/329cc0ac6eb2e52eee8c4c5535959d47.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0108,
+  "steps": 5 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.0.session/cache/a8575b778e6a1338826f75588b184b9a.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.0.session/cache/a8575b778e6a1338826f75588b184b9a.json
new file mode 100644
index 0000000000000000000000000000000000000000..3e4b6bf8774b0e52ab5ebdb4582573673230b46e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.0.session/cache/a8575b778e6a1338826f75588b184b9a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0128,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.res.oracle
index 12b3d155f8be29268fc07f0449de0efc646f4725..8de21842d8fbb97d1358643df647726d2fe518c2 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/tset.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/tset.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.0.res.oracle
index ddfbb1e23486e6e15b1108799cfb77b10b103c1c..66fb81dadf2992751cbdff88a688fe9a0f4d3658 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/type_guard.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.0.session/cache/97e65fe64d92e5a8031769b221e69ccf.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.0.session/cache/97e65fe64d92e5a8031769b221e69ccf.json
new file mode 100644
index 0000000000000000000000000000000000000000..9d1e20058ed7acdb37cd4c2e7369a29e47c4593a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.0.session/cache/97e65fe64d92e5a8031769b221e69ccf.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0173,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.1.res.oracle
index 09fd140cec8f65b106dad00ba0d4cc8469bc500f..ca7c410e823e8a0387fd7c273d8747376a537d87 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/type_guard.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.1.session/cache/9151bf7f78d38207ac18d6b238e10b92.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.1.session/cache/9151bf7f78d38207ac18d6b238e10b92.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/type_guard.1.session/cache/9151bf7f78d38207ac18d6b238e10b92.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.0.session/cache/d1a5d841e11f0a8ed014e2aa4ab1cc68.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.0.session/cache/d1a5d841e11f0a8ed014e2aa4ab1cc68.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.0.session/cache/d1a5d841e11f0a8ed014e2aa4ab1cc68.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.0.session/cache/f2e288c6ba3fc74ec5ba8e7052418211.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.0.session/cache/f2e288c6ba3fc74ec5ba8e7052418211.json
new file mode 100644
index 0000000000000000000000000000000000000000..6e4f8ae0e3cd1bd679eb57e9ac426c6a80265adf
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.0.session/cache/f2e288c6ba3fc74ec5ba8e7052418211.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0509,
+  "steps": 56 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.res.oracle
index 36e568d169f61b9ce5600e94b3a8cb1f9c430ca0..9c8efdfa48e60242dceff85de5b16dc6a0a14ff8 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/unit_bit_test.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bool.0.session/cache/ea51224602f5817b481d8b68c85bf05f.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bool.0.session/cache/ea51224602f5817b481d8b68c85bf05f.json
new file mode 100644
index 0000000000000000000000000000000000000000..a2e580db9b1dce83e858350377b42579a84f6f14
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bool.0.session/cache/ea51224602f5817b481d8b68c85bf05f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0101,
+  "steps": 4 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bool.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bool.res.oracle
index 48b1444f5eea6b9f51fedb4cf936092cfa4688e5..a457770ae98a1c44a65a2ccac90ec9cdefb6119a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bool.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bool.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/unit_bool.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.0.res.oracle
index c8becb7fc24765bed7959648be700b5b5a0828ff..3eb2f63b434bb900e407f1fb6dbe81c157f68a59 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_acsl/user_def_type_guard.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.0.session/cache/efda141dfdfe97789f4a4ffd5f7577cd.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.0.session/cache/efda141dfdfe97789f4a4ffd5f7577cd.json
new file mode 100644
index 0000000000000000000000000000000000000000..9d1e20058ed7acdb37cd4c2e7369a29e47c4593a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.0.session/cache/efda141dfdfe97789f4a4ffd5f7577cd.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0173,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.1.res.oracle
index 384654b8407866cd3e6a8ad7086ce4a63a34871f..d5a3dd35879fe81ed58b5a1bc72ff5466cb466e7 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_acsl/user_def_type_guard.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.1.session/cache/359125254990d37ce0c03112199b9d15.json b/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.1.session/cache/359125254990d37ce0c03112199b9d15.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/user_def_type_guard.1.session/cache/359125254990d37ce0c03112199b9d15.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle/issue_141.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/issue_141.res.oracle
index 92e03a00f08112f410963af62be988bc9e6e8d60..f84001a741b81c764034372d35bdefbf903406f3 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/issue_141.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/issue_141.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-rte [...]
+# frama-c -wp -wp-rte -wp-steps 50 [...]
 [kernel] Parsing tests/wp_bts/issue_141.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.0.session/cache/45adede70556d3565ca7da32bceece0c.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.0.session/cache/45adede70556d3565ca7da32bceece0c.json
new file mode 100644
index 0000000000000000000000000000000000000000..4edd8d1ef5c48f933f4e747831a1a1da7c1ce5a5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.0.session/cache/45adede70556d3565ca7da32bceece0c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0085,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.0.session/cache/cab2498bc3eae91d071c428687d9c535.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.0.session/cache/cab2498bc3eae91d071c428687d9c535.json
new file mode 100644
index 0000000000000000000000000000000000000000..b2577c8a974c984eadc69b09b67230a07ed782ee
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.0.session/cache/cab2498bc3eae91d071c428687d9c535.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.014,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.res.oracle
index aff0d060520798f8cd9f66eaa293c58cf6489b98..4be131e60409c2020a842bdd0ae2ab01fa35cf0b 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/bts0708.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0843.0.session/cache/8ee3ccd2b653146fa62b383b6d59595a.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0843.0.session/cache/8ee3ccd2b653146fa62b383b6d59595a.json
new file mode 100644
index 0000000000000000000000000000000000000000..ec0c22a505af25d9cbc8b8bcc24879d91f153d4e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0843.0.session/cache/8ee3ccd2b653146fa62b383b6d59595a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0154,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0843.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0843.res.oracle
index 33b4eab16620e6aebad92ab88de54117828e0be5..6ade8dc8e47d7d62db7bc92fceb4ac95519e0ca2 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0843.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0843.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/bts0843.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.0.session/cache/84e464991f42146c235a4fc00372cf66.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.0.session/cache/84e464991f42146c235a4fc00372cf66.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.0.session/cache/84e464991f42146c235a4fc00372cf66.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.0.session/cache/df22e5945984cae59d5572661c5078e4.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.0.session/cache/df22e5945984cae59d5572661c5078e4.json
new file mode 100644
index 0000000000000000000000000000000000000000..11600fa793ce9dc1405a2ade3b2b886bdc7d5b0f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.0.session/cache/df22e5945984cae59d5572661c5078e4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0228,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.res.oracle
index 4282d2c325ed9f4a51cfffdffcf7bd90f8710d10..e3c50082e0ac7d4a71ad71723b5dc8159bc6063b 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts779.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-rte -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-rte [...]
 [kernel] Parsing tests/wp_bts/bts779.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.0.session/cache/9615dd4933bcc9729b8d73c457ea1451.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.0.session/cache/9615dd4933bcc9729b8d73c457ea1451.json
new file mode 100644
index 0000000000000000000000000000000000000000..831509f7be221cfbb8a91c0487c9f341c190bdc3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.0.session/cache/9615dd4933bcc9729b8d73c457ea1451.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.016,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.0.session/cache/f3def660dbf6ffbaa12d1bfcbaf4fa10.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.0.session/cache/f3def660dbf6ffbaa12d1bfcbaf4fa10.json
new file mode 100644
index 0000000000000000000000000000000000000000..d70f58f9bdc6e8056118ae2b061662f59bef37d7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.0.session/cache/f3def660dbf6ffbaa12d1bfcbaf4fa10.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0156,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.res.oracle
index 1215384b9c189e02cbab664bff0b7103c5a5291b..5cd9ede34c1da3c9383ae83555f4ff3673995c65 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts788.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_bts/bts788.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts986.0.session/cache/9445275097129056bb2cb75cd5cbdc15.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts986.0.session/cache/9445275097129056bb2cb75cd5cbdc15.json
new file mode 100644
index 0000000000000000000000000000000000000000..91be312205d30027cccdd24e9ace4d63fc402458
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts986.0.session/cache/9445275097129056bb2cb75cd5cbdc15.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0196,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts986.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts986.res.oracle
index f28391971bd4ddecae9032b80d400cc2994db4a0..360961ac42c3def5b5c22ba3cdfe5a435aee1185 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts986.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts986.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_bts/bts986.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1174.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1174.res.oracle
index 374c06fec66e57309d74321eb49662b61147354d..4de546639bdce94817bb66c119bd9dd11ea8bb1e 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1174.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1174.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Real)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Real)' [...]
 [kernel] Parsing tests/wp_bts/bts_1174.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1176.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1176.res.oracle
index 6a39dfa841d142c2718620cb1567b07330b19d84..746589ddd94348aec7cc86e69d150da525fbe387 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1176.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1176.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_bts/bts_1176.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.0.session/cache/3bd45d7903238a8ffb491d774fe6fafe.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.0.session/cache/3bd45d7903238a8ffb491d774fe6fafe.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.0.session/cache/3bd45d7903238a8ffb491d774fe6fafe.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.0.session/cache/d6b34eb7a8b408a7607505bec8a37c29.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.0.session/cache/d6b34eb7a8b408a7607505bec8a37c29.json
new file mode 100644
index 0000000000000000000000000000000000000000..1c6eec79c76dfaf767f9f5898a5bdc8fe7d685b3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.0.session/cache/d6b34eb7a8b408a7607505bec8a37c29.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0171,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.res.oracle
index 61ff3d4d143239a6c98a5675e9d92e75f879c72a..710eb3051e1cd6e1dbdc94c374cb9236ea4e233c 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-rte -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-rte [...]
 [kernel] Parsing tests/wp_bts/bts_1360.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.0.session/cache/0498222ad10a7cab9a5f7e70ee6d9640.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.0.session/cache/0498222ad10a7cab9a5f7e70ee6d9640.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.0.session/cache/0498222ad10a7cab9a5f7e70ee6d9640.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.0.session/cache/16ddbd9fbf85a3bf8a6d0da586ad146a.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.0.session/cache/16ddbd9fbf85a3bf8a6d0da586ad146a.json
new file mode 100644
index 0000000000000000000000000000000000000000..4107c76915319131ab618252eac232115d74bb54
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.0.session/cache/16ddbd9fbf85a3bf8a6d0da586ad146a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0135,
+  "steps": 7 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.0.session/cache/7730ee1a1dbc7387268022b37006f301.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.0.session/cache/7730ee1a1dbc7387268022b37006f301.json
new file mode 100644
index 0000000000000000000000000000000000000000..9cf59a633fed40e81e00957be03c090fe95677f3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.0.session/cache/7730ee1a1dbc7387268022b37006f301.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0086,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.res.oracle
index d45f3ec09d3b0122e557e3b2b910a6fecd942f93..eb31be8a44ffba5eb0b43cb007262a89be0dfbee 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/bts_1462.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1586.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1586.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1586.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1586.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1586.res.oracle
index 722fea991544c5bda4ca295a89e6aa4231ee5788..ce7b8a4fe68ac48060a4b00f9f5d6d6d2b916fe2 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1586.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1586.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/bts_1586.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1588.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1588.res.oracle
index d3080fe82353c5930f7b03cdb1c457dc321de053..55913b62c703f179534e696b2cf9deb9b0ccd523 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1588.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1588.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/bts_1588.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.0.session/cache/1108d44ac28a86f5eb79e03578b6b5ca.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.0.session/cache/1108d44ac28a86f5eb79e03578b6b5ca.json
new file mode 100644
index 0000000000000000000000000000000000000000..a31d247527e48ce0250bc74e27a18fbe681fc04c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.0.session/cache/1108d44ac28a86f5eb79e03578b6b5ca.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0332,
+  "steps": 27 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.res.oracle
index d121feba83671afe3403b57c1f1680a09a400bdd..eeccda7e270c592e753c1d0429a739688b6aef55 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/bts_1601.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.res.oracle
index cccf36bcb811a33aad6db7974ad8b997b88eefd3..99bc35317b0c035e229adecc85911840f4de0657 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/bts_1828.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.session/cache/2f7f2c8f6ef7d223e768e1090d15a5ad.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.session/cache/2f7f2c8f6ef7d223e768e1090d15a5ad.json
new file mode 100644
index 0000000000000000000000000000000000000000..7d85e43e2a18a44d699d1b03a54c96174c82f785
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.session/cache/2f7f2c8f6ef7d223e768e1090d15a5ad.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0149,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.session/cache/73efff261f005628172071973be37a21.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.session/cache/73efff261f005628172071973be37a21.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.session/cache/73efff261f005628172071973be37a21.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.session/cache/c089c450772a3a0346e02bc1e798bdb0.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.session/cache/c089c450772a3a0346e02bc1e798bdb0.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.session/cache/c089c450772a3a0346e02bc1e798bdb0.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.res.oracle
index 7855fdce2b682ade757aa28766716c738e323b0f..8434a188aab590de1c135d9d6b42e879b9281425 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_bts/bts_1828.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.session/cache/2f7f2c8f6ef7d223e768e1090d15a5ad.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.session/cache/2f7f2c8f6ef7d223e768e1090d15a5ad.json
new file mode 100644
index 0000000000000000000000000000000000000000..a6f3d30f28048e57803ab1e7c56a368285cb6b44
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.session/cache/2f7f2c8f6ef7d223e768e1090d15a5ad.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0153,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2040.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2040.res.oracle
index 1c2fe17584e25389eabc964a263ad5aa6e7ef2ba..4d4b554f999735ad1765a76f7962b5e40cc0141d 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2040.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2040.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/bts_2040.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2079.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2079.res.oracle
index 40b78670f5ecb93d9d8ffb7a344292208a1ed931..d4b8e198b08346e06d4cf6f685de7d40b02e427e 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2079.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2079.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/bts_2079.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2159.0.session/cache/bdef92292b218ae60ed7bf31d9876725.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2159.0.session/cache/bdef92292b218ae60ed7bf31d9876725.json
new file mode 100644
index 0000000000000000000000000000000000000000..6531c88f85fc3d7a7108c71752cfcdd087801083
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2159.0.session/cache/bdef92292b218ae60ed7bf31d9876725.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0161,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2159.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2159.res.oracle
index 79511ba17200cdf6d780424e63b96a5eec1edf7c..f241129fe79416eb622e6e08a9a0382ae2c20860 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2159.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_2159.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/bts_2159.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/ergo_typecheck.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/ergo_typecheck.res.oracle
index 9f89e1687a37d3daebda3ed5de1544568b1271db..e0de6d5f1e0f840efc616420df58ba5df14897ba 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/ergo_typecheck.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/ergo_typecheck.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/ergo_typecheck.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.0.session/cache/20ce0275c1526238b5f71932690ce665.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.0.session/cache/20ce0275c1526238b5f71932690ce665.json
new file mode 100644
index 0000000000000000000000000000000000000000..5e333076a21c578e9a2736e28fdb3acb4bb1947e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.0.session/cache/20ce0275c1526238b5f71932690ce665.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0224,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.0.session/cache/811d41ea82968315323fd1dca753edac.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.0.session/cache/811d41ea82968315323fd1dca753edac.json
new file mode 100644
index 0000000000000000000000000000000000000000..7a077ad2df8006c5062a91ca87add67821a02616
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.0.session/cache/811d41ea82968315323fd1dca753edac.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0273,
+  "steps": 30 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.res.oracle
index 4231e564c8c7761d3b20cbc6b67ed871a8d7aa65..42d8ba9e5b75175e08864dd5d58147c5acdb2982 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue-364.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/issue-364.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.res.oracle
index 341cbfc3a200bd063b6f76628c03074d47be937b..e3ee19b027bad6735968cefd342c5cafa24922b0 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/issue_143.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.session/cache/38acf909585519bf444c738cb33ab2c5.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.session/cache/38acf909585519bf444c738cb33ab2c5.json
new file mode 100644
index 0000000000000000000000000000000000000000..c0a83f1be0e9165a755eae10bb5d2ba1713a831f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.session/cache/38acf909585519bf444c738cb33ab2c5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0099,
+  "steps": 4 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.session/cache/4125251455381bd914edf14cf4cbadb5.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.session/cache/4125251455381bd914edf14cf4cbadb5.json
new file mode 100644
index 0000000000000000000000000000000000000000..f2459e4701d26a1784c894e9dc9c2177110d2e4e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.session/cache/4125251455381bd914edf14cf4cbadb5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0084,
+  "steps": 4 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.res.oracle
index 5809812ed6884f8379efb13e39220c370b7d41bf..6985b4d2e2f79547295f3d204986459fe4b042e5 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/issue_143.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.session/cache/38acf909585519bf444c738cb33ab2c5.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.session/cache/38acf909585519bf444c738cb33ab2c5.json
new file mode 100644
index 0000000000000000000000000000000000000000..45da6c544390c07a35357e35a1788884fb8082ae
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.session/cache/38acf909585519bf444c738cb33ab2c5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0096,
+  "steps": 4 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.session/cache/4125251455381bd914edf14cf4cbadb5.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.session/cache/4125251455381bd914edf14cf4cbadb5.json
new file mode 100644
index 0000000000000000000000000000000000000000..fc25362a08e022927d67fdda70783ad53ed7204f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.session/cache/4125251455381bd914edf14cf4cbadb5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0094,
+  "steps": 4 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.res.oracle
index 020e138a0e7dfdc7abc0c2c612f7ad8a6b7c0017..feee3c9109990d2eebec4549db1f994cd3b95c2f 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/issue_143.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.session/cache/38acf909585519bf444c738cb33ab2c5.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.session/cache/38acf909585519bf444c738cb33ab2c5.json
new file mode 100644
index 0000000000000000000000000000000000000000..aaac644d52593d6e32c2a0d722a48ba742c5c1e0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.session/cache/38acf909585519bf444c738cb33ab2c5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0091,
+  "steps": 4 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.session/cache/4125251455381bd914edf14cf4cbadb5.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.session/cache/4125251455381bd914edf14cf4cbadb5.json
new file mode 100644
index 0000000000000000000000000000000000000000..ec2b0cfc1965d004317bcf4c6728ebdf7d631d46
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.session/cache/4125251455381bd914edf14cf4cbadb5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.009,
+  "steps": 4 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.3.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.3.res.oracle
index 740bb8ea13f1704edbe9a73b46b88a36d8170360..e9bc0c7109c1f4fcb013f7f3a1586a9cbcedf86d 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.3.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.3.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/issue_143.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_198.0.session/cache/38c1b43d76702d5ab3baa6900ee752eb.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_198.0.session/cache/38c1b43d76702d5ab3baa6900ee752eb.json
new file mode 100644
index 0000000000000000000000000000000000000000..854b07221b108088e703d1066086d9734a7d1ed1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_198.0.session/cache/38c1b43d76702d5ab3baa6900ee752eb.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0153,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_198.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_198.res.oracle
index 377e3ee717a2a10acaeeac0a449e40549feb62b6..f391d02b573f44e30cbcd5fbfad230fe371fe8e0 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_198.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_198.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/issue_198.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_447.0.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_447.0.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json
new file mode 100644
index 0000000000000000000000000000000000000000..d6f6d72c53b397b686f611763f07ce2fc4fdf560
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_447.0.session/cache/5d63c645e492af38b5a1d3859d7eeaa2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0084,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_447.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_447.res.oracle
index 06085822d33f851a729a86c4879786dfd6aa9ffb..f9611321b0c07ecc9cd0cd6a62b5fd80c99f8ad4 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_447.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_447.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/issue_447.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_453.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_453.res.oracle
index 5c91074b9d16dd1af773f8e70f375031623fabc2..a1ec9480bb7bf24cd58d799150e56fb4bac9071e 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_453.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_453.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/issue_453.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.0.session/cache/7dac874a74c4862db7a2944e8c37b9ee.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.0.session/cache/7dac874a74c4862db7a2944e8c37b9ee.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.0.session/cache/7dac874a74c4862db7a2944e8c37b9ee.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.0.session/cache/8c9a5bc85b9f4470e33ef29dbe5cc4d7.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.0.session/cache/8c9a5bc85b9f4470e33ef29dbe5cc4d7.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.0.session/cache/8c9a5bc85b9f4470e33ef29dbe5cc4d7.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.0.session/cache/ad665a340bece5a7e649ab81ad5c30ea.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.0.session/cache/ad665a340bece5a7e649ab81ad5c30ea.json
new file mode 100644
index 0000000000000000000000000000000000000000..81761b268468a36facec4cb7bd12a02aa10f2fa2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.0.session/cache/ad665a340bece5a7e649ab81ad5c30ea.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0208,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.res.oracle
index cf0252e05e8ef594e2b3a7929f5ad0a924178968..592d4a5f61330d27a4ab5382dc872b9f212dff89 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_494.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/issue_494.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_508.0.session/cache/e8f5425a0d4716aa3cf9bb584096267c.json b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_508.0.session/cache/e8f5425a0d4716aa3cf9bb584096267c.json
new file mode 100644
index 0000000000000000000000000000000000000000..513509ff14f94cf0b7c0050206f0862d1cf226a4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_508.0.session/cache/e8f5425a0d4716aa3cf9bb584096267c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0386,
+  "steps": 58 }
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_508.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_508.res.oracle
index 62d996fcf99309c0a209120b5f0bfcf882c0c507..565ebf75c772f30336b80a9a15332fd752615d91 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_508.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_508.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/issue_508.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/nupw-bcl-bts1120.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/nupw-bcl-bts1120.res.oracle
index f5969a63fa8a537593bd936c02243ac3ee4c8a4a..bfdf15d4931fd44e05f315d8ddcd4ca2a4516749 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/nupw-bcl-bts1120.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/nupw-bcl-bts1120.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_bts/nupw-bcl-bts1120.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/50b7ca427889aed35cdffb94389d1fc1.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/50b7ca427889aed35cdffb94389d1fc1.json
new file mode 100644
index 0000000000000000000000000000000000000000..ce54f97614d117d03cef880c8251c32e9148935a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/50b7ca427889aed35cdffb94389d1fc1.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1725,
+  "steps": 111 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/83dc0544abe24718ea722865cad8567d.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/83dc0544abe24718ea722865cad8567d.json
new file mode 100644
index 0000000000000000000000000000000000000000..984ee2ea36639a084fac85172b930105314d795e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/83dc0544abe24718ea722865cad8567d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0591,
+  "steps": 72 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/b4b065851b610941b8243cc07cc36ed7.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/b4b065851b610941b8243cc07cc36ed7.json
new file mode 100644
index 0000000000000000000000000000000000000000..2b1a1117297de611ac2b93d2aa41f0feba1a8a25
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/b4b065851b610941b8243cc07cc36ed7.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0404,
+  "steps": 52 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/bb32008f2b6dbbd81a3deecbf51e7d01.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/bb32008f2b6dbbd81a3deecbf51e7d01.json
new file mode 100644
index 0000000000000000000000000000000000000000..4558e35969c19a27aa4fa10783f9d4fa65da7384
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/bb32008f2b6dbbd81a3deecbf51e7d01.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0792,
+  "steps": 42 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/c39ca4ac35735cb6f87c385e13049ca6.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/c39ca4ac35735cb6f87c385e13049ca6.json
new file mode 100644
index 0000000000000000000000000000000000000000..dbcc2572ad7139b6777b855febb16b50df05c74d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/c39ca4ac35735cb6f87c385e13049ca6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0233,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/d200f15f1ef2cdeb0e4ccb444961c8cf.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/d200f15f1ef2cdeb0e4ccb444961c8cf.json
new file mode 100644
index 0000000000000000000000000000000000000000..0643fb332d7c7c3071868aaba50fcefb9921b9f2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/d200f15f1ef2cdeb0e4ccb444961c8cf.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0181,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/d5ffa33594d297a8ce47a352154deba1.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/d5ffa33594d297a8ce47a352154deba1.json
new file mode 100644
index 0000000000000000000000000000000000000000..34eb92e14c8f8b1ff591d64373ec98bf9aff7d6a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/d5ffa33594d297a8ce47a352154deba1.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0234,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/db765e117c923a38adaf1ca9b69e1bbd.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/db765e117c923a38adaf1ca9b69e1bbd.json
new file mode 100644
index 0000000000000000000000000000000000000000..76e11d42ddce4e65e08356c8627ab0f750dd3d48
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/db765e117c923a38adaf1ca9b69e1bbd.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0212,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/e62b96ca9a73811ef18902b193cbc59a.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/e62b96ca9a73811ef18902b193cbc59a.json
new file mode 100644
index 0000000000000000000000000000000000000000..6234bb10ca234b2e06c75ad96a87fec9021524bf
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/e62b96ca9a73811ef18902b193cbc59a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0251,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/edb252ae3606764fc300bb9f81803db8.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/edb252ae3606764fc300bb9f81803db8.json
new file mode 100644
index 0000000000000000000000000000000000000000..4524b881a692344279fed699077360f87f4bfb41
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/edb252ae3606764fc300bb9f81803db8.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0382,
+  "steps": 27 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/f069f82f764fc40974af232593211a75.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/f069f82f764fc40974af232593211a75.json
new file mode 100644
index 0000000000000000000000000000000000000000..6d63f7685627d0b28c82f8b36430d1b585de12dd
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.0.session/cache/f069f82f764fc40974af232593211a75.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.104,
+  "steps": 87 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.res.oracle
index b12a5179d4c23014d11aedb8ef7d40f82b89841c..4aa305f3c58224b6a063e5ea5469de67bc6af1d1 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication-without-overflow.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 -warn-unsigned-overflow [...]
+# frama-c -wp -warn-unsigned-overflow [...]
 [kernel] Parsing tests/wp_gallery/binary-multiplication-without-overflow.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/1539e57db2401020ec0e02d0f7961978.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/1539e57db2401020ec0e02d0f7961978.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ea41d6d57686836c0f816173aa79bc2c795408b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/1539e57db2401020ec0e02d0f7961978.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 90. }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/24386c81f53980bedb1b517805f58c72.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/24386c81f53980bedb1b517805f58c72.json
new file mode 100644
index 0000000000000000000000000000000000000000..d8c24dd5bc398427b5a0ce61ded73c53e4ddb31e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/24386c81f53980bedb1b517805f58c72.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.027,
+  "steps": 45 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/66c6d5d5b8486f066838ca77c26a99bc.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/66c6d5d5b8486f066838ca77c26a99bc.json
new file mode 100644
index 0000000000000000000000000000000000000000..32366ef6f8704ee4a628107b7d8358aab90e93b0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/66c6d5d5b8486f066838ca77c26a99bc.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0104,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/7679c569f1bb065300d3d8cb1464bbad.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/7679c569f1bb065300d3d8cb1464bbad.json
new file mode 100644
index 0000000000000000000000000000000000000000..966be8de4c5c99ea5ca44d5959e40fa3dc581f5c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/7679c569f1bb065300d3d8cb1464bbad.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0995,
+  "steps": 131 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/77d9616fbe16ad3e6a1b14e74982ead2.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/77d9616fbe16ad3e6a1b14e74982ead2.json
new file mode 100644
index 0000000000000000000000000000000000000000..5f4fc1b3c77448a9f55c74c35bc0c49f1cf7a26e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/77d9616fbe16ad3e6a1b14e74982ead2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0183,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/a0e9344a67a80337a267995dd5b05544.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/a0e9344a67a80337a267995dd5b05544.json
new file mode 100644
index 0000000000000000000000000000000000000000..48243733791ad2aafec0227b3bb678195b217db0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/a0e9344a67a80337a267995dd5b05544.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0201,
+  "steps": 53 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/b035bd9b0798630779b2676faf707d06.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/b035bd9b0798630779b2676faf707d06.json
new file mode 100644
index 0000000000000000000000000000000000000000..529f1a4edbc6c58f1e7e05bbecb05cb418b3fd3e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/b035bd9b0798630779b2676faf707d06.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.529,
+  "steps": 430 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/b336801d3713a314b5daec247980d7dd.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/b336801d3713a314b5daec247980d7dd.json
new file mode 100644
index 0000000000000000000000000000000000000000..475e6f519c09484abbf100af4245f21e29bd9bed
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/b336801d3713a314b5daec247980d7dd.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.5623,
+  "steps": 383 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/c450d21c433db1ccd7b96bfd362d035a.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/c450d21c433db1ccd7b96bfd362d035a.json
new file mode 100644
index 0000000000000000000000000000000000000000..c9edc62d71d621bb078e5a64a662e1be4388bcc5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/c450d21c433db1ccd7b96bfd362d035a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0108,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/d8e9312b5b8cdc167678751e3ede50c1.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/d8e9312b5b8cdc167678751e3ede50c1.json
new file mode 100644
index 0000000000000000000000000000000000000000..3e22b56b9cfc8f61e377ed6df7292025b929f43c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/d8e9312b5b8cdc167678751e3ede50c1.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0522,
+  "steps": 80 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/e0a684fe785a113b129a9df74687db0c.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/e0a684fe785a113b129a9df74687db0c.json
new file mode 100644
index 0000000000000000000000000000000000000000..1230f8c3f1e214bf9323af5d30012e74c6c45dd3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/e0a684fe785a113b129a9df74687db0c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0098,
+  "steps": 7 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/e487df371af8c54f2d6fb9cc129c1696.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/e487df371af8c54f2d6fb9cc129c1696.json
new file mode 100644
index 0000000000000000000000000000000000000000..0a9ec4eb67b3a73d39a570d5dce61554ae877115
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/e487df371af8c54f2d6fb9cc129c1696.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0384,
+  "steps": 114 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/fe5b0fc55cfd82dc6da71976001e38ec.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/fe5b0fc55cfd82dc6da71976001e38ec.json
new file mode 100644
index 0000000000000000000000000000000000000000..ffa74cd1fff22ee1a042c157ecf91c5182106b6f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.0.session/cache/fe5b0fc55cfd82dc6da71976001e38ec.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0132,
+  "steps": 7 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.res.oracle
index 8bb2f2aa48ea3cbc255177e1045da19274c25a64..42de806ba95e3bdf08b0418a6ef801e25fc89e39 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/binary-multiplication.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 90 -wp-steps 1500 [...]
+# frama-c -wp -wp-timeout 90 [...]
 [kernel] Parsing tests/wp_gallery/binary-multiplication.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/00ecf4296b3aee4d1912c74420c9bfce.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/00ecf4296b3aee4d1912c74420c9bfce.json
new file mode 100644
index 0000000000000000000000000000000000000000..2d671c4e72bc51f3c700e0e81919e990ca315d1d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/00ecf4296b3aee4d1912c74420c9bfce.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0238,
+  "steps": 25 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/0230914cd0121d246ef6d21a5cfc7fa1.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/0230914cd0121d246ef6d21a5cfc7fa1.json
new file mode 100644
index 0000000000000000000000000000000000000000..60e024902b6acefeaea8e2dd896cbbd49d46991d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/0230914cd0121d246ef6d21a5cfc7fa1.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0156,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/2deacada1b18db7a5111ef2c5b2638de.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/2deacada1b18db7a5111ef2c5b2638de.json
new file mode 100644
index 0000000000000000000000000000000000000000..23a0696e1c1def2480c519cbfe166c5762aed7c3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/2deacada1b18db7a5111ef2c5b2638de.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0667,
+  "steps": 102 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/45575d27fe1fe5a0b0153e23f53726c9.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/45575d27fe1fe5a0b0153e23f53726c9.json
new file mode 100644
index 0000000000000000000000000000000000000000..1163a8b34da8f77880f6f36066b24770e849ac2e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/45575d27fe1fe5a0b0153e23f53726c9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.028,
+  "steps": 31 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/48bd1dffec078a57cdf3c81460760830.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/48bd1dffec078a57cdf3c81460760830.json
new file mode 100644
index 0000000000000000000000000000000000000000..73761d478128e7d52e3d9428d70c38e07c368b95
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/48bd1dffec078a57cdf3c81460760830.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.017,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/a9a1699bcaaae331be6465b2f7af6a4c.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/a9a1699bcaaae331be6465b2f7af6a4c.json
new file mode 100644
index 0000000000000000000000000000000000000000..d395e4b317e1987a94be9ab879a6dd7eb06f88a3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/a9a1699bcaaae331be6465b2f7af6a4c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0406,
+  "steps": 47 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/b0c44ab7bb5e6a7220f7179fe6ae6761.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/b0c44ab7bb5e6a7220f7179fe6ae6761.json
new file mode 100644
index 0000000000000000000000000000000000000000..c59f1efb3db34f92b10b1e2b3f8f788da816765b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/b0c44ab7bb5e6a7220f7179fe6ae6761.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0373,
+  "steps": 51 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/d10c14e21c7d63a6a49829c726e18f8f.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/d10c14e21c7d63a6a49829c726e18f8f.json
new file mode 100644
index 0000000000000000000000000000000000000000..a98cc2b29345d6e23841f1b7ea6a7da5296bd341
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/d10c14e21c7d63a6a49829c726e18f8f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0312,
+  "steps": 51 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/d9457ea3aed60df13390d1465c9ae2a4.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/d9457ea3aed60df13390d1465c9ae2a4.json
new file mode 100644
index 0000000000000000000000000000000000000000..26acbfb2008c9a9516c00c23851980a1203c1607
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.0.session/cache/d9457ea3aed60df13390d1465c9ae2a4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0283,
+  "steps": 36 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.res.oracle
index 650002bfa46b9f86b1f1595fb3526edf99be9908..3d750b31c6924c9d1666b8dd25f1a34f2f52a7f0 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_gallery/frama_c_exo1_solved.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/09d860a6bed99d37144eb85b7d09c1cd.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/09d860a6bed99d37144eb85b7d09c1cd.json
new file mode 100644
index 0000000000000000000000000000000000000000..490ff3b9c836873ef3ad6cb64166a26979ffce86
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/09d860a6bed99d37144eb85b7d09c1cd.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0362,
+  "steps": 52 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/2298a3e138acd30bbfb9944ea8f9e47f.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/2298a3e138acd30bbfb9944ea8f9e47f.json
new file mode 100644
index 0000000000000000000000000000000000000000..625c9b5edd8412057893d68d889a0df41e170088
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/2298a3e138acd30bbfb9944ea8f9e47f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0315,
+  "steps": 32 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/2a85ef642eeffcb15f2c8c244d5e6fcd.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/2a85ef642eeffcb15f2c8c244d5e6fcd.json
new file mode 100644
index 0000000000000000000000000000000000000000..52ea5a3d300d5c4ab39a1663cd87f45adc5db334
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/2a85ef642eeffcb15f2c8c244d5e6fcd.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0486,
+  "steps": 61 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/37e42d2496a52f0392be3e018f994253.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/37e42d2496a52f0392be3e018f994253.json
new file mode 100644
index 0000000000000000000000000000000000000000..19bac4cb88932515027a1943f1e8b7cf5196511d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/37e42d2496a52f0392be3e018f994253.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0191,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/4024290cccf2bd02d1affc464c31272c.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/4024290cccf2bd02d1affc464c31272c.json
new file mode 100644
index 0000000000000000000000000000000000000000..10a37b87047e7a6498c864c6271917891a030815
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/4024290cccf2bd02d1affc464c31272c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0356,
+  "steps": 47 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/7384017a2cf1ceb7fa5e3f2a27ec1461.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/7384017a2cf1ceb7fa5e3f2a27ec1461.json
new file mode 100644
index 0000000000000000000000000000000000000000..e3809744262dc71767867c63983c7c3befb782bb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/7384017a2cf1ceb7fa5e3f2a27ec1461.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0354,
+  "steps": 46 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/8d7cbb96d2716e5e30fa2db72e0bc571.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/8d7cbb96d2716e5e30fa2db72e0bc571.json
new file mode 100644
index 0000000000000000000000000000000000000000..32100aa5bd4fbbb5857f23aa793267aba26b2f55
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/8d7cbb96d2716e5e30fa2db72e0bc571.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1911,
+  "steps": 275 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/9386d1588ee8ff353cf1bba248d8b6ce.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/9386d1588ee8ff353cf1bba248d8b6ce.json
new file mode 100644
index 0000000000000000000000000000000000000000..572d632b098d8d2739589f39aa0a560c5067bc74
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/9386d1588ee8ff353cf1bba248d8b6ce.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.031,
+  "steps": 41 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/99c9c4369b4e7f2cc778a41d382e4be5.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/99c9c4369b4e7f2cc778a41d382e4be5.json
new file mode 100644
index 0000000000000000000000000000000000000000..fc1c472beaefbde70944c197980dcd18bdbb280b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/99c9c4369b4e7f2cc778a41d382e4be5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0885,
+  "steps": 140 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/ac26388b1db7b81e2c7bbf9cbd232cbf.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/ac26388b1db7b81e2c7bbf9cbd232cbf.json
new file mode 100644
index 0000000000000000000000000000000000000000..4dfb994b110e3b105019744949b457628de5c9c6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/ac26388b1db7b81e2c7bbf9cbd232cbf.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0244,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/ba4e367ec1b498ad0f90c7529ea797f9.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/ba4e367ec1b498ad0f90c7529ea797f9.json
new file mode 100644
index 0000000000000000000000000000000000000000..716e5f07d34ee12a1d048c3cfba78b1179ae6850
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/ba4e367ec1b498ad0f90c7529ea797f9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0247,
+  "steps": 31 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/c8dc85fabdedd37aab84db72c8de7556.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/c8dc85fabdedd37aab84db72c8de7556.json
new file mode 100644
index 0000000000000000000000000000000000000000..68ec056a4efdb25925e5bc2d19acb04a2084f0f9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/c8dc85fabdedd37aab84db72c8de7556.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0245,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/d7f28bc4aeb695c611ec122b4a4690e5.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/d7f28bc4aeb695c611ec122b4a4690e5.json
new file mode 100644
index 0000000000000000000000000000000000000000..b10056a3d0b2a4f1c6ae895426e74215dc5dd878
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.0.session/cache/d7f28bc4aeb695c611ec122b4a4690e5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.075,
+  "steps": 87 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.res.oracle
index c0bfb08ca3b50875c885f9c27608b26cba945941..deaba47c54d9188bab890c5eaddf280739a5b0f0 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_gallery/frama_c_exo2_solved.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/0b5759138af93f51b0e7fb12c995eb14.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/0b5759138af93f51b0e7fb12c995eb14.json
new file mode 100644
index 0000000000000000000000000000000000000000..a4ff93c46280462dc0930b6e8f6d930fcc715ddf
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/0b5759138af93f51b0e7fb12c995eb14.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0602,
+  "steps": 122 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/0bb570bdfc29c713f2ab3cfdfeb32896.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/0bb570bdfc29c713f2ab3cfdfeb32896.json
new file mode 100644
index 0000000000000000000000000000000000000000..017d66c1e4d0c75ee03c2ba417c8efa08b2b3a2c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/0bb570bdfc29c713f2ab3cfdfeb32896.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0185,
+  "steps": 25 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/146fbdc1298b06be16738f962a3f5159.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/146fbdc1298b06be16738f962a3f5159.json
new file mode 100644
index 0000000000000000000000000000000000000000..356916e04e512e9933fef54fde7a27a7796b88c6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/146fbdc1298b06be16738f962a3f5159.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0476,
+  "steps": 88 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/283f609cf9f5e76247af6de360d9da6b.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/283f609cf9f5e76247af6de360d9da6b.json
new file mode 100644
index 0000000000000000000000000000000000000000..31277cd1001d1bd47e2b63d1834356de1652c633
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/283f609cf9f5e76247af6de360d9da6b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.018,
+  "steps": 36 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/381ee71a63ecd1842e5a04cbce851b5b.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/381ee71a63ecd1842e5a04cbce851b5b.json
new file mode 100644
index 0000000000000000000000000000000000000000..d293342494ac431101146536322c891849a15e54
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/381ee71a63ecd1842e5a04cbce851b5b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.2703,
+  "steps": 245 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/3c5ed1325c8ab6ee7d1fc9ecf57b6f9d.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/3c5ed1325c8ab6ee7d1fc9ecf57b6f9d.json
new file mode 100644
index 0000000000000000000000000000000000000000..6f328e11ca09707e05282f7c3d738ac74e746fce
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/3c5ed1325c8ab6ee7d1fc9ecf57b6f9d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.112,
+  "steps": 183 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/4b205930d3b4d8fee48261a586bc8073.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/4b205930d3b4d8fee48261a586bc8073.json
new file mode 100644
index 0000000000000000000000000000000000000000..6b60534c7382655936bd71fa4d46a34ff4fbc3d1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/4b205930d3b4d8fee48261a586bc8073.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 1.1391,
+  "steps": 480 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/6598f250edf1b886274861118ba008ad.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/6598f250edf1b886274861118ba008ad.json
new file mode 100644
index 0000000000000000000000000000000000000000..1f70495bc14e08b29f4cf30019db7bb99d09aea0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/6598f250edf1b886274861118ba008ad.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0237,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/70e5ed1bc7a3e313f8eb27096a17ae10.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/70e5ed1bc7a3e313f8eb27096a17ae10.json
new file mode 100644
index 0000000000000000000000000000000000000000..d2b22bf3f61124e4e09944d5da47a9b30e4ea3b0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/70e5ed1bc7a3e313f8eb27096a17ae10.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0659,
+  "steps": 153 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/79d831813d414cc08f58c5fda2236205.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/79d831813d414cc08f58c5fda2236205.json
new file mode 100644
index 0000000000000000000000000000000000000000..1efb4b7a7b930a3a1184785506a46953d6250696
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/79d831813d414cc08f58c5fda2236205.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0998,
+  "steps": 148 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/a0c5cf3bb71e2656a3034208a111b110.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/a0c5cf3bb71e2656a3034208a111b110.json
new file mode 100644
index 0000000000000000000000000000000000000000..83e77b85543ba88be2a2d5c1652080d9e17ddb32
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/a0c5cf3bb71e2656a3034208a111b110.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0608,
+  "steps": 119 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/b165ab4893ffc1cbfc6ae37fb197c0f1.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/b165ab4893ffc1cbfc6ae37fb197c0f1.json
new file mode 100644
index 0000000000000000000000000000000000000000..aecd77eee923f01f887797d2f328ed1fff128bc4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/b165ab4893ffc1cbfc6ae37fb197c0f1.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0431,
+  "steps": 100 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/b1811c4bf2e186a18d64936abca5b39f.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/b1811c4bf2e186a18d64936abca5b39f.json
new file mode 100644
index 0000000000000000000000000000000000000000..e4a8800d5498c514b0e0d8e016d8625e481de9fb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/b1811c4bf2e186a18d64936abca5b39f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0611,
+  "steps": 119 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/b8b99ab8c81e5a26ca31d567fc55ec6d.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/b8b99ab8c81e5a26ca31d567fc55ec6d.json
new file mode 100644
index 0000000000000000000000000000000000000000..3d998982126db30ea0df6ce8166aed8c8144e8f2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/b8b99ab8c81e5a26ca31d567fc55ec6d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 1.1315,
+  "steps": 587 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/bba11adb2ddad99a9727cb7458cea372.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/bba11adb2ddad99a9727cb7458cea372.json
new file mode 100644
index 0000000000000000000000000000000000000000..93c6ba91d6ab17e83ffb577e8004543a8de57f6a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/bba11adb2ddad99a9727cb7458cea372.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 1.0553,
+  "steps": 312 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/c04157f46e4552c161a37fde022748c4.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/c04157f46e4552c161a37fde022748c4.json
new file mode 100644
index 0000000000000000000000000000000000000000..cc17e1f381f47e115e9fbd4bb32d4f63b15fd983
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/c04157f46e4552c161a37fde022748c4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0629,
+  "steps": 121 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/c608f5ac1c4e41f6285e2d0288f7a3e6.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/c608f5ac1c4e41f6285e2d0288f7a3e6.json
new file mode 100644
index 0000000000000000000000000000000000000000..ad1b022b2a42f251869c199aee8ef2a323ac19ae
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/c608f5ac1c4e41f6285e2d0288f7a3e6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.9603,
+  "steps": 443 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/cbfaf2c41e4f40a1fe17f5ec7749baec.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/cbfaf2c41e4f40a1fe17f5ec7749baec.json
new file mode 100644
index 0000000000000000000000000000000000000000..a55641c71cc7c2ba3d2b7341bfd201ee690688ab
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/cbfaf2c41e4f40a1fe17f5ec7749baec.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0236,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/d9c5bf672a6c1429d923b3f9f333ad8b.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/d9c5bf672a6c1429d923b3f9f333ad8b.json
new file mode 100644
index 0000000000000000000000000000000000000000..56146e42c7c20b19f9bda8a72b4a1f92dac8c0c2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/d9c5bf672a6c1429d923b3f9f333ad8b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.6726,
+  "steps": 327 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/de3aef527d44800527eba214ba87014c.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/de3aef527d44800527eba214ba87014c.json
new file mode 100644
index 0000000000000000000000000000000000000000..a9f82758f59e445daced13bd8f5b3f37afc73466
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/de3aef527d44800527eba214ba87014c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0296,
+  "steps": 34 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/e3bdffb2192e8e9280a4f8319d797e5c.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/e3bdffb2192e8e9280a4f8319d797e5c.json
new file mode 100644
index 0000000000000000000000000000000000000000..4d07be06bf4a32d939ecbb84536fdfdcf1dadae5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.0.session/cache/e3bdffb2192e8e9280a4f8319d797e5c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.037,
+  "steps": 110 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.res.oracle
index dc1ca6605e834de70c1aad21315ba2111899f361..c74a9513362d1aeb26482ce4c48f074ef3c5e2ac 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_gallery/frama_c_exo3_solved.old.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/0994e7de773b107d157192d17ecbedc2.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/0994e7de773b107d157192d17ecbedc2.json
new file mode 100644
index 0000000000000000000000000000000000000000..33a9a92da40571a3c44d329d22d613f3624f8941
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/0994e7de773b107d157192d17ecbedc2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1735,
+  "steps": 263 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/3a323549e397e5966994d38f5eda824f.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/3a323549e397e5966994d38f5eda824f.json
new file mode 100644
index 0000000000000000000000000000000000000000..4e9a86a580a1a3f657150b48cbf02d7081e8928a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/3a323549e397e5966994d38f5eda824f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0262,
+  "steps": 29 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/3a56ae53705a898c58ab7719dad95879.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/3a56ae53705a898c58ab7719dad95879.json
new file mode 100644
index 0000000000000000000000000000000000000000..f3a60485cdd057a307f35cdf51c4c957a4318fd3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/3a56ae53705a898c58ab7719dad95879.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0641,
+  "steps": 96 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/4268a7599d49e87d664f37118bfe31e0.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/4268a7599d49e87d664f37118bfe31e0.json
new file mode 100644
index 0000000000000000000000000000000000000000..83d4dbd04c0e8a26e87adfce27e666ee87843e5c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/4268a7599d49e87d664f37118bfe31e0.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0346,
+  "steps": 40 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/52b8e721d8f9317b458272dda8b08ca7.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/52b8e721d8f9317b458272dda8b08ca7.json
new file mode 100644
index 0000000000000000000000000000000000000000..a8d060f488a5cbae44efcf2178b01700de008696
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/52b8e721d8f9317b458272dda8b08ca7.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0994,
+  "steps": 166 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/5fad8316b9a6c1a0d096e3445186bbda.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/5fad8316b9a6c1a0d096e3445186bbda.json
new file mode 100644
index 0000000000000000000000000000000000000000..d9e5cc396fd1e8b9cf311c00548827e7114c2c62
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/5fad8316b9a6c1a0d096e3445186bbda.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0335,
+  "steps": 39 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/67f47fb725f1d6b46adbfc0978186f71.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/67f47fb725f1d6b46adbfc0978186f71.json
new file mode 100644
index 0000000000000000000000000000000000000000..947f52857fd718cc40c50e2a1a4fce98e83a7fe7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/67f47fb725f1d6b46adbfc0978186f71.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0816,
+  "steps": 108 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/6fcf2fbb95adef2015dbd96c6436e748.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/6fcf2fbb95adef2015dbd96c6436e748.json
new file mode 100644
index 0000000000000000000000000000000000000000..2355f0fc4c7b3bec9d1e8b424a18bb9d522ffeb5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/6fcf2fbb95adef2015dbd96c6436e748.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0436,
+  "steps": 48 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/7cbb37cc372cb9c7ace1d05e5f61952f.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/7cbb37cc372cb9c7ace1d05e5f61952f.json
new file mode 100644
index 0000000000000000000000000000000000000000..7a077ad2df8006c5062a91ca87add67821a02616
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/7cbb37cc372cb9c7ace1d05e5f61952f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0273,
+  "steps": 30 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/8baa73c0a0cf86f103780b665f587c7e.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/8baa73c0a0cf86f103780b665f587c7e.json
new file mode 100644
index 0000000000000000000000000000000000000000..fb135c2fb4bedfb1727765ac67e8df74c78db3fa
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/8baa73c0a0cf86f103780b665f587c7e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0268,
+  "steps": 38 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/98b660918f4eeb38cb437039f2c8746f.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/98b660918f4eeb38cb437039f2c8746f.json
new file mode 100644
index 0000000000000000000000000000000000000000..4b1110b66cae3ca60f599ab74df94b648fde1f7a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/98b660918f4eeb38cb437039f2c8746f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0332,
+  "steps": 39 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/9a8bccb913784d4facd21f58c0b084c6.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/9a8bccb913784d4facd21f58c0b084c6.json
new file mode 100644
index 0000000000000000000000000000000000000000..8012428e0963e71e14d728a6d62f8dba2d6596fc
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/9a8bccb913784d4facd21f58c0b084c6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0456,
+  "steps": 68 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/a24a96fa07cf7d70235cbdd81c94626c.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/a24a96fa07cf7d70235cbdd81c94626c.json
new file mode 100644
index 0000000000000000000000000000000000000000..b8b0e648b9e664b4236aa9075d4eec84a2363827
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/a24a96fa07cf7d70235cbdd81c94626c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0374,
+  "steps": 54 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/abfb3fa59feee714e91e6024d3d916cb.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/abfb3fa59feee714e91e6024d3d916cb.json
new file mode 100644
index 0000000000000000000000000000000000000000..a6bc49b8e70b10b1e78d527c7cd0a3b502ee8016
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/abfb3fa59feee714e91e6024d3d916cb.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1541,
+  "steps": 264 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/b9b0b69bbd5926d173af68d85595f720.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/b9b0b69bbd5926d173af68d85595f720.json
new file mode 100644
index 0000000000000000000000000000000000000000..0eea236199445a4f47f4ad0c0aef7fca9218f3bd
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/b9b0b69bbd5926d173af68d85595f720.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0214,
+  "steps": 30 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/c3c471363fa4a5387ea0d4bdff81eec5.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/c3c471363fa4a5387ea0d4bdff81eec5.json
new file mode 100644
index 0000000000000000000000000000000000000000..d66dd20df53f6f62b6f528d8d5c106fab2b3d3f9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/c3c471363fa4a5387ea0d4bdff81eec5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1173,
+  "steps": 119 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/cd1a76fb30d85ca8043541c541bda7c5.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/cd1a76fb30d85ca8043541c541bda7c5.json
new file mode 100644
index 0000000000000000000000000000000000000000..431d5288f71e3727263e4945ab16a06650bbec18
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/cd1a76fb30d85ca8043541c541bda7c5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0339,
+  "steps": 45 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/d52a947f857129281877763e2ce75652.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/d52a947f857129281877763e2ce75652.json
new file mode 100644
index 0000000000000000000000000000000000000000..640d7fc28664f7dafc6ac1f6d778bdf0ce9f519e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/d52a947f857129281877763e2ce75652.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.039,
+  "steps": 70 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/d9074d7a7643baec0368e51d72f9e647.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/d9074d7a7643baec0368e51d72f9e647.json
new file mode 100644
index 0000000000000000000000000000000000000000..5e049850f9379edfa13fe99697d220dc94c41da7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/d9074d7a7643baec0368e51d72f9e647.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0486,
+  "steps": 70 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/da51cc8a750e66b95505021e00e8d6da.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/da51cc8a750e66b95505021e00e8d6da.json
new file mode 100644
index 0000000000000000000000000000000000000000..415776accd2cf60c298ec7b2ff12968f7684d37d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/da51cc8a750e66b95505021e00e8d6da.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0267,
+  "steps": 42 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/ef4e8894a88571b2c2789eaa08c82a12.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/ef4e8894a88571b2c2789eaa08c82a12.json
new file mode 100644
index 0000000000000000000000000000000000000000..d5ab9843e92e5b2426842a03fb4a65b1a9eccd39
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/ef4e8894a88571b2c2789eaa08c82a12.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1127,
+  "steps": 182 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/f0a77b66204fa20da473db042805e41e.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/f0a77b66204fa20da473db042805e41e.json
new file mode 100644
index 0000000000000000000000000000000000000000..c1c7a251c7768dc820dfaf66307e41ae840d7e6c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/f0a77b66204fa20da473db042805e41e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0246,
+  "steps": 41 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/f34f77d6c4322eaf0ee8de9aad034e23.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/f34f77d6c4322eaf0ee8de9aad034e23.json
new file mode 100644
index 0000000000000000000000000000000000000000..7ef04506ef88498412202142c984152bdc7015c9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.0.session/cache/f34f77d6c4322eaf0ee8de9aad034e23.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.043,
+  "steps": 60 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.res.oracle
index d28a3f0f2f2e06514de6f54968037e101b5054af..4476cb8738de23963295cfc67b47ed296d44a87d 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_gallery/frama_c_exo3_solved.old.v2.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/14276c6d39fd02eb3bfe8184e2080f3e.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/14276c6d39fd02eb3bfe8184e2080f3e.json
new file mode 100644
index 0000000000000000000000000000000000000000..aecf63f10b8ab40aa56ef13cd12976ec4de1ff72
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/14276c6d39fd02eb3bfe8184e2080f3e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0226,
+  "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/2a36d0493c8197c85fed26e515ca1746.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/2a36d0493c8197c85fed26e515ca1746.json
new file mode 100644
index 0000000000000000000000000000000000000000..b4fa77748023edca18fe43eef937c43b79a0524f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/2a36d0493c8197c85fed26e515ca1746.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0491,
+  "steps": 62 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/3710bb06a41471f5a1ba7a24e612a631.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/3710bb06a41471f5a1ba7a24e612a631.json
new file mode 100644
index 0000000000000000000000000000000000000000..ab4dafb58a5c99ad24bb91337c71a13a724d1383
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/3710bb06a41471f5a1ba7a24e612a631.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.032,
+  "steps": 48 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/4ea7eca23aaae8b6354c3d2681929873.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/4ea7eca23aaae8b6354c3d2681929873.json
new file mode 100644
index 0000000000000000000000000000000000000000..adcc1dd22e10bc23a2548ce58d5b7f84c597ea5f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/4ea7eca23aaae8b6354c3d2681929873.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0656,
+  "steps": 101 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/50f26ce79495d19742bd2d2bbe85a8ec.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/50f26ce79495d19742bd2d2bbe85a8ec.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ee6a1d67feef7d64714aeb7e86ad7663b7e35db
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/50f26ce79495d19742bd2d2bbe85a8ec.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0234,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/622a2b9a7f0c8f2711cdaad74aa9e154.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/622a2b9a7f0c8f2711cdaad74aa9e154.json
new file mode 100644
index 0000000000000000000000000000000000000000..b34b790d1523c6f982cb79ceab4a51a663482066
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/622a2b9a7f0c8f2711cdaad74aa9e154.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0253,
+  "steps": 25 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/6bea889a3e65713254fec285d40f00be.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/6bea889a3e65713254fec285d40f00be.json
new file mode 100644
index 0000000000000000000000000000000000000000..c3bb6d1b816f0e1910a5450126128ca9b0079959
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/6bea889a3e65713254fec285d40f00be.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.022,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/6d024368791118352e330ee5819a43da.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/6d024368791118352e330ee5819a43da.json
new file mode 100644
index 0000000000000000000000000000000000000000..88aa8a1c27e69f6bc438a6c440257998ea1ba1ea
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/6d024368791118352e330ee5819a43da.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0224,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/7af89e44e06470d4c58bdbdea0fe349b.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/7af89e44e06470d4c58bdbdea0fe349b.json
new file mode 100644
index 0000000000000000000000000000000000000000..d308652d48651b9245029987585e50db65266aa2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/7af89e44e06470d4c58bdbdea0fe349b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0253,
+  "steps": 46 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/80e82a5604b2fa67ff4f9b8091c99f1a.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/80e82a5604b2fa67ff4f9b8091c99f1a.json
new file mode 100644
index 0000000000000000000000000000000000000000..bb511fab6b56f24c885b5563e64dfb2f2c6698b8
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/80e82a5604b2fa67ff4f9b8091c99f1a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.231,
+  "steps": 151 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/850683912365f15b45151d1ab6686c10.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/850683912365f15b45151d1ab6686c10.json
new file mode 100644
index 0000000000000000000000000000000000000000..81949f34766d658ae8c03501e633c831f5d2e265
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/850683912365f15b45151d1ab6686c10.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0203,
+  "steps": 28 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/904575836baf21bc229b0d95f611a2f4.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/904575836baf21bc229b0d95f611a2f4.json
new file mode 100644
index 0000000000000000000000000000000000000000..3ac0a07eec48ef97758a773b83da45024e2978dc
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/904575836baf21bc229b0d95f611a2f4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0489,
+  "steps": 59 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/910a3dfe75b97d4b6b63f4d430267331.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/910a3dfe75b97d4b6b63f4d430267331.json
new file mode 100644
index 0000000000000000000000000000000000000000..f9129dc2162dc4e2425b69779f2e102acddabeab
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/910a3dfe75b97d4b6b63f4d430267331.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0435,
+  "steps": 72 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/bf28d7590dfa23396bb3dec88ced00fa.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/bf28d7590dfa23396bb3dec88ced00fa.json
new file mode 100644
index 0000000000000000000000000000000000000000..36169c210563b9c8ef087292b7d96e22b04ca077
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/bf28d7590dfa23396bb3dec88ced00fa.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0169,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/f9fc4b67c3f50f27fa531f82e161010e.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/f9fc4b67c3f50f27fa531f82e161010e.json
new file mode 100644
index 0000000000000000000000000000000000000000..d2194a9bc9d79158b7434c4b8821eb5732eaba26
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.0.session/cache/f9fc4b67c3f50f27fa531f82e161010e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0305,
+  "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.res.oracle
index 86b8662c59195f595d4a2841bd9693bb8d8d3611..5c40a1cfb36666e92516c004b8d45ec445061215 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_gallery/frama_c_exo3_solved.simplified.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/04f8fd45e1372421cd06dda8f75437c9.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/04f8fd45e1372421cd06dda8f75437c9.json
new file mode 100644
index 0000000000000000000000000000000000000000..2d3649f7e82226e3b713dd880a9e3bac2d49ecea
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/04f8fd45e1372421cd06dda8f75437c9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1085,
+  "steps": 95 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/078985c01b8321ee067c085a1e9cf2ce.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/078985c01b8321ee067c085a1e9cf2ce.json
new file mode 100644
index 0000000000000000000000000000000000000000..377ffd62394faccc376804f41f93d937b87ff610
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/078985c01b8321ee067c085a1e9cf2ce.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.4288,
+  "steps": 238 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/08b6db2d3fafc4cb93883a7010ed552d.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/08b6db2d3fafc4cb93883a7010ed552d.json
new file mode 100644
index 0000000000000000000000000000000000000000..c169b8294d526919d3f96814988d108bb495e5f1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/08b6db2d3fafc4cb93883a7010ed552d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0459,
+  "steps": 65 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/09dec9b675cb72a17a7c7f694202bc2a.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/09dec9b675cb72a17a7c7f694202bc2a.json
new file mode 100644
index 0000000000000000000000000000000000000000..fa5c0688aa29541e24fcadc5716bb839b136f98a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/09dec9b675cb72a17a7c7f694202bc2a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 3.0065,
+  "steps": 856 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/0d901f10aad13b11e2481369a063c076.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/0d901f10aad13b11e2481369a063c076.json
new file mode 100644
index 0000000000000000000000000000000000000000..89a531e9caae449bab92994594cebaeeeac8e517
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/0d901f10aad13b11e2481369a063c076.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.3412,
+  "steps": 249 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/12f261955534946a80dfa69cdf0af7df.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/12f261955534946a80dfa69cdf0af7df.json
new file mode 100644
index 0000000000000000000000000000000000000000..843b66a32693d2a086c9502b727c3e6ddb5e5017
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/12f261955534946a80dfa69cdf0af7df.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1377,
+  "steps": 133 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/14ef4399e9eaf6ab84982330b2695be9.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/14ef4399e9eaf6ab84982330b2695be9.json
new file mode 100644
index 0000000000000000000000000000000000000000..ff22fb4a9a392384af661673d45542e10968d56a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/14ef4399e9eaf6ab84982330b2695be9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0367,
+  "steps": 64 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1734ba914f5a9bff1a0c272ed625acf9.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1734ba914f5a9bff1a0c272ed625acf9.json
new file mode 100644
index 0000000000000000000000000000000000000000..bea631cbfdcdad454045c7deb047be0b31869cbf
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1734ba914f5a9bff1a0c272ed625acf9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0224,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1958628752b3b6ef861b93e29a4b0740.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1958628752b3b6ef861b93e29a4b0740.json
new file mode 100644
index 0000000000000000000000000000000000000000..811a5cae509221cb77c948ae7b771f3ad756e5fb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1958628752b3b6ef861b93e29a4b0740.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0432,
+  "steps": 54 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1a14c3c38306b325267f495a3b96cb22.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1a14c3c38306b325267f495a3b96cb22.json
new file mode 100644
index 0000000000000000000000000000000000000000..20ecc6f41bfa8f743c6076fd2339a5f55ff55883
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1a14c3c38306b325267f495a3b96cb22.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0267,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1a5d45fc87de676bd6e65e2299275bd8.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1a5d45fc87de676bd6e65e2299275bd8.json
new file mode 100644
index 0000000000000000000000000000000000000000..0785bafe2151662d4a053c9a58f682a5afb5b79a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1a5d45fc87de676bd6e65e2299275bd8.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0833,
+  "steps": 96 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1c83ad0e6fe132008040c290e2b1c7a9.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1c83ad0e6fe132008040c290e2b1c7a9.json
new file mode 100644
index 0000000000000000000000000000000000000000..9ec8e4a1489e2cda5699aaa13c0c63f587709a27
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/1c83ad0e6fe132008040c290e2b1c7a9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0243,
+  "steps": 25 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/23ea7b534e6e972e901f5d280822c447.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/23ea7b534e6e972e901f5d280822c447.json
new file mode 100644
index 0000000000000000000000000000000000000000..9e949102af53ca208400d66d954ab0a7e5ec4dc9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/23ea7b534e6e972e901f5d280822c447.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0622,
+  "steps": 80 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/27853ddb3ca2f0f4ad61cab2d03126b2.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/27853ddb3ca2f0f4ad61cab2d03126b2.json
new file mode 100644
index 0000000000000000000000000000000000000000..1c63c89a9db768c3849cfd1242320374e61da0a6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/27853ddb3ca2f0f4ad61cab2d03126b2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0966,
+  "steps": 114 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/292e5c2995144e8404ec9571f6249f8e.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/292e5c2995144e8404ec9571f6249f8e.json
new file mode 100644
index 0000000000000000000000000000000000000000..7529b30fb9e14f8b9a92318dbfb02fc85b03f3f2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/292e5c2995144e8404ec9571f6249f8e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0703,
+  "steps": 82 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/2932211f5ea4822c1cc4f1d7b5aca14c.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/2932211f5ea4822c1cc4f1d7b5aca14c.json
new file mode 100644
index 0000000000000000000000000000000000000000..97bcecd17ab6f7c514c39bf9cefa558e10ec21d5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/2932211f5ea4822c1cc4f1d7b5aca14c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0554,
+  "steps": 74 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/2d6cb92f2fd6ce2467089566831ba3fa.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/2d6cb92f2fd6ce2467089566831ba3fa.json
new file mode 100644
index 0000000000000000000000000000000000000000..f1fa2095778bb0350e9486c575aa7bf6133bc6e9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/2d6cb92f2fd6ce2467089566831ba3fa.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0407,
+  "steps": 61 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/327ad8c34d97a2b1d501faa2742234dd.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/327ad8c34d97a2b1d501faa2742234dd.json
new file mode 100644
index 0000000000000000000000000000000000000000..625c9b5edd8412057893d68d889a0df41e170088
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/327ad8c34d97a2b1d501faa2742234dd.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0315,
+  "steps": 32 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3816760d1f1f7ae54387d98f152bc630.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3816760d1f1f7ae54387d98f152bc630.json
new file mode 100644
index 0000000000000000000000000000000000000000..5f287a93d026639ebb4e37d83f87284c72d4cb95
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3816760d1f1f7ae54387d98f152bc630.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0356,
+  "steps": 42 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3a42861a3ebc3563932adaaefa80583d.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3a42861a3ebc3563932adaaefa80583d.json
new file mode 100644
index 0000000000000000000000000000000000000000..d3181803ea05726224233a31cef3965208d8b346
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3a42861a3ebc3563932adaaefa80583d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.2867,
+  "steps": 252 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3c2bdca046ada8649292938b16f2dd9b.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3c2bdca046ada8649292938b16f2dd9b.json
new file mode 100644
index 0000000000000000000000000000000000000000..6e0093dbd0cb4999e7ceb6458a00f453911c046a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3c2bdca046ada8649292938b16f2dd9b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.035,
+  "steps": 47 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3ed6ccb36aabda9beaecfc54b51bc6dc.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3ed6ccb36aabda9beaecfc54b51bc6dc.json
new file mode 100644
index 0000000000000000000000000000000000000000..087f0517b34bf7adc134f2c0cfed998ee81aef5d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3ed6ccb36aabda9beaecfc54b51bc6dc.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0232,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3f1a0275ffdc48d034f6dfacf4502be1.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3f1a0275ffdc48d034f6dfacf4502be1.json
new file mode 100644
index 0000000000000000000000000000000000000000..ae16c5901dd1fa5cf3f2ff72d7b7e0bcfd78cf86
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/3f1a0275ffdc48d034f6dfacf4502be1.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0234,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/417d31f008385f8de844ebd8a2b26109.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/417d31f008385f8de844ebd8a2b26109.json
new file mode 100644
index 0000000000000000000000000000000000000000..7bb9f5b96b8e6f2fbaeb7b363dafa8f8a0efe814
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/417d31f008385f8de844ebd8a2b26109.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0825,
+  "steps": 99 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/50198fa843b3c6d73486e1c8e97986fe.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/50198fa843b3c6d73486e1c8e97986fe.json
new file mode 100644
index 0000000000000000000000000000000000000000..189d0bd33804fc2c666a38055ab371b1fd16b1bd
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/50198fa843b3c6d73486e1c8e97986fe.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.2276,
+  "steps": 179 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/5d7433204af8e481f7a8887889f7ce55.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/5d7433204af8e481f7a8887889f7ce55.json
new file mode 100644
index 0000000000000000000000000000000000000000..64f59330da434ee7786f06da4ef7121ddc40bfcc
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/5d7433204af8e481f7a8887889f7ce55.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.078,
+  "steps": 91 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/5f56c6fcd7ff3a11c481090df3c059aa.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/5f56c6fcd7ff3a11c481090df3c059aa.json
new file mode 100644
index 0000000000000000000000000000000000000000..ea447ce5d6d31053873b71a34b25a1d7d1b210e4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/5f56c6fcd7ff3a11c481090df3c059aa.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0225,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/6509b0d16bb80f07dff8caefc0884f3f.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/6509b0d16bb80f07dff8caefc0884f3f.json
new file mode 100644
index 0000000000000000000000000000000000000000..918501b194d570e0e78258d50c0e445ab574b305
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/6509b0d16bb80f07dff8caefc0884f3f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0148,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/6c6d479ce89091eebd496b240d58507a.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/6c6d479ce89091eebd496b240d58507a.json
new file mode 100644
index 0000000000000000000000000000000000000000..4e61eb313dbd2970e2a5e9c4106a809e16864757
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/6c6d479ce89091eebd496b240d58507a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0858,
+  "steps": 96 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/720f79b436175dca03ae7858fc5c1f26.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/720f79b436175dca03ae7858fc5c1f26.json
new file mode 100644
index 0000000000000000000000000000000000000000..1488f15736938024e2f8bca896ea0c7c72438e98
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/720f79b436175dca03ae7858fc5c1f26.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0553,
+  "steps": 77 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/7293c9e0a0720923a5210c1362dd38f3.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/7293c9e0a0720923a5210c1362dd38f3.json
new file mode 100644
index 0000000000000000000000000000000000000000..1584919b4858e055a67d6284dc21fd9090248cfc
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/7293c9e0a0720923a5210c1362dd38f3.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1527,
+  "steps": 139 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/77c08f25814dcbff8b80bb9785ff47cf.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/77c08f25814dcbff8b80bb9785ff47cf.json
new file mode 100644
index 0000000000000000000000000000000000000000..4b1110b66cae3ca60f599ab74df94b648fde1f7a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/77c08f25814dcbff8b80bb9785ff47cf.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0332,
+  "steps": 39 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/788de7a3ed5ac15364ec4b0d1d549517.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/788de7a3ed5ac15364ec4b0d1d549517.json
new file mode 100644
index 0000000000000000000000000000000000000000..4a0fe0253e07d2a53533afbdb5016048727c86d3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/788de7a3ed5ac15364ec4b0d1d549517.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 1.6653,
+  "steps": 586 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/824309b24946e399494ae77d99d9da7d.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/824309b24946e399494ae77d99d9da7d.json
new file mode 100644
index 0000000000000000000000000000000000000000..ec67bb2ba5b0058fd7c33398fe1bafedcfc810d7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/824309b24946e399494ae77d99d9da7d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0495,
+  "steps": 73 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/8407ce0b26aeb833ba4fd8ce228a9e97.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/8407ce0b26aeb833ba4fd8ce228a9e97.json
new file mode 100644
index 0000000000000000000000000000000000000000..d19ad3523b3cf2dc8f77db727f66e4a5053a9d90
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/8407ce0b26aeb833ba4fd8ce228a9e97.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0217,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/845af4414c6bd5a5b8bb00092dfffa78.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/845af4414c6bd5a5b8bb00092dfffa78.json
new file mode 100644
index 0000000000000000000000000000000000000000..d245def208eeac3469f6d3492be56d5d3f4f1cdd
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/845af4414c6bd5a5b8bb00092dfffa78.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1146,
+  "steps": 106 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/86a33c92a0d8181413212c0955f840e9.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/86a33c92a0d8181413212c0955f840e9.json
new file mode 100644
index 0000000000000000000000000000000000000000..16e4b03a58d77d91047ccf2b09c95b3aa8bfdb67
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/86a33c92a0d8181413212c0955f840e9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0675,
+  "steps": 77 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/8982084a56561a53c5d6455bcda003af.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/8982084a56561a53c5d6455bcda003af.json
new file mode 100644
index 0000000000000000000000000000000000000000..b3d102960bf3457c638a7b40f62061b6d185058b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/8982084a56561a53c5d6455bcda003af.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.395,
+  "steps": 267 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/8bcc8ca7683995ab021498efdff9c7a9.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/8bcc8ca7683995ab021498efdff9c7a9.json
new file mode 100644
index 0000000000000000000000000000000000000000..a6c42bf73f3fb69c0265f03dda16dd747f9a719f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/8bcc8ca7683995ab021498efdff9c7a9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0197,
+  "steps": 33 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/96fb69d76e3bb0eead37b4c7dd252322.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/96fb69d76e3bb0eead37b4c7dd252322.json
new file mode 100644
index 0000000000000000000000000000000000000000..88c1ddc0681be750713437cfd8b91eb50107e6b6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/96fb69d76e3bb0eead37b4c7dd252322.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.037,
+  "steps": 38 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/99b2a99007595fd4779d0d783981aee6.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/99b2a99007595fd4779d0d783981aee6.json
new file mode 100644
index 0000000000000000000000000000000000000000..eefb5b29d263b4298581505d21ad4791c4b6739f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/99b2a99007595fd4779d0d783981aee6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0693,
+  "steps": 87 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/9a7791b227859785dd3658f3e00d05d2.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/9a7791b227859785dd3658f3e00d05d2.json
new file mode 100644
index 0000000000000000000000000000000000000000..a8c70b91d03c5b8117c7af1f1ebe833c04c4b7ed
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/9a7791b227859785dd3658f3e00d05d2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0581,
+  "steps": 65 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/9d34f304e163ac58156095e675166f3d.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/9d34f304e163ac58156095e675166f3d.json
new file mode 100644
index 0000000000000000000000000000000000000000..5200215dad1ef9f15e0f244d9a4afe4cb9203320
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/9d34f304e163ac58156095e675166f3d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0833,
+  "steps": 93 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/a2409dfdbd49a74d79f3176de0036845.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/a2409dfdbd49a74d79f3176de0036845.json
new file mode 100644
index 0000000000000000000000000000000000000000..f08a403b51571b2d112da532004f2f84fd5380c1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/a2409dfdbd49a74d79f3176de0036845.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.2383,
+  "steps": 222 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/a5be279fac32f0b7fee94dffea8f8101.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/a5be279fac32f0b7fee94dffea8f8101.json
new file mode 100644
index 0000000000000000000000000000000000000000..3f6cb1870ec20e97a67c10493b274b68170b4f61
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/a5be279fac32f0b7fee94dffea8f8101.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0269,
+  "steps": 29 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/a973ee94d22b5c133562523ebf227000.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/a973ee94d22b5c133562523ebf227000.json
new file mode 100644
index 0000000000000000000000000000000000000000..6f42cf67b16ea7efcedf916369455f9cbafbc1b5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/a973ee94d22b5c133562523ebf227000.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0459,
+  "steps": 48 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/b0313efe215d188230cbbcc2142dd6ed.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/b0313efe215d188230cbbcc2142dd6ed.json
new file mode 100644
index 0000000000000000000000000000000000000000..763be250ed6a99c835d242f0186dbef2cbf048b3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/b0313efe215d188230cbbcc2142dd6ed.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0969,
+  "steps": 121 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/b3c26bb27e0fffaaa5110deff2e14300.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/b3c26bb27e0fffaaa5110deff2e14300.json
new file mode 100644
index 0000000000000000000000000000000000000000..3e8c5a6c4fce755deea076d119c3fc6500003333
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/b3c26bb27e0fffaaa5110deff2e14300.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0557,
+  "steps": 65 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/b660ee1efdfd8a16a79a7c33e707143b.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/b660ee1efdfd8a16a79a7c33e707143b.json
new file mode 100644
index 0000000000000000000000000000000000000000..781a6129b8f74d7ef4f21ed049b6c366314c0890
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/b660ee1efdfd8a16a79a7c33e707143b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1566,
+  "steps": 133 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/d10fb006c2e7ab1ae79ed39f7a2856e6.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/d10fb006c2e7ab1ae79ed39f7a2856e6.json
new file mode 100644
index 0000000000000000000000000000000000000000..991bdd6f20bb35a7df582e50b0d5d0dcdf4c0a7e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/d10fb006c2e7ab1ae79ed39f7a2856e6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.055,
+  "steps": 65 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/df86e23aae9d67aa4641f46b44c3a1c6.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/df86e23aae9d67aa4641f46b44c3a1c6.json
new file mode 100644
index 0000000000000000000000000000000000000000..c5ebe904e0b51baec6a987953622bade653eafb9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/df86e23aae9d67aa4641f46b44c3a1c6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0402,
+  "steps": 56 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/e0bebedc1cebd03d88317637efe09d8d.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/e0bebedc1cebd03d88317637efe09d8d.json
new file mode 100644
index 0000000000000000000000000000000000000000..2108f99e49d78d8caeedb0b0b7397152aebc38b6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/e0bebedc1cebd03d88317637efe09d8d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0367,
+  "steps": 74 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/e1345f50f3bc2ff3a80387d8ffbda596.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/e1345f50f3bc2ff3a80387d8ffbda596.json
new file mode 100644
index 0000000000000000000000000000000000000000..670b9e65e4fdeff23b2fe0ecf3bf9897e00af300
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/e1345f50f3bc2ff3a80387d8ffbda596.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.522,
+  "steps": 209 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/e601503a32df36981fc0563bd80c220e.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/e601503a32df36981fc0563bd80c220e.json
new file mode 100644
index 0000000000000000000000000000000000000000..e4a1ecc9c79cc95d9f96ce3111365a2f134c6c87
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/e601503a32df36981fc0563bd80c220e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0236,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/e904a93fbfc0c12d33cae6f83d3efe25.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/e904a93fbfc0c12d33cae6f83d3efe25.json
new file mode 100644
index 0000000000000000000000000000000000000000..c13a305f3f656d4b2e40e0f1bc8831cab45faff6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/e904a93fbfc0c12d33cae6f83d3efe25.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1242,
+  "steps": 117 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/eb9e8de8de87cc201e95fc1b82db0191.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/eb9e8de8de87cc201e95fc1b82db0191.json
new file mode 100644
index 0000000000000000000000000000000000000000..09a743ded655ba077979243585d58e89861ce0c3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/eb9e8de8de87cc201e95fc1b82db0191.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.057,
+  "steps": 62 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/f73790b589aedf4d1aa297026d17411a.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/f73790b589aedf4d1aa297026d17411a.json
new file mode 100644
index 0000000000000000000000000000000000000000..b0178e16c84d96d90f8016a878a8fcf1c56b21b3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/f73790b589aedf4d1aa297026d17411a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1924,
+  "steps": 167 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/f8d98bcd8d53476d7b4bcd5ee998a283.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/f8d98bcd8d53476d7b4bcd5ee998a283.json
new file mode 100644
index 0000000000000000000000000000000000000000..1920fce8363108a8eab70533220536771920434a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.0.session/cache/f8d98bcd8d53476d7b4bcd5ee998a283.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0889,
+  "steps": 95 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.res.oracle
index a89aa37dc9e87d333b0dfed181a9ec8b633e7648..a551c80874c5dc909fbc66b4c6143d3a0e826539 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_gallery/frama_c_hashtbl_solved.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.0.session/cache/03fec2b350050f7ad0a32911983f92d4.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.0.session/cache/03fec2b350050f7ad0a32911983f92d4.json
new file mode 100644
index 0000000000000000000000000000000000000000..c4ecb09a605f33a701ae8231f2d8c7fe57d5d601
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.0.session/cache/03fec2b350050f7ad0a32911983f92d4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0148,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.0.session/cache/5c915923b8d3f16e0dddab272de43d35.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.0.session/cache/5c915923b8d3f16e0dddab272de43d35.json
new file mode 100644
index 0000000000000000000000000000000000000000..7523015fb5b958110a50d6d5d8131e5ce6f9bf4b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.0.session/cache/5c915923b8d3f16e0dddab272de43d35.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.7756,
+  "steps": 557 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.0.session/cache/e0b73b1d74026acf8109d693b6475ba1.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.0.session/cache/e0b73b1d74026acf8109d693b6475ba1.json
new file mode 100644
index 0000000000000000000000000000000000000000..e06323b85949b4c2426c8fe47705b8adff52f645
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.0.session/cache/e0b73b1d74026acf8109d693b6475ba1.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.036,
+  "steps": 100 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.0.session/cache/f4b6619cc6bf4e20fdcbc3c6a85e42b0.json b/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.0.session/cache/f4b6619cc6bf4e20fdcbc3c6a85e42b0.json
new file mode 100644
index 0000000000000000000000000000000000000000..ead5c5c67a0e8091290dab0338f26ddc3e7495c6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.0.session/cache/f4b6619cc6bf4e20fdcbc3c6a85e42b0.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0388,
+  "steps": 69 }
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.res.oracle
index 725c096960479d6f80a10937322a69ccc1ff865b..5f587e1a5d0eb36d6ee3b553999873d8d23a04fb 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_gallery/loop-statement.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.res.oracle
index 26633fe44659c00f8ff75155e449fa90a45569ef..185df39d3ab0baa7dcf76c3829444e2c583ab47f 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_hoare/byref.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.session/cache/914472b8d4c8fb3a40937ea1f3009a96.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.session/cache/914472b8d4c8fb3a40937ea1f3009a96.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.session/cache/914472b8d4c8fb3a40937ea1f3009a96.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.1.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.1.res.oracle
index 90e3b2a65808346eb24e680eeb77fabc9c135ef9..a4876a5fd53d3927efc6098ecc8dcbfb5d5d33db 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.1.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_hoare/byref.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var.res.oracle
index 8988bb2d21ba66ffe402fb47d67b3dc7fe25c76e..82582e12b00c8c44d24ba4744f269cebeca8210e 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_hoare/dispatch_var.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.0.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.0.res.oracle
index 585e9038dc75a2172fd6dbcaf2954671743522c1..16765c955e3a3c90e2e267ec7fade38c9535b95d 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.0.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-no-let -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' -wp-no-let [...]
 [kernel] Parsing tests/wp_hoare/dispatch_var2.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.1.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.1.res.oracle
index 750611233e6b6dcfc967034f9b14632b8b5e72f4..5757c0013bdfd8d594402d25a8b0c063c53388b5 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.1.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_hoare/dispatch_var2.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/isHoare.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/isHoare.res.oracle
index f4bbe476b3eb98c8b99b52fc0e915c59269be4b9..435a2090821eaa33049f181910c159a92d93038d 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/isHoare.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/isHoare.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_hoare/isHoare.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.0.session/cache/38f01fcc3946eedc95de0627fa9e9c8e.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.0.session/cache/38f01fcc3946eedc95de0627fa9e9c8e.json
new file mode 100644
index 0000000000000000000000000000000000000000..bb3d1e3d493e679341d7c3935a1c7feea894c897
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.0.session/cache/38f01fcc3946eedc95de0627fa9e9c8e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0442,
+  "steps": 39 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.0.session/cache/41a9a847c06c86a1a870724f991b1ea0.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.0.session/cache/41a9a847c06c86a1a870724f991b1ea0.json
new file mode 100644
index 0000000000000000000000000000000000000000..eafe55cabc3c0729cfc68b994dc74d7954af3128
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.0.session/cache/41a9a847c06c86a1a870724f991b1ea0.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0378,
+  "steps": 35 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.0.session/cache/d30ddbd7a04ea0b23fb737f7bf348101.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.0.session/cache/d30ddbd7a04ea0b23fb737f7bf348101.json
new file mode 100644
index 0000000000000000000000000000000000000000..9331760469135b61493efde123dbffb94105ab0f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.0.session/cache/d30ddbd7a04ea0b23fb737f7bf348101.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0345,
+  "steps": 39 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.res.oracle
index 4a3a8203b8cce59494795db9a73e5b6439e01730..ab5a5a62ec3ed9f0b8802c3227965dde57e121a6 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicarr.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_hoare/logicarr.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref.0.session/cache/5682e7679f747ad1baccf6715c89c77b.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref.0.session/cache/5682e7679f747ad1baccf6715c89c77b.json
new file mode 100644
index 0000000000000000000000000000000000000000..255a48a86dbea1dc2cfc6df1138163a24a4268e4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref.0.session/cache/5682e7679f747ad1baccf6715c89c77b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0398,
+  "steps": 70 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref.res.oracle
index 06c19d356c80224193f34110936db2574dffa189..084f416c0a5c907c739b824e6f2e2a3628ba5251 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_hoare/logicref.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.0.session/cache/318d89b595af1570a649f15bbbff5641.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.0.session/cache/318d89b595af1570a649f15bbbff5641.json
new file mode 100644
index 0000000000000000000000000000000000000000..4d7db26ea59a90c12d9295a1addcbe8a2199954c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.0.session/cache/318d89b595af1570a649f15bbbff5641.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0234,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.0.session/cache/5d8f0aabf61ed825acdb27fdae4c5762.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.0.session/cache/5d8f0aabf61ed825acdb27fdae4c5762.json
new file mode 100644
index 0000000000000000000000000000000000000000..a9d15d109e7c1f97cc184352d46a9d0ea966d9e2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.0.session/cache/5d8f0aabf61ed825acdb27fdae4c5762.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0235,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.0.session/cache/8a4919db9cce7f5f1a2301d319fa6b29.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.0.session/cache/8a4919db9cce7f5f1a2301d319fa6b29.json
new file mode 100644
index 0000000000000000000000000000000000000000..522db00fff905a5f2975d68dbfb941f04acf6234
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.0.session/cache/8a4919db9cce7f5f1a2301d319fa6b29.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0154,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.0.session/cache/a9946fa5de4da04cf54204ee6ab4aa06.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.0.session/cache/a9946fa5de4da04cf54204ee6ab4aa06.json
new file mode 100644
index 0000000000000000000000000000000000000000..c85740455016ba3fe85da30f8beeb0cbc2b9a6ef
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.0.session/cache/a9946fa5de4da04cf54204ee6ab4aa06.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0137,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.res.oracle
index 11f09dc4fe7cfa677a6c0bdbed0dc4bcfe4226c3..8a276ac051f9454e9344f2949407d60fba994155 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/logicref_simple.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_hoare/logicref_simple.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.res.oracle
index 974bff5d6c4ab589faf9b16964868f184ac614a2..604da7253962730f81a47a06e85c2a95c26cc177 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_hoare/reference.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/2997574795f2d8750bfb2e604df792d0.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/2997574795f2d8750bfb2e604df792d0.json
new file mode 100644
index 0000000000000000000000000000000000000000..f187b73f156cf9f4c85fda17e7d9fea1b4431781
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/2997574795f2d8750bfb2e604df792d0.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0072,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/30cbcd7f2b76c47e8e8cc22b6d0230ba.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/30cbcd7f2b76c47e8e8cc22b6d0230ba.json
new file mode 100644
index 0000000000000000000000000000000000000000..c3ba75b00577b3a99b67219704940cbadf034ac7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/30cbcd7f2b76c47e8e8cc22b6d0230ba.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0107,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/cc1529e7cf30a2d454364b33be49ceea.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/cc1529e7cf30a2d454364b33be49ceea.json
new file mode 100644
index 0000000000000000000000000000000000000000..5b534d6fa3af48bea6fd3caafaca8138961dd46e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/cc1529e7cf30a2d454364b33be49ceea.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.021,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/cf3f785f873f6cf9d0875e0c1961c0df.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/cf3f785f873f6cf9d0875e0c1961c0df.json
new file mode 100644
index 0000000000000000000000000000000000000000..d20bf7a4e96115c444d63eea4cc3a9810031b49e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/cf3f785f873f6cf9d0875e0c1961c0df.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0111,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/e866441f779fc7798857b21eef329295.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/e866441f779fc7798857b21eef329295.json
new file mode 100644
index 0000000000000000000000000000000000000000..c177d49bb1f2cf57ac77aced79ebf79c95f7258f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.0.session/cache/e866441f779fc7798857b21eef329295.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0099,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.res.oracle
index dba3f12ed283527f0f62f7300a814d8d8fc3e887..8980ef3f8b50487ff654448b52da3c09749d5f10 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_hoare/reference_and_struct.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/077d2f20bc5367a72365679fee3d38a4.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/077d2f20bc5367a72365679fee3d38a4.json
new file mode 100644
index 0000000000000000000000000000000000000000..6cb31fe495afc7f9fc960582194b5f0ae4c6cba2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/077d2f20bc5367a72365679fee3d38a4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0084,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/1e7344104d7210f7ec6ae8efc6b42d57.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/1e7344104d7210f7ec6ae8efc6b42d57.json
new file mode 100644
index 0000000000000000000000000000000000000000..f187b73f156cf9f4c85fda17e7d9fea1b4431781
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/1e7344104d7210f7ec6ae8efc6b42d57.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0072,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/423b6c29c3451823276ad77f781f6a6a.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/423b6c29c3451823276ad77f781f6a6a.json
new file mode 100644
index 0000000000000000000000000000000000000000..7ce04e99f39f79e1bf856d5538da6849c5a3bf05
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/423b6c29c3451823276ad77f781f6a6a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0112,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/588918e081502951ea3f03c1c1d7c12f.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/588918e081502951ea3f03c1c1d7c12f.json
new file mode 100644
index 0000000000000000000000000000000000000000..9c61f57421c06a75a64c3cd088a51137859a1f5f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/588918e081502951ea3f03c1c1d7c12f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.009,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/62514413e23ba5305cf24c6ff036d7ab.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/62514413e23ba5305cf24c6ff036d7ab.json
new file mode 100644
index 0000000000000000000000000000000000000000..a765fb2744493c680a0232981736e791ac2838bf
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/62514413e23ba5305cf24c6ff036d7ab.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0165,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/76b4ba27b4d7df4f72444fd646ad383c.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/76b4ba27b4d7df4f72444fd646ad383c.json
new file mode 100644
index 0000000000000000000000000000000000000000..15f062502d7a4e6a68e883e82f42e62aecdf6f75
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/76b4ba27b4d7df4f72444fd646ad383c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.014,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/7efca4558505433c34411f970848ed8c.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/7efca4558505433c34411f970848ed8c.json
new file mode 100644
index 0000000000000000000000000000000000000000..c3ba75b00577b3a99b67219704940cbadf034ac7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/7efca4558505433c34411f970848ed8c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0107,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/912ca6ada2f29485e603afd43c96230f.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/912ca6ada2f29485e603afd43c96230f.json
new file mode 100644
index 0000000000000000000000000000000000000000..86cdc1d390ff28bfcfd509eace62d676baa8eb6b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/912ca6ada2f29485e603afd43c96230f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0097,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/9b59f2c8997898e5cd20c9397d630a70.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/9b59f2c8997898e5cd20c9397d630a70.json
new file mode 100644
index 0000000000000000000000000000000000000000..ba4d59f51333314aed678ee989a8cf910e92e93c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/9b59f2c8997898e5cd20c9397d630a70.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0108,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/ad29f0a440fa5619b6beacba2993114a.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/ad29f0a440fa5619b6beacba2993114a.json
new file mode 100644
index 0000000000000000000000000000000000000000..fc716cc8c772c580489dbca419fb93223380c8f4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/ad29f0a440fa5619b6beacba2993114a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0074,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/cb18b19c27fdc4c535d96f98c1300701.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/cb18b19c27fdc4c535d96f98c1300701.json
new file mode 100644
index 0000000000000000000000000000000000000000..37f1ec7dfc34d3d189638b28c1f6391ee8765e7d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/cb18b19c27fdc4c535d96f98c1300701.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0128,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/e02d6a197b2feb41566f9f70042c1161.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/e02d6a197b2feb41566f9f70042c1161.json
new file mode 100644
index 0000000000000000000000000000000000000000..7fe6dc31a5ca77f1705459b79baca20580086b6a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.0.session/cache/e02d6a197b2feb41566f9f70042c1161.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0067,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.res.oracle
index 19d23d6357938cca885c1adf99e7b4466ac3553e..9ccbcce0d1f0527e0f79c7f637c0cda62141b311 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_hoare/reference_array.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array_simple.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array_simple.res.oracle
index c4971ab52e2157a9e2831ab30da39c555dc02430..78b38ba1195b50e9f5ff97b9a4c6d45a7da58aac 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array_simple.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array_simple.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_hoare/reference_array_simple.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.0.session/cache/29bd54364c6cbab6b5edf958e89561f6.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.0.session/cache/29bd54364c6cbab6b5edf958e89561f6.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.0.session/cache/29bd54364c6cbab6b5edf958e89561f6.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.0.session/cache/639f5f795718cce5837c2a5bc34605e0.json b/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.0.session/cache/639f5f795718cce5837c2a5bc34605e0.json
new file mode 100644
index 0000000000000000000000000000000000000000..122750093e457754bd1147848f1bc741e0869833
--- /dev/null
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.0.session/cache/639f5f795718cce5837c2a5bc34605e0.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0207,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.res.oracle
index 1bef150b691a095304a330ec28cd024e22fcb4f2..4f3725c5bb2c930e420db1cec44484b989ca2daa 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/refguards.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_hoare/refguards.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.0.res.oracle b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.0.res.oracle
index df1f35bd569a09d119bf536e99dc4f69615c5aba..a4c3d2bc111137836ddce0acca61c839f0687a1e 100644
--- a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.0.res.oracle
+++ b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_manual/manual.i (no preprocessing)
 [kernel] Parsing tests/wp_manual/working_dir/swap.c (with preprocessing)
 [kernel] Parsing tests/wp_manual/working_dir/swap1.h (with preprocessing)
diff --git a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.0.session/cache/d88a99b129ce316ba3299ac7e85f666d.json b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.0.session/cache/d88a99b129ce316ba3299ac7e85f666d.json
new file mode 100644
index 0000000000000000000000000000000000000000..840b90ac547c73f20a4ced830e999c5b369d5327
--- /dev/null
+++ b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.0.session/cache/d88a99b129ce316ba3299ac7e85f666d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0229,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.res.oracle b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.res.oracle
index 39ecdb3048af5a4c01b827814846b46d10077584..5897a7cede15c1f0b21e79bc4b2686ab13793875 100644
--- a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.res.oracle
+++ b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-rte -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-rte [...]
 [kernel] Parsing tests/wp_manual/manual.i (no preprocessing)
 [kernel] Parsing tests/wp_manual/working_dir/swap.c (with preprocessing)
 [kernel] Parsing tests/wp_manual/working_dir/swap2.h (with preprocessing)
diff --git a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.session/cache/19ce43ef6379eb9ea574ac9b1382a30c.json b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.session/cache/19ce43ef6379eb9ea574ac9b1382a30c.json
new file mode 100644
index 0000000000000000000000000000000000000000..ba8cd1ff526af8357b864eca5d70e5f5ea4f0692
--- /dev/null
+++ b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.session/cache/19ce43ef6379eb9ea574ac9b1382a30c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0199,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.session/cache/522c058d7703faeb37d62ce550ad47a9.json b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.session/cache/522c058d7703faeb37d62ce550ad47a9.json
new file mode 100644
index 0000000000000000000000000000000000000000..e03ff751e1ba249cdd653752ee9473eac527a8b4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.session/cache/522c058d7703faeb37d62ce550ad47a9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0191,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.session/cache/a84bbfbec4416c44461feaf1d7cb7e08.json b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.session/cache/a84bbfbec4416c44461feaf1d7cb7e08.json
new file mode 100644
index 0000000000000000000000000000000000000000..476574d5b4bd5e9edff2884414067d0874dc2af7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.1.session/cache/a84bbfbec4416c44461feaf1d7cb7e08.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.017,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.res.oracle b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.res.oracle
index 83a1077be56d572bce041153e6f50235bb16f792..cad3da72c7dcfc78c9447a6695165eb34eec0a44 100644
--- a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.res.oracle
+++ b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-rte -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-rte [...]
 [rte] annotating function swap
 -------------------------------------------------------------
 Functions           WP     Alt-Ergo        Total   Success
diff --git a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.session/cache/19ce43ef6379eb9ea574ac9b1382a30c.json b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.session/cache/19ce43ef6379eb9ea574ac9b1382a30c.json
new file mode 100644
index 0000000000000000000000000000000000000000..a8fb3b9374986112494b1dd438191b4555fa2ed7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.session/cache/19ce43ef6379eb9ea574ac9b1382a30c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0137,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.session/cache/522c058d7703faeb37d62ce550ad47a9.json b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.session/cache/522c058d7703faeb37d62ce550ad47a9.json
new file mode 100644
index 0000000000000000000000000000000000000000..a6c5cd0bc3ce4e02e2ce338795112145cf16e537
--- /dev/null
+++ b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.session/cache/522c058d7703faeb37d62ce550ad47a9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0174,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.session/cache/a84bbfbec4416c44461feaf1d7cb7e08.json b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.session/cache/a84bbfbec4416c44461feaf1d7cb7e08.json
new file mode 100644
index 0000000000000000000000000000000000000000..ed38428b9b7f89f91c9c0f7a47a933f6c1d5fc68
--- /dev/null
+++ b/src/plugins/wp/tests/wp_manual/oracle_qualif/manual.2.session/cache/a84bbfbec4416c44461feaf1d7cb7e08.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0139,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_plugin/convert.i b/src/plugins/wp/tests/wp_plugin/convert.i
index 380f6dc6405686b87144779477816abc64802aea..630c406f9676e288b6fedf7f56b5bd86006d5d1b 100644
--- a/src/plugins/wp/tests/wp_plugin/convert.i
+++ b/src/plugins/wp/tests/wp_plugin/convert.i
@@ -3,9 +3,8 @@
 */
 
 /* run.config_qualif
-   CMD: @frama-c@ -no-autoload-plugins -load-module wp -wp -wp-par 1 -wp-timeout 100 -wp-steps 500 -wp-share ./share -wp-msg-key shell,success-only -wp-out @PTEST_FILE@.@PTEST_NUMBER@.out @PTEST_FILE@
-   OPT: -wp-prover alt-ergo -wp-report=tests/qualif.report
-   OPT: -wp-prover why3:alt-ergo -wp-report=tests/qualif-why3.report
+   OPT:
+   OPT: -wp-prover native:alt-ergo -wp-report=tests/native.report
 */
 
 // --------------------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/math.i b/src/plugins/wp/tests/wp_plugin/math.i
index a2120d8296fef339049046fe3f32a80cf429accc..3fece066d5a57e4ab2eb985cd98223ce0b839618 100644
--- a/src/plugins/wp/tests/wp_plugin/math.i
+++ b/src/plugins/wp/tests/wp_plugin/math.i
@@ -3,11 +3,10 @@
 */
 
 /* run.config_qualif
-   CMD: @frama-c@ -no-autoload-plugins -load-module wp -wp -wp-par 1 -wp-share ./share -wp-msg-key shell,success-only -wp-out @PTEST_FILE@.@PTEST_NUMBER@.out @PTEST_FILE@
-   OPT: -wp-prover alt-ergo      -wp-report=tests/qualif.report      -wp-prop=-ko  -wp-timeout 100 -wp-steps 1500
-   OPT: -wp-prover why3:alt-ergo -wp-report=tests/qualif-why3.report -wp-prop=-ko  -wp-timeout 100 -wp-steps 1500
-   OPT: -wp-prover alt-ergo      -wp-report=tests/qualif.report      -wp-prop=ko   -wp-timeout 1 -wp-steps 50
-   OPT: -wp-prover why3:alt-ergo -wp-report=tests/qualif-why3.report -wp-prop=ko   -wp-timeout 1
+   OPT: -wp-prover alt-ergo                                            -wp-prop=-ko  -wp-timeout 100 -wp-steps 1500
+   OPT: -wp-prover native:alt-ergo -wp-report=tests/native.report      -wp-prop=-ko  -wp-timeout 100 -wp-steps 1500
+   OPT: -wp-prover alt-ergo                                            -wp-prop=ko   -wp-timeout 1 -wp-steps 50
+   OPT: -wp-prover native:alt-ergo -wp-report=tests/native.report      -wp-prop=ko   -wp-timeout 1
 */
 
 // --------------------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/model.i b/src/plugins/wp/tests/wp_plugin/model.i
index 226489bb68d4f81e8d2c708953bfabaf6fdbe63b..0f90c5deb366647d57c2b869aaeac6de026b9c5d 100644
--- a/src/plugins/wp/tests/wp_plugin/model.i
+++ b/src/plugins/wp/tests/wp_plugin/model.i
@@ -4,8 +4,7 @@
 */
 
 /* run.config_qualif
-   CMD: @frama-c@ -wp-share ./share -wp-msg-key cluster,shell -wp-par 1 -wp-timeout 100 -wp-steps 500
-   OPT: -wp-model Typed -wp -wp-check -then -wp-model Typed+ref -wp -wp-check
+   OPT: -wp-msg-key cluster -wp-model Typed -wp-check -then -wp -wp-model Typed+ref -wp-check
 */
 
 //@ predicate P(integer a);
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle
index 521d75998371f7b6d43197b4d990e7210f625971..324363205674edba699cb8e9bfe8af0293e73744 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle
@@ -1,6 +1,6 @@
 # frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/model.i (no preprocessing)
-[kernel] tests/wp_plugin/model.i:11: Warning: 
+[kernel] tests/wp_plugin/model.i:10: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
@@ -82,7 +82,7 @@ end
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/model.i, line 13) in 'f':
+Goal Post-condition (file tests/wp_plugin/model.i, line 12) in 'f':
 Let x = Mint_0[shift_sint32(p, k)].
 Assume {
   Type: is_sint32(k) /\ is_sint32(x).
@@ -199,7 +199,7 @@ end
   Function f
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/model.i, line 13) in 'f':
+Goal Post-condition (file tests/wp_plugin/model.i, line 12) in 'f':
 Let x = Mint_0[shift_sint32(p, k)].
 Assume {
   Type: is_sint32(k) /\ is_sint32(x).
@@ -210,7 +210,7 @@ Prove: P_P(x).
 
 ------------------------------------------------------------
 
-Goal Post-condition (file tests/wp_plugin/model.i, line 13) in 'f':
+Goal Post-condition (file tests/wp_plugin/model.i, line 12) in 'f':
 Let x = Mint_0[shift_sint32(p, k)].
 Assume {
   Type: is_sint32(k) /\ is_sint32(x).
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/unroll.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/unroll.res.oracle
index 77e0cc1a55cb4eb7c18dd43d751316168bfc3385..a47827c25ddd95445b957e641150c7d8a5110713 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/unroll.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/unroll.res.oracle
@@ -5,11 +5,6 @@
 [wp] Warning: Missing RTE guards
 [wp] tests/wp_plugin/unroll.i:20: Warning: 
   Missing assigns clause (assigns 'everything' instead)
-[wp] 1 goal scheduled
-[wp] [Tactical] Goal typed_unrolled_loop_ensures_zero : Valid
-[wp] Proved goals:    1 / 1
-  Qed:             0 
-  Script:          1
 ------------------------------------------------------------
   Function unrolled_loop
 ------------------------------------------------------------
@@ -30,6 +25,5 @@ Prove: P_zeroed(Mint_0[a <- 0][shift_uint32(t, 1) <- 0][shift_uint32(t, 2)
                   [shift_uint32(t, 11) <- 0][shift_uint32(t, 12) <- 0]
                   [shift_uint32(t, 13) <- 0][shift_uint32(t, 14) <- 0]
                   [shift_uint32(t, 15) <- 0], t, 0, 15).
-Prover Tactical returns Valid
 
 ------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.0.res.oracle
index 3be28fd7c30ec04da6d7e8a1a33ed4b14aa58c9b..266bc9673625f68473a544c9d518f470b5b7e9f2 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/abs.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.0.session/cache/197ec27172491d33862a78fd32fadc0f.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.0.session/cache/197ec27172491d33862a78fd32fadc0f.json
new file mode 100644
index 0000000000000000000000000000000000000000..47b41cb0efc00ac0ce13af8d2d2d49a1639c162f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.0.session/cache/197ec27172491d33862a78fd32fadc0f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0171,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.1.res.oracle
index bee639e5bedba2217eb554615f780b278e3aee82..4b9063d0f178130732921868959b1cc8bf2afca3 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/abs.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.2.res.oracle
index 5ff11df22997fe2251b4e42d0ef8c36046e2d9f7..c56a75a74f2900e6ff2ab6b0b7f26d96cb053126 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/abs.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.2.session/cache/197ec27172491d33862a78fd32fadc0f.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.2.session/cache/197ec27172491d33862a78fd32fadc0f.json
new file mode 100644
index 0000000000000000000000000000000000000000..fd9a2caf946c4d2526d8450cf38d2475dfa61075
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/abs.2.session/cache/197ec27172491d33862a78fd32fadc0f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0158,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.0.session/cache/9ffeff1b1fd70de5988221b29b130cda.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.0.session/cache/9ffeff1b1fd70de5988221b29b130cda.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.0.session/cache/9ffeff1b1fd70de5988221b29b130cda.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.res.oracle
index 4737abaddafdf4b9fe82fde1ebb402cf0e08afc6..b7c278753cf17af36dd6ea1e994bb81b13ee1d73 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/asm.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/asm.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bit_test.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bit_test.res.oracle
index 40432fecac9796bf6a8309e254f86d77942b22df..93c9d28b2329d3ec978a1ec326c31b3a5cb0f82b 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bit_test.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bit_test.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/bit_test.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/1ecbe0b41a07f6fd2241aff3258cd377.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/1ecbe0b41a07f6fd2241aff3258cd377.json
new file mode 100644
index 0000000000000000000000000000000000000000..dd07c3cd82e4cacb1dcc543efa31e26a916ebc2d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/1ecbe0b41a07f6fd2241aff3258cd377.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0157,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/22c1313f9df2b9bda80d2bb8c4d175fc.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/22c1313f9df2b9bda80d2bb8c4d175fc.json
new file mode 100644
index 0000000000000000000000000000000000000000..3de8a23def55c251c37e96fca986abc9ef556137
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/22c1313f9df2b9bda80d2bb8c4d175fc.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0145,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/4fc19b7c827e48214e31ff4f16d7a060.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/4fc19b7c827e48214e31ff4f16d7a060.json
new file mode 100644
index 0000000000000000000000000000000000000000..e412969caa36b7e07b915459a34b6de64d32e2cf
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/4fc19b7c827e48214e31ff4f16d7a060.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0146,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/7aa1ae97b0ddd96dc9a92948a21d089d.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/7aa1ae97b0ddd96dc9a92948a21d089d.json
new file mode 100644
index 0000000000000000000000000000000000000000..477f5ab7d10672d23580697ada736a6ff71a0615
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/7aa1ae97b0ddd96dc9a92948a21d089d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0366,
+  "steps": 26 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/f46d52d0100d219b44e3dd94ca164077.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/f46d52d0100d219b44e3dd94ca164077.json
new file mode 100644
index 0000000000000000000000000000000000000000..577743d83824bc09d3b5ed8801aca1bfdc5b9812
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.0.session/cache/f46d52d0100d219b44e3dd94ca164077.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0177,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.res.oracle
index 7edd3815e32b6afc8c24d3642212bc6be9b51419..cf4825d1b682fab9f601434a2ac7b74b366b9df0 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-no-let -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-no-let [...]
 [kernel] Parsing tests/wp_plugin/bool.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.0.res.oracle
index 1174aab59452145b6eda8e73f843ae20a8ce1513..005e353f3645b93e49541f2cc2e122d63877dbdf 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 100 -wp-steps 500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/convert.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
@@ -8,7 +8,9 @@
 [wp] Proved goals:    2 / 2
   Qed:               0 
   Alt-Ergo 2.0.0:    2
+[wp] Report in:  'tests/wp_plugin/oracle_qualif/convert.0.report.json'
+[wp] Report out: 'tests/wp_plugin/result_qualif/convert.0.report.json'
 -------------------------------------------------------------
 Axiomatics          WP     Alt-Ergo        Total   Success
-Lemma               -       2                2       100%
+Lemma               -       2 (1..12)        2       100%
 -------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.0.session/cache/41595c57ce7e98269d53becbfeb7bcb3.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.0.session/cache/41595c57ce7e98269d53becbfeb7bcb3.json
new file mode 100644
index 0000000000000000000000000000000000000000..5f72202be45140fd54f9735aeb95dd628189a2fb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.0.session/cache/41595c57ce7e98269d53becbfeb7bcb3.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0062,
+  "steps": 7 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.0.session/cache/997da10e0a56b9a3ff392e4d0e7b52b7.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.0.session/cache/997da10e0a56b9a3ff392e4d0e7b52b7.json
new file mode 100644
index 0000000000000000000000000000000000000000..9c4815d94cdba728365d7ed298f6fe9bfa6d0ed0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.0.session/cache/997da10e0a56b9a3ff392e4d0e7b52b7.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0087,
+  "steps": 7 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.1.res.oracle
index cf1e24e7a662e3f60447a08cfde4b9fb9cd6d9f8..3dd881b83a080a87062470970a66d63508976476 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/convert.1.res.oracle
@@ -1,11 +1,20 @@
-# frama-c -wp -wp-timeout 100 -wp-steps 500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/convert.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
 [wp] 2 goals scheduled
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_ceil : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_floor : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_ceil : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_floor : Valid
 [wp] Proved goals:    2 / 2
-  Qed:               0 
-  Alt-Ergo 2.0.0:    2
-[kernel] System error: tests/qualif-why3.report: No such file or directory
+  Qed:             0 
+  Alt-Ergo:        2
+[wp] Report in:  'tests/wp_plugin/oracle_qualif/convert.1.report.json'
+[wp] Report out: 'tests/wp_plugin/result_qualif/convert.1.report.json'
+-------------------------------------------------------------
+Axiomatics          WP     Alt-Ergo        Total   Success
+Lemma               -      -  (20..32)       2       100%
+-------------------------------------------------------------
+-------------------------------------------------------------
+Axiomatics          WP     Alt-Ergo (Native) Total Success
+Lemma               -       2 (20..32)       2       100%
+-------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/3140ad3c2c0e7f22f4a38c1cf4630073.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/3140ad3c2c0e7f22f4a38c1cf4630073.json
new file mode 100644
index 0000000000000000000000000000000000000000..9cc06a15d6e3d2a607153e9bc3f7cd5b984bb920
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/3140ad3c2c0e7f22f4a38c1cf4630073.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0288,
+  "steps": 24 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/5bc3c212fe4290ff88ccb5e99871fd74.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/5bc3c212fe4290ff88ccb5e99871fd74.json
new file mode 100644
index 0000000000000000000000000000000000000000..3782bef305412c4e70ee91e81ab3b31e08386dd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/5bc3c212fe4290ff88ccb5e99871fd74.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0222,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/6d5890f1993535b246213e3d240ff1fa.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/6d5890f1993535b246213e3d240ff1fa.json
new file mode 100644
index 0000000000000000000000000000000000000000..daf4764e778dde0c37ffd891c9bf9658759c38f3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/6d5890f1993535b246213e3d240ff1fa.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0277,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/81cbf3977a1b360e77c61be578e71228.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/81cbf3977a1b360e77c61be578e71228.json
new file mode 100644
index 0000000000000000000000000000000000000000..f61e07fedf5bbe22c77ccb4c67da589c0b764914
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/81cbf3977a1b360e77c61be578e71228.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0409,
+  "steps": 35 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/9c576504d70a15b48202a701c1077cae.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/9c576504d70a15b48202a701c1077cae.json
new file mode 100644
index 0000000000000000000000000000000000000000..7111d54fab54ff1640ddb871fc7b102830bf9a5a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/9c576504d70a15b48202a701c1077cae.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1354,
+  "steps": 149 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/dbd1fa1555b07e233372cbf9a102eb50.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/dbd1fa1555b07e233372cbf9a102eb50.json
new file mode 100644
index 0000000000000000000000000000000000000000..8eac0a9afccf5d64833cdb7bb857f87359eb95d9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.0.session/cache/dbd1fa1555b07e233372cbf9a102eb50.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0455,
+  "steps": 56 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.res.oracle
index e58dd159662b31d042d3b6b0b81e344cb50fd5af..d663290a72fbe304f0409c6cfc07c0f8db78dea1 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/copy.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/copy.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.session/cache/8004973d77211411c9d59b27077c16c6.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.session/cache/8004973d77211411c9d59b27077c16c6.json
new file mode 100644
index 0000000000000000000000000000000000000000..12c062e103a757bc45a963a36437d06716f75081
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.session/cache/8004973d77211411c9d59b27077c16c6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0326,
+  "steps": 47 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.session/cache/b42d5e72c9522a062a198e91751c2c9a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.session/cache/b42d5e72c9522a062a198e91751c2c9a.json
new file mode 100644
index 0000000000000000000000000000000000000000..b4485782cad42d49ff1b81d754f15a6d74ab31f9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.session/cache/b42d5e72c9522a062a198e91751c2c9a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0201,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.session/cache/dbfcb0e8dad365619370802f774d9de9.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.session/cache/dbfcb0e8dad365619370802f774d9de9.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.session/cache/dbfcb0e8dad365619370802f774d9de9.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.session/cache/f9a8c7c2b4e60999d63dc9182c6a31ad.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.session/cache/f9a8c7c2b4e60999d63dc9182c6a31ad.json
new file mode 100644
index 0000000000000000000000000000000000000000..0496e0b70b2c50da3a97c1659756a9288fab503d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.0.session/cache/f9a8c7c2b4e60999d63dc9182c6a31ad.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0205,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.res.oracle
index 3a2e135ecdeea288f12d98f0b59a8ccacec55500..7fdb8a52676fac4bfcee9da841bcfb4aab010d13 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/dynamic.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.res.oracle
index b60e1d430a69f0c5fff4abd75613d0805f71d97c..424e076b6068d9251c7ace2c47755f79ff19762c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp [...]
+# frama-c -wp -wp-timeout 1 [...]
 [kernel] Parsing tests/wp_plugin/flash.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/1698f6d176f78548e841b5696d79f026.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/1698f6d176f78548e841b5696d79f026.json
new file mode 100644
index 0000000000000000000000000000000000000000..852d81aab273985772cb5b7d655f3f996ee7db5d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/1698f6d176f78548e841b5696d79f026.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 1. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/64c8e35016a398a56f0882104d837eaa.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/64c8e35016a398a56f0882104d837eaa.json
new file mode 100644
index 0000000000000000000000000000000000000000..852d81aab273985772cb5b7d655f3f996ee7db5d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/64c8e35016a398a56f0882104d837eaa.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 1. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/ab0c36ef916b4a78d99270e7c4d27723.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/ab0c36ef916b4a78d99270e7c4d27723.json
new file mode 100644
index 0000000000000000000000000000000000000000..852d81aab273985772cb5b7d655f3f996ee7db5d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/ab0c36ef916b4a78d99270e7c4d27723.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 1. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/caccd9276079faaf886ed8d3279e4728.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/caccd9276079faaf886ed8d3279e4728.json
new file mode 100644
index 0000000000000000000000000000000000000000..852d81aab273985772cb5b7d655f3f996ee7db5d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/caccd9276079faaf886ed8d3279e4728.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 1. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/dbda47b47c29a1b3c4192f4c68c94771.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/dbda47b47c29a1b3c4192f4c68c94771.json
new file mode 100644
index 0000000000000000000000000000000000000000..852d81aab273985772cb5b7d655f3f996ee7db5d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.0.session/cache/dbda47b47c29a1b3c4192f4c68c94771.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 1. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.res.oracle
index c711d65adab2c7627884e9744ca2f2f4b867cdcc..29dde40a08d80b5a59d453c35479a2a6362fd40c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/flash.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/26805f260519bc357ddfbab77162336d.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/26805f260519bc357ddfbab77162336d.json
new file mode 100644
index 0000000000000000000000000000000000000000..3577959010599f241f7f23bba6f16c956d63d120
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/26805f260519bc357ddfbab77162336d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0346,
+  "steps": 34 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/78930ca891a9430a1c4a252f99dae940.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/78930ca891a9430a1c4a252f99dae940.json
new file mode 100644
index 0000000000000000000000000000000000000000..c9d861e9b74358eccc18634b57740f1ee1733398
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/78930ca891a9430a1c4a252f99dae940.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0357,
+  "steps": 37 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/80325efaf7a8086892d0eca4f9c22550.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/80325efaf7a8086892d0eca4f9c22550.json
new file mode 100644
index 0000000000000000000000000000000000000000..f00c0fc9b0a36112aa3e440ef81242bb28cc9c42
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/80325efaf7a8086892d0eca4f9c22550.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0362,
+  "steps": 34 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/c8c1639da21238ff80c3f5a92311bf03.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/c8c1639da21238ff80c3f5a92311bf03.json
new file mode 100644
index 0000000000000000000000000000000000000000..8d9bed93bc822e278ca3efa5768bd27d50e031e3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/c8c1639da21238ff80c3f5a92311bf03.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0321,
+  "steps": 39 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/fee62065a13cef000396b31ff5ca19d5.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/fee62065a13cef000396b31ff5ca19d5.json
new file mode 100644
index 0000000000000000000000000000000000000000..49d9c94139e862d7e8a0a877dc04320a8b95ca08
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.1.session/cache/fee62065a13cef000396b31ff5ca19d5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.038,
+  "steps": 34 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.2.res.oracle
index 1712b1e0c1871091ed0ad097bfcb8b3d756b47df..803faf1078bd49153e3508f0b7812aeefcd67ee2 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/flash.2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/flash.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.0.res.oracle
index 3e525c780366ac1535c5a41df8d0faf756c4226e..8f2da577ae2b91e982e22236096af9b0387f36cf 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/float_format.i (no preprocessing)
 [kernel:parser:decimal-float] tests/wp_plugin/float_format.i:10: Warning: 
   Floating-point constant 0.2 is not represented exactly. Will use 0x1.999999999999ap-3.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.1.res.oracle
index dff0921f02e5a5d5791bb1656a780c8aa34df18e..9f87d54d4ed370a5490dfc6b41b9a0f9e81abe2d 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_plugin/float_format.i (no preprocessing)
 [kernel:parser:decimal-float] tests/wp_plugin/float_format.i:10: Warning: 
   Floating-point constant 0.2 is not represented exactly. Will use 0x1.999999999999ap-3.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.1.session/cache/5f7ed05c194dba2e5f64e0c2e288f317.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.1.session/cache/5f7ed05c194dba2e5f64e0c2e288f317.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.1.session/cache/5f7ed05c194dba2e5f64e0c2e288f317.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.2.res.oracle
index 1aef24e167aae8bd72bca9cc4b0b1141851fe3a0..2230d173868d3de4a87b2ea35b6a238d9a296e24 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp [...]
+# frama-c -wp -wp-timeout 1 [...]
 [kernel] Parsing tests/wp_plugin/float_format.i (no preprocessing)
 [kernel:parser:decimal-float] tests/wp_plugin/float_format.i:10: Warning: 
   Floating-point constant 0.2 is not represented exactly. Will use 0x1.999999999999ap-3.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.2.session/cache/5f7ed05c194dba2e5f64e0c2e288f317.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.2.session/cache/5f7ed05c194dba2e5f64e0c2e288f317.json
new file mode 100644
index 0000000000000000000000000000000000000000..852d81aab273985772cb5b7d655f3f996ee7db5d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.2.session/cache/5f7ed05c194dba2e5f64e0c2e288f317.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 1. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.res.oracle
index 31633324320eef03e7772dceca65bbceb3df7683..00476c270d854358a93114ab4b8798d2638dc444 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Real)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Real)' [...]
 [kernel] Parsing tests/wp_plugin/float_real.i (no preprocessing)
 [kernel:parser:decimal-float] tests/wp_plugin/float_real.i:19: Warning: 
   Floating-point constant 1e-5 is not represented exactly. Will use 0x1.4f8b588e368f1p-17.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.session/cache/005069532f5e111f1f882ee47ecb2236.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.session/cache/005069532f5e111f1f882ee47ecb2236.json
new file mode 100644
index 0000000000000000000000000000000000000000..55a5f32d3747474b2a802462cf8fe417a8a74864
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.session/cache/005069532f5e111f1f882ee47ecb2236.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0186,
+  "steps": 25 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.res.oracle
index 43d07c8326c0f546f7e97d6dd7d21eb12e9ebe5f..82e758381388a01df4390cf51c8ab9a9c1a7e9fb 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed' [...]
 [kernel] Parsing tests/wp_plugin/float_real.i (no preprocessing)
 [kernel:parser:decimal-float] tests/wp_plugin/float_real.i:19: Warning: 
   Floating-point constant 1e-5 is not represented exactly. Will use 0x1.4f8b588e368f1p-17.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.session/cache/bd9564689062a5d819d3ecdcd86f1a1a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.session/cache/bd9564689062a5d819d3ecdcd86f1a1a.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.session/cache/bd9564689062a5d819d3ecdcd86f1a1a.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.0.session/cache/2d6105cda5f37243a24f7a2895f11ae9.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.0.session/cache/2d6105cda5f37243a24f7a2895f11ae9.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.0.session/cache/2d6105cda5f37243a24f7a2895f11ae9.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.0.session/cache/985d0f98114267e42ecf4062e9da25ee.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.0.session/cache/985d0f98114267e42ecf4062e9da25ee.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.0.session/cache/985d0f98114267e42ecf4062e9da25ee.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.0.session/cache/cf9f0c2706019f16f1733c8811811eac.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.0.session/cache/cf9f0c2706019f16f1733c8811811eac.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.0.session/cache/cf9f0c2706019f16f1733c8811811eac.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.res.oracle
index 773b4122b041c1fa129091f5d7ce9dd086acb56c..8247a946f2452f3d7ad4fabe8e4d679ba797ac4a 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/frame.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/ground_real.0.session/cache/b9ba36e18d95628c4dc26e47bdf41a0a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/ground_real.0.session/cache/b9ba36e18d95628c4dc26e47bdf41a0a.json
new file mode 100644
index 0000000000000000000000000000000000000000..66657150e32c1eec6985a2f067650a88cfdfc582
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/ground_real.0.session/cache/b9ba36e18d95628c4dc26e47bdf41a0a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0063,
+  "steps": 3 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/ground_real.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/ground_real.res.oracle
index 4341a8387fac517ae66ea4980de6d8928a9704d1..f5f790a0cff2610ddeabcc70c7a3855eb8078f1a 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/ground_real.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/ground_real.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/ground_real.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/inductive.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/inductive.res.oracle
index e58fc4777e8012604626ae376347f60bb26cf998..58f1a2f1d9209618e89faafebbc1c4254004245b 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/inductive.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/inductive.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 240 -wp-steps 1500 [...]
+# frama-c -wp -wp-timeout 240 [...]
 [kernel] Parsing tests/wp_plugin/inductive.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.0.session/cache/03322f9510d2676e91ad7ae2340e23ef.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.0.session/cache/03322f9510d2676e91ad7ae2340e23ef.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.0.session/cache/03322f9510d2676e91ad7ae2340e23ef.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.0.session/cache/0919645d26a767a053dbbd305257f300.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.0.session/cache/0919645d26a767a053dbbd305257f300.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.0.session/cache/0919645d26a767a053dbbd305257f300.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.res.oracle
index f719ce191c98e10950e3f51bc336b6b54413be44..bc0a1b82ce3a7624d46f2f2f0ff7acbad2150cbf 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/init_const.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.0.session/cache/1ad47165aab381beb89b339b538b35c9.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.0.session/cache/1ad47165aab381beb89b339b538b35c9.json
new file mode 100644
index 0000000000000000000000000000000000000000..72fb61e0d7a6bb7d7d402130081ea99a0763a222
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.0.session/cache/1ad47165aab381beb89b339b538b35c9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0203,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.0.session/cache/336ea90cae3def59085db6b73febe669.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.0.session/cache/336ea90cae3def59085db6b73febe669.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.0.session/cache/336ea90cae3def59085db6b73febe669.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.0.session/cache/81d910177d09bd437f5605c7e08689ba.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.0.session/cache/81d910177d09bd437f5605c7e08689ba.json
new file mode 100644
index 0000000000000000000000000000000000000000..b50294b7d4eefa1ecc330667274374a6787b44aa
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.0.session/cache/81d910177d09bd437f5605c7e08689ba.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0217,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.res.oracle
index 74fbe6265909520852af9cb5ba3bcf0c7d32a8a0..c2c2e3ceccba326c240a62e8d27eee2feb2e024f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_const_guard.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/init_const_guard.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.0.session/cache/9f69b51c20bff6d78ba77de6d29573a4.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.0.session/cache/9f69b51c20bff6d78ba77de6d29573a4.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.0.session/cache/9f69b51c20bff6d78ba77de6d29573a4.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.res.oracle
index 8fee97c8110c7ffd2ed80f7e0cb00e502bf15b68..1538d48fe05df12b2ea5f031f48fbd0da3d4dae4 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_extern.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/init_extern.i (no preprocessing)
 [kernel] Parsing tests/wp_plugin/init_linker.i (no preprocessing)
 [wp] Running WP plugin...
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_valid.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_valid.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_valid.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_valid.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_valid.res.oracle
index 9a9e12457487933fcf9ae2ef4a740e0a4e13cd0e..c303e914f2a206dd6e1eba7f310e49a73fa1fa2f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_valid.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/init_valid.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/init_valid.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.0.session/cache/0db5b2bd93ab415281ca907407740c69.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.0.session/cache/0db5b2bd93ab415281ca907407740c69.json
new file mode 100644
index 0000000000000000000000000000000000000000..61fde8be2114028d7e3ecd3d478302bd0b2980ea
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.0.session/cache/0db5b2bd93ab415281ca907407740c69.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0231,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.0.session/cache/ccc85e53f5794ab230694892164f63b9.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.0.session/cache/ccc85e53f5794ab230694892164f63b9.json
new file mode 100644
index 0000000000000000000000000000000000000000..dc19d8b173b90f3aff18b110d47015b35b3c3819
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.0.session/cache/ccc85e53f5794ab230694892164f63b9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0263,
+  "steps": 34 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.res.oracle
index 06ab6be80f469b8c42f674f693cf1837eeef0cbe..3e092c0517374eaa9ac8ec3aa51825fbbd923925 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/initarr.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/initarr.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.0.res.oracle
index 09a1441179746ce863839cbdcc68f7ec44ed9d37..21e508fd59198c77d1bad1ec5d77b40c922fffef 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/injector.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.res.oracle
index 8e07c7e303008a3472678de0979ddb2f1a619885..b4667f759fafe214bf078668e22afba5bef27309 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_plugin/injector.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.session/cache/22902ca7289610fdec09e1a4a8161028.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.session/cache/22902ca7289610fdec09e1a4a8161028.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.session/cache/22902ca7289610fdec09e1a4a8161028.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.session/cache/bb05ba082c84bad439158a8650b204b5.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.session/cache/bb05ba082c84bad439158a8650b204b5.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.session/cache/bb05ba082c84bad439158a8650b204b5.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.session/cache/f8c939f0e411b5d911aec8b560c65159.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.session/cache/f8c939f0e411b5d911aec8b560c65159.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/injector.1.session/cache/f8c939f0e411b5d911aec8b560c65159.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/399ec703f06dad6957a965ed8c343ca0.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/399ec703f06dad6957a965ed8c343ca0.json
new file mode 100644
index 0000000000000000000000000000000000000000..d07c6239273125aa5580850bfadee79aca277db5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/399ec703f06dad6957a965ed8c343ca0.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0237,
+  "steps": 32 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/40b122f0e00fce362b3986a91de91687.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/40b122f0e00fce362b3986a91de91687.json
new file mode 100644
index 0000000000000000000000000000000000000000..f70df46a961b43d6d08fd71be771ac3c7e0a1fab
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/40b122f0e00fce362b3986a91de91687.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0316,
+  "steps": 70 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/63650a5c524f80133df6ee0a87081cef.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/63650a5c524f80133df6ee0a87081cef.json
new file mode 100644
index 0000000000000000000000000000000000000000..f6a96cef0f66d4005f8e7c21d8a1460b7a81a9bf
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/63650a5c524f80133df6ee0a87081cef.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0181,
+  "steps": 29 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/680b47de429711710f8e789107aba188.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/680b47de429711710f8e789107aba188.json
new file mode 100644
index 0000000000000000000000000000000000000000..339df5f98d71e96b341c588760ece9936763d33a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/680b47de429711710f8e789107aba188.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0148,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/c22b2b7de2cf2f354d9edafa47d34589.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/c22b2b7de2cf2f354d9edafa47d34589.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/c22b2b7de2cf2f354d9edafa47d34589.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/d82134accee9fa37acc671a4193d9c28.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/d82134accee9fa37acc671a4193d9c28.json
new file mode 100644
index 0000000000000000000000000000000000000000..14184a3b85dd66b422825baae6cfc99b125e7513
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.0.session/cache/d82134accee9fa37acc671a4193d9c28.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0129,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.res.oracle
index c73a0cad6ce48aeeb1ca1992948d20285693caf3..84704dba34e66dd794e4d8d57af1205cc56fb6f9 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loop.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/loop.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopcurrent.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopcurrent.res.oracle
index 887d7f68708dc1a848a60aa321059b337190c26e..1243a954f859f9d6e03ac990ddc16b4057a46b5c 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopcurrent.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopcurrent.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/loopcurrent.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopentry.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopentry.res.oracle
index 190504de364ff5fd3eb30cca5941465b89c01540..73078e24dae3e5475cfbef86b24ae6139e281755 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopentry.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopentry.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/loopentry.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopextra.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopextra.res.oracle
index be03eb0c54595ad6b793cc867b569f7268407899..61bff7f94a53987b34e56f173cf691bf19b4c5ba 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopextra.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/loopextra.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/loopextra.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/mask.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/mask.res.oracle
index 80f261630b6e9f3ed59ea6ccdfc2e159d55d9840..85ae2cc2fcd0da78deff5a45841fd0485d9fd3d7 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/mask.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/mask.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/mask.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.res.oracle
index f0091eae9395ddb6e163d79773842ef51e642cee..bf50cd0feb5c66106877ddadf5bcd83ddbdc3f06 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.res.oracle
@@ -37,10 +37,12 @@
 [wp] Proved goals:   30 / 30
   Qed:               5 
   Alt-Ergo 2.0.0:   25
+[wp] Report in:  'tests/wp_plugin/oracle_qualif/math.0.report.json'
+[wp] Report out: 'tests/wp_plugin/result_qualif/math.0.report.json'
 -------------------------------------------------------------
 Axiomatics          WP     Alt-Ergo        Total   Success
-Lemma                3     16               19       100%
+Lemma                3     16 (104..128)    19       100%
 -------------------------------------------------------------
 Functions           WP     Alt-Ergo        Total   Success
-ok                   2      9               11       100%
+ok                   2      9 (88..112)     11       100%
 -------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/213b42a122d2ddf0d68abd0132ffa198.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/213b42a122d2ddf0d68abd0132ffa198.json
new file mode 100644
index 0000000000000000000000000000000000000000..56d6d6b8ca03346574968685622db77202ec59f7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/213b42a122d2ddf0d68abd0132ffa198.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0174,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/216283795b958a5995693f6b04391255.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/216283795b958a5995693f6b04391255.json
new file mode 100644
index 0000000000000000000000000000000000000000..394a3b9ef049ead5912ee38e8c8352b4d664bfd7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/216283795b958a5995693f6b04391255.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0266,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/2bb9f22d5936cad4dafccff30f05d502.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/2bb9f22d5936cad4dafccff30f05d502.json
new file mode 100644
index 0000000000000000000000000000000000000000..b3705767c611764a7a6473c4fb10667efb683609
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/2bb9f22d5936cad4dafccff30f05d502.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0167,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/2d32ce8d5323849bb1cd1ea322b03fc6.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/2d32ce8d5323849bb1cd1ea322b03fc6.json
new file mode 100644
index 0000000000000000000000000000000000000000..067b1f347ab333dae2fe1198beff1386395f7fa9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/2d32ce8d5323849bb1cd1ea322b03fc6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0159,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/4eca6dd59584171a069c267a778ee47a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/4eca6dd59584171a069c267a778ee47a.json
new file mode 100644
index 0000000000000000000000000000000000000000..ffe942521c362031ec987a71d540b376bb3d136d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/4eca6dd59584171a069c267a778ee47a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.012,
+  "steps": 8 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/5242bd61a48707f0dbeba4f38867c9f2.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/5242bd61a48707f0dbeba4f38867c9f2.json
new file mode 100644
index 0000000000000000000000000000000000000000..8c51bdf3c16648d7b76243a23583cf07cd5783fd
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/5242bd61a48707f0dbeba4f38867c9f2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0129,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/608785a9f24131b1483d79ac5364abfd.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/608785a9f24131b1483d79ac5364abfd.json
new file mode 100644
index 0000000000000000000000000000000000000000..f13651d340613ef74bab898253de5f9c14fb3c40
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/608785a9f24131b1483d79ac5364abfd.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.043,
+  "steps": 102 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/74c3e8d21260f1b900a321bdcbb800a0.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/74c3e8d21260f1b900a321bdcbb800a0.json
new file mode 100644
index 0000000000000000000000000000000000000000..c4ecb09a605f33a701ae8231f2d8c7fe57d5d601
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/74c3e8d21260f1b900a321bdcbb800a0.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0148,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/88292638416b99243a8f32021f03109a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/88292638416b99243a8f32021f03109a.json
new file mode 100644
index 0000000000000000000000000000000000000000..226ecf6e77233c5261e5a47270f1ae4d709042f3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/88292638416b99243a8f32021f03109a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0226,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/953c0fa2728747865ab3cc4a8c6e542b.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/953c0fa2728747865ab3cc4a8c6e542b.json
new file mode 100644
index 0000000000000000000000000000000000000000..8f2135784a883c330520b946fdc10524b1d69d39
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/953c0fa2728747865ab3cc4a8c6e542b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0299,
+  "steps": 102 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/9f5e2e6c71421110e2f65d8ed414c02e.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/9f5e2e6c71421110e2f65d8ed414c02e.json
new file mode 100644
index 0000000000000000000000000000000000000000..5418206a73aa7713cc98c17ef59a89ea48daf3b5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/9f5e2e6c71421110e2f65d8ed414c02e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0961,
+  "steps": 112 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/a6000acb106889adb2406b9b4fe1d766.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/a6000acb106889adb2406b9b4fe1d766.json
new file mode 100644
index 0000000000000000000000000000000000000000..8bcf714c86f32e2cc9e61d9c041296f7fc8fae5d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/a6000acb106889adb2406b9b4fe1d766.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0111,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/be015da8ea402327f26ad277f16105be.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/be015da8ea402327f26ad277f16105be.json
new file mode 100644
index 0000000000000000000000000000000000000000..f6eecbe287176fa34dc678667de28a29557d14c9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/be015da8ea402327f26ad277f16105be.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0146,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/c2279ab65c88304c7da4f176ab90104a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/c2279ab65c88304c7da4f176ab90104a.json
new file mode 100644
index 0000000000000000000000000000000000000000..4673d05bf0c5b509ff915ae5aa5e2f9e55e32ae1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/c2279ab65c88304c7da4f176ab90104a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0159,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/cbb21de6be103d1c306d22fb5bcd151a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/cbb21de6be103d1c306d22fb5bcd151a.json
new file mode 100644
index 0000000000000000000000000000000000000000..157bdf4d3fa7274be611e69f081b7af6e56bede4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/cbb21de6be103d1c306d22fb5bcd151a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0226,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/cdd33c50e974deac92d7a61b7ef1b147.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/cdd33c50e974deac92d7a61b7ef1b147.json
new file mode 100644
index 0000000000000000000000000000000000000000..f8aa6a47ce4b87ee6379ae9f860fb2c141a33374
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/cdd33c50e974deac92d7a61b7ef1b147.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0149,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/d19c016bf41554f2de4951c95fbeccd3.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/d19c016bf41554f2de4951c95fbeccd3.json
new file mode 100644
index 0000000000000000000000000000000000000000..5251b3d24f199ec55223e858c3417811ab8494ad
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/d19c016bf41554f2de4951c95fbeccd3.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0091,
+  "steps": 7 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/d1d4887b46a0420ab75cc8918df27bab.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/d1d4887b46a0420ab75cc8918df27bab.json
new file mode 100644
index 0000000000000000000000000000000000000000..1344f4b9fbce698ffc340637d1a47d7db84aa67c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/d1d4887b46a0420ab75cc8918df27bab.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0088,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/d21f257b332e78cc8f8cda8295a42bb6.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/d21f257b332e78cc8f8cda8295a42bb6.json
new file mode 100644
index 0000000000000000000000000000000000000000..8d54a2552f4398472a5afcc9066ae48cea01ae15
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/d21f257b332e78cc8f8cda8295a42bb6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0082,
+  "steps": 8 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/d7f2dfb78ccb8b374e7c31f3e400a87c.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/d7f2dfb78ccb8b374e7c31f3e400a87c.json
new file mode 100644
index 0000000000000000000000000000000000000000..c1dd535b5e8ca90bc9a8b0e1e9ae252ae9fdce5e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/d7f2dfb78ccb8b374e7c31f3e400a87c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0102,
+  "steps": 8 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/db7197273e4c9b70483c4b824b63758d.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/db7197273e4c9b70483c4b824b63758d.json
new file mode 100644
index 0000000000000000000000000000000000000000..b4cced389d2cefb05363a8328f8de42fc7b0dee5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/db7197273e4c9b70483c4b824b63758d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0138,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/dc243cd01c34785cb9be1e4789152362.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/dc243cd01c34785cb9be1e4789152362.json
new file mode 100644
index 0000000000000000000000000000000000000000..dc92c73f4abbb6b2b10006eace25166d176d1ae6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/dc243cd01c34785cb9be1e4789152362.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0172,
+  "steps": 24 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/dcbbd5701a2bead6112fe6ba82e3b416.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/dcbbd5701a2bead6112fe6ba82e3b416.json
new file mode 100644
index 0000000000000000000000000000000000000000..9d97183cc094395fda29e1c10dd3793445e774f6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/dcbbd5701a2bead6112fe6ba82e3b416.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0303,
+  "steps": 28 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/df09915b27230dac460c7ec419a242c8.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/df09915b27230dac460c7ec419a242c8.json
new file mode 100644
index 0000000000000000000000000000000000000000..7ce04e99f39f79e1bf856d5538da6849c5a3bf05
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/df09915b27230dac460c7ec419a242c8.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0112,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/e1b094cde27b35f3f652d8dbb0006d05.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/e1b094cde27b35f3f652d8dbb0006d05.json
new file mode 100644
index 0000000000000000000000000000000000000000..4016ae19df3b68e5df230521aea1156b73af0e58
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.0.session/cache/e1b094cde27b35f3f652d8dbb0006d05.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0285,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.1.res.oracle
index f638b39f0c0a698adfe2a033ed5fd6858162cfc1..902a09e4e83ab6fb2d5bc6cb54f3bb2a1659e873 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.1.res.oracle
@@ -4,37 +4,52 @@
 [wp] Loading driver 'share/wp.driver'
 [wp] Warning: Missing RTE guards
 [wp] 30 goals scheduled
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_abs_neg : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_abs_pos : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_atan_sin_cos : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_cosh_opp : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_distance : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_exp_log_add_mul : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_abs_neg : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_abs_pos : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_atan_sin_cos : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_cosh_opp : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_distance : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_exp_log_add_mul : Valid
 [wp] [Qed] Goal typed_lemma_exp_pos : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_log_exp_mul_add : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_log_exp_mul_add : Valid
 [wp] [Qed] Goal typed_lemma_max_ac : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_max_inf : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_max_or : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_max_inf : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_max_or : Valid
 [wp] [Qed] Goal typed_lemma_min_ac : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_min_inf : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_min_or : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_pow_2 : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_sinh_opp : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_sqrt_mono : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_sqrt_pos : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_lemma_tanh_opp : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_ok_ensures_sin_asin : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_ok_ensures_sin_asin_in_range : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_ok_ensures_cos_acos : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_ok_ensures_cos_acos_in_range : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_min_inf : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_min_or : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_pow_2 : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_sinh_opp : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_sqrt_mono : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_sqrt_pos : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_lemma_tanh_opp : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_ok_ensures_sin_asin : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_ok_ensures_sin_asin_in_range : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_ok_ensures_cos_acos : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_ok_ensures_cos_acos_in_range : Valid
 [wp] [Qed] Goal typed_ok_ensures_tan_atan : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_ok_ensures_log_pow : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_ok_ensures_log_pow : Valid
 [wp] [Qed] Goal typed_ok_ensures_log_exp : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_ok_ensures_exp_log : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_ok_ensures_min_plus_distrib : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_ok_ensures_sqrt_pos : Valid
-[wp] [Alt-Ergo 2.0.0] Goal typed_ok_ensures_sqrt_pos0 : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_ok_ensures_exp_log : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_ok_ensures_min_plus_distrib : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_ok_ensures_sqrt_pos : Valid
+[wp] [Alt-Ergo (Native)] Goal typed_ok_ensures_sqrt_pos0 : Valid
 [wp] Proved goals:   30 / 30
-  Qed:               5 
-  Alt-Ergo 2.0.0:   25
-[kernel] System error: tests/qualif-why3.report: No such file or directory
+  Qed:             5 
+  Alt-Ergo:       25
+[wp] Report in:  'tests/wp_plugin/oracle_qualif/math.1.report.json'
+[wp] Report out: 'tests/wp_plugin/result_qualif/math.1.report.json'
+-------------------------------------------------------------
+Axiomatics          WP     Alt-Ergo        Total   Success
+Lemma                3     -  (96..120)     19       100%
+-------------------------------------------------------------
+Functions           WP     Alt-Ergo        Total   Success
+ok                   2     -  (288..336)    11       100%
+-------------------------------------------------------------
+-------------------------------------------------------------
+Axiomatics          WP     Alt-Ergo (Native) Total Success
+Lemma                3     16 (96..120)     19       100%
+-------------------------------------------------------------
+Functions           WP     Alt-Ergo (Native) Total Success
+ok                   2      9 (288..336)    11       100%
+-------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.res.oracle
index 17b764af7535a0e49a60f6a1643cdcd4b596f922..fb561d0e65eea8dc3d908d4512eafe5ea289295d 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp [...]
+# frama-c -wp -wp-timeout 1 -wp-steps 50 [...]
 [kernel] Parsing tests/wp_plugin/math.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
@@ -15,6 +15,8 @@
 [wp] [Alt-Ergo 2.0.0] Goal typed_ko_ensures_ko_sqrt_pos : Unsuccess
 [wp] Proved goals:    0 / 9
   Alt-Ergo 2.0.0:    0  (unsuccess: 9)
+[wp] Report in:  'tests/wp_plugin/oracle_qualif/math.2.report.json'
+[wp] Report out: 'tests/wp_plugin/result_qualif/math.2.report.json'
 -------------------------------------------------------------
 Functions           WP     Alt-Ergo        Total   Success
 ko                  -      -                 9       0.0%
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/13197ec1be944f7d7e647e0ec9e42a92.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/13197ec1be944f7d7e647e0ec9e42a92.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/13197ec1be944f7d7e647e0ec9e42a92.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/13df20db3083b249543b1b76494b44bd.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/13df20db3083b249543b1b76494b44bd.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/13df20db3083b249543b1b76494b44bd.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/4b726b5654038ef80abec267b3ab0f40.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/4b726b5654038ef80abec267b3ab0f40.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/4b726b5654038ef80abec267b3ab0f40.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/a2ffaa4a6ec6a720426ea37225a3de9f.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/a2ffaa4a6ec6a720426ea37225a3de9f.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/a2ffaa4a6ec6a720426ea37225a3de9f.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/a858d2bb68ec4cf0515963f97a2a0cc7.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/a858d2bb68ec4cf0515963f97a2a0cc7.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/a858d2bb68ec4cf0515963f97a2a0cc7.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/de75098d7ad46b5fbf6335788df2267a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/de75098d7ad46b5fbf6335788df2267a.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/de75098d7ad46b5fbf6335788df2267a.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/e1e85e0396eb4b3f9ecfd0ef9c975545.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/e1e85e0396eb4b3f9ecfd0ef9c975545.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/e1e85e0396eb4b3f9ecfd0ef9c975545.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/e56758316a511fb81fc9497c7c535a3e.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/e56758316a511fb81fc9497c7c535a3e.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/e56758316a511fb81fc9497c7c535a3e.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/f4c19e502fd825db09fe53ba86788b3c.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/f4c19e502fd825db09fe53ba86788b3c.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.2.session/cache/f4c19e502fd825db09fe53ba86788b3c.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.3.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.3.res.oracle
index 5e01bcd2a45f1e785d732d9ad661bc8a43c0793e..6117c36a1ed9e8201c05943529493aeac4879fa4 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.3.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/math.3.res.oracle
@@ -1,18 +1,27 @@
-# frama-c -wp [...]
+# frama-c -wp -wp-timeout 1 [...]
 [kernel] Parsing tests/wp_plugin/math.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
 [wp] Warning: Missing RTE guards
 [wp] 9 goals scheduled
-[wp] [Alt-Ergo 2.0.0] Goal typed_ko_ensures_ko_sin_asin : Unsuccess
-[wp] [Alt-Ergo 2.0.0] Goal typed_ko_ensures_ko_cos_acos : Unsuccess
-[wp] [Alt-Ergo 2.0.0] Goal typed_ko_ensures_ko_asin_sin : Unsuccess
-[wp] [Alt-Ergo 2.0.0] Goal typed_ko_ensures_ko_acos_cos : Unsuccess
-[wp] [Alt-Ergo 2.0.0] Goal typed_ko_ensures_ko_atan_tan : Unsuccess
-[wp] [Alt-Ergo 2.0.0] Goal typed_ko_ensures_ko_log_pow : Unsuccess
-[wp] [Alt-Ergo 2.0.0] Goal typed_ko_ensures_ko_exp_log : Unsuccess
-[wp] [Alt-Ergo 2.0.0] Goal typed_ko_ensures_ko_exp_log_add_mul : Unsuccess
-[wp] [Alt-Ergo 2.0.0] Goal typed_ko_ensures_ko_sqrt_pos : Unsuccess
+[wp] [Alt-Ergo (Native)] Goal typed_ko_ensures_ko_sin_asin : Unsuccess
+[wp] [Alt-Ergo (Native)] Goal typed_ko_ensures_ko_cos_acos : Unsuccess
+[wp] [Alt-Ergo (Native)] Goal typed_ko_ensures_ko_asin_sin : Unsuccess
+[wp] [Alt-Ergo (Native)] Goal typed_ko_ensures_ko_acos_cos : Unsuccess
+[wp] [Alt-Ergo (Native)] Goal typed_ko_ensures_ko_atan_tan : Unsuccess
+[wp] [Alt-Ergo (Native)] Goal typed_ko_ensures_ko_log_pow : Unsuccess
+[wp] [Alt-Ergo (Native)] Goal typed_ko_ensures_ko_exp_log : Unsuccess
+[wp] [Alt-Ergo (Native)] Goal typed_ko_ensures_ko_exp_log_add_mul : Unsuccess
+[wp] [Alt-Ergo (Native)] Goal typed_ko_ensures_ko_sqrt_pos : Unsuccess
 [wp] Proved goals:    0 / 9
-  Alt-Ergo 2.0.0:    0  (unsuccess: 9)
-[kernel] System error: tests/qualif-why3.report: No such file or directory
+  Alt-Ergo:        0  (unsuccess: 9)
+[wp] Report in:  'tests/wp_plugin/oracle_qualif/math.3.report.json'
+[wp] Report out: 'tests/wp_plugin/result_qualif/math.3.report.json'
+-------------------------------------------------------------
+Functions           WP     Alt-Ergo        Total   Success
+ko                  -      -                 9       0.0%
+-------------------------------------------------------------
+-------------------------------------------------------------
+Functions           WP     Alt-Ergo (Native) Total Success
+ko                  -      -                 9       0.0%
+-------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/model.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/model.res.oracle
index a86ad7dc115ee32e11c03761f33f4cd198468d2e..8569ce3a25eb9a34fa3d72c80219e0aab42f8b97 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/model.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/model.res.oracle
@@ -1,6 +1,6 @@
-# frama-c -wp -wp-timeout 100 -wp-steps 500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/model.i (no preprocessing)
-[kernel] tests/wp_plugin/model.i:11: Warning: 
+[kernel] tests/wp_plugin/model.i:10: Warning: 
   parsing obsolete ACSL construct 'logic declaration'. 'an axiomatic block' should be used instead.
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
@@ -50,7 +50,13 @@ theory Axiomatic
 end
 [wp] [Alt-Ergo 2.0.0] Goal typed_f_ensures : Typechecked
 [wp] Proved goals:    0 / 1
-  Alt-Ergo 2.0.0:    0  (unknown: 1)
+  Alt-Ergo 2.0.0:    0  (unsuccess: 1)
+[wp] Report in:  'tests/wp_plugin/oracle_qualif/model.0.report.json'
+[wp] Report out: 'tests/wp_plugin/result_qualif/model.0.report.json'
+-------------------------------------------------------------
+Functions           WP     Alt-Ergo        Total   Success
+f                   -      -                 1       0.0%
+-------------------------------------------------------------
 [wp] Running WP plugin...
 [wp] 2 goals scheduled
 [wp] [Alt-Ergo 2.0.0] Goal typed_f_ensures : Typechecked
@@ -98,4 +104,10 @@ theory Axiomatic1
 end
 [wp] [Alt-Ergo 2.0.0] Goal typed_ref_f_ensures : Typechecked
 [wp] Proved goals:    0 / 2
-  Alt-Ergo 2.0.0:    0  (unknown: 2)
+  Alt-Ergo 2.0.0:    0  (unsuccess: 2)
+[wp] Report in:  'tests/wp_plugin/oracle_qualif/model.0.report.json'
+[wp] Report out: 'tests/wp_plugin/result_qualif/model.0.report.json'
+-------------------------------------------------------------
+Functions           WP     Alt-Ergo        Total   Success
+f                   -      -                 2       0.0%
+-------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nowp.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nowp.res.oracle
index 9fbeaeadf91429555fdf9f669b578fe91df55c8a..e643d4c567daf51c79055402f3cf01f7a869227e 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nowp.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nowp.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/nowp.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.0.res.oracle
index 7409dcd50ccde6a33b8b0fbe710f6cab78e32164..4bde6e9381121d531b5372ef2e35e6b18e8017b7 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/nth.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.0.session/cache/f02880d9f20c50d2696d69306b9f2210.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.0.session/cache/f02880d9f20c50d2696d69306b9f2210.json
new file mode 100644
index 0000000000000000000000000000000000000000..523a262cc78753b0e6cd5db68018930a3dc36f0c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.0.session/cache/f02880d9f20c50d2696d69306b9f2210.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 1.5952,
+  "steps": 165 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.0.session/cache/fe32aa00366c24b440cce98e1de247ca.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.0.session/cache/fe32aa00366c24b440cce98e1de247ca.json
new file mode 100644
index 0000000000000000000000000000000000000000..02db2e696f3e6ccb67fb45c6665daebc0e9f08af
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.0.session/cache/fe32aa00366c24b440cce98e1de247ca.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0603,
+  "steps": 94 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.res.oracle
index 3b2532f0d41508e2d60c23b61489597c09da6580..9e7b8a071cd6ac00a38c0c6cd6c51771dd4af2f6 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/nth.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.session/cache/af662533ee30f3d19d6e3a181c22b81a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.session/cache/af662533ee30f3d19d6e3a181c22b81a.json
new file mode 100644
index 0000000000000000000000000000000000000000..11b78f4b7836c1bd2114c533c00440be1ecab01a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.session/cache/af662533ee30f3d19d6e3a181c22b81a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.8449,
+  "steps": 159 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.session/cache/f02880d9f20c50d2696d69306b9f2210.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.session/cache/f02880d9f20c50d2696d69306b9f2210.json
new file mode 100644
index 0000000000000000000000000000000000000000..656105c04ace60c519ebf252a0704ceac2229964
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.session/cache/f02880d9f20c50d2696d69306b9f2210.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 1.4727,
+  "steps": 165 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.session/cache/fe32aa00366c24b440cce98e1de247ca.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.session/cache/fe32aa00366c24b440cce98e1de247ca.json
new file mode 100644
index 0000000000000000000000000000000000000000..941cfaed7c655fc39b4be8e5696204d205d81a2d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.session/cache/fe32aa00366c24b440cce98e1de247ca.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.071,
+  "steps": 94 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.0.session/cache/2435783c50932d991f8ee829724a1949.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.0.session/cache/2435783c50932d991f8ee829724a1949.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.0.session/cache/2435783c50932d991f8ee829724a1949.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.0.session/cache/f9c13ffe00b0b154325d6265a980d603.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.0.session/cache/f9c13ffe00b0b154325d6265a980d603.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.0.session/cache/f9c13ffe00b0b154325d6265a980d603.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.res.oracle
index f3b60ab008961fb5341fbf9554a81aa247ac721a..9fed766a89f00383277a2a549628fe1988cb5d97 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overarray.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/overarray.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.0.session/cache/4d61b75fe6abd8df19f1a9be60dd9763.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.0.session/cache/4d61b75fe6abd8df19f1a9be60dd9763.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.0.session/cache/4d61b75fe6abd8df19f1a9be60dd9763.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.0.session/cache/55eeed2d5cf9cb6cfa8e52612c324d9d.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.0.session/cache/55eeed2d5cf9cb6cfa8e52612c324d9d.json
new file mode 100644
index 0000000000000000000000000000000000000000..037ed6f9037e953c9d1cc1a3a7e84c962ec941c4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.0.session/cache/55eeed2d5cf9cb6cfa8e52612c324d9d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0196,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.0.session/cache/bd8277dfe06709be8acedb93fa4872f9.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.0.session/cache/bd8277dfe06709be8acedb93fa4872f9.json
new file mode 100644
index 0000000000000000000000000000000000000000..950b0ac0ce789bb2b0aed1d24776e32e93ee4a25
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.0.session/cache/bd8277dfe06709be8acedb93fa4872f9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0196,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.0.session/cache/c10d88d85fe0d4ee0f388d8245f869f7.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.0.session/cache/c10d88d85fe0d4ee0f388d8245f869f7.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.0.session/cache/c10d88d85fe0d4ee0f388d8245f869f7.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.res.oracle
index 75b57c96bb52e19213403b8e9b1b9b459cfef807..b8758ed7581120597f270c9f128dd8ede4528a5e 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/overassign.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/overassign.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/params.0.session/cache/c29b3bdbe3eb1277e4c71838ea2a4887.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/params.0.session/cache/c29b3bdbe3eb1277e4c71838ea2a4887.json
new file mode 100644
index 0000000000000000000000000000000000000000..8a553686ab8de2cdbad071071ddb787c979bff32
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/params.0.session/cache/c29b3bdbe3eb1277e4c71838ea2a4887.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0088,
+  "steps": 4 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/params.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/params.res.oracle
index 472834ac035cc5379ae493d77fc563e45edc9b8b..281d6f5ec593145eee51ba16a07b40ea4e666729 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/params.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/params.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/params.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/plet.0.session/cache/570d6a8b3ed674b838476cd14ab30316.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/plet.0.session/cache/570d6a8b3ed674b838476cd14ab30316.json
new file mode 100644
index 0000000000000000000000000000000000000000..bf72bb63210ad332fff8ec7e971cc7209c023b6c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/plet.0.session/cache/570d6a8b3ed674b838476cd14ab30316.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0139,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/plet.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/plet.res.oracle
index d77ba62ed0b65f94f7be90e9ff932d807b89b8f3..cda0cfc000b9642c5a5edff2a217b690624b503e 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/plet.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/plet.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/plet.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/polarity.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/polarity.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/polarity.0.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/polarity.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/polarity.res.oracle
index 001d2294e71948b34e2b7db7c6f80712c55640d2..aa3a09060e6a2af9016f5c23e2d7440c8cf61624 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/polarity.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/polarity.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/polarity.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/778a39b644999f1f9b43c71dd8ee9b0b.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/778a39b644999f1f9b43c71dd8ee9b0b.json
new file mode 100644
index 0000000000000000000000000000000000000000..d3739bdbc17bb4c61048218b734121b13583428d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/778a39b644999f1f9b43c71dd8ee9b0b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0228,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/867e591f25a0a603f41701659323e11a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/867e591f25a0a603f41701659323e11a.json
new file mode 100644
index 0000000000000000000000000000000000000000..383b44a3e2eeee733aa94d91275d7198dbd2eac0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/867e591f25a0a603f41701659323e11a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0271,
+  "steps": 30 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/8bb2dfe3f4fe3359717a56a05cf8314b.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/8bb2dfe3f4fe3359717a56a05cf8314b.json
new file mode 100644
index 0000000000000000000000000000000000000000..e1c6b71743b54feac4d6ec7edc4330d88d182e3a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/8bb2dfe3f4fe3359717a56a05cf8314b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0246,
+  "steps": 31 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/d9dc95959e010c582ac876a6d9a50fd5.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/d9dc95959e010c582ac876a6d9a50fd5.json
new file mode 100644
index 0000000000000000000000000000000000000000..f0aa1e7cc458c1e9b2100c4cee2fa40188c7c020
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/d9dc95959e010c582ac876a6d9a50fd5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0224,
+  "steps": 26 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/fd671e76634e44a48acb86857c5565b0.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/fd671e76634e44a48acb86857c5565b0.json
new file mode 100644
index 0000000000000000000000000000000000000000..97056353d70be2e9f8834b89eb1722ead9f2dfe1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.0.session/cache/fd671e76634e44a48acb86857c5565b0.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1358,
+  "steps": 220 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.res.oracle
index 5caef16184fc1ec7b8995dad9dace72f0b53110f..bbe0916d104b0e192bcec9ae4f751a9fcf06cb06 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/prenex.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/prenex.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/removed.0.session/cache/4dc341b2d4deefe644f427eea94616b0.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/removed.0.session/cache/4dc341b2d4deefe644f427eea94616b0.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/removed.0.session/cache/4dc341b2d4deefe644f427eea94616b0.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/10a23103267207b4187f3b74e41ef72d.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/10a23103267207b4187f3b74e41ef72d.json
new file mode 100644
index 0000000000000000000000000000000000000000..d80e6f5a218ad4ae293d0b4b128104379434a37a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/10a23103267207b4187f3b74e41ef72d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0189,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/15db3cdd6e613c3be1475c9017b1faaf.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/15db3cdd6e613c3be1475c9017b1faaf.json
new file mode 100644
index 0000000000000000000000000000000000000000..01eaafc7f1f182eac23508d09aa802811aa34eec
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/15db3cdd6e613c3be1475c9017b1faaf.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 1.2244,
+  "steps": 557 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/4233f9536c694126fa361ebeb7de55a2.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/4233f9536c694126fa361ebeb7de55a2.json
new file mode 100644
index 0000000000000000000000000000000000000000..e4c22a8e7cc39ddc526ee44eadc54a9e2e6bf835
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/4233f9536c694126fa361ebeb7de55a2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.9089,
+  "steps": 403 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/7a60c6978f1ede6682bd66a6423e5044.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/7a60c6978f1ede6682bd66a6423e5044.json
new file mode 100644
index 0000000000000000000000000000000000000000..bcdf206d8cd077fe81d2a1fb84860e2b7a04b421
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/7a60c6978f1ede6682bd66a6423e5044.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0184,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/9d1b3fbe16b7a7d6baf2910a974c3d6a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/9d1b3fbe16b7a7d6baf2910a974c3d6a.json
new file mode 100644
index 0000000000000000000000000000000000000000..9d3708fb56b4ebc536d37d6958155781dde7d25b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.0.session/cache/9d1b3fbe16b7a7d6baf2910a974c3d6a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 1.1571,
+  "steps": 555 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.res.oracle
index 3a7456bff6c60d9788a9e55f3e41e125ca441471..eb995af1813c90479e30ad40638cd16e38a41128 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/repeat.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/3afdeebefb45f797fcaeee80a3130909.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/3afdeebefb45f797fcaeee80a3130909.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/3afdeebefb45f797fcaeee80a3130909.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/914472b8d4c8fb3a40937ea1f3009a96.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/914472b8d4c8fb3a40937ea1f3009a96.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/914472b8d4c8fb3a40937ea1f3009a96.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/9f2022b03307856ff4ac275b4d10b064.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/9f2022b03307856ff4ac275b4d10b064.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/9f2022b03307856ff4ac275b4d10b064.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/bc9c09c9d7f65d10c82f09240d77fd35.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/bc9c09c9d7f65d10c82f09240d77fd35.json
new file mode 100644
index 0000000000000000000000000000000000000000..b2577c8a974c984eadc69b09b67230a07ed782ee
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/bc9c09c9d7f65d10c82f09240d77fd35.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.014,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/fc54a11274dceec702d37696f5e88f2b.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/fc54a11274dceec702d37696f5e88f2b.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.0.session/cache/fc54a11274dceec702d37696f5e88f2b.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.res.oracle
index ac262be90812cecb6917673e5050d63a3296fdce..417ba94b1f097942359616890a1021290140bec0 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/rte.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-rte -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-rte [...]
 [kernel] Parsing tests/wp_plugin/rte.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle
index 87fabd092458751d9da6d409bde18a8f9ce64434..aaed31ba7592c4cca9baa1e20aa94227f16a9955 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Caveat)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Caveat)' [...]
 [kernel] Parsing tests/wp_plugin/sequence.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/05bf3d9a5dd94c3fb9bc16d3d4b6cf93.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/05bf3d9a5dd94c3fb9bc16d3d4b6cf93.json
new file mode 100644
index 0000000000000000000000000000000000000000..92f6fb7db1b2636deea9480d13d04e8263ca48c3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/05bf3d9a5dd94c3fb9bc16d3d4b6cf93.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0185,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/594fed1892de5619cb273dae40ac83ea.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/594fed1892de5619cb273dae40ac83ea.json
new file mode 100644
index 0000000000000000000000000000000000000000..05d97de31bb884f5a3edf4a9a0b1e357b432d66d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/594fed1892de5619cb273dae40ac83ea.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0181,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/5ed2e8c21a156adae7a0b25abc9c27bb.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/5ed2e8c21a156adae7a0b25abc9c27bb.json
new file mode 100644
index 0000000000000000000000000000000000000000..d1ebd59c8514e07f9e95a1c44ea9ed160da971f9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/5ed2e8c21a156adae7a0b25abc9c27bb.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0966,
+  "steps": 141 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/66cef80b694298de7699f046dadd3a7a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/66cef80b694298de7699f046dadd3a7a.json
new file mode 100644
index 0000000000000000000000000000000000000000..dce9da0899d3209bafdda9db3a5e864aeb21ba8d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/66cef80b694298de7699f046dadd3a7a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0117,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/7574eb33ed23e94657554393efbad553.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/7574eb33ed23e94657554393efbad553.json
new file mode 100644
index 0000000000000000000000000000000000000000..29dfa66ba7fc4e9ce74dbe617784a96b33cfb1c6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/7574eb33ed23e94657554393efbad553.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0181,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/784a2a0777dc3fa9793867967284103e.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/784a2a0777dc3fa9793867967284103e.json
new file mode 100644
index 0000000000000000000000000000000000000000..145e39c98e309cec3f204c59208ccd520910b97d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/784a2a0777dc3fa9793867967284103e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0177,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/86f836b1a4b0e86a126c21cada46e167.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/86f836b1a4b0e86a126c21cada46e167.json
new file mode 100644
index 0000000000000000000000000000000000000000..b07a39efda4c47df30bddeb6e25041204c94dd5f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/86f836b1a4b0e86a126c21cada46e167.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.012,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/8e0fa0b1315a7ec1e10b590a424d9af5.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/8e0fa0b1315a7ec1e10b590a424d9af5.json
new file mode 100644
index 0000000000000000000000000000000000000000..6e553c7b9af0d0bded58680efce6b01408f10ff9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/8e0fa0b1315a7ec1e10b590a424d9af5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0097,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/9101c7dc858a555edc2755b8060d142a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/9101c7dc858a555edc2755b8060d142a.json
new file mode 100644
index 0000000000000000000000000000000000000000..7add2b7ec533734d3d67665e9fe1e6212e28c4dd
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/9101c7dc858a555edc2755b8060d142a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0152,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/9821148ea670387683fe3d59f7309d93.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/9821148ea670387683fe3d59f7309d93.json
new file mode 100644
index 0000000000000000000000000000000000000000..3700724c921f1d025b9977f790018d268d15d81e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/9821148ea670387683fe3d59f7309d93.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0131,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/9b4f07f146bbffd40781f95d7f400f8e.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/9b4f07f146bbffd40781f95d7f400f8e.json
new file mode 100644
index 0000000000000000000000000000000000000000..c4b275aeea9076255a8e2e13e7521fa955bca872
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/9b4f07f146bbffd40781f95d7f400f8e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0124,
+  "steps": 5 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/a63e4475b84df547e1877256ffba381f.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/a63e4475b84df547e1877256ffba381f.json
new file mode 100644
index 0000000000000000000000000000000000000000..2b30ebc190b8c3b4ac54e851b1cc09c506fb4acb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/a63e4475b84df547e1877256ffba381f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0214,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/ef0e894ee011e93e53fac9b69881e5bb.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/ef0e894ee011e93e53fac9b69881e5bb.json
new file mode 100644
index 0000000000000000000000000000000000000000..78c78ac7ac11211bb4db72b2ab9503beb161ebda
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.session/cache/ef0e894ee011e93e53fac9b69881e5bb.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0464,
+  "steps": 74 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle
index 80b9ff0503b45f67bd3b130d0c8b3dc1b7803b79..5024ff81a94df5e715e19da33f404d37ad8c3167 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Caveat)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Caveat)' [...]
 [kernel] Parsing tests/wp_plugin/sequence.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/594fed1892de5619cb273dae40ac83ea.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/594fed1892de5619cb273dae40ac83ea.json
new file mode 100644
index 0000000000000000000000000000000000000000..6e829976fb599352f85e20329e25d02792a7c145
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/594fed1892de5619cb273dae40ac83ea.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0121,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/5ed2e8c21a156adae7a0b25abc9c27bb.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/5ed2e8c21a156adae7a0b25abc9c27bb.json
new file mode 100644
index 0000000000000000000000000000000000000000..0bdb11b27fa7f24c38e9e8b0163b7cf57c5d6d61
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/5ed2e8c21a156adae7a0b25abc9c27bb.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.115,
+  "steps": 141 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/66cef80b694298de7699f046dadd3a7a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/66cef80b694298de7699f046dadd3a7a.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ffa46911f38b71a63f4c94252abf3139dae8803
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/66cef80b694298de7699f046dadd3a7a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0194,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/7574eb33ed23e94657554393efbad553.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/7574eb33ed23e94657554393efbad553.json
new file mode 100644
index 0000000000000000000000000000000000000000..2bbf8a2683dc525e770751cb76b48ac99c0c77d5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/7574eb33ed23e94657554393efbad553.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0208,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/784a2a0777dc3fa9793867967284103e.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/784a2a0777dc3fa9793867967284103e.json
new file mode 100644
index 0000000000000000000000000000000000000000..c58789eaa387f7cbf82647913c9c9428b6b1f7d6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/784a2a0777dc3fa9793867967284103e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0161,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/8e0fa0b1315a7ec1e10b590a424d9af5.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/8e0fa0b1315a7ec1e10b590a424d9af5.json
new file mode 100644
index 0000000000000000000000000000000000000000..04330141487811781a5bff5420615adad9bc203e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/8e0fa0b1315a7ec1e10b590a424d9af5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0141,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/9101c7dc858a555edc2755b8060d142a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/9101c7dc858a555edc2755b8060d142a.json
new file mode 100644
index 0000000000000000000000000000000000000000..993005ed8bca603f87dcce2ab2220aa26011e8bc
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/9101c7dc858a555edc2755b8060d142a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0132,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/9821148ea670387683fe3d59f7309d93.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/9821148ea670387683fe3d59f7309d93.json
new file mode 100644
index 0000000000000000000000000000000000000000..17cc18aa7944b2ad5e6f70bfcfd4b27e3ae5990e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/9821148ea670387683fe3d59f7309d93.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.017,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/9b4f07f146bbffd40781f95d7f400f8e.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/9b4f07f146bbffd40781f95d7f400f8e.json
new file mode 100644
index 0000000000000000000000000000000000000000..9300b4a4993da877eab08a1d2a3e4e6b8c651f48
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/9b4f07f146bbffd40781f95d7f400f8e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0129,
+  "steps": 5 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/a63e4475b84df547e1877256ffba381f.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/a63e4475b84df547e1877256ffba381f.json
new file mode 100644
index 0000000000000000000000000000000000000000..877db681854a5b1f0b64620359229720c27aeb03
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/a63e4475b84df547e1877256ffba381f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0241,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/ef0e894ee011e93e53fac9b69881e5bb.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/ef0e894ee011e93e53fac9b69881e5bb.json
new file mode 100644
index 0000000000000000000000000000000000000000..f70156bbf2a699640c9675e84b586f07ae03c410
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.session/cache/ef0e894ee011e93e53fac9b69881e5bb.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0404,
+  "steps": 74 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.2.res.oracle
index 92097c803f9ea4eea08995f5a907a9767c02eac4..c77bd72116ab75085ea9169e9391dc3238d54110 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Caveat)' -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-model 'Typed (Caveat)' -wp-steps 50 [...]
 [kernel] Parsing tests/wp_plugin/sequence.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/stmt.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/stmt.res.oracle
index a27557f5d76d40812e9fbba0827875b36c140e77..5db0c6c63cd4bb28e87aefff871a797438fa3bf6 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/stmt.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/stmt.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/stmt.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/1fd19b1624fc53b9912d6f0ad221ec6f.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/1fd19b1624fc53b9912d6f0ad221ec6f.json
new file mode 100644
index 0000000000000000000000000000000000000000..535f080af84b9686200713727729842f53f71839
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/1fd19b1624fc53b9912d6f0ad221ec6f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.049,
+  "steps": 73 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/22ae9e720aa18673fde1bf5bf44f6cf7.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/22ae9e720aa18673fde1bf5bf44f6cf7.json
new file mode 100644
index 0000000000000000000000000000000000000000..cea59644c2c192496a40cc834829bb5cf87b49ff
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/22ae9e720aa18673fde1bf5bf44f6cf7.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0449,
+  "steps": 65 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/37a769467fe16bd6c8e51bb795925ac2.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/37a769467fe16bd6c8e51bb795925ac2.json
new file mode 100644
index 0000000000000000000000000000000000000000..877db681854a5b1f0b64620359229720c27aeb03
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/37a769467fe16bd6c8e51bb795925ac2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0241,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/3e3d4cc5ad35a080a3177a7f3ec258cc.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/3e3d4cc5ad35a080a3177a7f3ec258cc.json
new file mode 100644
index 0000000000000000000000000000000000000000..7eec519000763ac738d4cc9ea50f22b4c0c5b1ee
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/3e3d4cc5ad35a080a3177a7f3ec258cc.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0428,
+  "steps": 57 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/475f43b5141cacef63a9fb29fc1cac5a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/475f43b5141cacef63a9fb29fc1cac5a.json
new file mode 100644
index 0000000000000000000000000000000000000000..9c9e521d79b359a998aa030e2f040137545b629f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/475f43b5141cacef63a9fb29fc1cac5a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.44,
+  "steps": 584 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/562405020562c12a637e0806e8d2e002.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/562405020562c12a637e0806e8d2e002.json
new file mode 100644
index 0000000000000000000000000000000000000000..270f501075c7de636b9ee6f72f2a1830d9e551e5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/562405020562c12a637e0806e8d2e002.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.3172,
+  "steps": 322 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/62b32135ad2a3cac5d9211c8315c186d.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/62b32135ad2a3cac5d9211c8315c186d.json
new file mode 100644
index 0000000000000000000000000000000000000000..8cc8cb0bd767f41c24113d4b585f2e0cb66073db
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/62b32135ad2a3cac5d9211c8315c186d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0446,
+  "steps": 66 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/7ae2466dd8effcacd1b09685243d30ac.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/7ae2466dd8effcacd1b09685243d30ac.json
new file mode 100644
index 0000000000000000000000000000000000000000..5278ab4099a393cd326ad99d9f9ffe4b6a4aa068
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/7ae2466dd8effcacd1b09685243d30ac.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0421,
+  "steps": 58 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/81cd25cebf3da9202e88c41378ec816b.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/81cd25cebf3da9202e88c41378ec816b.json
new file mode 100644
index 0000000000000000000000000000000000000000..ece56cc458c393136456cbdd621b730c109a1296
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/81cd25cebf3da9202e88c41378ec816b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0304,
+  "steps": 34 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/8630b9236946264d9694e22731dbc58e.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/8630b9236946264d9694e22731dbc58e.json
new file mode 100644
index 0000000000000000000000000000000000000000..d3f48e34786620457f1b24d847d45778914ab775
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/8630b9236946264d9694e22731dbc58e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.033,
+  "steps": 45 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/8f1f07fefdcb2da5edaeb9947c3c94fa.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/8f1f07fefdcb2da5edaeb9947c3c94fa.json
new file mode 100644
index 0000000000000000000000000000000000000000..658b7602c1e4bf9751dae79f7da03ce5f5059358
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/8f1f07fefdcb2da5edaeb9947c3c94fa.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1142,
+  "steps": 173 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/959df566ba7701627b29205476f394dd.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/959df566ba7701627b29205476f394dd.json
new file mode 100644
index 0000000000000000000000000000000000000000..63971ad49603ac7fb75f70334bcd2c464b3e8291
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/959df566ba7701627b29205476f394dd.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0453,
+  "steps": 66 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/9eadc2bb4dfac638f224938d4827c98a.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/9eadc2bb4dfac638f224938d4827c98a.json
new file mode 100644
index 0000000000000000000000000000000000000000..1cd57909cc6be2a3659af104df75ebb188a1ee82
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/9eadc2bb4dfac638f224938d4827c98a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1016,
+  "steps": 149 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/a408ee78b5aa14b900f8f4743c80c30f.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/a408ee78b5aa14b900f8f4743c80c30f.json
new file mode 100644
index 0000000000000000000000000000000000000000..9287f91232a8744341ab1dcb7b320fb4b7c44c29
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/a408ee78b5aa14b900f8f4743c80c30f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.789,
+  "steps": 792 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/a6915fd039c2b41b75325a7a38af7922.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/a6915fd039c2b41b75325a7a38af7922.json
new file mode 100644
index 0000000000000000000000000000000000000000..200bd8cfae9592d146c2d0aeee0aec922ae9a4fc
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/a6915fd039c2b41b75325a7a38af7922.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.7625,
+  "steps": 832 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/c4a259dc1139cea44a64d59453d32ca8.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/c4a259dc1139cea44a64d59453d32ca8.json
new file mode 100644
index 0000000000000000000000000000000000000000..5a6ddbdeaba0b2b5b805d2b7c7f0e41bcaeaf51b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/c4a259dc1139cea44a64d59453d32ca8.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 1.035,
+  "steps": 1149 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/cfcb0b08ce7db18fba2ef14e3337c69c.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/cfcb0b08ce7db18fba2ef14e3337c69c.json
new file mode 100644
index 0000000000000000000000000000000000000000..532f29e69d5ed848d790db2ce670051eef1720d8
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/cfcb0b08ce7db18fba2ef14e3337c69c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1327,
+  "steps": 240 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/d458cf258c73a8c5e326b88ee299af29.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/d458cf258c73a8c5e326b88ee299af29.json
new file mode 100644
index 0000000000000000000000000000000000000000..13c5b80b9a7e7f2e9af39c8f9481f81fbb27243e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/d458cf258c73a8c5e326b88ee299af29.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.5189,
+  "steps": 517 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/ecd44ac349286d334751a465a5cff5c2.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/ecd44ac349286d334751a465a5cff5c2.json
new file mode 100644
index 0000000000000000000000000000000000000000..968e9652f8765391e3918b35eaf7de524cc2f735
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/ecd44ac349286d334751a465a5cff5c2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.6816,
+  "steps": 695 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/f75bb0be87eb031e88d999b77f9192b5.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/f75bb0be87eb031e88d999b77f9192b5.json
new file mode 100644
index 0000000000000000000000000000000000000000..a746afe63ab07a5ddb7ec3142eba12d0e89eec2d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/f75bb0be87eb031e88d999b77f9192b5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0691,
+  "steps": 92 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/fa932219f75871937a0bf5a2463c35fa.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/fa932219f75871937a0bf5a2463c35fa.json
new file mode 100644
index 0000000000000000000000000000000000000000..9bda2b4db98d84024a19ca7f30c0fc017244d196
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/string_c.0.session/cache/fa932219f75871937a0bf5a2463c35fa.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0417,
+  "steps": 66 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct.res.oracle
index 13f3d7def48d65c2d6945c2d8d50c3e48e6a97b7..e1033c3097e5418ab115e472bfebcf0f2f637bf1 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/struct.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.0.session/cache/03e9d9aea4caaaea78ebc830b62d8073.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.0.session/cache/03e9d9aea4caaaea78ebc830b62d8073.json
new file mode 100644
index 0000000000000000000000000000000000000000..92f56cfa4f016b0c006b1e00553c7fcd03bf2bc7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.0.session/cache/03e9d9aea4caaaea78ebc830b62d8073.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.026,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.0.session/cache/2df753a0bc45f4676e4c82cfa17ff8c2.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.0.session/cache/2df753a0bc45f4676e4c82cfa17ff8c2.json
new file mode 100644
index 0000000000000000000000000000000000000000..a06d4bf3508488a4638d707ca481452081bc3f17
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.0.session/cache/2df753a0bc45f4676e4c82cfa17ff8c2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0291,
+  "steps": 24 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.0.session/cache/b618ebdd987075885732173edc4f11fd.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.0.session/cache/b618ebdd987075885732173edc4f11fd.json
new file mode 100644
index 0000000000000000000000000000000000000000..71f56af4bee197bc39fddece8c9aa5a6010fa698
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.0.session/cache/b618ebdd987075885732173edc4f11fd.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0178,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.0.session/cache/b6842d965f810481a95fe4d330575379.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.0.session/cache/b6842d965f810481a95fe4d330575379.json
new file mode 100644
index 0000000000000000000000000000000000000000..46c2543f4279eea8c7245249311972eda93cab89
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.0.session/cache/b6842d965f810481a95fe4d330575379.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0176,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.res.oracle
index fdcbde2330850ff9a650eaec6caf4d70feafb0c0..e372635af1201315b88338298b4674d4044faeb2 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct_hack.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/struct_hack.i (no preprocessing)
 [kernel] tests/wp_plugin/struct_hack.i:46: Warning: 
   parsing obsolete ACSL construct '\valid_range(addr,min,max)'. '\valid(addr+(min..max))' should be used instead.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset.0.session/cache/ef25e4fbee039799ba168684b032c1d6.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset.0.session/cache/ef25e4fbee039799ba168684b032c1d6.json
new file mode 100644
index 0000000000000000000000000000000000000000..1343e0b6ebfa177c282aa75fc9925a37875d3c20
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset.0.session/cache/ef25e4fbee039799ba168684b032c1d6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0486,
+  "steps": 118 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset.res.oracle
index 87dc894abd202f89644685e3ccdb72c8042c452d..b9adc00779472dcb6c6b07e3e4bf43a0fa835bd9 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/subset.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.0.session/cache/cb73f123a1cf6b187a7bd5666229a6c3.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.0.session/cache/cb73f123a1cf6b187a7bd5666229a6c3.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.0.session/cache/cb73f123a1cf6b187a7bd5666229a6c3.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.0.session/cache/e8364b07184fcc0b90ff66af1cab0d63.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.0.session/cache/e8364b07184fcc0b90ff66af1cab0d63.json
new file mode 100644
index 0000000000000000000000000000000000000000..206f18bdc885a3e4ec9f8198dc6edec249f66d7e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.0.session/cache/e8364b07184fcc0b90ff66af1cab0d63.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0661,
+  "steps": 99 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.res.oracle
index 26b6ff968acc1c8c7d6e0ff57e07e27a18383f4d..6c887c02728915d1e379da10f538f9d2e7f48253 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/subset_fopen.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/subset_fopen.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.0.session/cache/9cac4e4c5ad2ba362cbff297e7e3f513.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.0.session/cache/9cac4e4c5ad2ba362cbff297e7e3f513.json
new file mode 100644
index 0000000000000000000000000000000000000000..0247b16103980cc834a34269569b86a5c8f97c2e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.0.session/cache/9cac4e4c5ad2ba362cbff297e7e3f513.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0239,
+  "steps": 47 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.0.session/cache/9fb4615e03fde8c0009bb7471774ef0b.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.0.session/cache/9fb4615e03fde8c0009bb7471774ef0b.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.0.session/cache/9fb4615e03fde8c0009bb7471774ef0b.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.0.session/cache/b357f70199b976ad18756d76b6b46f96.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.0.session/cache/b357f70199b976ad18756d76b6b46f96.json
new file mode 100644
index 0000000000000000000000000000000000000000..1e886e9021d88e6e56b6c2ed750e1b4da7f46c9b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.0.session/cache/b357f70199b976ad18756d76b6b46f96.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0242,
+  "steps": 44 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.res.oracle
index acc077c487728454faf2e382a93d4f058533b8d9..e53872ad04a782f50d7e7d0a15550246fae5b5dc 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/trig.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/trig.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unroll.0.session/script/typed_unrolled_loop_ensures_zero.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unroll.0.session/script/typed_unrolled_loop_ensures_zero.json
new file mode 100644
index 0000000000000000000000000000000000000000..1c97c0efd6fc200100d43ffe2b726792238d7235
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unroll.0.session/script/typed_unrolled_loop_ensures_zero.json
@@ -0,0 +1,54 @@
+[ { "header": "Definition", "tactic": "Wp.unfold", "params": {},
+    "select": { "select": "clause-goal",
+                "target": "(P_zeroed\n  Mint_37[(shift_uint32 t_2 0)->0][(shift_uint32 t_2 1)->0]\n    [(shift_uint32 t_2 2)->0][(shift_uint32 t_2 3)->0][(shift_uint32 t_2 4)\n    ->0][(shift_uint32 t_2 5)->0][(shift_uint32 t_2 6)->0]\n    [(shift_uint32 t_2 7)->0][(shift_uint32 t_2 8)->0][(shift_uint32 t_2 9)\n    ->0][(shift_uint32 t_2 10)->0][(shift_uint32 t_2 11)->0]\n    [(shift_uint32 t_2 12)->0][(shift_uint32 t_2 13)->0]\n    [(shift_uint32 t_2 14)->0][(shift_uint32 t_2 15)->0] t_2 0 15)",
+                "pattern": "P_zeroed[=]$t015[=]shift_uint320" },
+    "children": { "Unfold 'P_zeroed'": [ { "header": "Range",
+                                           "tactic": "Wp.range",
+                                           "params": { "inf": 0, "sup": 15 },
+                                           "select": { "select": "inside-goal",
+                                                       "occur": 0,
+                                                       "target": "i_0",
+                                                       "pattern": "$i" },
+                                           "children": { "Lower 0": [ { "prover": "qed",
+                                                                    "verdict": "valid" } ],
+                                                         "Value 0": [ { "prover": "qed",
+                                                                    "verdict": "valid" } ],
+                                                         "Value 1": [ { "prover": "qed",
+                                                                    "verdict": "valid" } ],
+                                                         "Value 2": [ { "prover": "qed",
+                                                                    "verdict": "valid" } ],
+                                                         "Value 3": [ { "prover": "qed",
+                                                                    "verdict": "valid" } ],
+                                                         "Value 4": [ { "prover": "qed",
+                                                                    "verdict": "valid" } ],
+                                                         "Value 5": [ { "prover": "qed",
+                                                                    "verdict": "valid" } ],
+                                                         "Value 6": [ { "prover": "qed",
+                                                                    "verdict": "valid" } ],
+                                                         "Value 7": [ { "prover": "qed",
+                                                                    "verdict": "valid" } ],
+                                                         "Value 8": [ { "prover": "qed",
+                                                                    "verdict": "valid" } ],
+                                                         "Value 9": [ { "prover": "qed",
+                                                                    "verdict": "valid" } ],
+                                                         "Value 10": 
+                                                           [ { "prover": "qed",
+                                                               "verdict": "valid" } ],
+                                                         "Value 11": 
+                                                           [ { "prover": "qed",
+                                                               "verdict": "valid" } ],
+                                                         "Value 12": 
+                                                           [ { "prover": "qed",
+                                                               "verdict": "valid" } ],
+                                                         "Value 13": 
+                                                           [ { "prover": "qed",
+                                                               "verdict": "valid" } ],
+                                                         "Value 14": 
+                                                           [ { "prover": "qed",
+                                                               "verdict": "valid" } ],
+                                                         "Value 15": 
+                                                           [ { "prover": "qed",
+                                                               "verdict": "valid" } ],
+                                                         "Upper 15": 
+                                                           [ { "prover": "qed",
+                                                               "verdict": "valid" } ] } } ] } } ]
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unroll.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unroll.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..c077b5a44c1a4c38af7d11b03e83cc6fa1917e77
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unroll.res.oracle
@@ -0,0 +1,18 @@
+# frama-c -wp [...]
+[kernel] Parsing tests/wp_plugin/unroll.i (no preprocessing)
+[wp] Running WP plugin...
+[wp] Loading driver 'share/wp.driver'
+[wp] Warning: Missing RTE guards
+[wp] tests/wp_plugin/unroll.i:20: Warning: 
+  Missing assigns clause (assigns 'everything' instead)
+[wp] 1 goal scheduled
+[wp] [Tactical] Goal typed_unrolled_loop_ensures_zero : Valid
+[wp] Proved goals:    1 / 1
+  Qed:             0 
+  Script:          1
+[wp] Report in:  'tests/wp_plugin/oracle_qualif/unroll.0.report.json'
+[wp] Report out: 'tests/wp_plugin/result_qualif/unroll.0.report.json'
+-------------------------------------------------------------
+Functions           WP     Alt-Ergo        Total   Success
+unrolled_loop       -      -                 1       100%
+-------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsafe-arrays.0.session/cache/289db7d0541622b954c4cae7878c6f7b.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsafe-arrays.0.session/cache/289db7d0541622b954c4cae7878c6f7b.json
new file mode 100644
index 0000000000000000000000000000000000000000..30631ae5ea56eb89d80efc8be31df69010510ee1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsafe-arrays.0.session/cache/289db7d0541622b954c4cae7878c6f7b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0144,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsafe-arrays.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsafe-arrays.res.oracle
index 81ae9d616c3ffd01a094c00b44111b4dad2b9a8a..61a5c555291a5cba3e8360456dc7325908eff2a1 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsafe-arrays.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsafe-arrays.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/unsafe-arrays.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.0.session/cache/19c802b07f6d4113a2f12322c0298dfe.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.0.session/cache/19c802b07f6d4113a2f12322c0298dfe.json
new file mode 100644
index 0000000000000000000000000000000000000000..7ef0cdd8905c57df89274f5e451f4ccdb5336e64
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.0.session/cache/19c802b07f6d4113a2f12322c0298dfe.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0149,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.0.session/cache/66834a034e1789cc5e9adf1ea0729786.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.0.session/cache/66834a034e1789cc5e9adf1ea0729786.json
new file mode 100644
index 0000000000000000000000000000000000000000..0b814035ff9f0b354f899fc3f09d215125f54372
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.0.session/cache/66834a034e1789cc5e9adf1ea0729786.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0153,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_plugin/unsigned/wp/typed/typed_lemma_U32.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.0.session/script/typed_lemma_U32.json
similarity index 73%
rename from src/plugins/wp/tests/wp_plugin/unsigned/wp/typed/typed_lemma_U32.json
rename to src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.0.session/script/typed_lemma_U32.json
index 6ec3b5e22a09d50b40d86436a02bf7fa99a22632..b077d283b8965ef5489eb3d01b88f7e41f14c7cc 100644
--- a/src/plugins/wp/tests/wp_plugin/unsigned/wp/typed/typed_lemma_U32.json
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.0.session/script/typed_lemma_U32.json
@@ -8,21 +8,25 @@
                                "select": { "select": "clause-goal",
                                            "target": "(0<=x_0) /\\ (0<=(land 4294967295 x_0)) /\\ (x_0<=4294967295)",
                                            "pattern": "&<=<=<=0$x0land$x42949672954294967295" },
-                               "children": { "Goal 1/3": [ { "prover": "alt-ergo",
+                               "children": { "Goal 1/3": [ { "prover": "why3:Alt-Ergo,2.0.0",
                                                              "verdict": "valid",
-                                                             "time": 0.0087,
-                                                             "steps": 7 } ],
+                                                             "time": 0.0103,
+                                                             "steps": 10 } ],
                                              "Goal 2/3": [ { "header": "Bit Range",
                                                              "tactic": "Wp.bitrange",
-                                                             "params": {},
+                                                             "params": 
+                                                               { "positive-land": true,
+                                                                 "positive-lor": true },
                                                              "select": 
                                                                { "select": "clause-goal",
                                                                  "target": "0<=(land 4294967295 x_0)",
                                                                  "pattern": "<=0land4294967295$x" },
-                                                             "children": {} } ],
-                                             "Goal 3/3": [ { "prover": "alt-ergo",
+                                                             "children": 
+                                                               { "bit-range": 
+                                                                   [ { "prover": "qed",
+                                                                    "verdict": "valid" } ] } } ],
+                                             "Goal 3/3": [ { "prover": "why3:Alt-Ergo,2.0.0",
                                                              "verdict": "valid",
-                                                             "time": 0.0073,
-                                                             "steps": 7 } ] } } ],
-                  "bitwise": [ { "prover": "alt-ergo", "verdict": "valid",
-                                 "time": 0.0167, "steps": 10 } ] } } ]
\ No newline at end of file
+                                                             "time": 0.0105,
+                                                             "steps": 10 } ] } } ],
+                  "bitwise": [ { "prover": "qed", "verdict": "valid" } ] } } ]
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.res.oracle
index 65756a3d261611f45290ed81b457928767c00b37..42aeee4e9a9e690d98379fdc278b77ba3b46149a 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsigned.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/unsigned.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsupported_init.0.session/cache/863155426862d4055826840722d6b345.json b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsupported_init.0.session/cache/863155426862d4055826840722d6b345.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsupported_init.0.session/cache/863155426862d4055826840722d6b345.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsupported_init.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsupported_init.res.oracle
index 8fa3b75a019bd11d31d5954436d43c7ebff7ec86..bd4a0fcd4acdcc479dfa27c686bb400cd8d1db58 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsupported_init.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/unsupported_init.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_plugin/unsupported_init.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_plugin/removed.i b/src/plugins/wp/tests/wp_plugin/removed.i
index e865b65ae689e3fc680dfc6ff64320ce00d84e81..dadeb120b00dcd110e99dcd63b1eb270116346e2 100644
--- a/src/plugins/wp/tests/wp_plugin/removed.i
+++ b/src/plugins/wp/tests/wp_plugin/removed.i
@@ -1,5 +1,5 @@
 /* run.config_qualif
-   CMD: @frama-c@ -wp-share ./share -wp-msg-key success-only -wp-par 1 -wp-timeout 100 -wp-steps 500
+   CMD: @frama-c@ -wp-share ./share -wp-msg-key success-only -wp-par 1 -wp-session @PTEST_DIR@/oracle@PTEST_CONFIG@/@PTEST_NAME@.@PTEST_NUMBER@.session -wp-cache offline
    OPT: -eva -eva-msg-key=-summary -then -wp -then -no-eva -warn-unsigned-overflow -wp
  */
 
diff --git a/src/plugins/wp/tests/wp_plugin/unroll.i b/src/plugins/wp/tests/wp_plugin/unroll.i
index 5ac917b0ddb23b34e0df8188e75e75a800e4a895..8e34f8f66edd7b4183b97299107d84c6b78c391c 100644
--- a/src/plugins/wp/tests/wp_plugin/unroll.i
+++ b/src/plugins/wp/tests/wp_plugin/unroll.i
@@ -1,9 +1,9 @@
 /* run.config
-   OPT: -ulevel=1 -wp -wp-prop=@ensures -wp-prover script -session tests/wp_plugin/unroll -wp-msg-key no-time-info,no-step-info
+   OPT: -ulevel=1 -wp-prop=@ensures
 */
 
 /* run.config_qualif
-   DONTRUN:
+   OPT: -ulevel=1 -wp-prop=@ensures -wp-prover script
 */
 
 enum {Max = 16};
diff --git a/src/plugins/wp/tests/wp_plugin/unroll/wp/typed/typed_unrolled_loop_ensures_zero.json b/src/plugins/wp/tests/wp_plugin/unroll/wp/typed/typed_unrolled_loop_ensures_zero.json
deleted file mode 100644
index c767fda61ee94a504729605165e8b9d103dfb719..0000000000000000000000000000000000000000
--- a/src/plugins/wp/tests/wp_plugin/unroll/wp/typed/typed_unrolled_loop_ensures_zero.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[ { "header": "Definition", "tactic": "Wp.unfold", "params": {},
-    "select": { "select": "clause-goal",
-                "target": "(P_zeroed\n  Mint_37[(shift_uint32 t_2 0)->0][(shift_uint32 t_2 1)->0]\n    [(shift_uint32 t_2 2)->0][(shift_uint32 t_2 3)->0][(shift_uint32 t_2 4)\n    ->0][(shift_uint32 t_2 5)->0][(shift_uint32 t_2 6)->0]\n    [(shift_uint32 t_2 7)->0][(shift_uint32 t_2 8)->0][(shift_uint32 t_2 9)\n    ->0][(shift_uint32 t_2 10)->0][(shift_uint32 t_2 11)->0]\n    [(shift_uint32 t_2 12)->0][(shift_uint32 t_2 13)->0]\n    [(shift_uint32 t_2 14)->0][(shift_uint32 t_2 15)->0] t_2 0 15)",
-                "pattern": "P_zeroed[=]$t015[=]shift_uint320" },
-    "children": { "Unfold 'P_zeroed'": [ { "header": "Range",
-                                           "tactic": "Wp.range",
-                                           "params": { "inf": 0, "sup": 15 },
-                                           "select": { "select": "inside-goal",
-                                                       "occur": 0,
-                                                       "target": "i_0",
-                                                       "pattern": "$i" },
-                                           "children": {} } ] } } ]
\ No newline at end of file
diff --git a/src/plugins/wp/tests/wp_plugin/unsigned.i b/src/plugins/wp/tests/wp_plugin/unsigned.i
index 53b1efa1b8141219ec560df54259be1486ff3f5a..b48f75fbbc3d9925d4f25f00ca77f8d7a292c9b0 100644
--- a/src/plugins/wp/tests/wp_plugin/unsigned.i
+++ b/src/plugins/wp/tests/wp_plugin/unsigned.i
@@ -3,7 +3,7 @@
 */
 
 /* run.config_qualif
-   OPT: -session tests/wp_plugin/unsigned -wp-prover script
+   OPT: -wp-prover script
 */
 
 /*@
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/array.res.oracle b/src/plugins/wp/tests/wp_store/oracle_qualif/array.res.oracle
index 486277148c2b615ac8884661930b44f25fa8f070..688dc734ded0d204998132a54fd180a5385cce31 100644
--- a/src/plugins/wp/tests/wp_store/oracle_qualif/array.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/array.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_store/array.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/natural.res.oracle b/src/plugins/wp/tests/wp_store/oracle_qualif/natural.res.oracle
index 4a6c59025d9d5eac465ef05f4729ba60f51023bb..df7d99285199c8506fdeb1d8aead575571546e80 100644
--- a/src/plugins/wp/tests/wp_store/oracle_qualif/natural.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/natural.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_store/natural.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.res.oracle b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.res.oracle
index 4f2da7d33510743596cc85d000d7250dde13f9a1..308c618c46da5c2fc1d2ba33d2bbeda73c3c341f 100644
--- a/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_store/nonaliasing.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.session/cache/1eacf7c3305a9cc892313ba746d6283c.json b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.session/cache/1eacf7c3305a9cc892313ba746d6283c.json
new file mode 100644
index 0000000000000000000000000000000000000000..55bd8e1486c3c1f04ae504a49bd0cd2ce1fb8384
--- /dev/null
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.session/cache/1eacf7c3305a9cc892313ba746d6283c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0237,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.session/cache/5be6ae2606260e1c31e654d29333298b.json b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.session/cache/5be6ae2606260e1c31e654d29333298b.json
new file mode 100644
index 0000000000000000000000000000000000000000..c9c137e6fe3aae679676187adf2a2815ce4a7c2c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.0.session/cache/5be6ae2606260e1c31e654d29333298b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0238,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.res.oracle b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.res.oracle
index 244af382e0549870f08fbbd8a8959dedc8987a0a..359493b38c24ecff90aeac5f806afc645c613163 100644
--- a/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 50 [...]
+# frama-c -wp -wp-steps 50 [...]
 [kernel] Parsing tests/wp_store/nonaliasing.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.session/cache/339586df40fb4086fed3428656bab655.json b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.session/cache/339586df40fb4086fed3428656bab655.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.session/cache/339586df40fb4086fed3428656bab655.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.session/cache/fc10a843e258f1965ae63d31d71037ae.json b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.session/cache/fc10a843e258f1965ae63d31d71037ae.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b46e40ba2406227255ff986f8a819d0c84f60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/nonaliasing.1.session/cache/fc10a843e258f1965ae63d31d71037ae.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/struct.0.session/cache/4f3f819897e17d244836052e8e391eeb.json b/src/plugins/wp/tests/wp_store/oracle_qualif/struct.0.session/cache/4f3f819897e17d244836052e8e391eeb.json
new file mode 100644
index 0000000000000000000000000000000000000000..bd18f2d694e48d3b4a4118ffec9d15fadad58200
--- /dev/null
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/struct.0.session/cache/4f3f819897e17d244836052e8e391eeb.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0297,
+  "steps": 36 }
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/struct.0.session/cache/64ebd3573ba64793b60c3a76b642f1bb.json b/src/plugins/wp/tests/wp_store/oracle_qualif/struct.0.session/cache/64ebd3573ba64793b60c3a76b642f1bb.json
new file mode 100644
index 0000000000000000000000000000000000000000..145e39c98e309cec3f204c59208ccd520910b97d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/struct.0.session/cache/64ebd3573ba64793b60c3a76b642f1bb.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0177,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/struct.res.oracle b/src/plugins/wp/tests/wp_store/oracle_qualif/struct.res.oracle
index 162e249c284a25103bf26b39b83ed4aecd79fa96..02c96c873c8b9d70dd945e2c7951531a09814a2f 100644
--- a/src/plugins/wp/tests/wp_store/oracle_qualif/struct.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/struct.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_store/struct.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_tip/tac_split_quantifiers/wp/typed/typed_split_ensures_Goal_Exist_And.json b/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.0.session/script/typed_split_ensures_Goal_Exist_And.json
similarity index 100%
rename from src/plugins/wp/tests/wp_tip/tac_split_quantifiers/wp/typed/typed_split_ensures_Goal_Exist_And.json
rename to src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.0.session/script/typed_split_ensures_Goal_Exist_And.json
diff --git a/src/plugins/wp/tests/wp_tip/tac_split_quantifiers/wp/typed/typed_split_ensures_Goal_Exist_And_bis.json b/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.0.session/script/typed_split_ensures_Goal_Exist_And_bis.json
similarity index 100%
rename from src/plugins/wp/tests/wp_tip/tac_split_quantifiers/wp/typed/typed_split_ensures_Goal_Exist_And_bis.json
rename to src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.0.session/script/typed_split_ensures_Goal_Exist_And_bis.json
diff --git a/src/plugins/wp/tests/wp_tip/tac_split_quantifiers/wp/typed/typed_split_ensures_Goal_Exist_Or.json b/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.0.session/script/typed_split_ensures_Goal_Exist_Or.json
similarity index 100%
rename from src/plugins/wp/tests/wp_tip/tac_split_quantifiers/wp/typed/typed_split_ensures_Goal_Exist_Or.json
rename to src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.0.session/script/typed_split_ensures_Goal_Exist_Or.json
diff --git a/src/plugins/wp/tests/wp_tip/tac_split_quantifiers/wp/typed/typed_split_ensures_Hyp_Forall_And.json b/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.0.session/script/typed_split_ensures_Hyp_Forall_And.json
similarity index 100%
rename from src/plugins/wp/tests/wp_tip/tac_split_quantifiers/wp/typed/typed_split_ensures_Hyp_Forall_And.json
rename to src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.0.session/script/typed_split_ensures_Hyp_Forall_And.json
diff --git a/src/plugins/wp/tests/wp_tip/tac_split_quantifiers/wp/typed/typed_split_ensures_Hyp_Forall_Or_bis.json b/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.0.session/script/typed_split_ensures_Hyp_Forall_Or_bis.json
similarity index 100%
rename from src/plugins/wp/tests/wp_tip/tac_split_quantifiers/wp/typed/typed_split_ensures_Hyp_Forall_Or_bis.json
rename to src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.0.session/script/typed_split_ensures_Hyp_Forall_Or_bis.json
diff --git a/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.res.oracle b/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.res.oracle
index 4ebd433885c3414987c5b00fd15954cef872be65..a189a671dc8975ceed01fa53b61b5bc60867a5ca 100644
--- a/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle_qualif/tac_split_quantifiers.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_tip/tac_split_quantifiers.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_tip/tac_split_quantifiers.i b/src/plugins/wp/tests/wp_tip/tac_split_quantifiers.i
index 7f99eb527c97c356d2045d5feca4cae3817e82a5..7d6f12f66d12dcc3006b3c17fb5bc2a54bbc3c66 100644
--- a/src/plugins/wp/tests/wp_tip/tac_split_quantifiers.i
+++ b/src/plugins/wp/tests/wp_tip/tac_split_quantifiers.i
@@ -3,7 +3,7 @@
 */
 
 /* run.config_qualif
-   OPT: -load-module tests/wp_tip/TacNOP.ml -wp -wp-par 1 -wp-prover script -session tests/wp_tip/tac_split_quantifiers
+   OPT: -load-module tests/wp_tip/TacNOP.ml -wp -wp-par 1 -wp-prover script
 */
 
 
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.res.oracle
index d71cbec20ec2ba57e2f9136a547de6c412bd7bd7..bad51ba3f9b0a8390c505c2901f954fa7b516ae1 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/array_initialized.c (with preprocessing)
 [kernel] tests/wp_typed/array_initialized.c:13: Warning: 
   Too many initializers for array g
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.session/cache/55baf89709405ac3477a55d65a1f7437.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.session/cache/55baf89709405ac3477a55d65a1f7437.json
new file mode 100644
index 0000000000000000000000000000000000000000..034d730af184342a66689d4892b7ba8d719bbcf3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.session/cache/55baf89709405ac3477a55d65a1f7437.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0253,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.session/cache/62b28c9aaf5071f95b892ef8ca5a3403.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.session/cache/62b28c9aaf5071f95b892ef8ca5a3403.json
new file mode 100644
index 0000000000000000000000000000000000000000..8d6b64f5baa458652c57e282b8a5ae51969aebf0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.session/cache/62b28c9aaf5071f95b892ef8ca5a3403.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0092,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.session/cache/9c1dad50b414ee369fd69bc9d0573507.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.session/cache/9c1dad50b414ee369fd69bc9d0573507.json
new file mode 100644
index 0000000000000000000000000000000000000000..3860e30df867646cb91ece6df7ec206efa744955
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.session/cache/9c1dad50b414ee369fd69bc9d0573507.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0282,
+  "steps": 41 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.session/cache/d517f1ea6e30eb4409edb1685ab99e1b.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.session/cache/d517f1ea6e30eb4409edb1685ab99e1b.json
new file mode 100644
index 0000000000000000000000000000000000000000..94c0c7775e495f11e0587885c6bd494b2d882334
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.0.session/cache/d517f1ea6e30eb4409edb1685ab99e1b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0508,
+  "steps": 108 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.res.oracle
index 407f88f1e8dca2dd91a571c38fdbcd9b396c919d..1c4aad2918c041cddd328830e5399d8bf0eb5f8d 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/array_initialized.c (with preprocessing)
 [kernel] tests/wp_typed/array_initialized.c:13: Warning: 
   Too many initializers for array g
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.session/cache/0226c036aa5891898e194a949cb4bad8.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.session/cache/0226c036aa5891898e194a949cb4bad8.json
new file mode 100644
index 0000000000000000000000000000000000000000..a431f0b8510566265a88fe5ab5d383ce11228848
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.session/cache/0226c036aa5891898e194a949cb4bad8.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.017,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.session/cache/4c40e531b30c4cea3f1a55402ed96a2b.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.session/cache/4c40e531b30c4cea3f1a55402ed96a2b.json
new file mode 100644
index 0000000000000000000000000000000000000000..d0dd58c2329c933df58d6871eb2d569730ee9ab0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.session/cache/4c40e531b30c4cea3f1a55402ed96a2b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0229,
+  "steps": 48 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.session/cache/55baf89709405ac3477a55d65a1f7437.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.session/cache/55baf89709405ac3477a55d65a1f7437.json
new file mode 100644
index 0000000000000000000000000000000000000000..dbcc2572ad7139b6777b855febb16b50df05c74d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.session/cache/55baf89709405ac3477a55d65a1f7437.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0233,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.session/cache/cf4bc14ebc2273cf1f578315cec5298f.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.session/cache/cf4bc14ebc2273cf1f578315cec5298f.json
new file mode 100644
index 0000000000000000000000000000000000000000..6f0b014827b3167760a3cf4df57150b552df065d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/array_initialized.1.session/cache/cf4bc14ebc2273cf1f578315cec5298f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0633,
+  "steps": 115 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/avar.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/avar.res.oracle
index 882fd42aa67fcd60983696e0344edb2ea46445d1..a8932bccedf0b6a407165e0a8e2c9503a00e7593 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/avar.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/avar.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/avar.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/01b31a8d32606bc4d753764a4effdb69.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/01b31a8d32606bc4d753764a4effdb69.json
new file mode 100644
index 0000000000000000000000000000000000000000..e5e4877929fd796d622d59436419aec751dc09ca
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/01b31a8d32606bc4d753764a4effdb69.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0223,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/350ab72a5631cc09a74f36f1df8e6ce6.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/350ab72a5631cc09a74f36f1df8e6ce6.json
new file mode 100644
index 0000000000000000000000000000000000000000..31dc56889168960f0321bc0ecc00be042ddc62e9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/350ab72a5631cc09a74f36f1df8e6ce6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0253,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/93a495c6aa514eeff83763085fe00a21.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/93a495c6aa514eeff83763085fe00a21.json
new file mode 100644
index 0000000000000000000000000000000000000000..e4dd89a3b7e97f9f61144dbb72b4e0e8105d7675
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/93a495c6aa514eeff83763085fe00a21.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.023,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/ac04114d85a36676f0a72989d04ad0a7.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/ac04114d85a36676f0a72989d04ad0a7.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/ac04114d85a36676f0a72989d04ad0a7.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/b231ae79ea0fe869fda1ef72009e17f4.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/b231ae79ea0fe869fda1ef72009e17f4.json
new file mode 100644
index 0000000000000000000000000000000000000000..afb817d5a0dfdc5dce034fb86fef45019a857cb4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/b231ae79ea0fe869fda1ef72009e17f4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.023,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/c3302b7cff80d960e1fe9acbfedd37b2.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/c3302b7cff80d960e1fe9acbfedd37b2.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/c3302b7cff80d960e1fe9acbfedd37b2.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/df19ca38260e48624376dada84dccd43.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/df19ca38260e48624376dada84dccd43.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.0.session/cache/df19ca38260e48624376dada84dccd43.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.res.oracle
index 68e665c137e8ce9a49a2d7ec9fd9b4a03662815a..de595eb78834b53baf22ad0a68a4f31a2565669e 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/cast_fits.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.0.session/cache/3fc118376c0d61686ee236278514e97e.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.0.session/cache/3fc118376c0d61686ee236278514e97e.json
new file mode 100644
index 0000000000000000000000000000000000000000..92f56cfa4f016b0c006b1e00553c7fcd03bf2bc7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.0.session/cache/3fc118376c0d61686ee236278514e97e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.026,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.0.session/cache/96ef4de15a302b15c8381191688def2f.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.0.session/cache/96ef4de15a302b15c8381191688def2f.json
new file mode 100644
index 0000000000000000000000000000000000000000..670fe5e0743967555a640029d2e87f6b19a4722c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.0.session/cache/96ef4de15a302b15c8381191688def2f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0223,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.0.session/cache/ea44c4fb1c9d9e05f845023195ef9af7.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.0.session/cache/ea44c4fb1c9d9e05f845023195ef9af7.json
new file mode 100644
index 0000000000000000000000000000000000000000..0ea08aabaa95b4213c1c75ef43061da55814c4c4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.0.session/cache/ea44c4fb1c9d9e05f845023195ef9af7.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0226,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.res.oracle
index a64bd492a48b533063f67a46bc620998aed335ea..7c6f289582ec1efb2896b844fa9bde729fba1a8c 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/shift_lemma.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/shift_lemma.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/struct_array_type.0.session/cache/6d805359e3283381e46c2a08305c0c24.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/struct_array_type.0.session/cache/6d805359e3283381e46c2a08305c0c24.json
new file mode 100644
index 0000000000000000000000000000000000000000..cf0829bc518498af400dad64668fa6cc39debe7c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/struct_array_type.0.session/cache/6d805359e3283381e46c2a08305c0c24.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0145,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/struct_array_type.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/struct_array_type.res.oracle
index 8549fbcc64f0223c9a9d18214fea174152e0a9e0..fc0bebfe6e6c32fb33b1bddea5e0bd791b6811ec 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/struct_array_type.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/struct_array_type.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/struct_array_type.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.res.oracle
index e8a1ae26e730dcde8d49887a0b6c277f04a26475..33c30e5011ffb60e802f90a6349566f6a680d721 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_alloc.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.session/cache/231adc600de0d1f2c32a5a61a667816d.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.session/cache/231adc600de0d1f2c32a5a61a667816d.json
new file mode 100644
index 0000000000000000000000000000000000000000..8dc8e398f4160c11c49363dd4c74a0252e3a5ec8
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.session/cache/231adc600de0d1f2c32a5a61a667816d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0194,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.session/cache/858923f594ba95cfa2a175bc579173e8.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.session/cache/858923f594ba95cfa2a175bc579173e8.json
new file mode 100644
index 0000000000000000000000000000000000000000..b3a72b15fdf1995f8e3849f18611e56d7df6151b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.session/cache/858923f594ba95cfa2a175bc579173e8.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0195,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.session/cache/f5a0ac770771c7dc02aed3d95f573fe5.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.session/cache/f5a0ac770771c7dc02aed3d95f573fe5.json
new file mode 100644
index 0000000000000000000000000000000000000000..63fe64fe1e9240574f4978192769975b6a5c030c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.session/cache/f5a0ac770771c7dc02aed3d95f573fe5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0175,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.res.oracle
index d0235b8a0873f05cc47e5a026484c823e75a997d..44d2660eb212b4aa20727e4889cc47c4d161f358 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_typed/unit_alloc.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.session/cache/231adc600de0d1f2c32a5a61a667816d.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.session/cache/231adc600de0d1f2c32a5a61a667816d.json
new file mode 100644
index 0000000000000000000000000000000000000000..315b9d286d3d3498aeb606a649c8b7bfbfeb7a3c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.session/cache/231adc600de0d1f2c32a5a61a667816d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0153,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.session/cache/858923f594ba95cfa2a175bc579173e8.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.session/cache/858923f594ba95cfa2a175bc579173e8.json
new file mode 100644
index 0000000000000000000000000000000000000000..d9cfb735843f773edbc65085a26454c94a43be8c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.session/cache/858923f594ba95cfa2a175bc579173e8.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0199,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.session/cache/f5a0ac770771c7dc02aed3d95f573fe5.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.session/cache/f5a0ac770771c7dc02aed3d95f573fe5.json
new file mode 100644
index 0000000000000000000000000000000000000000..9f8f32c4ec4b0f50e1d9a3b88d30df30a17115d1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.session/cache/f5a0ac770771c7dc02aed3d95f573fe5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0272,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.res.oracle
index 9a11fc16b0ced3efe537cda627bace6c888c54ea..84f7b84effb20be4db4da5bc3988605987046ef8 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_bitwise.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/004ac845ae4a785d4fdbb86120f0c314.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/004ac845ae4a785d4fdbb86120f0c314.json
new file mode 100644
index 0000000000000000000000000000000000000000..056c200efc6061e07c3fe6702ed7aa754aea4215
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/004ac845ae4a785d4fdbb86120f0c314.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0312,
+  "steps": 38 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/1c32382179a4141d62bff5310e671fc0.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/1c32382179a4141d62bff5310e671fc0.json
new file mode 100644
index 0000000000000000000000000000000000000000..4dfb994b110e3b105019744949b457628de5c9c6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/1c32382179a4141d62bff5310e671fc0.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0244,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/1f9de386423d1492664e876701348c9a.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/1f9de386423d1492664e876701348c9a.json
new file mode 100644
index 0000000000000000000000000000000000000000..648945dab932690785c40d9169b3006f39adab56
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/1f9de386423d1492664e876701348c9a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0316,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/22cd352417dac14e9f1ae99c41abc82c.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/22cd352417dac14e9f1ae99c41abc82c.json
new file mode 100644
index 0000000000000000000000000000000000000000..293a91f7cd9d97c026dfb72a3d334f5aa1e9aca4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/22cd352417dac14e9f1ae99c41abc82c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0343,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/3c4a5ebcfee080a4e312b27642ccc507.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/3c4a5ebcfee080a4e312b27642ccc507.json
new file mode 100644
index 0000000000000000000000000000000000000000..3e44e6509efd05e586134ba2977af05978f1fc0a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/3c4a5ebcfee080a4e312b27642ccc507.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0345,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/3edc2498c4f9af53bc71844bf3b5decb.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/3edc2498c4f9af53bc71844bf3b5decb.json
new file mode 100644
index 0000000000000000000000000000000000000000..a0d99fbabe96cd92843e837d11af076a5c7749d5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/3edc2498c4f9af53bc71844bf3b5decb.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0348,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/46a0d3c26a8bfd22eec332ddb17e9186.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/46a0d3c26a8bfd22eec332ddb17e9186.json
new file mode 100644
index 0000000000000000000000000000000000000000..0eb3a35f5e4aeaeb5be73a7c3827f1f50da5f191
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/46a0d3c26a8bfd22eec332ddb17e9186.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0263,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/5f80dcc2503e3d496d272d363bac8ec9.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/5f80dcc2503e3d496d272d363bac8ec9.json
new file mode 100644
index 0000000000000000000000000000000000000000..899fa237e54bae5e63a64149e7b41be46137d65a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/5f80dcc2503e3d496d272d363bac8ec9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0332,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/6b3a0fabc8fff3e8340a114e8f2f8775.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/6b3a0fabc8fff3e8340a114e8f2f8775.json
new file mode 100644
index 0000000000000000000000000000000000000000..7fa625754784d90299bf4e6ebdd30bf19139fdb0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/6b3a0fabc8fff3e8340a114e8f2f8775.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0307,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/6b96b373a888d2ad22f6bbbded229fe7.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/6b96b373a888d2ad22f6bbbded229fe7.json
new file mode 100644
index 0000000000000000000000000000000000000000..64d21ef98131aafb679c9b122eae9ff6f3a6977f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/6b96b373a888d2ad22f6bbbded229fe7.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0326,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/804ab2c0bc65ace18118a96bd3d80a72.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/804ab2c0bc65ace18118a96bd3d80a72.json
new file mode 100644
index 0000000000000000000000000000000000000000..abb54c5891338e6423f8398727f9b94c29431d4f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/804ab2c0bc65ace18118a96bd3d80a72.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0345,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/8e7c71f6dec836843a055e2ab3408816.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/8e7c71f6dec836843a055e2ab3408816.json
new file mode 100644
index 0000000000000000000000000000000000000000..2358a8d8264628a696d7d916b3fae8c1ff14bd93
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/8e7c71f6dec836843a055e2ab3408816.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0213,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/90b79b6c24be599880dfa15b1a40a6d6.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/90b79b6c24be599880dfa15b1a40a6d6.json
new file mode 100644
index 0000000000000000000000000000000000000000..21031e94bff29057e4578d6a70637ce56a9bfb99
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/90b79b6c24be599880dfa15b1a40a6d6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0267,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/9d8c715a87fa25adc41f169095de4869.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/9d8c715a87fa25adc41f169095de4869.json
new file mode 100644
index 0000000000000000000000000000000000000000..73853c083e97b0c76950854e33afb151a4c8b054
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/9d8c715a87fa25adc41f169095de4869.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0212,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/9e4ea6fcbc2695bea58f3794a22c3c1e.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/9e4ea6fcbc2695bea58f3794a22c3c1e.json
new file mode 100644
index 0000000000000000000000000000000000000000..b68cf3b458e47251dd6c8522fd1f1d8b19e248ee
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/9e4ea6fcbc2695bea58f3794a22c3c1e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0242,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/b173d1a75f5baa2eaa2e8450f7146d2e.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/b173d1a75f5baa2eaa2e8450f7146d2e.json
new file mode 100644
index 0000000000000000000000000000000000000000..899fa237e54bae5e63a64149e7b41be46137d65a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/b173d1a75f5baa2eaa2e8450f7146d2e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0332,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/b2047b599c8f9aa7acca4d4505be6502.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/b2047b599c8f9aa7acca4d4505be6502.json
new file mode 100644
index 0000000000000000000000000000000000000000..2da17bcbb9ab67fc64c9fedeb72a4213cdd1f426
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/b2047b599c8f9aa7acca4d4505be6502.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0314,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/b706a11795e39a83472e7b7a00e99e63.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/b706a11795e39a83472e7b7a00e99e63.json
new file mode 100644
index 0000000000000000000000000000000000000000..419ba2095fe46064f24c473dd8f453c93602bade
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/b706a11795e39a83472e7b7a00e99e63.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.018,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/ff5e3e7eb06476367c989b0161633549.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/ff5e3e7eb06476367c989b0161633549.json
new file mode 100644
index 0000000000000000000000000000000000000000..c954795ac6c6cb3488d7bfb0dd2101a399cfa70e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.session/cache/ff5e3e7eb06476367c989b0161633549.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.03,
+  "steps": 26 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.res.oracle
index 1c1f801a70c0aef7706b91635e9980f12d0ad42a..f89e7bf6498769582592c7062cab02596f10c0db 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_bitwise.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.session/cache/1dae8dc38cb748f9343ca0d69bb38c25.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.session/cache/1dae8dc38cb748f9343ca0d69bb38c25.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.session/cache/1dae8dc38cb748f9343ca0d69bb38c25.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.session/cache/5945f10ed5fb50005716725df2ecbbab.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.session/cache/5945f10ed5fb50005716725df2ecbbab.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.session/cache/5945f10ed5fb50005716725df2ecbbab.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.session/cache/7c08477b9cbcfb3078d09847c3f5f71c.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.session/cache/7c08477b9cbcfb3078d09847c3f5f71c.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.session/cache/7c08477b9cbcfb3078d09847c3f5f71c.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.session/cache/e155aee6d2195fbd92c7782b9764f20a.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.session/cache/e155aee6d2195fbd92c7782b9764f20a.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.session/cache/e155aee6d2195fbd92c7782b9764f20a.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_call.0.session/cache/51a2c8924a7c354c4e5f2843179b1d10.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_call.0.session/cache/51a2c8924a7c354c4e5f2843179b1d10.json
new file mode 100644
index 0000000000000000000000000000000000000000..11402384260fa19f58ede4e4f2d5efb1b7f99d1c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_call.0.session/cache/51a2c8924a7c354c4e5f2843179b1d10.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0133,
+  "steps": 7 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_call.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_call.res.oracle
index eb02a84c8a14fa3e6d31e0ddf486444ea0387661..d9dd667a56392061d1021765053171ffecb610fc 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_call.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_call.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_call.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cast.0.session/cache/1acaacb2b2e244807c31b57b8cd645cc.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cast.0.session/cache/1acaacb2b2e244807c31b57b8cd645cc.json
new file mode 100644
index 0000000000000000000000000000000000000000..cfb0beb3823d2e3e6c82d1bce59c88ef0572e0d0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cast.0.session/cache/1acaacb2b2e244807c31b57b8cd645cc.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0232,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cast.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cast.res.oracle
index 92b3928c5f7c495dfaca780f50cf7aa6c684cd54..32cabdf891b34ee11803c54f24f23f9fb7d26c36 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cast.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cast.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_cast.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cst.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cst.res.oracle
index 27195d8e897753d79f385a0f0d93f0ac540ec82a..4c071c988dc2273c396cf8dcb45305ce120b1771 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cst.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_cst.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_cst.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_float.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_float.res.oracle
index a636e612e81df564f9fdb164b7b7fb65284ba954..2b61ac101b76814dd56c7ad75e7c42d338d4e9c0 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_float.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_float.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed' [...]
 [kernel] Parsing tests/wp_typed/unit_float.i (no preprocessing)
 [kernel:parser:decimal-float] tests/wp_typed/unit_float.i:21: Warning: 
   Floating-point constant 0.2 is not represented exactly. Will use 0x1.999999999999ap-3.
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_hard.0.session/cache/807b3a99c3272409cea9ce5b5c1dc040.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_hard.0.session/cache/807b3a99c3272409cea9ce5b5c1dc040.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_hard.0.session/cache/807b3a99c3272409cea9ce5b5c1dc040.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_hard.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_hard.res.oracle
index 5aab1b036220867e4957a2661cc10e3af6834eda..b5a6c46d069cd94900077f88522254a63e42798c 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_hard.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_hard.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_hard.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_ite.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_ite.res.oracle
index 2f4749d9608805b97dd6e8b971da74397b22d839..176778cfcb43b6b114b21b8ee41cbb6bf62b18e7 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_ite.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_ite.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_ite.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.0.session/cache/06d4ef6a685a7aee45be22bae851588a.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.0.session/cache/06d4ef6a685a7aee45be22bae851588a.json
new file mode 100644
index 0000000000000000000000000000000000000000..fb6a16787b63de13deadf4dacb132322ee64feb9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.0.session/cache/06d4ef6a685a7aee45be22bae851588a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0223,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.0.session/cache/2960c76fc29a64d478b8ca3fe6d93430.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.0.session/cache/2960c76fc29a64d478b8ca3fe6d93430.json
new file mode 100644
index 0000000000000000000000000000000000000000..7f23f62bdb3962d37bc094acba197426e2c9f193
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.0.session/cache/2960c76fc29a64d478b8ca3fe6d93430.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0208,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.0.session/cache/baec4d7980fe8e76cb398da63faaa0b4.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.0.session/cache/baec4d7980fe8e76cb398da63faaa0b4.json
new file mode 100644
index 0000000000000000000000000000000000000000..319dc341532e50ec5878f3609d1514f836bcf800
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.0.session/cache/baec4d7980fe8e76cb398da63faaa0b4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0234,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.res.oracle
index f83f7c8a48375e803b02f6705616b6c2a8580c76..6ff11cc1d5c227b5904f067522094e9e367ccd1a 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_labels.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_labels.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/068e80340e8c40c1c577aba748dc1c92.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/068e80340e8c40c1c577aba748dc1c92.json
new file mode 100644
index 0000000000000000000000000000000000000000..b27a3e96fbc06afbd41059a591043fc5a643ef01
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/068e80340e8c40c1c577aba748dc1c92.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0066,
+  "steps": 7 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/4840e191521173237ce2962142ae08c6.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/4840e191521173237ce2962142ae08c6.json
new file mode 100644
index 0000000000000000000000000000000000000000..7fe6dc31a5ca77f1705459b79baca20580086b6a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/4840e191521173237ce2962142ae08c6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0067,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/739ea0a07fdb15c217020db88cb899d6.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/739ea0a07fdb15c217020db88cb899d6.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/739ea0a07fdb15c217020db88cb899d6.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/cfa5b5bda4db07159e0a722d1ea3ddeb.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/cfa5b5bda4db07159e0a722d1ea3ddeb.json
new file mode 100644
index 0000000000000000000000000000000000000000..58c026abe03dee98a5df5b18460b83f684eb71b6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/cfa5b5bda4db07159e0a722d1ea3ddeb.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0091,
+  "steps": 5 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/e363be29dbc13ae78d21c0ab0218ad5d.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/e363be29dbc13ae78d21c0ab0218ad5d.json
new file mode 100644
index 0000000000000000000000000000000000000000..18103944d85534f61c5e573ed83d79115282c79e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/e363be29dbc13ae78d21c0ab0218ad5d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0101,
+  "steps": 6 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/f9ca1daffc903faa8a9befb274be3d26.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/f9ca1daffc903faa8a9befb274be3d26.json
new file mode 100644
index 0000000000000000000000000000000000000000..ca9a6ddbc0936e62871e465b06cfe1d8eb459ce5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.0.session/cache/f9ca1daffc903faa8a9befb274be3d26.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.011,
+  "steps": 5 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.res.oracle
index 34fd709d63e75cb42f6cf067203f23eef954f495..187ce05819653312a9a7e48b448da687af3d3398 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_lemma.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.res.oracle
index 4a7acb218e3b2549ee7364e57b16a813ab2c921d..8ee86f601117d0b6f5ec0f74584de8b72ddcbe80 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_local.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.session/cache/6e5fd2ad22b7c9f54f64d91dae29dde1.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.session/cache/6e5fd2ad22b7c9f54f64d91dae29dde1.json
new file mode 100644
index 0000000000000000000000000000000000000000..a1d2c02d47249878f319e3d7a8144c890341c81d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.session/cache/6e5fd2ad22b7c9f54f64d91dae29dde1.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0132,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.res.oracle
index 907467024d1d1358a23de8569151f9c9ed11e151..f0b944bdbcce3e819d288fab774b68e286f2a58c 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Raw)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Raw)' [...]
 [kernel] Parsing tests/wp_typed/unit_local.c (with preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.session/cache/80a38b049190d6b75796d20a3ff8a48a.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.session/cache/80a38b049190d6b75796d20a3ff8a48a.json
new file mode 100644
index 0000000000000000000000000000000000000000..1bf231001e38adf7ebc94e98ca98c3cdeacc6ef6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.session/cache/80a38b049190d6b75796d20a3ff8a48a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0177,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.session/cache/84b5fa3ae353adf589e77a910f9ec2c7.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.session/cache/84b5fa3ae353adf589e77a910f9ec2c7.json
new file mode 100644
index 0000000000000000000000000000000000000000..0e971072e50cdb22a6c80731711fd66cc1183417
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.session/cache/84b5fa3ae353adf589e77a910f9ec2c7.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0161,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.session/cache/fb83e2c25fded1d5e6cee517f4302fad.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.session/cache/fb83e2c25fded1d5e6cee517f4302fad.json
new file mode 100644
index 0000000000000000000000000000000000000000..a3cf33ba24d366fd6acefba28dc414028eb4685f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.session/cache/fb83e2c25fded1d5e6cee517f4302fad.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0157,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.0.res.oracle
index bf3d6522ac99eebaa0ee7cc29f804e2a1afc5a6d..28cab47713a5fada2c6cd1e0bc71ece49bb732d6 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_loopscope.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.0.session/cache/c089c450772a3a0346e02bc1e798bdb0.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.0.session/cache/c089c450772a3a0346e02bc1e798bdb0.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.0.session/cache/c089c450772a3a0346e02bc1e798bdb0.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.1.res.oracle
index 41ceb697fd285fee441129e068076ef172eba313..514db21cf01114521244bdfe6b8c5d2044851f73 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_typed/unit_loopscope.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.1.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.1.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_loopscope.1.session/cache/2d7c06745f3753a4a8a87aab2a863efc.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.0.session/cache/18f592a6c7a637717dc4f838b22cc228.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.0.session/cache/18f592a6c7a637717dc4f838b22cc228.json
new file mode 100644
index 0000000000000000000000000000000000000000..132b718eb29a38eb8c33e2ab760a9757fd853a61
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.0.session/cache/18f592a6c7a637717dc4f838b22cc228.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0095,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.0.session/cache/cc0d1ac6f6f59a78e04778f515e93997.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.0.session/cache/cc0d1ac6f6f59a78e04778f515e93997.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.0.session/cache/cc0d1ac6f6f59a78e04778f515e93997.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.res.oracle
index 522383856688d3c27bbe7b00b750db0524a625e7..b4416b982a1dd792608361c339709e253b760492 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_matrix.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_matrix.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/3edeafeea0a17e8e0e359ecd8e5a5090.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/3edeafeea0a17e8e0e359ecd8e5a5090.json
new file mode 100644
index 0000000000000000000000000000000000000000..6902cd10a7829ffd836d4a530650dd951420c58b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/3edeafeea0a17e8e0e359ecd8e5a5090.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0491,
+  "steps": 70 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/4073bb68237268f1f8fb55a7493fe963.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/4073bb68237268f1f8fb55a7493fe963.json
new file mode 100644
index 0000000000000000000000000000000000000000..6f02dbcdcf4b9187452db0c838d5dd06da97d4a2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/4073bb68237268f1f8fb55a7493fe963.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0374,
+  "steps": 62 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/6a171da02d906e7eeb564bbf61683223.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/6a171da02d906e7eeb564bbf61683223.json
new file mode 100644
index 0000000000000000000000000000000000000000..039758e772299c967fa797060c3b0c652b5e4e11
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/6a171da02d906e7eeb564bbf61683223.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0246,
+  "steps": 34 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/6ab91892d1fc5574e862b9592b5b0898.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/6ab91892d1fc5574e862b9592b5b0898.json
new file mode 100644
index 0000000000000000000000000000000000000000..1b47b3201c879db3aec209fb8d11f6be8303b500
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/6ab91892d1fc5574e862b9592b5b0898.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0512,
+  "steps": 79 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/763383182ae33cdadbc4d0c8c7d84061.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/763383182ae33cdadbc4d0c8c7d84061.json
new file mode 100644
index 0000000000000000000000000000000000000000..1fa8724e90d9507840e8f35f8f9aec2f083dd373
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/763383182ae33cdadbc4d0c8c7d84061.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0355,
+  "steps": 59 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/b29cf8d3f11583cabff01ab730386006.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/b29cf8d3f11583cabff01ab730386006.json
new file mode 100644
index 0000000000000000000000000000000000000000..fa4226bb76851cc797c852bf46ebd9ec9fc6d0e9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.0.session/cache/b29cf8d3f11583cabff01ab730386006.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0395,
+  "steps": 62 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.res.oracle
index a8a5e99ca4c6c0a93a87800b9ed35ac84401c48d..05965e3ea997380d09ef2291cd261f20b328a747 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_string.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_string.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_tset.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_tset.res.oracle
index b9b2d0e9c263b7afd666dee898b4db2c6b3cd038..2a0fe19ec722ceb8859414da5a182fe138e4bed9 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_tset.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_tset.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/unit_tset.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.res.oracle
index d26be5ba50b3a72e23c8e952854f323150b5fc78..5408bc35bad4021aa374eb7030e56e0cc1d5dfcf 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_typed/user_bitwise.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/2a99efd40d5dc72611e4194c15952930.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/2a99efd40d5dc72611e4194c15952930.json
new file mode 100644
index 0000000000000000000000000000000000000000..0865306572b25c5b1ea8e9ad9c8a8e216494d41d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/2a99efd40d5dc72611e4194c15952930.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0335,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/71e00f8738f2f0572b0f7356c68b6d4e.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/71e00f8738f2f0572b0f7356c68b6d4e.json
new file mode 100644
index 0000000000000000000000000000000000000000..8fa32ae6697044b61cc0457ec2f81adad7d4a64a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/71e00f8738f2f0572b0f7356c68b6d4e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0629,
+  "steps": 68 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/766a0e00f67af30922ebda94d841073e.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/766a0e00f67af30922ebda94d841073e.json
new file mode 100644
index 0000000000000000000000000000000000000000..8c8e1f15543eab05b76a1ea9a896966a8add9980
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/766a0e00f67af30922ebda94d841073e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0778,
+  "steps": 73 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/7b72b0d78e1465aa092ec6718f7dba34.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/7b72b0d78e1465aa092ec6718f7dba34.json
new file mode 100644
index 0000000000000000000000000000000000000000..8cb5e07cb0ac127a0f7e3883bfa08aed4c53b798
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/7b72b0d78e1465aa092ec6718f7dba34.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0674,
+  "steps": 72 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/9835ec6ee6e0aa525508f2538c4fe771.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/9835ec6ee6e0aa525508f2538c4fe771.json
new file mode 100644
index 0000000000000000000000000000000000000000..aaf63f5c7b526cccb70db64440259591d1378a1d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/9835ec6ee6e0aa525508f2538c4fe771.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0617,
+  "steps": 68 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/a78463f0759de4a4c64f6463d5ee4fa4.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/a78463f0759de4a4c64f6463d5ee4fa4.json
new file mode 100644
index 0000000000000000000000000000000000000000..244d9f61f8fe35f9f845954956aa52d58244dafb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/a78463f0759de4a4c64f6463d5ee4fa4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0767,
+  "steps": 73 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/c532c9d58425e86864eab87cb87852c4.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/c532c9d58425e86864eab87cb87852c4.json
new file mode 100644
index 0000000000000000000000000000000000000000..18a3c55ffacbf8ca78ba07c73b0412b71ea48b3a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/c532c9d58425e86864eab87cb87852c4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.042,
+  "steps": 67 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/c987f056b7a00d97c82cee451e558d5e.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/c987f056b7a00d97c82cee451e558d5e.json
new file mode 100644
index 0000000000000000000000000000000000000000..13617c6d2f77b1cd8b29f204075c503fb6d20695
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/c987f056b7a00d97c82cee451e558d5e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0717,
+  "steps": 72 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/cfc22935dd8816750938954336b944d8.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/cfc22935dd8816750938954336b944d8.json
new file mode 100644
index 0000000000000000000000000000000000000000..6e22251b02cdb7c25c10f7e8fb7f2c870de78ccb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/cfc22935dd8816750938954336b944d8.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.049,
+  "steps": 58 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/e1cf4931c611c331b5828398e1f0f9ea.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/e1cf4931c611c331b5828398e1f0f9ea.json
new file mode 100644
index 0000000000000000000000000000000000000000..528ae03a14f7eee27ca0b5f5fd9ea8771f75f509
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/e1cf4931c611c331b5828398e1f0f9ea.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0629,
+  "steps": 67 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/f2e288c6ba3fc74ec5ba8e7052418211.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/f2e288c6ba3fc74ec5ba8e7052418211.json
new file mode 100644
index 0000000000000000000000000000000000000000..9113829bfcfd985d7e7186c5495a57b4fbb1edf9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.session/cache/f2e288c6ba3fc74ec5ba8e7052418211.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0504,
+  "steps": 56 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.1.res.oracle
index d63ff2f336b20473ea1dea71b2b7933d8f4e7883..edcc63f630692b4347e34264dd672acd68d90ae1 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_typed/user_bitwise.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/1e1971aba9e213a3834fd0075f0d16f2.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/1e1971aba9e213a3834fd0075f0d16f2.json
new file mode 100644
index 0000000000000000000000000000000000000000..3e4b6bf8774b0e52ab5ebdb4582573673230b46e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/1e1971aba9e213a3834fd0075f0d16f2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0128,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/36d1d613dcd28dbff9027bd624d9f1ea.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/36d1d613dcd28dbff9027bd624d9f1ea.json
new file mode 100644
index 0000000000000000000000000000000000000000..a72db10971051bc0d8e233180b9e7c19b624f92b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/36d1d613dcd28dbff9027bd624d9f1ea.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0141,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/3db08a4ec3b1c26942faf4fef0c7c7dd.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/3db08a4ec3b1c26942faf4fef0c7c7dd.json
new file mode 100644
index 0000000000000000000000000000000000000000..4ff7dbe572a574cb8e2a9a6c1ac852471037ed1e
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/3db08a4ec3b1c26942faf4fef0c7c7dd.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0174,
+  "steps": 37 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/6063796664ffb4fa4f35179577f25d88.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/6063796664ffb4fa4f35179577f25d88.json
new file mode 100644
index 0000000000000000000000000000000000000000..afc56f4778895914d7667bffb4965fdd4a8b1691
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/6063796664ffb4fa4f35179577f25d88.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0119,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/950ad2561e5a99afcab1ec9cac18f07d.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/950ad2561e5a99afcab1ec9cac18f07d.json
new file mode 100644
index 0000000000000000000000000000000000000000..12d0111b621ad64943100579057e794eea93a03a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/950ad2561e5a99afcab1ec9cac18f07d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0277,
+  "steps": 39 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/ac50150b93111355c0d052553c80aead.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/ac50150b93111355c0d052553c80aead.json
new file mode 100644
index 0000000000000000000000000000000000000000..1349489d4aa3997a0024baffc99d385c6bdcbdcb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/ac50150b93111355c0d052553c80aead.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0245,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/bb874fe07e3ace324494b9fb02ec1462.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/bb874fe07e3ace324494b9fb02ec1462.json
new file mode 100644
index 0000000000000000000000000000000000000000..5471530895d08ab159d24f422c90a54aa497e704
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/bb874fe07e3ace324494b9fb02ec1462.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0369,
+  "steps": 49 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/c16210fcd8fef3377492b4e49810d049.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/c16210fcd8fef3377492b4e49810d049.json
new file mode 100644
index 0000000000000000000000000000000000000000..e4cfe9298105491592d708fc3ed12b878f670b67
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/c16210fcd8fef3377492b4e49810d049.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0265,
+  "steps": 37 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/e9df85a8bbbb031ff7f9d5f56814a985.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/e9df85a8bbbb031ff7f9d5f56814a985.json
new file mode 100644
index 0000000000000000000000000000000000000000..c2662945268f2896cda63a185ca4dd01dc006d24
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.0.session/cache/e9df85a8bbbb031ff7f9d5f56814a985.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0315,
+  "steps": 50 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.res.oracle
index 0322e3c7950cf5ee16c2c09f28818897e17ee24b..4aaf43770a3a55096891adaf170819eec7683580 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/user_collect.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.res.oracle
index 549deb2265ca02a630d5e7a9d8cd5eecfd658186..f6b7811bc5a255b6b10447860ee65b864b8be065 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/user_init.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/17ffcbe3e6038146194ef1fdae892a6f.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/17ffcbe3e6038146194ef1fdae892a6f.json
new file mode 100644
index 0000000000000000000000000000000000000000..2d41bc2c1160a9b9176370e89a21017750a7ddaa
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/17ffcbe3e6038146194ef1fdae892a6f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.019,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/1a6f29802546cccc3383f2f3b5d85520.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/1a6f29802546cccc3383f2f3b5d85520.json
new file mode 100644
index 0000000000000000000000000000000000000000..135b41795c421800ebcd34bb3d976dfcc10eb1f7
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/1a6f29802546cccc3383f2f3b5d85520.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0254,
+  "steps": 24 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/1e8cf3361abc3e40c7b69eaefb0bee8e.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/1e8cf3361abc3e40c7b69eaefb0bee8e.json
new file mode 100644
index 0000000000000000000000000000000000000000..2bbf8a2683dc525e770751cb76b48ac99c0c77d5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/1e8cf3361abc3e40c7b69eaefb0bee8e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0208,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/228d52b71b2541eaaa93dd42fe5db1d4.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/228d52b71b2541eaaa93dd42fe5db1d4.json
new file mode 100644
index 0000000000000000000000000000000000000000..3a8de80e0709fd7665be4f86de1b89cbd2b15223
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/228d52b71b2541eaaa93dd42fe5db1d4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0107,
+  "steps": 8 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/2e2f38c80c32abeeee80bd2772efd1c3.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/2e2f38c80c32abeeee80bd2772efd1c3.json
new file mode 100644
index 0000000000000000000000000000000000000000..22a94416cb115d8934334b753fbfc383f6fdcf7c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/2e2f38c80c32abeeee80bd2772efd1c3.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0168,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/3257bc02a1b4c4c0a054c65060bbb397.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/3257bc02a1b4c4c0a054c65060bbb397.json
new file mode 100644
index 0000000000000000000000000000000000000000..edd9d608a03085efcf75c11e8c3c7d7d00d46a25
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/3257bc02a1b4c4c0a054c65060bbb397.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0233,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/4188555c4f042616866d63828ff5b2e5.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/4188555c4f042616866d63828ff5b2e5.json
new file mode 100644
index 0000000000000000000000000000000000000000..9f172318c5ba18ad4f95bb9fd205167796592982
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/4188555c4f042616866d63828ff5b2e5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0212,
+  "steps": 36 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/47cd09489b3e50fba17f77b299ccaa12.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/47cd09489b3e50fba17f77b299ccaa12.json
new file mode 100644
index 0000000000000000000000000000000000000000..5e1ca335796c6189256561080facffdf1cd06af6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/47cd09489b3e50fba17f77b299ccaa12.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0256,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/4843af752a0384e05880a83b28c17a62.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/4843af752a0384e05880a83b28c17a62.json
new file mode 100644
index 0000000000000000000000000000000000000000..73b90641a4e9478c732da624300dec38cefe8a60
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/4843af752a0384e05880a83b28c17a62.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0116,
+  "steps": 8 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/4f26762cc8a7431a2d798305a934b0b7.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/4f26762cc8a7431a2d798305a934b0b7.json
new file mode 100644
index 0000000000000000000000000000000000000000..4ee838a562f0751c1543a70ad1508f89055b8b51
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/4f26762cc8a7431a2d798305a934b0b7.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.2135,
+  "steps": 195 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/56fc7f213e10ad404cc0057de958a129.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/56fc7f213e10ad404cc0057de958a129.json
new file mode 100644
index 0000000000000000000000000000000000000000..f16e94edeb43cd083ee8ed530a3eab61f41383a0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/56fc7f213e10ad404cc0057de958a129.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0184,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/5a23d2fe56c6d03db907785acbfa66b4.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/5a23d2fe56c6d03db907785acbfa66b4.json
new file mode 100644
index 0000000000000000000000000000000000000000..ff39a0fb8e4911d0f0cdca2e9682c3596f3b0979
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/5a23d2fe56c6d03db907785acbfa66b4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.2206,
+  "steps": 193 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/5d2128c35440220613e84b0e3693ed94.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/5d2128c35440220613e84b0e3693ed94.json
new file mode 100644
index 0000000000000000000000000000000000000000..042fcfad99971685e75c7db9fc036876222fe21a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/5d2128c35440220613e84b0e3693ed94.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0243,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/5da1562233ff52d4105c487410aad5f2.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/5da1562233ff52d4105c487410aad5f2.json
new file mode 100644
index 0000000000000000000000000000000000000000..3ac895068823b76132789e0c909ffae853d83ffb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/5da1562233ff52d4105c487410aad5f2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0187,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/6339633fc0069471c27d0dbc6e00f234.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/6339633fc0069471c27d0dbc6e00f234.json
new file mode 100644
index 0000000000000000000000000000000000000000..74c808bb8b4086d5609ef2bf368115416fa9d046
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/6339633fc0069471c27d0dbc6e00f234.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0308,
+  "steps": 35 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/63936350508172f3a502497159f09d1d.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/63936350508172f3a502497159f09d1d.json
new file mode 100644
index 0000000000000000000000000000000000000000..a483c0382cad4e55e74d86d44be29690d92fe1cb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/63936350508172f3a502497159f09d1d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0166,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/65aaa0d0a807cda430e0edb1b315a27e.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/65aaa0d0a807cda430e0edb1b315a27e.json
new file mode 100644
index 0000000000000000000000000000000000000000..e06608958f095283f96ded4f117f4df559dfd3b0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/65aaa0d0a807cda430e0edb1b315a27e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0123,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/6b66ec30e1510c30a4a50320f9ce8915.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/6b66ec30e1510c30a4a50320f9ce8915.json
new file mode 100644
index 0000000000000000000000000000000000000000..9909f699af2e47f8a90a923ff58e83ebee1cc056
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/6b66ec30e1510c30a4a50320f9ce8915.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0174,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/6cebd2665383563c8d6f79868895551a.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/6cebd2665383563c8d6f79868895551a.json
new file mode 100644
index 0000000000000000000000000000000000000000..c78cd697100705c497fd7fcb5db2d2685f807c78
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/6cebd2665383563c8d6f79868895551a.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0213,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/72307f01c14b926050adf0e387958166.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/72307f01c14b926050adf0e387958166.json
new file mode 100644
index 0000000000000000000000000000000000000000..75fce7352d1075d45f32468df283e40bc51b034b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/72307f01c14b926050adf0e387958166.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0245,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/72f3565cf594cefa13d49fa68fbc55a6.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/72f3565cf594cefa13d49fa68fbc55a6.json
new file mode 100644
index 0000000000000000000000000000000000000000..d457b6634a71487212025ea4c9feb9eb572b3d04
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/72f3565cf594cefa13d49fa68fbc55a6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0119,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/759b4f86531e161fd97b974d6e254585.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/759b4f86531e161fd97b974d6e254585.json
new file mode 100644
index 0000000000000000000000000000000000000000..de4170e9392c822d947052248f3fb74f1d66b1be
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/759b4f86531e161fd97b974d6e254585.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0294,
+  "steps": 36 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/7958e2d72644d464557344ca48f74b69.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/7958e2d72644d464557344ca48f74b69.json
new file mode 100644
index 0000000000000000000000000000000000000000..79dbe6246b2d1f04faf902aff7fddad26a86b9d8
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/7958e2d72644d464557344ca48f74b69.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0161,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/80f119c647a7d44e844fb264e7de715b.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/80f119c647a7d44e844fb264e7de715b.json
new file mode 100644
index 0000000000000000000000000000000000000000..aaeb734a0befb8858d27d161c755743b6ce76ab0
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/80f119c647a7d44e844fb264e7de715b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0163,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/82dd09e758b61ed5e37c805feee4b424.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/82dd09e758b61ed5e37c805feee4b424.json
new file mode 100644
index 0000000000000000000000000000000000000000..17d5732e112de12f550dcdbc5749dd2c81f1daed
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/82dd09e758b61ed5e37c805feee4b424.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0247,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/9300d7aafc1b4a8b042fbd06f29ca7f2.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/9300d7aafc1b4a8b042fbd06f29ca7f2.json
new file mode 100644
index 0000000000000000000000000000000000000000..807c41c5c6309486cf8303f5639479f5bfbba17a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/9300d7aafc1b4a8b042fbd06f29ca7f2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0214,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/a8972f010edd0a69f963e59097a090c9.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/a8972f010edd0a69f963e59097a090c9.json
new file mode 100644
index 0000000000000000000000000000000000000000..77ebe4529a84bf1b9e93a417ce8a75e1964417c9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/a8972f010edd0a69f963e59097a090c9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0392,
+  "steps": 54 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/a96c9d5e0977498703591925319a2fe2.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/a96c9d5e0977498703591925319a2fe2.json
new file mode 100644
index 0000000000000000000000000000000000000000..ad6182f9ae5b72e9efa6479cbc0c993a40cf190b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/a96c9d5e0977498703591925319a2fe2.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.016,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/ab9758d98109ead2b00b740b739cbea7.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/ab9758d98109ead2b00b740b739cbea7.json
new file mode 100644
index 0000000000000000000000000000000000000000..c95c26de92b178b12b07df4f78acdb832a3fc7ab
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/ab9758d98109ead2b00b740b739cbea7.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0154,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/be587dbd7143b1c7ce2d0963783d63e6.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/be587dbd7143b1c7ce2d0963783d63e6.json
new file mode 100644
index 0000000000000000000000000000000000000000..d084c88c1eb528488460dec8a00db61420f00dc2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/be587dbd7143b1c7ce2d0963783d63e6.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.04,
+  "steps": 42 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/c3e01e58641965407c42021976235616.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/c3e01e58641965407c42021976235616.json
new file mode 100644
index 0000000000000000000000000000000000000000..f438058886ccce8352a18bd20008f326377d9978
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/c3e01e58641965407c42021976235616.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0278,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/cc6ae51c4577487698ea0ca6d031b200.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/cc6ae51c4577487698ea0ca6d031b200.json
new file mode 100644
index 0000000000000000000000000000000000000000..67b9cbd1d1265b40be9ca3da204c1cbe5cf65448
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/cc6ae51c4577487698ea0ca6d031b200.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0274,
+  "steps": 28 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/d4df5778b285c01494d5f780cbcbea22.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/d4df5778b285c01494d5f780cbcbea22.json
new file mode 100644
index 0000000000000000000000000000000000000000..87f69595c0bfeb06b0d86b805e997ceb98240b88
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/d4df5778b285c01494d5f780cbcbea22.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0186,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/dc1be4b07122fbb25abc778b0dc17a78.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/dc1be4b07122fbb25abc778b0dc17a78.json
new file mode 100644
index 0000000000000000000000000000000000000000..b7d2634b96312992cd955c7bc59727001f8cf937
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/dc1be4b07122fbb25abc778b0dc17a78.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0167,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/e35aa9db4b874c1ab88a964e7bccd040.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/e35aa9db4b874c1ab88a964e7bccd040.json
new file mode 100644
index 0000000000000000000000000000000000000000..202e53debb34d7a277eda32e3aba4dee156d4d4c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/e35aa9db4b874c1ab88a964e7bccd040.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0249,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/ed2dbebf05c2807c5acdbe5c8e76f346.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/ed2dbebf05c2807c5acdbe5c8e76f346.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb99aed3a29e366f197d13f0f36a2ae0403491ce
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/ed2dbebf05c2807c5acdbe5c8e76f346.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0319,
+  "steps": 36 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/f98305c0ceedf164df38d274061bf4f8.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/f98305c0ceedf164df38d274061bf4f8.json
new file mode 100644
index 0000000000000000000000000000000000000000..786ba6c4e87db2dfbae253e6cdcff83405d2e545
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/f98305c0ceedf164df38d274061bf4f8.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0443,
+  "steps": 56 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/faa56ce35a5497aae0306357d671727c.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/faa56ce35a5497aae0306357d671727c.json
new file mode 100644
index 0000000000000000000000000000000000000000..1221da03762ad520587c8721336cc2b7017d70f4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/faa56ce35a5497aae0306357d671727c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0158,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/fd21a301bed246119d512f8722bebe30.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/fd21a301bed246119d512f8722bebe30.json
new file mode 100644
index 0000000000000000000000000000000000000000..b7491299aa49898aeb50f92ea5113f0e09e6c3a1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/fd21a301bed246119d512f8722bebe30.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0128,
+  "steps": 13 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/fd87cc7cce7bb9d33ea6b15c17320c14.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/fd87cc7cce7bb9d33ea6b15c17320c14.json
new file mode 100644
index 0000000000000000000000000000000000000000..336fe69141b3de17d78e26d1b32102c84a881a19
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.session/cache/fd87cc7cce7bb9d33ea6b15c17320c14.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0165,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.res.oracle
index 60c38cd4360789439d93bed382ab118266e4ddee..678587ce0a19a84b0c6aec70c4db00d43b169252 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/user_init.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
@@ -10,8 +10,6 @@
 [wp] Warning: Missing RTE guards
 [wp] 23 goals scheduled
 [wp] [Qed] Goal typed_init_t2_bis_v2_loop_assigns_part1 : Valid
-[wp] Warning: creating session directory `tests/wp_typed/result_qualif/user_init-session-1'
-[wp] Warning: creating session directory `tests/wp_typed/result_qualif/user_init-session-1/wp'
 [wp] [Tactical] Goal typed_init_t2_bis_v2_loop_assigns_part2 : Valid
 [wp] [Tactical] Goal typed_init_t2_bis_v2_loop_assigns_part3 : Valid
 [wp] [Tactical] Goal typed_init_t2_bis_v2_assigns_exit_part1 : Valid
@@ -38,7 +36,6 @@
   Qed:              11 
   Script:           12 
   Alt-Ergo 2.0.0:    0  (unsuccess: 12)
-[wp] Updated session with 12 new valid scripts.
 [wp] Report in:  'tests/wp_typed/oracle_qualif/user_init.1.report.json'
 [wp] Report out: 'tests/wp_typed/result_qualif/user_init.1.report.json'
 -------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/057dadfe08269b073b5fdb3f99f0cf54.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/057dadfe08269b073b5fdb3f99f0cf54.json
new file mode 100644
index 0000000000000000000000000000000000000000..2641cfc16411e023724b3ff2fd7fea9d62b941fd
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/057dadfe08269b073b5fdb3f99f0cf54.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0194,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/0c3b278c42bf147df2e97f708aad39c7.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/0c3b278c42bf147df2e97f708aad39c7.json
new file mode 100644
index 0000000000000000000000000000000000000000..8fe835d83d3c41e7bb748c188f241bea47874cb1
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/0c3b278c42bf147df2e97f708aad39c7.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.015,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/158fd2c31ad9f3fb8884cdb74df5281d.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/158fd2c31ad9f3fb8884cdb74df5281d.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/158fd2c31ad9f3fb8884cdb74df5281d.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/1980519d8a76496098382d14d534dadf.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/1980519d8a76496098382d14d534dadf.json
new file mode 100644
index 0000000000000000000000000000000000000000..d4dbaaf180c49bba46e82fe885651a3c85274d5a
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/1980519d8a76496098382d14d534dadf.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0122,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/1da9df6b30b87e2c91aec83169ce811f.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/1da9df6b30b87e2c91aec83169ce811f.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/1da9df6b30b87e2c91aec83169ce811f.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/1f309a1d5a32893ca637697bc07011bc.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/1f309a1d5a32893ca637697bc07011bc.json
new file mode 100644
index 0000000000000000000000000000000000000000..63704f20a281a4b35de94ca0cdca96353a3e0758
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/1f309a1d5a32893ca637697bc07011bc.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0214,
+  "steps": 24 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/224a90add7284f0760379d53a02297d5.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/224a90add7284f0760379d53a02297d5.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/224a90add7284f0760379d53a02297d5.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/2b41b08d1284872f477fb2388e8800eb.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/2b41b08d1284872f477fb2388e8800eb.json
new file mode 100644
index 0000000000000000000000000000000000000000..cf47b7ac6983aead0acb94aec46fe9cf5d67993f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/2b41b08d1284872f477fb2388e8800eb.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.021,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/2f1f28ca445ed465b0ae929f90868b82.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/2f1f28ca445ed465b0ae929f90868b82.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/2f1f28ca445ed465b0ae929f90868b82.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/5a0077053c40e3064cc4d801008327cf.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/5a0077053c40e3064cc4d801008327cf.json
new file mode 100644
index 0000000000000000000000000000000000000000..ee59ad18fd3ffff962f4ae19fa42f2b6cef854df
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/5a0077053c40e3064cc4d801008327cf.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0209,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/6d3a184c57d19bf5bec185cdd9a32977.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/6d3a184c57d19bf5bec185cdd9a32977.json
new file mode 100644
index 0000000000000000000000000000000000000000..355773d8cbc5928daab5f9c6b8356918283034fe
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/6d3a184c57d19bf5bec185cdd9a32977.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0188,
+  "steps": 12 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/83c1ab76624d77e68e878b15ed852b50.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/83c1ab76624d77e68e878b15ed852b50.json
new file mode 100644
index 0000000000000000000000000000000000000000..193e5c53bbf817044979addc89f1a5fee041fb10
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/83c1ab76624d77e68e878b15ed852b50.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0101,
+  "steps": 11 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/856ef6dc0590c047b1d3652564226902.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/856ef6dc0590c047b1d3652564226902.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/856ef6dc0590c047b1d3652564226902.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/95cc8276bbb11044a4e3b015c9ee9b87.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/95cc8276bbb11044a4e3b015c9ee9b87.json
new file mode 100644
index 0000000000000000000000000000000000000000..0e397c08c6e102dc8f7fa2e4411738f55c22403c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/95cc8276bbb11044a4e3b015c9ee9b87.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0244,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/96284b720d44be9937917112595ce737.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/96284b720d44be9937917112595ce737.json
new file mode 100644
index 0000000000000000000000000000000000000000..0612fec612b3d368f8f36c8d2aeeac8ff4231d6f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/96284b720d44be9937917112595ce737.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0279,
+  "steps": 28 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/999ef60012010d43899a9a6ec6b500fc.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/999ef60012010d43899a9a6ec6b500fc.json
new file mode 100644
index 0000000000000000000000000000000000000000..d82a6e5dfae97d8b927814af017e915b26f81093
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/999ef60012010d43899a9a6ec6b500fc.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0184,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/9dd4bd5439992f8110255fc40cb80f3c.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/9dd4bd5439992f8110255fc40cb80f3c.json
new file mode 100644
index 0000000000000000000000000000000000000000..5f31bae436051b4a7cdb72b14163c9521690eb8d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/9dd4bd5439992f8110255fc40cb80f3c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0136,
+  "steps": 23 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/9e42bdda7b75ea04a21390c1cd79e94e.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/9e42bdda7b75ea04a21390c1cd79e94e.json
new file mode 100644
index 0000000000000000000000000000000000000000..5e5a7cc120f62286931126541cbd5d9a16f3b1cf
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/9e42bdda7b75ea04a21390c1cd79e94e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0099,
+  "steps": 9 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/9f720bd2b7cbd3d3b6184708001e37f5.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/9f720bd2b7cbd3d3b6184708001e37f5.json
new file mode 100644
index 0000000000000000000000000000000000000000..e483fd134e95abb93f8130df05af799dfa0fef9f
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/9f720bd2b7cbd3d3b6184708001e37f5.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0203,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/a899e157a4902c73770f124eeb3cd657.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/a899e157a4902c73770f124eeb3cd657.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/a899e157a4902c73770f124eeb3cd657.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/b05e910de5694eeeeb4ee951e4aed6dc.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/b05e910de5694eeeeb4ee951e4aed6dc.json
new file mode 100644
index 0000000000000000000000000000000000000000..7b221755d1f1b8d718dbb1a776eec480e9b54cec
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/b05e910de5694eeeeb4ee951e4aed6dc.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0256,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/ba3dea951634b8bd7a5ca1f8baaa7eb0.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/ba3dea951634b8bd7a5ca1f8baaa7eb0.json
new file mode 100644
index 0000000000000000000000000000000000000000..11d7362192b774b90e4bfd4142597919d7e8f5fd
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/ba3dea951634b8bd7a5ca1f8baaa7eb0.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0216,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/bff645c52a42a68ca1b84c1494fd1b13.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/bff645c52a42a68ca1b84c1494fd1b13.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/bff645c52a42a68ca1b84c1494fd1b13.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/d3665f048a98e8dab4915d8a84bd23b2.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/d3665f048a98e8dab4915d8a84bd23b2.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/d3665f048a98e8dab4915d8a84bd23b2.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/e492dc27edeac355abd81970ee07192c.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/e492dc27edeac355abd81970ee07192c.json
new file mode 100644
index 0000000000000000000000000000000000000000..0dd4d70dcc79b8d12345ddf84aa9d9be8fc1de34
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/e492dc27edeac355abd81970ee07192c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0143,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/e7d62ff8b93e37d744c6408bed5962da.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/e7d62ff8b93e37d744c6408bed5962da.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/e7d62ff8b93e37d744c6408bed5962da.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/ed30e9104b38b725fca6f73bf271db4d.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/ed30e9104b38b725fca6f73bf271db4d.json
new file mode 100644
index 0000000000000000000000000000000000000000..196d264f5b17663d7789d7705fc3e8ad8c23b654
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.session/cache/ed30e9104b38b725fca6f73bf271db4d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0235,
+  "steps": 27 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.res.oracle
index 18f10ef164aa265909e5d14ab325151a51bcc1c1..5d0066fd74ea0aa5b4912e279a74880b4d099271 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 300 [...]
+# frama-c -wp -wp-steps 300 [...]
 [kernel] Parsing tests/wp_typed/user_init.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/0100435d7eb5d5f3110823d4de973a7c.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/0100435d7eb5d5f3110823d4de973a7c.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/0100435d7eb5d5f3110823d4de973a7c.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/0f79a147b89c832850e713eac0d64ca3.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/0f79a147b89c832850e713eac0d64ca3.json
new file mode 100644
index 0000000000000000000000000000000000000000..37c0342c50cdc2b8adf67053406b23274b4d9fdb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/0f79a147b89c832850e713eac0d64ca3.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 300 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/158946c941f7cb0d7f4adad7b651c5a9.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/158946c941f7cb0d7f4adad7b651c5a9.json
new file mode 100644
index 0000000000000000000000000000000000000000..37c0342c50cdc2b8adf67053406b23274b4d9fdb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/158946c941f7cb0d7f4adad7b651c5a9.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "stepout", "steps": 300 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/17ca2e9a9e791668d493c5c26273b252.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/17ca2e9a9e791668d493c5c26273b252.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/17ca2e9a9e791668d493c5c26273b252.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/557f9df490c1ca5f511f15e95f2409d4.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/557f9df490c1ca5f511f15e95f2409d4.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/557f9df490c1ca5f511f15e95f2409d4.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/caeaed7ca3a14a3a5355de6317aff0cd.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/caeaed7ca3a14a3a5355de6317aff0cd.json
new file mode 100644
index 0000000000000000000000000000000000000000..b71cf46c25577306988cdea7c77bcf2823613073
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/caeaed7ca3a14a3a5355de6317aff0cd.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "unknown" }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/d4d47565b23f563ed61355cca7c19925.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/d4d47565b23f563ed61355cca7c19925.json
new file mode 100644
index 0000000000000000000000000000000000000000..16d19ceb388989d8142fd2c2a7248345ad165cd2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.session/cache/d4d47565b23f563ed61355cca7c19925.json
@@ -0,0 +1 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "timeout", "time": 10. }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.0.res.oracle
index c2358598c8dac977ca56732dbbc43083349748b1..c8197b04ff7f89006fdb9f02dfeb7869d967f3ac 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/user_injector.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.1.res.oracle
index 347c74e839d0aaaf9da291d6e7ee87fedb65ba17..aefa32d0a90bfe3dd2c0c2081463ea3a9038f084 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_injector.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_typed/user_injector.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/207326109c96065385229899bf6e8c06.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/207326109c96065385229899bf6e8c06.json
new file mode 100644
index 0000000000000000000000000000000000000000..a6379a2180c61845201daf01917aa8bb35c281f2
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/207326109c96065385229899bf6e8c06.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0173,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/5016883671521c9b689c126ca9d08888.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/5016883671521c9b689c126ca9d08888.json
new file mode 100644
index 0000000000000000000000000000000000000000..f1f2b690a352553f893a311c25df1dc25442c9cf
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/5016883671521c9b689c126ca9d08888.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0159,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/55046db71906c1c748d41dbb0ca37184.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/55046db71906c1c748d41dbb0ca37184.json
new file mode 100644
index 0000000000000000000000000000000000000000..2d02e832877d05d1bce3db0060e66ca6368c1628
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/55046db71906c1c748d41dbb0ca37184.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0183,
+  "steps": 15 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/6015a9ab731f106ae004ce0d86d123ef.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/6015a9ab731f106ae004ce0d86d123ef.json
new file mode 100644
index 0000000000000000000000000000000000000000..549a24c52b05267fa6501bfc8dcf91466260e677
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/6015a9ab731f106ae004ce0d86d123ef.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0185,
+  "steps": 24 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/618c7efb305ce296bbbe05979547f4fa.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/618c7efb305ce296bbbe05979547f4fa.json
new file mode 100644
index 0000000000000000000000000000000000000000..a28d809e25fa0e68feade87c00fa04941f3d5de3
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/618c7efb305ce296bbbe05979547f4fa.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0185,
+  "steps": 19 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/792e50cc7d21272b1e7001dd6c4dcd38.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/792e50cc7d21272b1e7001dd6c4dcd38.json
new file mode 100644
index 0000000000000000000000000000000000000000..79cc1c642d4364fc528c317f8a30ddfd089af7f4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/792e50cc7d21272b1e7001dd6c4dcd38.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.01,
+  "steps": 7 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/7e9ea7a08d3ac877fda2e5a31a718b6e.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/7e9ea7a08d3ac877fda2e5a31a718b6e.json
new file mode 100644
index 0000000000000000000000000000000000000000..1b8c51ffd506f89d82b94c42aeaaaf19295b7f74
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/7e9ea7a08d3ac877fda2e5a31a718b6e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.2956,
+  "steps": 71 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/939f4f5607ea882e81415960715edb2b.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/939f4f5607ea882e81415960715edb2b.json
new file mode 100644
index 0000000000000000000000000000000000000000..22b038d0574d47cf0b12fb2c725e0412f39e7dd4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/939f4f5607ea882e81415960715edb2b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0162,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/aa84c6434886d4c88317bf14f38e87a7.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/aa84c6434886d4c88317bf14f38e87a7.json
new file mode 100644
index 0000000000000000000000000000000000000000..37987222a51d663bb4c7cefdf67461aef85600b4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/aa84c6434886d4c88317bf14f38e87a7.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0151,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/b5f39dd55d1fe0185583a4d7f9432e90.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/b5f39dd55d1fe0185583a4d7f9432e90.json
new file mode 100644
index 0000000000000000000000000000000000000000..7944645312e3115ade74cc12d4f98c4d3e589c1b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/b5f39dd55d1fe0185583a4d7f9432e90.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0975,
+  "steps": 61 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/c0abf618f311dc2132c4f217858f5dc4.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/c0abf618f311dc2132c4f217858f5dc4.json
new file mode 100644
index 0000000000000000000000000000000000000000..b8f141ac85cf7ef8589547eccd9c57d289a6c17b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/c0abf618f311dc2132c4f217858f5dc4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0152,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/c316400f931e0d4c6b9c98c176caf5ba.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/c316400f931e0d4c6b9c98c176caf5ba.json
new file mode 100644
index 0000000000000000000000000000000000000000..7bfaf22b3475bf1b296d3fbf8346afd68d1ac619
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/c316400f931e0d4c6b9c98c176caf5ba.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.016,
+  "steps": 10 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/d3b49ce61e9215ada7a98791ca384dae.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/d3b49ce61e9215ada7a98791ca384dae.json
new file mode 100644
index 0000000000000000000000000000000000000000..acc9ec5504daff3486b17553d6480e3a25ed3298
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/d3b49ce61e9215ada7a98791ca384dae.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0144,
+  "steps": 8 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/ea71a5e55707a127b54654938f0eb56f.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/ea71a5e55707a127b54654938f0eb56f.json
new file mode 100644
index 0000000000000000000000000000000000000000..4cde49f20a2244a08eda7254b5562bfd4f4f0362
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.0.session/cache/ea71a5e55707a127b54654938f0eb56f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0164,
+  "steps": 16 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.res.oracle
index 004a6b35b205717689bc86109b9de4f063ad1b3b..b3cc0003566606d2217a47c75ced6a0afaf1aeb7 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_rec.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/user_rec.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/318af641ec03fdd0322dd08dccac35c4.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/318af641ec03fdd0322dd08dccac35c4.json
new file mode 100644
index 0000000000000000000000000000000000000000..5844ebd6a82930c255046d9a94ff56c64a7ae8c8
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/318af641ec03fdd0322dd08dccac35c4.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0278,
+  "steps": 46 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/47a0c213ac046fed137967f11715854c.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/47a0c213ac046fed137967f11715854c.json
new file mode 100644
index 0000000000000000000000000000000000000000..0b0e31815901d19df3767bdb3a67df6d6f74dce4
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/47a0c213ac046fed137967f11715854c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0335,
+  "steps": 49 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/4b07f4b8b92a2f5950e483bd650d046b.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/4b07f4b8b92a2f5950e483bd650d046b.json
new file mode 100644
index 0000000000000000000000000000000000000000..872fb61f73140db36b8b5790d8e286cd74d1d952
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/4b07f4b8b92a2f5950e483bd650d046b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0718,
+  "steps": 128 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/d5d8241a0f94158a0f4c457ef4668e89.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/d5d8241a0f94158a0f4c457ef4668e89.json
new file mode 100644
index 0000000000000000000000000000000000000000..d8c68d0deaafb7e588b2c31c0b85eb4d928b7f27
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/d5d8241a0f94158a0f4c457ef4668e89.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0435,
+  "steps": 58 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/d78a3cf05e7f40c234f06683281536ab.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/d78a3cf05e7f40c234f06683281536ab.json
new file mode 100644
index 0000000000000000000000000000000000000000..4033b2920bb87ac1fca7c5a038b470290eaed3ab
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.0.session/cache/d78a3cf05e7f40c234f06683281536ab.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0289,
+  "steps": 34 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.res.oracle
index 68f3ed824c653e6c755c6b4d67475adbaa43f8c6..0689081a4c3db7848d65b23c4e193fcd905ba59e 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_string.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/user_string.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.res.oracle
index 260b1c3252fe37060e6a22c09ec6e994caafdc81..a8f54d19ca9e4071ef9e9095718f97ecaaf2f6fa 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_typed/user_swap.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.session/cache/f04b8466b45644e5c7e745a6d56137ca.json b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.session/cache/f04b8466b45644e5c7e745a6d56137ca.json
new file mode 100644
index 0000000000000000000000000000000000000000..09389263f2beac9857a699b7367bc5852de93c77
--- /dev/null
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.session/cache/f04b8466b45644e5c7e745a6d56137ca.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0222,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.1.res.oracle
index bf1b70d2492d61d3b56ff8ba8ede0613df47cd52..7b634d3983825d2378a9829a75692476ae6337fb 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Ref)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Ref)' [...]
 [kernel] Parsing tests/wp_typed/user_swap.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_typed/user_init.i b/src/plugins/wp/tests/wp_typed/user_init.i
index a34d4664bb4cdb7cdbe9e5738e75b0b78a2a5de0..a22e23c5afc69423bfbf574d37c64794359eb442 100644
--- a/src/plugins/wp/tests/wp_typed/user_init.i
+++ b/src/plugins/wp/tests/wp_typed/user_init.i
@@ -1,7 +1,7 @@
 /* run.config_qualif
-   EXECNOW: rm -rf @PTEST_DIR@/result@PTEST_CONFIG@/@PTEST_NAME@-session-1/
+   EXECNOW: rm -rf @PTEST_DIR@/oracle@PTEST_CONFIG@/@PTEST_NAME@.1.session/script
    OPT: -wp-prop=-lack,-tactic
-   OPT: -wp-prop=tactic -wp-auto=wp:split -session @PTEST_DIR@/result@PTEST_CONFIG@/@PTEST_NAME@-session-@PTEST_NUMBER@
+   OPT: -wp-prop=tactic -wp-auto=wp:split
    OPT: -wp-prop=lack -wp-steps 300
  */
 /*@ requires \valid(a+(0..n-1)) ;
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.0.session/cache/80f6701d0f80b164f372e92eff639c54.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.0.session/cache/80f6701d0f80b164f372e92eff639c54.json
new file mode 100644
index 0000000000000000000000000000000000000000..bf92a9289b09c93ba4c2e8756bb9042bdd3f8d6b
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.0.session/cache/80f6701d0f80b164f372e92eff639c54.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0149,
+  "steps": 17 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.0.session/cache/ba6ce636da22fa507f53e0946883c712.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.0.session/cache/ba6ce636da22fa507f53e0946883c712.json
new file mode 100644
index 0000000000000000000000000000000000000000..c6ef2b0614c521a7e19282cda530ffbf2d5eed7d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.0.session/cache/ba6ce636da22fa507f53e0946883c712.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.025,
+  "steps": 21 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.0.session/cache/eceb5a78bf7fdc3bd9778841c5280885.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.0.session/cache/eceb5a78bf7fdc3bd9778841c5280885.json
new file mode 100644
index 0000000000000000000000000000000000000000..d250d6af1d33f56149b39313d45ffbda5f543a51
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.0.session/cache/eceb5a78bf7fdc3bd9778841c5280885.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0232,
+  "steps": 24 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.res.oracle b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.res.oracle
index 0d5c1cdfb0c6883ac44538cdad5380421deedbed..4993df34f430d10e46b869d26ea9107392ba0309 100644
--- a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat2.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Caveat)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Caveat)' [...]
 [kernel] Parsing tests/wp_usage/caveat2.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/61be9475652004f8c05d1ea28f06fa09.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/61be9475652004f8c05d1ea28f06fa09.json
new file mode 100644
index 0000000000000000000000000000000000000000..2b5f5d48342be07321a6778b2aeeb65d1334f768
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/61be9475652004f8c05d1ea28f06fa09.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0241,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/ae856774bc866a2144d8ffd2d286403f.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/ae856774bc866a2144d8ffd2d286403f.json
new file mode 100644
index 0000000000000000000000000000000000000000..6b815a653c3758e61ce3f1314fae101ca65299e6
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/ae856774bc866a2144d8ffd2d286403f.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0491,
+  "steps": 48 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/c2a508f6e1261d3b62db019669a4950d.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/c2a508f6e1261d3b62db019669a4950d.json
new file mode 100644
index 0000000000000000000000000000000000000000..89c3c81ffb97d8c2cd28e28ee953df2fe0bcf1eb
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/c2a508f6e1261d3b62db019669a4950d.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0258,
+  "steps": 20 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/ca384e03c7946b821ae8da538e1f6623.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/ca384e03c7946b821ae8da538e1f6623.json
new file mode 100644
index 0000000000000000000000000000000000000000..d033e3f28cdb85de4369e3b4d0589ededfde6e81
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/ca384e03c7946b821ae8da538e1f6623.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0187,
+  "steps": 14 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/dc427c170a23ffc4f55bc2c62e565f39.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/dc427c170a23ffc4f55bc2c62e565f39.json
new file mode 100644
index 0000000000000000000000000000000000000000..ccb17ede4c918d69af7ffb97a3a5db99e38124f8
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.0.session/cache/dc427c170a23ffc4f55bc2c62e565f39.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0318,
+  "steps": 28 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.res.oracle b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.res.oracle
index c210cf13b65355cca9e05876537e49ed8252fd4e..5b69c867545a814e366b0dcba77c76fb53337df3 100644
--- a/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/caveat_range.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-model 'Typed (Caveat)' -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp -wp-model 'Typed (Caveat)' [...]
 [kernel] Parsing tests/wp_usage/caveat_range.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.res.oracle b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.res.oracle
index f85eb21dbeeba87fc2361e09cf7d60ea92258ee8..b0661cf032828930c048a589750451ae7ea2de11 100644
--- a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_usage/issue-189-bis.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/00e94c6d1cb55703ffda9fab29b813b9.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/00e94c6d1cb55703ffda9fab29b813b9.json
new file mode 100644
index 0000000000000000000000000000000000000000..e8399131b5f36d3352c1d2e378cd03e5e82cf1cd
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/00e94c6d1cb55703ffda9fab29b813b9.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0679,
+  "steps": 104 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/0bd1df0d0b2e1f1f6c86a11c4e3e7667.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/0bd1df0d0b2e1f1f6c86a11c4e3e7667.json
new file mode 100644
index 0000000000000000000000000000000000000000..1b5f7e32a16226f3a593bec63847e8db6d7246d9
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/0bd1df0d0b2e1f1f6c86a11c4e3e7667.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1051,
+  "steps": 95 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/1c5283d37d5a9530667280d4393f3269.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/1c5283d37d5a9530667280d4393f3269.json
new file mode 100644
index 0000000000000000000000000000000000000000..11fbaf2d824d537a2f31d15b3e5dd119bff1bf21
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/1c5283d37d5a9530667280d4393f3269.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0908,
+  "steps": 104 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/2e194c88ad379ec85c89d67c01925c2b.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/2e194c88ad379ec85c89d67c01925c2b.json
new file mode 100644
index 0000000000000000000000000000000000000000..a2e503d2e7428cb880f73b188a972fd81d48ddef
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/2e194c88ad379ec85c89d67c01925c2b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0229,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/56872fc33e8d31ec1a10fc59a5c51a39.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/56872fc33e8d31ec1a10fc59a5c51a39.json
new file mode 100644
index 0000000000000000000000000000000000000000..172b80812b496f31878ca86e59a8fe2b864e8910
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/56872fc33e8d31ec1a10fc59a5c51a39.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1045,
+  "steps": 173 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/5b73230c42aef6290641f873c8e5187e.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/5b73230c42aef6290641f873c8e5187e.json
new file mode 100644
index 0000000000000000000000000000000000000000..65cebbc76fa480206f02c7989a6b4f3e2b5dc3ac
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/5b73230c42aef6290641f873c8e5187e.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.019,
+  "steps": 22 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/bbc123de2b09fb50167cd299a220cf86.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/bbc123de2b09fb50167cd299a220cf86.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ab967a31411a52ce9d2bc8a4a5d254f48f8ad02
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/bbc123de2b09fb50167cd299a220cf86.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 1.1764,
+  "steps": 1031 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/e62e3d018c328d46bb7dffa103c2ba6b.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/e62e3d018c328d46bb7dffa103c2ba6b.json
new file mode 100644
index 0000000000000000000000000000000000000000..761dfb2709284cbd6a6a96722f57b172adf1043c
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/e62e3d018c328d46bb7dffa103c2ba6b.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 1.2327,
+  "steps": 1031 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/e727bb5e1f0ab34c9f6384bba69e291c.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/e727bb5e1f0ab34c9f6384bba69e291c.json
new file mode 100644
index 0000000000000000000000000000000000000000..018d685b52760c693c36be001df3a4f661f60207
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/e727bb5e1f0ab34c9f6384bba69e291c.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1119,
+  "steps": 173 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/ed06e9d81948ded2110fb079a2394279.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/ed06e9d81948ded2110fb079a2394279.json
new file mode 100644
index 0000000000000000000000000000000000000000..4a18f509ba5813d28f3ce597fb5d4be71ac93c0d
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.0.session/cache/ed06e9d81948ded2110fb079a2394279.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.1088,
+  "steps": 97 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.res.oracle b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.res.oracle
index d5147644f0c99886f5aa85fb419036673013a675..da52504bdeb3bdb72adf62cc07d6c47db95967d1 100644
--- a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.res.oracle
@@ -1,4 +1,4 @@
-# frama-c -wp -wp-timeout 45 -wp-steps 1500 [...]
+# frama-c -wp [...]
 [kernel] Parsing tests/wp_usage/issue-189-bis.i (no preprocessing)
 [wp] Running WP plugin...
 [wp] Loading driver 'share/wp.driver'
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.session/cache/6eed7c883e5da5d9f84f96967729ed87.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.session/cache/6eed7c883e5da5d9f84f96967729ed87.json
new file mode 100644
index 0000000000000000000000000000000000000000..e7fa4f60df947b733d75db2ef9b5eec4de2bb1ba
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.session/cache/6eed7c883e5da5d9f84f96967729ed87.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0675,
+  "steps": 63 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.session/cache/7fdefda153070e31f7bfa7092643c211.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.session/cache/7fdefda153070e31f7bfa7092643c211.json
new file mode 100644
index 0000000000000000000000000000000000000000..477a74075d1a2472b10ae309e1c78f1170ee56c5
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.session/cache/7fdefda153070e31f7bfa7092643c211.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0218,
+  "steps": 18 }
diff --git a/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.session/cache/d54c81800e8bf82aee1e1baf74b4b696.json b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.session/cache/d54c81800e8bf82aee1e1baf74b4b696.json
new file mode 100644
index 0000000000000000000000000000000000000000..83d3ee0f1234ca4b022b51647243f172cd5190ea
--- /dev/null
+++ b/src/plugins/wp/tests/wp_usage/oracle_qualif/issue-189-bis.1.session/cache/d54c81800e8bf82aee1e1baf74b4b696.json
@@ -0,0 +1,2 @@
+{ "prover": "why3:Alt-Ergo,2.0.0", "verdict": "valid", "time": 0.0221,
+  "steps": 18 }
diff --git a/src/plugins/wp/wp_parameters.ml b/src/plugins/wp/wp_parameters.ml
index e67a9bf835de191c32ab68bf7565556bd7b1d63b..008dde9e07fd880217e16b011afd64fa3581ce3c 100644
--- a/src/plugins/wp/wp_parameters.ml
+++ b/src/plugins/wp/wp_parameters.ml
@@ -466,10 +466,27 @@ module Provers = String_list
          - 'coq', 'coqide' (see also -wp-coq-script)\n\
          - 'why3:<dp>' or '<dp>' (why3 prover, see -wp-detect)\n\
          - 'native:alt-ergo'\n\
-         - 'native:altgr-ergo'\n\
          - 'native:coq'\n\
-         - 'native:coqide'\n\
-         - 'why3ide' (why3 gui)"
+         - 'native:coqide'\
+        "
+    end)
+
+let () = Parameter_customize.set_group wp_prover
+module Cache = String
+    (struct
+      let option_name = "-wp-cache"
+      let arg_name = "mode"
+      let default = ""
+      let help =
+        "WP cache mode:\n\
+         - 'none': no cache, run provers (default)\n\
+         - 'update': use cache or run provers and update cache\n\
+         - 'cleanup': update mode with garbage collection\n\
+         - 'replay': update mode with no cache update\n\
+         - 'rebuild': always run provers and update cache\n\
+         - 'offline': use cache but never run provers\n\
+         This option is overriden by environment variable FRAMAC_WP_CACHE.\
+        "
     end)
 
 let () = Parameter_customize.set_group wp_prover
@@ -574,8 +591,7 @@ module Auto = String_list
       let arg_name = "s"
       let help =
         "Activate auto-search with strategy <s>.\n\
-         Implies -wp-prover 'tip'.\n\
-         Use '-wp-prover ?' for listing strategies."
+         Use '-wp-auto <?>' for available strategies."
     end)
 
 let () = Parameter_customize.set_group wp_prover
@@ -972,7 +988,6 @@ let base_output () =
       output
   | Some output -> output
 
-
 let get_session () = Session.dir ~error:false ()
 
 let get_session_dir d =
diff --git a/src/plugins/wp/wp_parameters.mli b/src/plugins/wp/wp_parameters.mli
index 8918d667abf36e6abdcfe1047302addcad2414f9..43db4176f892546d7a789889da12388e74c96846 100644
--- a/src/plugins/wp/wp_parameters.mli
+++ b/src/plugins/wp/wp_parameters.mli
@@ -94,6 +94,7 @@ module PrecondWeakening : Parameter_sig.Bool
 module Detect: Parameter_sig.Bool
 module Generate:Parameter_sig.Bool
 module Provers: Parameter_sig.String_list
+module Cache: Parameter_sig.String
 module Drivers: Parameter_sig.String_list
 module Script: Parameter_sig.String
 module UpdateScript: Parameter_sig.Bool