diff --git a/src/plugins/aorai/tests/Aorai_test.ml b/src/plugins/aorai/tests/Aorai_test.ml
index 1b2243f3b54ac8ccb28c8e6a772d59e5448745d0..75cc19b2aa94b4b2f35a4dee6942d3081ab4407b 100644
--- a/src/plugins/aorai/tests/Aorai_test.ml
+++ b/src/plugins/aorai/tests/Aorai_test.ml
@@ -52,7 +52,17 @@ let extend () =
     let run = !Db.Toplevel.run in
     fun f ->
       let my_project = Project.create "Reparsing" in
-      let wp_compute_kf kf = Wp.VC.command (Wp.VC.generate_kf kf) in
+      let wp_compute_kf kf =
+        let vcs = Wp.VC.generate_kf kf in
+        Wp.VC.command vcs;
+        Bag.iter
+          (fun vc ->
+             if not (Wp.VC.is_proved vc) then
+               P.warning "Could not prove %a in automaton function %a"
+                 Property.pretty (Wp.VC.get_property vc)
+                 Kernel_function.pretty kf)
+          vcs
+      in
       let check_auto_func kf =
         let name = Kernel_function.get_name kf in
         if Kernel_function.is_definition kf &&
@@ -91,7 +101,6 @@ let extend () =
           Wp.Wp_parameters.Share.set (InternalWpShare.get());
         Wp.Wp_parameters.Verbose.set 0;
         Globals.Functions.iter check_auto_func;
-        Report.Register.print ();
       end else begin
         File.pretty_ast ();
       end;
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/assigns.0.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/assigns.0.res.oracle
index 3f6ceb60607d908e25e26ad1f0f878395b5efa16..5aec8b21daa3a3dcb4af484c1f115d2b59736883 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/assigns.0.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/assigns.0.res.oracle
@@ -2,166 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_assigns_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 37)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 38)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_assigns_0.i, line 43)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_assigns_0.i, line 46)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in_f_in' (file /tmp/aorai_assigns_0.i, line 50)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in_f_out' (file /tmp/aorai_assigns_0.i, line 54)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_assigns_0.i, line 57)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_in_main_out' (file /tmp/aorai_assigns_0.i, line 60)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_assigns_0.i, line 39)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_in_f_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_in_f_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_in_main_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 94)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 95)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_assigns_0.i, line 100)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_assigns_0.i, line 103)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in_f_out' (file /tmp/aorai_assigns_0.i, line 106)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_assigns_0.i, line 109)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_in_main_in' (file /tmp/aorai_assigns_0.i, line 113)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_in_main_out' (file /tmp/aorai_assigns_0.i, line 117)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_assigns_0.i, line 96)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_in_f_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_in_main_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_in_main_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 166)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 167)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_assigns_0.i, line 172)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_assigns_0.i, line 175)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in_f_out' (file /tmp/aorai_assigns_0.i, line 178)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_assigns_0.i, line 182)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_assigns_0.i, line 186)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_in_main_out' (file /tmp/aorai_assigns_0.i, line 189)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_assigns_0.i, line 168)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_in_f_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_in_main_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 223)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 224)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_assigns_0.i, line 229)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_in' (file /tmp/aorai_assigns_0.i, line 233)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_assigns_0.i, line 237)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in_f_out' (file /tmp/aorai_assigns_0.i, line 240)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_assigns_0.i, line 243)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_in_main_out' (file /tmp/aorai_assigns_0.i, line 246)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_assigns_0.i, line 225)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_in_f_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_in_main_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    65 Completely validated
-    65 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/assigns.1.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/assigns.1.res.oracle
index 82ad8993e78f11e81583de0b417996c5905738af..49feab1f711fb27f3d3cbe9023b371942ae021b6 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/assigns.1.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/assigns.1.res.oracle
@@ -2,166 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_assigns_1.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 50)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 51)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_assigns_1.i, line 55)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_assigns_1.i, line 58)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in_f_in' (file /tmp/aorai_assigns_1.i, line 62)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in_f_out' (file /tmp/aorai_assigns_1.i, line 66)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_assigns_1.i, line 69)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_in_main_out' (file /tmp/aorai_assigns_1.i, line 72)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_assigns_1.i, line 52)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_in_f_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_in_f_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_in_main_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 89)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 90)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_assigns_1.i, line 94)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_assigns_1.i, line 97)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in_f_out' (file /tmp/aorai_assigns_1.i, line 100)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_assigns_1.i, line 103)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_in_main_in' (file /tmp/aorai_assigns_1.i, line 107)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_in_main_out' (file /tmp/aorai_assigns_1.i, line 111)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_assigns_1.i, line 91)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_in_f_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_in_main_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_in_main_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 141)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 142)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_assigns_1.i, line 146)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_assigns_1.i, line 149)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in_f_out' (file /tmp/aorai_assigns_1.i, line 152)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_assigns_1.i, line 156)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_assigns_1.i, line 160)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_in_main_out' (file /tmp/aorai_assigns_1.i, line 163)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_assigns_1.i, line 143)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_in_f_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_in_main_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 180)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 181)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_assigns_1.i, line 185)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_in' (file /tmp/aorai_assigns_1.i, line 189)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_assigns_1.i, line 193)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in_f_out' (file /tmp/aorai_assigns_1.i, line 196)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_assigns_1.i, line 199)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_in_main_out' (file /tmp/aorai_assigns_1.i, line 202)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_assigns_1.i, line 182)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_in_f_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_in_main_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    65 Completely validated
-    65 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/bts1289.0.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/bts1289.0.res.oracle
index eb643f6c43db733cafc11cc51e6c5270f587a89c..43d8b12fc49f8f8b86c69c30a399b5925cb64bab 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/bts1289.0.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/bts1289.0.res.oracle
@@ -3,93 +3,3 @@
 [aorai] Warning: Call to main does not follow automaton's specification. This path is assumed to be dead
 [kernel] Parsing /tmp/aorai_bts1289_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'a_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 31)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 32)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_out' (file /tmp/aorai_bts1289_0.i, line 36)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_bts1289_0.i, line 33)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'a_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 53)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 54)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_out' (file /tmp/aorai_bts1289_0.i, line 58)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_bts1289_0.i, line 55)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'a'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 86)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 87)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_out' (file /tmp/aorai_bts1289_0.i, line 91)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_bts1289_0.i, line 88)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 108)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 109)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_out' (file /tmp/aorai_bts1289_0.i, line 113)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_bts1289_0.i, line 110)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    26 Completely validated
-    26 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/bts1289.1.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/bts1289.1.res.oracle
index e4a09da5c63607378f9d08d32ca37bb97e5653b3..f8cbd2cb00cc28beac038201209a13a6f97f0c01 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/bts1289.1.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/bts1289.1.res.oracle
@@ -2,181 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_bts1289_1.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'a_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 38)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 39)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_out' (file /tmp/aorai_bts1289_1.i, line 44)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T_out' (file /tmp/aorai_bts1289_1.i, line 47)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_in' (file /tmp/aorai_bts1289_1.i, line 51)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_bts1289_1.i, line 55)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_in' (file /tmp/aorai_bts1289_1.i, line 59)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_bts1289_1.i, line 63)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_bts1289_1.i, line 66)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_bts1289_1.i, line 40)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'a_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 103)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 104)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in' (file /tmp/aorai_bts1289_1.i, line 110)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_out' (file /tmp/aorai_bts1289_1.i, line 114)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T_in' (file /tmp/aorai_bts1289_1.i, line 118)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T_out' (file /tmp/aorai_bts1289_1.i, line 122)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_bts1289_1.i, line 125)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_bts1289_1.i, line 128)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_bts1289_1.i, line 131)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_bts1289_1.i, line 105)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'a'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 206)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 207)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in' (file /tmp/aorai_bts1289_1.i, line 213)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_out' (file /tmp/aorai_bts1289_1.i, line 217)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T_out' (file /tmp/aorai_bts1289_1.i, line 220)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_bts1289_1.i, line 223)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_bts1289_1.i, line 226)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_bts1289_1.i, line 229)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_bts1289_1.i, line 208)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 265)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 266)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in' (file /tmp/aorai_bts1289_1.i, line 272)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_out' (file /tmp/aorai_bts1289_1.i, line 276)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T_out' (file /tmp/aorai_bts1289_1.i, line 279)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_bts1289_1.i, line 282)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_bts1289_1.i, line 285)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_bts1289_1.i, line 288)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_bts1289_1.i, line 267)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    70 Completely validated
-    70 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/declared_function.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/declared_function.res.oracle
index bc88b696896e5a1658cccb9945903ee4b344624e..a648f24de411db26b26f4b5b4d45c9eab0db4440 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/declared_function.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/declared_function.res.oracle
@@ -4,72 +4,3 @@
 [kernel:annot:missing-spec] /tmp/aorai_declared_function_0.i:48: Warning: 
   Neither code nor specification for function f, generating default assigns from the prototype
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'f'
---------------------------------------------------------------------------------
-
-[    -    ] Assigns nothing
-            tried with Inferred annotations.
-[    -    ] Froms (file /tmp/aorai_declared_function_0.i, line 2)
-            tried with Inferred annotations.
-[    -    ] Default behavior
-            tried with Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_declared_function_0.i, line 64)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_declared_function_0.i, line 65)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_I_in' (file /tmp/aorai_declared_function_0.i, line 70)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_I_out' (file /tmp/aorai_declared_function_0.i, line 74)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_declared_function_0.i, line 66)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_I_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_I_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_declared_function_0.i, line 95)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_declared_function_0.i, line 96)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_I_in' (file /tmp/aorai_declared_function_0.i, line 101)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_I_out' (file /tmp/aorai_declared_function_0.i, line 105)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_declared_function_0.i, line 97)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_I_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_I_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    17 Completely validated
-     3 To be validated
-    20 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/deterministic.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/deterministic.res.oracle
index c6932196d269808397296a27ec4369363e5eed86..24fb75961ac86626467eb9a9f64ce3cc57ff36fc 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/deterministic.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/deterministic.res.oracle
@@ -2,443 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_deterministic_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'g_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 82)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 83)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_deterministic_0.i, line 87)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_deterministic_0.i, line 90)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 93)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_deterministic_0.i, line 96)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_in' (file /tmp/aorai_deterministic_0.i, line 100)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_deterministic_0.i, line 104)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_in' (file /tmp/aorai_deterministic_0.i, line 108)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_deterministic_0.i, line 112)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_deterministic_0.i, line 115)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Si_out' (file /tmp/aorai_deterministic_0.i, line 118)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 84)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Si_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 136)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 137)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_deterministic_0.i, line 141)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_deterministic_0.i, line 145)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_deterministic_0.i, line 149)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 152)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_in' (file /tmp/aorai_deterministic_0.i, line 156)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_deterministic_0.i, line 160)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_deterministic_0.i, line 163)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_deterministic_0.i, line 166)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_deterministic_0.i, line 169)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Si_out' (file /tmp/aorai_deterministic_0.i, line 172)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 138)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Si_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 210)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 211)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_deterministic_0.i, line 215)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_deterministic_0.i, line 218)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 221)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_in' (file /tmp/aorai_deterministic_0.i, line 225)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_deterministic_0.i, line 229)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_deterministic_0.i, line 232)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_deterministic_0.i, line 235)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_deterministic_0.i, line 238)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Si_out' (file /tmp/aorai_deterministic_0.i, line 241)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 212)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Si_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 259)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 260)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_deterministic_0.i, line 264)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_deterministic_0.i, line 267)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_in' (file /tmp/aorai_deterministic_0.i, line 271)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 275)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_deterministic_0.i, line 278)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_deterministic_0.i, line 281)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_deterministic_0.i, line 284)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_deterministic_0.i, line 287)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Si_out' (file /tmp/aorai_deterministic_0.i, line 290)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 261)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Si_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'real_main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 328)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 329)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_deterministic_0.i, line 333)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_deterministic_0.i, line 337)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_deterministic_0.i, line 341)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_in' (file /tmp/aorai_deterministic_0.i, line 345)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 349)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_deterministic_0.i, line 352)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_deterministic_0.i, line 355)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_deterministic_0.i, line 358)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_deterministic_0.i, line 361)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Si_out' (file /tmp/aorai_deterministic_0.i, line 364)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 330)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Si_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'real_main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 382)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 383)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_deterministic_0.i, line 387)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_deterministic_0.i, line 390)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 393)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_deterministic_0.i, line 396)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_deterministic_0.i, line 399)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_deterministic_0.i, line 402)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_deterministic_0.i, line 406)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_deterministic_0.i, line 410)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Si_out' (file /tmp/aorai_deterministic_0.i, line 413)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 384)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Si_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'real_main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 446)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 447)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_in' (file /tmp/aorai_deterministic_0.i, line 452)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_deterministic_0.i, line 456)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_deterministic_0.i, line 459)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 462)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_deterministic_0.i, line 465)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_deterministic_0.i, line 468)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_deterministic_0.i, line 471)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_deterministic_0.i, line 474)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Si_out' (file /tmp/aorai_deterministic_0.i, line 477)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 448)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Si_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 494)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 495)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_deterministic_0.i, line 499)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_deterministic_0.i, line 502)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 505)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_deterministic_0.i, line 508)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_deterministic_0.i, line 511)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_deterministic_0.i, line 514)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_deterministic_0.i, line 518)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_deterministic_0.i, line 522)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Si_out' (file /tmp/aorai_deterministic_0.i, line 525)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 496)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Si_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   186 Completely validated
-   186 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/formals.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/formals.res.oracle
index 415bc01cd89590f2b66d8c7e05bda894720da535..909b386d342a780effeac57643276283280105cd 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/formals.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/formals.res.oracle
@@ -2,345 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_formals_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 95)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 96)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_OK_out' (file /tmp/aorai_formals_0.i, line 101)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_in_0' (file /tmp/aorai_formals_0.i, line 105)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_in_0' (file /tmp/aorai_formals_0.i, line 106)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_formals_0.i, line 110)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_formals_0.i, line 111)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_formals_0.i, line 114)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_formals_0.i, line 117)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_in_0' (file /tmp/aorai_formals_0.i, line 121)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_in_0' (file /tmp/aorai_formals_0.i, line 122)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_formals_0.i, line 126)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_formals_0.i, line 127)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_out' (file /tmp/aorai_formals_0.i, line 130)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_formals_0.i, line 133)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_formals_0.i, line 136)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_formals_0.i, line 97)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_OK_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_in_0'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_in_0'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 168)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 169)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_OK_in' (file /tmp/aorai_formals_0.i, line 175)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_OK_out' (file /tmp/aorai_formals_0.i, line 181)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_formals_0.i, line 184)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_in' (file /tmp/aorai_formals_0.i, line 189)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_formals_0.i, line 194)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_formals_0.i, line 197)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_formals_0.i, line 200)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_in' (file /tmp/aorai_formals_0.i, line 206)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_out' (file /tmp/aorai_formals_0.i, line 213)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_formals_0.i, line 216)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_formals_0.i, line 219)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_formals_0.i, line 170)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_OK_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_OK_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 306)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 307)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_OK_in' (file /tmp/aorai_formals_0.i, line 312)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_OK_out' (file /tmp/aorai_formals_0.i, line 316)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_formals_0.i, line 319)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_formals_0.i, line 322)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_0' (file /tmp/aorai_formals_0.i, line 326)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_0' (file /tmp/aorai_formals_0.i, line 327)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_formals_0.i, line 331)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_formals_0.i, line 332)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_formals_0.i, line 335)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_in' (file /tmp/aorai_formals_0.i, line 339)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_out' (file /tmp/aorai_formals_0.i, line 343)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_formals_0.i, line 346)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_formals_0.i, line 349)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_formals_0.i, line 308)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_OK_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_OK_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_in_0'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 376)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 377)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_OK_in' (file /tmp/aorai_formals_0.i, line 384)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_OK_out' (file /tmp/aorai_formals_0.i, line 391)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_formals_0.i, line 394)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_formals_0.i, line 397)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_formals_0.i, line 400)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_formals_0.i, line 403)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_in' (file /tmp/aorai_formals_0.i, line 409)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_out' (file /tmp/aorai_formals_0.i, line 416)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_formals_0.i, line 419)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_formals_0.i, line 422)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_formals_0.i, line 378)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_OK_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_OK_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 480)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 481)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_OK_out' (file /tmp/aorai_formals_0.i, line 485)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_formals_0.i, line 488)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_formals_0.i, line 491)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_formals_0.i, line 494)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_formals_0.i, line 497)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_out' (file /tmp/aorai_formals_0.i, line 500)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_formals_0.i, line 503)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_in' (file /tmp/aorai_formals_0.i, line 507)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_formals_0.i, line 511)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_formals_0.i, line 482)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_OK_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 528)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 529)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_OK_in' (file /tmp/aorai_formals_0.i, line 534)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_OK_out' (file /tmp/aorai_formals_0.i, line 538)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_formals_0.i, line 541)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_formals_0.i, line 544)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_formals_0.i, line 547)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_formals_0.i, line 550)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_in' (file /tmp/aorai_formals_0.i, line 554)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_out' (file /tmp/aorai_formals_0.i, line 558)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_formals_0.i, line 561)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_formals_0.i, line 564)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_formals_0.i, line 530)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_OK_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_OK_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   152 Completely validated
-   152 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/generate_assigns_bts1290.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/generate_assigns_bts1290.res.oracle
index cc83a3f3e7d07bcb0b2ed68b8073cb4c38a8ff29..cbb069f8f76dfa325a45f225fae22e8ce906bdcb 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/generate_assigns_bts1290.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/generate_assigns_bts1290.res.oracle
@@ -2,60 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_generate_assigns_bts1290_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_generate_assigns_bts1290_0.i, line 30)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_generate_assigns_bts1290_0.i, line 31)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in' (file /tmp/aorai_generate_assigns_bts1290_0.i, line 36)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_out' (file /tmp/aorai_generate_assigns_bts1290_0.i, line 40)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_generate_assigns_bts1290_0.i, line 32)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_generate_assigns_bts1290_0.i, line 57)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_generate_assigns_bts1290_0.i, line 58)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in' (file /tmp/aorai_generate_assigns_bts1290_0.i, line 63)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_out' (file /tmp/aorai_generate_assigns_bts1290_0.i, line 67)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_generate_assigns_bts1290_0.i, line 59)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    17 Completely validated
-    17 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/goto.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/goto.res.oracle
index db107e5cb92b1c5a84880d3ec09ff418089321f6..90d513137afe2ca3fd22d5721c2fc1cb28da8c66 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/goto.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/goto.res.oracle
@@ -6,391 +6,3 @@
 [wp] /tmp/aorai_goto_0.i:4: Warning: 
   Global invariant not handled yet ('inv' ignored)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 46)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 47)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_goto_0.i, line 52)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_in' (file /tmp/aorai_goto_0.i, line 56)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_goto_0.i, line 60)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_goto_0.i, line 63)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_goto_0.i, line 66)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_goto_0.i, line 69)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_goto_0.i, line 72)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_goto_0.i, line 75)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 48)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 119)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 120)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_goto_0.i, line 125)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_goto_0.i, line 128)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_in' (file /tmp/aorai_goto_0.i, line 132)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_goto_0.i, line 136)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_goto_0.i, line 139)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_goto_0.i, line 142)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_goto_0.i, line 145)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_goto_0.i, line 148)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 121)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 215)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 216)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_goto_0.i, line 221)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_goto_0.i, line 224)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_goto_0.i, line 227)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_in' (file /tmp/aorai_goto_0.i, line 231)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_goto_0.i, line 235)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_goto_0.i, line 238)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_goto_0.i, line 241)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_goto_0.i, line 244)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 217)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 288)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 289)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_goto_0.i, line 294)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_goto_0.i, line 297)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_goto_0.i, line 300)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_goto_0.i, line 303)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_in' (file /tmp/aorai_goto_0.i, line 307)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_goto_0.i, line 311)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_goto_0.i, line 314)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_goto_0.i, line 317)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 290)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opc_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 377)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 378)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_goto_0.i, line 383)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_goto_0.i, line 386)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_goto_0.i, line 389)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_goto_0.i, line 392)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_goto_0.i, line 395)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_goto_0.i, line 398)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_goto_0.i, line 401)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 379)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opc_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 442)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 443)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_goto_0.i, line 448)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_goto_0.i, line 451)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_goto_0.i, line 454)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_goto_0.i, line 457)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_goto_0.i, line 460)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_goto_0.i, line 463)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_goto_0.i, line 466)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 444)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opc'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 541)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 542)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_goto_0.i, line 548)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_goto_0.i, line 552)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_goto_0.i, line 555)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_goto_0.i, line 558)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_goto_0.i, line 561)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_goto_0.i, line 564)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_goto_0.i, line 567)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_goto_0.i, line 570)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 543)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 614)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 615)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_goto_0.i, line 620)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_goto_0.i, line 623)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_goto_0.i, line 626)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_goto_0.i, line 629)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_goto_0.i, line 632)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_in' (file /tmp/aorai_goto_0.i, line 636)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_goto_0.i, line 640)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_goto_0.i, line 643)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 616)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   160 Completely validated
-   160 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/hoare_seq.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/hoare_seq.res.oracle
index a00b3bb62e40942a879ef020241b0aef805c8ecd..e10a469f4eb782349a83d67248eea95c87de1ce1 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/hoare_seq.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/hoare_seq.res.oracle
@@ -2,208 +2,5 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_hoare_seq_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_hoare_seq_0.i, line 40)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_hoare_seq_0.i, line 41)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_hoare_seq_0.i, line 48)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_hoare_seq_0.i, line 51)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_hoare_seq_0.i, line 54)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_hoare_seq_0.i, line 57)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in' (file /tmp/aorai_hoare_seq_0.i, line 61)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_hoare_seq_0.i, line 65)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_hoare_seq_0.i, line 68)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_in' (file /tmp/aorai_hoare_seq_0.i, line 72)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_out' (file /tmp/aorai_hoare_seq_0.i, line 76)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_hoare_seq_0.i, line 42)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_hoare_seq_0.i, line 122)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_hoare_seq_0.i, line 123)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_hoare_seq_0.i, line 130)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_hoare_seq_0.i, line 133)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_hoare_seq_0.i, line 136)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_hoare_seq_0.i, line 139)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_hoare_seq_0.i, line 142)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_in' (file /tmp/aorai_hoare_seq_0.i, line 146)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_hoare_seq_0.i, line 150)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_in' (file /tmp/aorai_hoare_seq_0.i, line 154)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_out' (file /tmp/aorai_hoare_seq_0.i, line 158)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_hoare_seq_0.i, line 124)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_hoare_seq_0.i, line 254)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_hoare_seq_0.i, line 255)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_hoare_seq_0.i, line 262)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_hoare_seq_0.i, line 265)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_in' (file /tmp/aorai_hoare_seq_0.i, line 269)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_hoare_seq_0.i, line 273)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_in' (file /tmp/aorai_hoare_seq_0.i, line 277)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_hoare_seq_0.i, line 281)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_hoare_seq_0.i, line 284)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_hoare_seq_0.i, line 287)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_out' (file /tmp/aorai_hoare_seq_0.i, line 290)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_hoare_seq_0.i, line 256)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_in'
-            by Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_out'
-            tried with Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_hoare_seq_0.i, line 337)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_hoare_seq_0.i, line 338)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_hoare_seq_0.i, line 345)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_hoare_seq_0.i, line 351)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_hoare_seq_0.i, line 357)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_hoare_seq_0.i, line 360)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_hoare_seq_0.i, line 363)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_hoare_seq_0.i, line 366)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_hoare_seq_0.i, line 369)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_in' (file /tmp/aorai_hoare_seq_0.i, line 376)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_out' (file /tmp/aorai_hoare_seq_0.i, line 383)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_hoare_seq_0.i, line 339)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_reject_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    86 Completely validated
-     2 To be validated
-    88 Total
---------------------------------------------------------------------------------
+[aorai-test] Warning: Could not prove ensures
+  0 ≡ aorai_intermediate_state in automaton function main_pre_func
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/incorrect.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/incorrect.res.oracle
index f4fdd9fc7467e0ce9616ddb71c46963bfcfa196e..b981ababa8830e6f8e3555ceded3f9d253f2a26e 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/incorrect.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/incorrect.res.oracle
@@ -5,64 +5,3 @@
 [wp] Warning: Missing RTE guards
 [kernel:annot:missing-spec] /tmp/aorai_incorrect_0.i:61: Warning: 
   Neither code nor specification for function f, generating default assigns from the prototype
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'f'
---------------------------------------------------------------------------------
-
-[    -    ] Assigns nothing
-            tried with Inferred annotations.
-[    -    ] Froms (file /tmp/aorai_incorrect_0.i, line 4)
-            tried with Inferred annotations.
-[    -    ] Default behavior
-            tried with Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_incorrect_0.i, line 39)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_incorrect_0.i, line 40)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_s0_out' (file /tmp/aorai_incorrect_0.i, line 44)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_incorrect_0.i, line 41)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_s0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_incorrect_0.i, line 60)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_incorrect_0.i, line 61)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_s0_out' (file /tmp/aorai_incorrect_0.i, line 65)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_incorrect_0.i, line 62)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_s0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    13 Completely validated
-     3 To be validated
-    16 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/loop_bts1050.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/loop_bts1050.res.oracle
index b8965f6fff472f3381f445aad41caeb5bf6fa8c3..7800d93810c2a947f410410abee6417f5f347ceb 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/loop_bts1050.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/loop_bts1050.res.oracle
@@ -2,313 +2,5 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_loop_bts1050_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 45)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 46)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_loop_bts1050_0.i, line 53)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_loop_bts1050_0.i, line 56)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_loop_bts1050_0.i, line 59)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_loop_bts1050_0.i, line 62)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_0' (file /tmp/aorai_loop_bts1050_0.i, line 66)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_0' (file /tmp/aorai_loop_bts1050_0.i, line 67)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_1' (file /tmp/aorai_loop_bts1050_0.i, line 71)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_1' (file /tmp/aorai_loop_bts1050_0.i, line 72)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_loop_bts1050_0.i, line 78)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_loop_bts1050_0.i, line 79)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_loop_bts1050_0.i, line 82)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_loop_bts1050_0.i, line 85)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_loop_bts1050_0.i, line 47)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_1_in_0'
-            tried with Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_in_1'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 134)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 135)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_loop_bts1050_0.i, line 142)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_loop_bts1050_0.i, line 145)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_loop_bts1050_0.i, line 148)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_loop_bts1050_0.i, line 151)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_loop_bts1050_0.i, line 154)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_in' (file /tmp/aorai_loop_bts1050_0.i, line 158)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_loop_bts1050_0.i, line 162)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_loop_bts1050_0.i, line 165)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_loop_bts1050_0.i, line 136)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 244)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 245)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_loop_bts1050_0.i, line 252)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_loop_bts1050_0.i, line 255)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_loop_bts1050_0.i, line 258)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_loop_bts1050_0.i, line 261)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_loop_bts1050_0.i, line 264)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_loop_bts1050_0.i, line 267)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_in' (file /tmp/aorai_loop_bts1050_0.i, line 271)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_loop_bts1050_0.i, line 275)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_loop_bts1050_0.i, line 246)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 321)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 322)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_loop_bts1050_0.i, line 329)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_loop_bts1050_0.i, line 332)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_loop_bts1050_0.i, line 335)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_in' (file /tmp/aorai_loop_bts1050_0.i, line 339)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_loop_bts1050_0.i, line 343)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_loop_bts1050_0.i, line 346)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_loop_bts1050_0.i, line 349)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_loop_bts1050_0.i, line 352)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_loop_bts1050_0.i, line 323)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 419)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 420)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_loop_bts1050_0.i, line 427)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_loop_bts1050_0.i, line 430)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_in' (file /tmp/aorai_loop_bts1050_0.i, line 434)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_loop_bts1050_0.i, line 438)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_loop_bts1050_0.i, line 441)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_loop_bts1050_0.i, line 444)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_loop_bts1050_0.i, line 447)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_loop_bts1050_0.i, line 450)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_loop_bts1050_0.i, line 421)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 495)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 496)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_loop_bts1050_0.i, line 503)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_loop_bts1050_0.i, line 508)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_loop_bts1050_0.i, line 513)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_loop_bts1050_0.i, line 516)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_loop_bts1050_0.i, line 519)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_loop_bts1050_0.i, line 522)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_loop_bts1050_0.i, line 525)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_loop_bts1050_0.i, line 528)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_loop_bts1050_0.i, line 497)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   126 Completely validated
-     2 To be validated
-   128 Total
---------------------------------------------------------------------------------
+[aorai-test] Warning: Could not prove ensures
+  1 ≡ aorai_intermediate_state_1 in automaton function f_pre_func
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/not_prm.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/not_prm.res.oracle
index fe44203edb2a5a73756d89b4aba4ce5a0db35037..01011d01c1f0027d7567671d668e8d8cf2148805 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/not_prm.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/not_prm.res.oracle
@@ -2,68 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_not_prm_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_not_prm_0.i, line 32)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_not_prm_0.i, line 33)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_not_prm_0.i, line 37)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_not_prm_0.i, line 41)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_not_prm_0.i, line 45)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_not_prm_0.i, line 34)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_not_prm_0.i, line 66)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_not_prm_0.i, line 67)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_not_prm_0.i, line 71)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_not_prm_0.i, line 75)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_not_prm_0.i, line 79)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_not_prm_0.i, line 68)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    21 Completely validated
-    21 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/other.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/other.res.oracle
index 627597f041a428493950ee9b1c7b3c804f5ff196..1d33786221618dd7e40f0ee66d798e851849010c 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/other.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/other.res.oracle
@@ -2,250 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_other_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 36)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 37)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_in' (file /tmp/aorai_other_0.i, line 42)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_other_0.i, line 46)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_last_in' (file /tmp/aorai_other_0.i, line 51)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_last_out' (file /tmp/aorai_other_0.i, line 57)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_step1_in' (file /tmp/aorai_other_0.i, line 63)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_step1_out' (file /tmp/aorai_other_0.i, line 69)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_other_0.i, line 38)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_init_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_last_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_last_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_step1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_step1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 99)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 100)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_in' (file /tmp/aorai_other_0.i, line 105)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_other_0.i, line 109)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_last_in' (file /tmp/aorai_other_0.i, line 114)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_last_out' (file /tmp/aorai_other_0.i, line 120)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_step1_in' (file /tmp/aorai_other_0.i, line 126)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_step1_out' (file /tmp/aorai_other_0.i, line 132)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_other_0.i, line 101)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_init_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_last_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_last_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_step1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_step1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 226)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 227)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_in' (file /tmp/aorai_other_0.i, line 232)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_other_0.i, line 236)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_last_in' (file /tmp/aorai_other_0.i, line 241)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_last_out' (file /tmp/aorai_other_0.i, line 247)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_step1_in' (file /tmp/aorai_other_0.i, line 253)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_step1_out' (file /tmp/aorai_other_0.i, line 259)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_other_0.i, line 228)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_init_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_last_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_last_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_step1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_step1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 289)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 290)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_in' (file /tmp/aorai_other_0.i, line 295)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_other_0.i, line 299)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_last_in' (file /tmp/aorai_other_0.i, line 304)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_last_out' (file /tmp/aorai_other_0.i, line 310)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_step1_in' (file /tmp/aorai_other_0.i, line 316)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_step1_out' (file /tmp/aorai_other_0.i, line 322)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_other_0.i, line 291)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_init_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_last_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_last_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_step1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_step1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 415)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 416)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_in' (file /tmp/aorai_other_0.i, line 421)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_other_0.i, line 425)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_last_out' (file /tmp/aorai_other_0.i, line 428)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_step1_in' (file /tmp/aorai_other_0.i, line 432)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_step1_out' (file /tmp/aorai_other_0.i, line 436)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_other_0.i, line 417)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_init_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_last_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_step1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_step1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 462)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 463)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_in' (file /tmp/aorai_other_0.i, line 468)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_other_0.i, line 472)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_last_in' (file /tmp/aorai_other_0.i, line 477)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_last_out' (file /tmp/aorai_other_0.i, line 483)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_step1_in' (file /tmp/aorai_other_0.i, line 489)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_step1_out' (file /tmp/aorai_other_0.i, line 495)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_other_0.i, line 464)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_init_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_last_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_last_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_step1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_step1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    97 Completely validated
-    97 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/seq.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/seq.res.oracle
index 1eb9f2fb9845b027dba2d000d69949c27c35a5d0..7c1aab1abe4f54ad288f51e3bd26f924bf512108 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/seq.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/seq.res.oracle
@@ -2,319 +2,5 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_seq_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 43)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 44)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_seq_0.i, line 51)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_seq_0.i, line 54)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_seq_0.i, line 57)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_seq_0.i, line 60)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in' (file /tmp/aorai_seq_0.i, line 64)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_0.i, line 68)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_seq_0.i, line 71)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_0.i, line 74)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_seq_0.i, line 45)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 120)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 121)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_seq_0.i, line 128)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_seq_0.i, line 131)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_seq_0.i, line 134)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_in' (file /tmp/aorai_seq_0.i, line 138)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_seq_0.i, line 142)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_0.i, line 145)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_seq_0.i, line 148)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_0.i, line 151)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_seq_0.i, line 122)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 224)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 225)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_seq_0.i, line 232)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_seq_0.i, line 235)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_seq_0.i, line 238)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_seq_0.i, line 241)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_0.i, line 244)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_seq_0.i, line 247)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_3_in_0' (file /tmp/aorai_seq_0.i, line 251)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_in_0' (file /tmp/aorai_seq_0.i, line 252)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_in_1' (file /tmp/aorai_seq_0.i, line 256)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_in_1' (file /tmp/aorai_seq_0.i, line 257)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_in_2' (file /tmp/aorai_seq_0.i, line 261)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_in_2' (file /tmp/aorai_seq_0.i, line 262)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_0.i, line 268)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_0.i, line 269)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_seq_0.i, line 226)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_3_in_0'
-            tried with Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_in_1'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_in_2'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 320)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 321)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_seq_0.i, line 328)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_seq_0.i, line 331)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_seq_0.i, line 334)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_seq_0.i, line 337)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_0.i, line 340)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_in' (file /tmp/aorai_seq_0.i, line 344)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_seq_0.i, line 348)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_0.i, line 351)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_seq_0.i, line 322)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 441)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 442)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_seq_0.i, line 449)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_seq_0.i, line 452)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_in' (file /tmp/aorai_seq_0.i, line 456)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_seq_0.i, line 460)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_seq_0.i, line 463)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_0.i, line 466)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_seq_0.i, line 469)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_0.i, line 472)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_seq_0.i, line 443)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 519)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 520)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_seq_0.i, line 527)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_seq_0.i, line 531)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_seq_0.i, line 535)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_seq_0.i, line 538)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_seq_0.i, line 541)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_0.i, line 544)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_seq_0.i, line 547)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_0.i, line 550)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_seq_0.i, line 521)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   129 Completely validated
-     2 To be validated
-   131 Total
---------------------------------------------------------------------------------
+[aorai-test] Warning: Could not prove ensures
+  1 ≡ aorai_intermediate_state_3 in automaton function g_pre_func
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/seq_loop.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/seq_loop.res.oracle
index c3ab60aacd9343b558f539d3f06be87f6fa76141..91bbf9123ac28316d201cdf502362adf55674962 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/seq_loop.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/seq_loop.res.oracle
@@ -2,306 +2,5 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_seq_loop_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 45)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 46)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_seq_loop_0.i, line 53)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_seq_loop_0.i, line 56)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_seq_loop_0.i, line 59)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_seq_loop_0.i, line 62)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_0' (file /tmp/aorai_seq_loop_0.i, line 66)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_0' (file /tmp/aorai_seq_loop_0.i, line 67)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_1' (file /tmp/aorai_seq_loop_0.i, line 71)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_1' (file /tmp/aorai_seq_loop_0.i, line 72)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_loop_0.i, line 78)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_loop_0.i, line 79)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_seq_loop_0.i, line 82)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_loop_0.i, line 85)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_seq_loop_0.i, line 47)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_1_in_0'
-            tried with Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_in_1'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 134)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 135)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_seq_loop_0.i, line 142)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_seq_loop_0.i, line 145)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_seq_loop_0.i, line 148)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_seq_loop_0.i, line 151)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_loop_0.i, line 154)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_in' (file /tmp/aorai_seq_loop_0.i, line 158)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_seq_loop_0.i, line 162)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_loop_0.i, line 165)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_seq_loop_0.i, line 136)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'f'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 244)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 245)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_seq_loop_0.i, line 252)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_seq_loop_0.i, line 255)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_seq_loop_0.i, line 258)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_seq_loop_0.i, line 261)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_loop_0.i, line 264)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_seq_loop_0.i, line 267)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_in' (file /tmp/aorai_seq_loop_0.i, line 271)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_loop_0.i, line 275)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_seq_loop_0.i, line 246)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 321)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 322)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_seq_loop_0.i, line 329)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_seq_loop_0.i, line 332)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_seq_loop_0.i, line 335)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_in' (file /tmp/aorai_seq_loop_0.i, line 339)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_seq_loop_0.i, line 343)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_loop_0.i, line 346)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_seq_loop_0.i, line 349)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_loop_0.i, line 352)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_seq_loop_0.i, line 323)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'g'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 419)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 420)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_seq_loop_0.i, line 427)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_seq_loop_0.i, line 430)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_in' (file /tmp/aorai_seq_loop_0.i, line 434)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_seq_loop_0.i, line 438)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_seq_loop_0.i, line 441)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_loop_0.i, line 444)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_seq_loop_0.i, line 447)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_loop_0.i, line 450)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_seq_loop_0.i, line 421)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 495)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 496)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_seq_loop_0.i, line 503)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_seq_loop_0.i, line 508)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_seq_loop_0.i, line 513)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_seq_loop_0.i, line 516)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_seq_loop_0.i, line 519)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_seq_loop_0.i, line 522)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_seq_loop_0.i, line 525)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_out' (file /tmp/aorai_seq_loop_0.i, line 528)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_seq_loop_0.i, line 497)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   125 Completely validated
-     2 To be validated
-   127 Total
---------------------------------------------------------------------------------
+[aorai-test] Warning: Could not prove ensures
+  1 ≡ aorai_intermediate_state_1 in automaton function f_pre_func
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/single_call.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/single_call.res.oracle
index dc1e3bfe79ca5df1a08619401145d8765531eabc..705c6f7085cc5e1a5483e6514b0334623f911d3c 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/single_call.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/single_call.res.oracle
@@ -2,76 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_single_call_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_single_call_0.i, line 32)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_single_call_0.i, line 33)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_single_call_0.i, line 38)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_single_call_0.i, line 41)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_in' (file /tmp/aorai_single_call_0.i, line 45)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_single_call_0.i, line 49)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_single_call_0.i, line 34)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_single_call_0.i, line 75)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_single_call_0.i, line 76)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_single_call_0.i, line 81)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_single_call_0.i, line 85)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_single_call_0.i, line 89)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_single_call_0.i, line 92)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_single_call_0.i, line 77)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S0_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Sf_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_aorai_intermediate_state_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    25 Completely validated
-    25 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_acces_params.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_acces_params.res.oracle
index 0811518881ab85fccdc73c4c6e6a9fc36a52d52e..006ec0acdd2678df89af629134ab5fcba9ee2f0b 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_acces_params.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_acces_params.res.oracle
@@ -4,278 +4,3 @@
 [wp] /tmp/aorai_test_acces_params_0.i:4: Warning: 
   Global invariant not handled yet ('inv' ignored)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 44)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 45)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params_0.i, line 50)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_in' (file /tmp/aorai_test_acces_params_0.i, line 54)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params_0.i, line 58)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params_0.i, line 61)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params_0.i, line 64)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_SF_out' (file /tmp/aorai_test_acces_params_0.i, line 67)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_mainst_out' (file /tmp/aorai_test_acces_params_0.i, line 70)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params_0.i, line 46)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_SF_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_mainst_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 109)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 110)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params_0.i, line 115)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params_0.i, line 118)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_in' (file /tmp/aorai_test_acces_params_0.i, line 122)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params_0.i, line 126)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params_0.i, line 129)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_SF_out' (file /tmp/aorai_test_acces_params_0.i, line 132)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_mainst_out' (file /tmp/aorai_test_acces_params_0.i, line 135)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params_0.i, line 111)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_SF_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_mainst_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 196)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 197)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params_0.i, line 202)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params_0.i, line 205)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params_0.i, line 208)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_in' (file /tmp/aorai_test_acces_params_0.i, line 212)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params_0.i, line 216)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_SF_out' (file /tmp/aorai_test_acces_params_0.i, line 219)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_mainst_out' (file /tmp/aorai_test_acces_params_0.i, line 222)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params_0.i, line 198)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_SF_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_mainst_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 262)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 263)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params_0.i, line 268)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params_0.i, line 271)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params_0.i, line 274)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params_0.i, line 277)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_SF_in' (file /tmp/aorai_test_acces_params_0.i, line 281)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_SF_out' (file /tmp/aorai_test_acces_params_0.i, line 285)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_mainst_out' (file /tmp/aorai_test_acces_params_0.i, line 288)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params_0.i, line 264)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_SF_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_SF_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_mainst_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 347)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 348)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_acces_params_0.i, line 354)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params_0.i, line 358)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params_0.i, line 361)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params_0.i, line 364)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params_0.i, line 367)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_SF_out' (file /tmp/aorai_test_acces_params_0.i, line 370)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_mainst_out' (file /tmp/aorai_test_acces_params_0.i, line 373)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params_0.i, line 349)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_SF_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_mainst_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 412)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 413)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params_0.i, line 418)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params_0.i, line 421)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params_0.i, line 424)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params_0.i, line 427)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_SF_in' (file /tmp/aorai_test_acces_params_0.i, line 431)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_SF_out' (file /tmp/aorai_test_acces_params_0.i, line 435)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_mainst_out' (file /tmp/aorai_test_acces_params_0.i, line 438)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params_0.i, line 414)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_SF_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_SF_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_mainst_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   111 Completely validated
-   111 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_acces_params2.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_acces_params2.res.oracle
index 29e7c31415de9dc26da145123e822c68fa8bb72a..c5b2f97589bfe3a0b833081f0782788f5b8af497 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_acces_params2.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_acces_params2.res.oracle
@@ -4,391 +4,3 @@
 [wp] /tmp/aorai_test_acces_params2_0.i:3: Warning: 
   Global invariant not handled yet ('inv' ignored)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 46)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 47)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params2_0.i, line 52)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params2_0.i, line 55)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_in' (file /tmp/aorai_test_acces_params2_0.i, line 59)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params2_0.i, line 63)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params2_0.i, line 66)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_test_acces_params2_0.i, line 69)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S6_out' (file /tmp/aorai_test_acces_params2_0.i, line 72)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S7_out' (file /tmp/aorai_test_acces_params2_0.i, line 75)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params2_0.i, line 48)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S7_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 120)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 121)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params2_0.i, line 126)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params2_0.i, line 129)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params2_0.i, line 132)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_in' (file /tmp/aorai_test_acces_params2_0.i, line 136)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params2_0.i, line 140)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_test_acces_params2_0.i, line 143)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S6_out' (file /tmp/aorai_test_acces_params2_0.i, line 146)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S7_out' (file /tmp/aorai_test_acces_params2_0.i, line 149)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params2_0.i, line 122)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S7_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 219)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 220)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params2_0.i, line 225)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params2_0.i, line 228)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params2_0.i, line 231)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params2_0.i, line 234)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_in' (file /tmp/aorai_test_acces_params2_0.i, line 238)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_test_acces_params2_0.i, line 242)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S6_out' (file /tmp/aorai_test_acces_params2_0.i, line 245)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S7_out' (file /tmp/aorai_test_acces_params2_0.i, line 248)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params2_0.i, line 221)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S7_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 292)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 293)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params2_0.i, line 298)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params2_0.i, line 301)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params2_0.i, line 304)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params2_0.i, line 307)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_test_acces_params2_0.i, line 310)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S6_in' (file /tmp/aorai_test_acces_params2_0.i, line 314)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S6_out' (file /tmp/aorai_test_acces_params2_0.i, line 318)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S7_out' (file /tmp/aorai_test_acces_params2_0.i, line 321)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params2_0.i, line 294)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S6_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S7_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opc_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 385)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 386)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params2_0.i, line 391)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params2_0.i, line 394)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params2_0.i, line 397)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params2_0.i, line 400)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_test_acces_params2_0.i, line 403)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S6_out' (file /tmp/aorai_test_acces_params2_0.i, line 406)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S7_out' (file /tmp/aorai_test_acces_params2_0.i, line 409)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params2_0.i, line 387)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S7_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opc_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 450)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 451)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params2_0.i, line 456)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params2_0.i, line 459)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params2_0.i, line 462)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params2_0.i, line 465)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_test_acces_params2_0.i, line 468)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S6_out' (file /tmp/aorai_test_acces_params2_0.i, line 471)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S7_out' (file /tmp/aorai_test_acces_params2_0.i, line 474)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params2_0.i, line 452)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S7_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opc'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 552)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 553)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params2_0.i, line 558)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_in' (file /tmp/aorai_test_acces_params2_0.i, line 562)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params2_0.i, line 566)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params2_0.i, line 569)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params2_0.i, line 572)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_test_acces_params2_0.i, line 575)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S6_out' (file /tmp/aorai_test_acces_params2_0.i, line 578)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S7_out' (file /tmp/aorai_test_acces_params2_0.i, line 581)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params2_0.i, line 554)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S7_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 625)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 626)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_acces_params2_0.i, line 631)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_acces_params2_0.i, line 634)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_test_acces_params2_0.i, line 637)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_test_acces_params2_0.i, line 640)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_test_acces_params2_0.i, line 643)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S6_out' (file /tmp/aorai_test_acces_params2_0.i, line 646)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S7_in' (file /tmp/aorai_test_acces_params2_0.i, line 650)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S7_out' (file /tmp/aorai_test_acces_params2_0.i, line 654)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_acces_params2_0.i, line 627)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S7_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S7_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   160 Completely validated
-   160 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle.res.oracle
index 682ed874344dd7e1ee0fc62c92c3de5aeef7a86b..1e1cc8acb149b69e62719f05364e2b4059a5ed16 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle.res.oracle
@@ -6,197 +6,3 @@
 [wp] Warning: Missing RTE guards
 [kernel:annot:missing-spec] /tmp/aorai_test_boucle_0.i:81: Warning: 
   Neither code nor specification for function call_to_an_undefined_function, generating default assigns from the prototype
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'call_to_an_undefined_function'
---------------------------------------------------------------------------------
-
-[    -    ] Assigns nothing
-            tried with Inferred annotations.
-[    -    ] Froms (file /tmp/aorai_test_boucle_0.i, line 2)
-            tried with Inferred annotations.
-[    -    ] Default behavior
-            tried with Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'a_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 37)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 38)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle_0.i, line 43)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle_0.i, line 46)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_boucle_0.i, line 50)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_boucle_0.i, line 54)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle_0.i, line 39)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'a_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 80)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 81)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle_0.i, line 86)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle_0.i, line 89)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_boucle_0.i, line 93)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_boucle_0.i, line 97)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle_0.i, line 82)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'b_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 141)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 142)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_boucle_0.i, line 148)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle_0.i, line 152)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle_0.i, line 155)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_boucle_0.i, line 158)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle_0.i, line 143)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'b_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 183)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 184)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_boucle_0.i, line 190)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle_0.i, line 194)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle_0.i, line 197)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_boucle_0.i, line 200)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle_0.i, line 185)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 245)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 246)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle_0.i, line 251)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle_0.i, line 254)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_boucle_0.i, line 258)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_boucle_0.i, line 262)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle_0.i, line 247)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 287)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 288)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle_0.i, line 293)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle_0.i, line 296)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_boucle_0.i, line 300)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_boucle_0.i, line 304)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle_0.i, line 289)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    72 Completely validated
-     3 To be validated
-    75 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle1.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle1.res.oracle
index 0b5635aa29b0ddca4dea072b00c0913a5aac47bf..ea51c03c1194f8e4cc201c32a0eaff1520a0d1b4 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle1.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle1.res.oracle
@@ -6,266 +6,3 @@
 [wp] /tmp/aorai_test_boucle1_0.i:6: Warning: 
   Global invariant not handled yet ('inv_status' ignored)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'commit_trans_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 45)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 46)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_boucle1_0.i, line 51)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_boucle1_0.i, line 55)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_boucle1_0.i, line 59)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle1_0.i, line 62)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_boucle1_0.i, line 65)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_boucle1_0.i, line 68)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle1_0.i, line 47)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'commit_trans_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 104)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 105)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_boucle1_0.i, line 110)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_boucle1_0.i, line 114)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_boucle1_0.i, line 118)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle1_0.i, line 121)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_boucle1_0.i, line 124)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_boucle1_0.i, line 127)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle1_0.i, line 106)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'commit_trans'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'init_trans_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 187)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 188)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_boucle1_0.i, line 193)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_boucle1_0.i, line 197)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_boucle1_0.i, line 201)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle1_0.i, line 204)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_boucle1_0.i, line 207)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_boucle1_0.i, line 210)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle1_0.i, line 189)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'init_trans_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 247)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 248)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_boucle1_0.i, line 253)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_boucle1_0.i, line 257)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_boucle1_0.i, line 261)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle1_0.i, line 264)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_in' (file /tmp/aorai_test_boucle1_0.i, line 268)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_boucle1_0.i, line 272)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_boucle1_0.i, line 275)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle1_0.i, line 249)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'init_trans'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 340)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 341)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_boucle1_0.i, line 346)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_boucle1_0.i, line 350)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_boucle1_0.i, line 354)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle1_0.i, line 357)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_boucle1_0.i, line 360)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_boucle1_0.i, line 363)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle1_0.i, line 342)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 399)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 400)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_boucle1_0.i, line 406)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_boucle1_0.i, line 410)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_boucle1_0.i, line 414)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_boucle1_0.i, line 418)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_in' (file /tmp/aorai_test_boucle1_0.i, line 422)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle1_0.i, line 426)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_boucle1_0.i, line 429)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_boucle1_0.i, line 432)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle1_0.i, line 401)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   105 Completely validated
-   105 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle2.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle2.res.oracle
index bf090ec3929b2af40f68dddd3efb920218d66f38..c92dd0a548ef141e82706a317fde2e7d7218f18b 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle2.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle2.res.oracle
@@ -4,282 +4,3 @@
 [wp] /tmp/aorai_test_boucle2_0.i:4: Warning: 
   Global invariant not handled yet ('inv' ignored)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 44)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 45)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_boucle2_0.i, line 51)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle2_0.i, line 55)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle2_0.i, line 58)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle2_0.i, line 61)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_boucle2_0.i, line 64)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_boucle2_0.i, line 67)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_boucle2_0.i, line 70)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle2_0.i, line 46)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 110)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 111)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_boucle2_0.i, line 117)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle2_0.i, line 121)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle2_0.i, line 124)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_in' (file /tmp/aorai_test_boucle2_0.i, line 128)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle2_0.i, line 132)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_boucle2_0.i, line 135)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_boucle2_0.i, line 138)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_boucle2_0.i, line 141)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle2_0.i, line 112)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 207)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 208)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle2_0.i, line 213)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle2_0.i, line 216)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle2_0.i, line 219)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_in' (file /tmp/aorai_test_boucle2_0.i, line 223)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_boucle2_0.i, line 227)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_boucle2_0.i, line 230)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_boucle2_0.i, line 233)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle2_0.i, line 209)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 273)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 274)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle2_0.i, line 279)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle2_0.i, line 282)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle2_0.i, line 285)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_boucle2_0.i, line 288)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_in' (file /tmp/aorai_test_boucle2_0.i, line 292)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_boucle2_0.i, line 296)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_boucle2_0.i, line 299)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle2_0.i, line 275)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 358)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 359)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_boucle2_0.i, line 365)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle2_0.i, line 369)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle2_0.i, line 372)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle2_0.i, line 375)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_boucle2_0.i, line 378)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_boucle2_0.i, line 381)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_boucle2_0.i, line 384)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle2_0.i, line 360)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 424)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 425)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle2_0.i, line 430)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle2_0.i, line 433)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle2_0.i, line 436)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_boucle2_0.i, line 439)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_boucle2_0.i, line 442)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_in' (file /tmp/aorai_test_boucle2_0.i, line 446)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_boucle2_0.i, line 450)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle2_0.i, line 426)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   113 Completely validated
-   113 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle3.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle3.res.oracle
index 38668419cd8c2ba8f20176b8739a06dc9a68dcb0..ecc13c24f91ff2f21bb18d2f2312270bc174735a 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle3.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle3.res.oracle
@@ -4,266 +4,3 @@
 [wp] /tmp/aorai_test_boucle3_0.i:4: Warning: 
   Global invariant not handled yet ('inv' ignored)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 42)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 43)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S4_in' (file /tmp/aorai_test_boucle3_0.i, line 49)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S4_out' (file /tmp/aorai_test_boucle3_0.i, line 53)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle3_0.i, line 56)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_S2_in' (file /tmp/aorai_test_boucle3_0.i, line 60)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_S2_out' (file /tmp/aorai_test_boucle3_0.i, line 64)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle3_0.i, line 67)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_boucle3_0.i, line 70)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle3_0.i, line 44)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S4_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 105)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 106)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S4_in' (file /tmp/aorai_test_boucle3_0.i, line 112)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S4_out' (file /tmp/aorai_test_boucle3_0.i, line 116)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle3_0.i, line 119)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_S2_in' (file /tmp/aorai_test_boucle3_0.i, line 123)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_S2_out' (file /tmp/aorai_test_boucle3_0.i, line 127)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle3_0.i, line 130)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_boucle3_0.i, line 133)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle3_0.i, line 107)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S4_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 212)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 213)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S4_out' (file /tmp/aorai_test_boucle3_0.i, line 218)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle3_0.i, line 221)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_S2_out' (file /tmp/aorai_test_boucle3_0.i, line 224)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_in' (file /tmp/aorai_test_boucle3_0.i, line 228)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle3_0.i, line 232)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_boucle3_0.i, line 235)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle3_0.i, line 214)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 270)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 271)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S4_in' (file /tmp/aorai_test_boucle3_0.i, line 277)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S4_out' (file /tmp/aorai_test_boucle3_0.i, line 281)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle3_0.i, line 284)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_S2_out' (file /tmp/aorai_test_boucle3_0.i, line 287)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle3_0.i, line 290)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_boucle3_0.i, line 293)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle3_0.i, line 272)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S4_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 347)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 348)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S4_out' (file /tmp/aorai_test_boucle3_0.i, line 353)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle3_0.i, line 356)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_S2_in' (file /tmp/aorai_test_boucle3_0.i, line 360)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_S2_out' (file /tmp/aorai_test_boucle3_0.i, line 364)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle3_0.i, line 367)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_boucle3_0.i, line 370)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle3_0.i, line 349)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 405)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 406)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S4_in' (file /tmp/aorai_test_boucle3_0.i, line 412)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S4_out' (file /tmp/aorai_test_boucle3_0.i, line 416)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_boucle3_0.i, line 419)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_S2_out' (file /tmp/aorai_test_boucle3_0.i, line 422)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_boucle3_0.i, line 425)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_in' (file /tmp/aorai_test_boucle3_0.i, line 429)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_boucle3_0.i, line 433)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle3_0.i, line 407)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S4_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   105 Completely validated
-   105 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle_rechercheTableau.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle_rechercheTableau.res.oracle
index 56b9a30b4da5d3053db1afa5049de6bf7056fbea..6a9fc826a871d2802b82780f28a0df4c9c0f2ee0 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle_rechercheTableau.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_boucle_rechercheTableau.res.oracle
@@ -6,203 +6,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_test_boucle_rechercheTableau_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'isPresent_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 34)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 35)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 39)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_in' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 43)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 47)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 50)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 36)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'isPresent_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 76)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 77)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 82)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 86)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 89)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_in' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 93)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 97)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 78)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'foo_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 178)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 179)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 184)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 188)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 191)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 194)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 180)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'foo_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 219)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 220)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 225)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 229)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 232)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 235)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 221)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'foo'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 273)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 274)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 278)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_in' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 282)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 286)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 289)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 275)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 314)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 315)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 320)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 324)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 327)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 330)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 316)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    76 Completely validated
-    76 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_factorial.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_factorial.res.oracle
index 2b21ccd94da5796f491019cea462d6ddf41c0de9..999cb771ba7268229f0af5eceb9d4963f59c3eea 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_factorial.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_factorial.res.oracle
@@ -2,204 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_test_factorial_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'decode_int_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 34)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 35)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_factorial_0.i, line 41)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_factorial_0.i, line 45)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_factorial_0.i, line 48)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_factorial_0.i, line 51)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_factorial_0.i, line 36)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'decode_int_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 76)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 77)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_factorial_0.i, line 83)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_factorial_0.i, line 87)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_factorial_0.i, line 91)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_factorial_0.i, line 95)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_factorial_0.i, line 98)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_factorial_0.i, line 78)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'decode_int'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'factorial_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 201)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 202)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_factorial_0.i, line 207)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_factorial_0.i, line 211)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_factorial_0.i, line 215)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_factorial_0.i, line 218)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_factorial_0.i, line 203)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'factorial_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 244)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 245)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_factorial_0.i, line 251)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_factorial_0.i, line 255)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_factorial_0.i, line 259)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_factorial_0.i, line 263)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_factorial_0.i, line 266)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_factorial_0.i, line 246)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 320)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 321)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_factorial_0.i, line 327)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_factorial_0.i, line 331)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_factorial_0.i, line 334)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_factorial_0.i, line 337)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_factorial_0.i, line 322)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 362)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 363)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_factorial_0.i, line 369)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_factorial_0.i, line 373)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_factorial_0.i, line 377)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_factorial_0.i, line 381)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_factorial_0.i, line 384)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_factorial_0.i, line 364)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    79 Completely validated
-    79 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_factorial2.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_factorial2.res.oracle
index 223c7eaa61d3d8e2e4a26a514756c63b791be999..78ecfbfbfa1800fbcbb0f176e08fd47109ba5614 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_factorial2.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_factorial2.res.oracle
@@ -2,204 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_test_factorial2_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'decode_int_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 34)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 35)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_factorial2_0.i, line 40)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_factorial2_0.i, line 44)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_factorial2_0.i, line 47)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_test_factorial2_0.i, line 50)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_factorial2_0.i, line 36)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'decode_int_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 75)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 76)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_factorial2_0.i, line 81)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_factorial2_0.i, line 85)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_in' (file /tmp/aorai_test_factorial2_0.i, line 89)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_factorial2_0.i, line 93)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_test_factorial2_0.i, line 96)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_factorial2_0.i, line 77)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'decode_int'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'factorial_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 201)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 202)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_factorial2_0.i, line 206)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_in' (file /tmp/aorai_test_factorial2_0.i, line 210)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_factorial2_0.i, line 214)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_test_factorial2_0.i, line 217)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_factorial2_0.i, line 203)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'factorial_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 242)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 243)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_factorial2_0.i, line 248)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_factorial2_0.i, line 252)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_in' (file /tmp/aorai_test_factorial2_0.i, line 256)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_factorial2_0.i, line 260)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_test_factorial2_0.i, line 263)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_factorial2_0.i, line 244)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 316)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 317)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_factorial2_0.i, line 322)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_factorial2_0.i, line 326)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_factorial2_0.i, line 329)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_test_factorial2_0.i, line 332)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_factorial2_0.i, line 318)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 357)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 358)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_factorial2_0.i, line 363)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_factorial2_0.i, line 367)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_in' (file /tmp/aorai_test_factorial2_0.i, line 371)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_test_factorial2_0.i, line 375)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_test_factorial2_0.i, line 378)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_factorial2_0.i, line 359)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    79 Completely validated
-    79 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion1.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion1.res.oracle
index 1324ad5e028c9a0d3d481b09bebe9e992e519733..d635246be991db1aaf2daf921e81e7affdc2b633 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion1.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion1.res.oracle
@@ -9,206 +9,3 @@
 [kernel] Parsing /tmp/aorai_test_recursion1_0.i (no preprocessing)
 [wp] Warning: No definition for 'string_len' interpreted as reads nothing
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
---------------------------------------------------------------------------------
---- Global Properties
---------------------------------------------------------------------------------
-
-[ Extern  ] Axiom 'strlen0'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'strlen1'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'strlen2'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'strlen3'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'strlen4'
-            Unverifiable but considered Valid.
-[  Valid  ] Axiomatic 'string_len'
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 62)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 63)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_recursion1_0.i, line 69)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_recursion1_0.i, line 73)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion1_0.i, line 76)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_recursion1_0.i, line 79)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion1_0.i, line 64)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 104)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 105)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_recursion1_0.i, line 111)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_recursion1_0.i, line 115)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion1_0.i, line 118)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_recursion1_0.i, line 121)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion1_0.i, line 106)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 175)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 176)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_recursion1_0.i, line 182)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_recursion1_0.i, line 186)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion1_0.i, line 189)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_recursion1_0.i, line 192)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion1_0.i, line 177)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 217)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 218)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_recursion1_0.i, line 223)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion1_0.i, line 226)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_recursion1_0.i, line 230)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_recursion1_0.i, line 234)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion1_0.i, line 219)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 282)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 283)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_recursion1_0.i, line 288)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion1_0.i, line 291)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_recursion1_0.i, line 295)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_recursion1_0.i, line 299)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion1_0.i, line 284)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 324)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 325)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_recursion1_0.i, line 331)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_recursion1_0.i, line 335)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion1_0.i, line 338)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_recursion1_0.i, line 342)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_recursion1_0.i, line 346)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion1_0.i, line 326)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    75 Completely validated
-     5 Considered valid
-    80 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion2.0.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion2.0.res.oracle
index c3782c51b839c14c2eae109469bc5f73f2a72dce..1bf5237ee0b0253f2bd01d12432dd3c1c0b77553 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion2.0.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion2.0.res.oracle
@@ -4,238 +4,3 @@
 [wp] Warning: No definition for 'string_len' interpreted as reads nothing
 [wp] Warning: No definition for 'sum_tab' interpreted as reads nothing
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
---------------------------------------------------------------------------------
---- Global Properties
---------------------------------------------------------------------------------
-
-[ Extern  ] Axiom 'strlen0'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'strlen1'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'strlen2'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'strlen3'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'strlen4'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'sum_tab0'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'sum_tabi'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'sum_tabn'
-            Unverifiable but considered Valid.
-[  Valid  ] Axiomatic 'string_len'
-            by Frama-C kernel.
-[  Valid  ] Axiomatic 'sum_tab'
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 85)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 86)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_recursion2_0.i, line 92)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_recursion2_0.i, line 96)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion2_0.i, line 99)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_out' (file /tmp/aorai_test_recursion2_0.i, line 102)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_out' (file /tmp/aorai_test_recursion2_0.i, line 105)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_0.i, line 87)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 134)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 135)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_recursion2_0.i, line 141)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_recursion2_0.i, line 145)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion2_0.i, line 148)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_out' (file /tmp/aorai_test_recursion2_0.i, line 151)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_out' (file /tmp/aorai_test_recursion2_0.i, line 154)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_0.i, line 136)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'sumOne_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 211)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 212)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_recursion2_0.i, line 217)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion2_0.i, line 220)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_in' (file /tmp/aorai_test_recursion2_0.i, line 224)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_out' (file /tmp/aorai_test_recursion2_0.i, line 228)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_out' (file /tmp/aorai_test_recursion2_0.i, line 231)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_0.i, line 213)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'sumOne_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 260)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 261)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_recursion2_0.i, line 266)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion2_0.i, line 269)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_in' (file /tmp/aorai_test_recursion2_0.i, line 273)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_out' (file /tmp/aorai_test_recursion2_0.i, line 277)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_out' (file /tmp/aorai_test_recursion2_0.i, line 280)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_0.i, line 262)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 343)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 344)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_recursion2_0.i, line 349)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion2_0.i, line 352)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_in' (file /tmp/aorai_test_recursion2_0.i, line 356)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_out' (file /tmp/aorai_test_recursion2_0.i, line 360)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_out' (file /tmp/aorai_test_recursion2_0.i, line 363)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_0.i, line 345)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 392)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 393)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_recursion2_0.i, line 398)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion2_0.i, line 401)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_in' (file /tmp/aorai_test_recursion2_0.i, line 405)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_out' (file /tmp/aorai_test_recursion2_0.i, line 409)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_in' (file /tmp/aorai_test_recursion2_0.i, line 413)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_out' (file /tmp/aorai_test_recursion2_0.i, line 417)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_0.i, line 394)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    88 Completely validated
-     8 Considered valid
-    96 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion2.1.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion2.1.res.oracle
index 8ea88394978c9d83b427bcbdb9c69bf8f3f6c85a..6782e2af71e1129dc7238ac11b8f4facbc8ab0b4 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion2.1.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion2.1.res.oracle
@@ -4,238 +4,3 @@
 [wp] Warning: No definition for 'string_len' interpreted as reads nothing
 [wp] Warning: No definition for 'sum_tab' interpreted as reads nothing
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
---------------------------------------------------------------------------------
---- Global Properties
---------------------------------------------------------------------------------
-
-[ Extern  ] Axiom 'strlen0'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'strlen1'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'strlen2'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'strlen3'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'strlen4'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'sum_tab0'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'sum_tabi'
-            Unverifiable but considered Valid.
-[ Extern  ] Axiom 'sum_tabn'
-            Unverifiable but considered Valid.
-[  Valid  ] Axiomatic 'string_len'
-            by Frama-C kernel.
-[  Valid  ] Axiomatic 'sum_tab'
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 85)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 86)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_recursion2_1.i, line 92)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_recursion2_1.i, line 96)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion2_1.i, line 99)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_out' (file /tmp/aorai_test_recursion2_1.i, line 102)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_out' (file /tmp/aorai_test_recursion2_1.i, line 105)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_1.i, line 87)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 134)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 135)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_recursion2_1.i, line 141)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_recursion2_1.i, line 145)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion2_1.i, line 148)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_out' (file /tmp/aorai_test_recursion2_1.i, line 151)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_out' (file /tmp/aorai_test_recursion2_1.i, line 154)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_1.i, line 136)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'sumOne_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 211)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 212)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_recursion2_1.i, line 217)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion2_1.i, line 220)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_in' (file /tmp/aorai_test_recursion2_1.i, line 224)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_out' (file /tmp/aorai_test_recursion2_1.i, line 228)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_out' (file /tmp/aorai_test_recursion2_1.i, line 231)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_1.i, line 213)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'sumOne_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 260)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 261)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_recursion2_1.i, line 266)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion2_1.i, line 269)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_in' (file /tmp/aorai_test_recursion2_1.i, line 273)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_out' (file /tmp/aorai_test_recursion2_1.i, line 277)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_out' (file /tmp/aorai_test_recursion2_1.i, line 280)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_1.i, line 262)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 343)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 344)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_recursion2_1.i, line 349)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion2_1.i, line 352)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_in' (file /tmp/aorai_test_recursion2_1.i, line 356)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_out' (file /tmp/aorai_test_recursion2_1.i, line 360)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_out' (file /tmp/aorai_test_recursion2_1.i, line 363)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_1.i, line 345)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 392)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 393)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_recursion2_1.i, line 398)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_recursion2_1.i, line 401)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_in' (file /tmp/aorai_test_recursion2_1.i, line 405)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T1_out' (file /tmp/aorai_test_recursion2_1.i, line 409)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_in' (file /tmp/aorai_test_recursion2_1.i, line 413)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_T2_out' (file /tmp/aorai_test_recursion2_1.i, line 417)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_1.i, line 394)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_T2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    88 Completely validated
-     8 Considered valid
-    96 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion4.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion4.res.oracle
index 9e4a6ae19e1c1560edb230b7ab6cfa35c43cd14e..2cb6a23598f3b75b3779c7b00937bd4fdd776456 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion4.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion4.res.oracle
@@ -2,203 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_test_recursion4_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'isPresent_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 35)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 36)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion4_0.i, line 40)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_in' (file /tmp/aorai_test_recursion4_0.i, line 44)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion4_0.i, line 48)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion4_0.i, line 51)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion4_0.i, line 37)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'isPresent_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 79)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 80)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_recursion4_0.i, line 85)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion4_0.i, line 90)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion4_0.i, line 93)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_in' (file /tmp/aorai_test_recursion4_0.i, line 98)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion4_0.i, line 104)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion4_0.i, line 81)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'foo_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 178)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 179)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_recursion4_0.i, line 184)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion4_0.i, line 188)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion4_0.i, line 191)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion4_0.i, line 194)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion4_0.i, line 180)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'foo_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 219)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 220)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_recursion4_0.i, line 225)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion4_0.i, line 229)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion4_0.i, line 232)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion4_0.i, line 235)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion4_0.i, line 221)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'foo'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 273)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 274)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion4_0.i, line 278)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_in' (file /tmp/aorai_test_recursion4_0.i, line 282)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion4_0.i, line 286)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion4_0.i, line 289)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion4_0.i, line 275)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 314)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 315)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_recursion4_0.i, line 320)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion4_0.i, line 324)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion4_0.i, line 327)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion4_0.i, line 330)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion4_0.i, line 316)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    76 Completely validated
-    76 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion5.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion5.res.oracle
index 6468bb0de2f3efdb084763813fe3913b25c6d8e9..d9337988b6937f7f2deae0720894f0272ce4b0b1 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion5.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_recursion5.res.oracle
@@ -6,297 +6,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_test_recursion5_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'isPresentRec_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 37)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 38)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion5_0.i, line 43)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_in' (file /tmp/aorai_test_recursion5_0.i, line 47)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion5_0.i, line 51)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_IgnoreFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 54)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 57)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 39)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_IgnoreFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'isPresentRec_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 90)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 91)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion5_0.i, line 96)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion5_0.i, line 99)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_IgnoreFoo_in' (file /tmp/aorai_test_recursion5_0.i, line 104)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_IgnoreFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 110)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_in' (file /tmp/aorai_test_recursion5_0.i, line 115)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 121)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 92)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_IgnoreFoo_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_IgnoreFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'isPresent_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 199)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 200)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion5_0.i, line 205)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_in' (file /tmp/aorai_test_recursion5_0.i, line 209)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion5_0.i, line 213)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_IgnoreFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 216)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 219)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 201)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_IgnoreFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'isPresent_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 251)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 252)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_recursion5_0.i, line 258)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion5_0.i, line 262)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion5_0.i, line 265)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_IgnoreFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 268)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_in' (file /tmp/aorai_test_recursion5_0.i, line 272)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 276)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 253)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_IgnoreFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'foo_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 336)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 337)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_recursion5_0.i, line 343)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion5_0.i, line 347)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion5_0.i, line 350)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_IgnoreFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 353)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 356)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 338)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_IgnoreFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'foo_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 386)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 387)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_recursion5_0.i, line 393)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion5_0.i, line 397)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion5_0.i, line 400)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_IgnoreFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 403)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 406)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 388)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_IgnoreFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'foo'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 450)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 451)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion5_0.i, line 456)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_in' (file /tmp/aorai_test_recursion5_0.i, line 460)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion5_0.i, line 464)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_IgnoreFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 467)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 470)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 452)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_IgnoreFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 500)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 501)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_recursion5_0.i, line 507)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion5_0.i, line 511)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Idle_out' (file /tmp/aorai_test_recursion5_0.i, line 514)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_IgnoreFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 517)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_WillDoFoo_out' (file /tmp/aorai_test_recursion5_0.i, line 520)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 502)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_End_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_End_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_Idle_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_IgnoreFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_WillDoFoo_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   118 Completely validated
-   118 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_struct.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_struct.res.oracle
index 8ab8082884ed877a19c027be0c80c52c1d0e32d4..60ed3fef31e7f4f0c731f19f23e8ad40fb989d92 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_struct.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_struct.res.oracle
@@ -2,125 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_test_struct_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'increment_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_struct_0.i, line 39)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_struct_0.i, line 40)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_struct_0.i, line 45)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_struct_0.i, line 49)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_test_struct_0.i, line 52)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_struct_0.i, line 41)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'increment_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_struct_0.i, line 74)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_struct_0.i, line 75)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_struct_0.i, line 80)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_struct_0.i, line 84)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_test_struct_0.i, line 87)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_struct_0.i, line 76)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'increment'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_struct_0.i, line 126)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_struct_0.i, line 127)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_struct_0.i, line 132)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_struct_0.i, line 136)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_test_struct_0.i, line 139)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_struct_0.i, line 128)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_struct_0.i, line 161)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_struct_0.i, line 162)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_struct_0.i, line 167)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_test_struct_0.i, line 171)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_test_struct_0.i, line 174)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_struct_0.i, line 163)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_main_0_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    42 Completely validated
-    42 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_switch2.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_switch2.res.oracle
index 2ba2aecbeb16bd5323600348dc78dde7e0d202f4..93f710b0f1ac3217e43d52feac9b3774b07c657a 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_switch2.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_switch2.res.oracle
@@ -8,391 +8,3 @@
 [wp] /tmp/aorai_test_switch2_0.i:4: Warning: 
   Global invariant not handled yet ('inv' ignored)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 46)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 47)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch2_0.i, line 52)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_in' (file /tmp/aorai_test_switch2_0.i, line 56)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_switch2_0.i, line 60)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_switch2_0.i, line 63)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_switch2_0.i, line 66)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_test_switch2_0.i, line 69)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_switch2_0.i, line 72)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_switch2_0.i, line 75)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch2_0.i, line 48)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 119)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 120)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch2_0.i, line 125)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_switch2_0.i, line 128)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_in' (file /tmp/aorai_test_switch2_0.i, line 132)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_switch2_0.i, line 136)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_switch2_0.i, line 139)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_test_switch2_0.i, line 142)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_switch2_0.i, line 145)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_switch2_0.i, line 148)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch2_0.i, line 121)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opa'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 215)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 216)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch2_0.i, line 221)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_switch2_0.i, line 224)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_switch2_0.i, line 227)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_in' (file /tmp/aorai_test_switch2_0.i, line 231)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_switch2_0.i, line 235)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_test_switch2_0.i, line 238)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_switch2_0.i, line 241)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_switch2_0.i, line 244)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch2_0.i, line 217)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 288)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 289)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch2_0.i, line 294)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_switch2_0.i, line 297)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_switch2_0.i, line 300)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_switch2_0.i, line 303)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_in' (file /tmp/aorai_test_switch2_0.i, line 307)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_test_switch2_0.i, line 311)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_switch2_0.i, line 314)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_switch2_0.i, line 317)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch2_0.i, line 290)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opb'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opc_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 377)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 378)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch2_0.i, line 383)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_switch2_0.i, line 386)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_switch2_0.i, line 389)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_switch2_0.i, line 392)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_test_switch2_0.i, line 395)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_switch2_0.i, line 398)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_switch2_0.i, line 401)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch2_0.i, line 379)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opc_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 442)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 443)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch2_0.i, line 448)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_switch2_0.i, line 451)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_switch2_0.i, line 454)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_switch2_0.i, line 457)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_test_switch2_0.i, line 460)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_switch2_0.i, line 463)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_switch2_0.i, line 466)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch2_0.i, line 444)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'opc'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 541)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 542)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_switch2_0.i, line 548)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch2_0.i, line 552)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_switch2_0.i, line 555)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_switch2_0.i, line 558)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_switch2_0.i, line 561)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_test_switch2_0.i, line 564)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_switch2_0.i, line 567)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_switch2_0.i, line 570)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch2_0.i, line 543)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 614)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 615)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch2_0.i, line 620)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S3_out' (file /tmp/aorai_test_switch2_0.i, line 623)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S4_out' (file /tmp/aorai_test_switch2_0.i, line 626)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S5_out' (file /tmp/aorai_test_switch2_0.i, line 629)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S6_out' (file /tmp/aorai_test_switch2_0.i, line 632)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_in' (file /tmp/aorai_test_switch2_0.i, line 636)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_all_out' (file /tmp/aorai_test_switch2_0.i, line 640)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_init_out' (file /tmp/aorai_test_switch2_0.i, line 643)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch2_0.i, line 616)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S3_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S4_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S5_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S6_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_all_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_init_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-   160 Completely validated
-   160 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3.res.oracle
index 652b471f22401a002d09d3a44c21d2c17fa42cd7..18083a07f97a4ae9788647aea229ab95e6a91295 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3.res.oracle
@@ -2,250 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_test_switch3_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 37)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 38)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_0.i, line 44)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_0.i, line 48)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_0.i, line 51)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_0.i, line 54)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_0.i, line 57)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_0.i, line 39)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 87)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 88)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_0.i, line 94)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_0.i, line 98)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_0.i, line 101)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_0.i, line 104)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_0.i, line 107)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_0.i, line 89)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 163)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 164)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_0.i, line 170)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_0.i, line 174)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_0.i, line 177)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_0.i, line 180)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_switch3_0.i, line 184)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_0.i, line 188)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_0.i, line 165)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 219)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 220)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_0.i, line 226)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_0.i, line 230)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_0.i, line 233)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_switch3_0.i, line 237)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_0.i, line 241)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_switch3_0.i, line 245)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_0.i, line 249)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_0.i, line 221)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 312)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 313)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_0.i, line 319)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_0.i, line 323)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_0.i, line 326)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_switch3_0.i, line 330)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_0.i, line 334)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_0.i, line 337)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_0.i, line 314)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 367)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 368)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_0.i, line 374)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_0.i, line 378)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_0.i, line 381)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_switch3_0.i, line 385)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_0.i, line 389)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_0.i, line 392)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_0.i, line 369)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    97 Completely validated
-    97 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3_et_recursion.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3_et_recursion.res.oracle
index 4e7437440fe3183f779f423b0a58fdbe5c55748d..f8cb4d8f76544eebb3e58cf05a32f8c19a69dad5 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3_et_recursion.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3_et_recursion.res.oracle
@@ -4,206 +4,3 @@
   Call to countOne does not follow automaton's specification. This path is assumed to be dead
 [kernel] Parsing /tmp/aorai_test_switch3_et_recursion_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 34)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 35)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 41)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 45)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 48)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 51)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_et_recursion_0.i, line 36)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 76)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 77)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 82)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 85)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 88)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_et_recursion_0.i, line 78)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 139)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 140)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 146)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 150)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 153)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 156)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_et_recursion_0.i, line 141)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 181)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 182)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 187)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 190)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 194)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 198)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_et_recursion_0.i, line 183)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 248)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 249)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 254)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 257)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 261)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 265)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_et_recursion_0.i, line 250)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 290)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 291)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 297)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 301)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 304)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 308)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 312)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_et_recursion_0.i, line 292)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    75 Completely validated
-    75 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3_if.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3_if.res.oracle
index d74231853de37de402974b8882a11fa6b98511bd..adfb3aca7b5b77fb780ba60c8198b2b7e4152d35 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3_if.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3_if.res.oracle
@@ -2,250 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_test_switch3_if_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 37)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 38)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_if_0.i, line 44)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_if_0.i, line 48)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_if_0.i, line 51)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_if_0.i, line 54)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_if_0.i, line 57)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_if_0.i, line 39)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 87)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 88)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_if_0.i, line 94)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_if_0.i, line 98)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_if_0.i, line 101)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_if_0.i, line 104)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_if_0.i, line 107)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_if_0.i, line 89)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 161)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 162)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_if_0.i, line 168)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_if_0.i, line 172)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_if_0.i, line 175)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_if_0.i, line 178)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_switch3_if_0.i, line 182)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_if_0.i, line 186)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_if_0.i, line 163)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 217)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 218)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_if_0.i, line 224)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_if_0.i, line 228)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_if_0.i, line 231)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_switch3_if_0.i, line 235)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_if_0.i, line 239)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_switch3_if_0.i, line 243)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_if_0.i, line 247)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_if_0.i, line 219)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 310)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 311)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_if_0.i, line 317)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_if_0.i, line 321)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_if_0.i, line 324)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_switch3_if_0.i, line 328)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_if_0.i, line 332)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_if_0.i, line 335)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_if_0.i, line 312)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 365)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 366)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_if_0.i, line 372)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_if_0.i, line 376)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_if_0.i, line 379)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_switch3_if_0.i, line 383)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_if_0.i, line 387)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_if_0.i, line 390)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_if_0.i, line 367)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    97 Completely validated
-    97 Total
---------------------------------------------------------------------------------
diff --git a/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3_return.res.oracle b/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3_return.res.oracle
index 6ee3eb3e4ef61010fb21e647aaa94e51b35dc395..68bbfec82cc9b42f63eab4c70eba89ba72d0158d 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3_return.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/test_switch3_return.res.oracle
@@ -2,250 +2,3 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_test_switch3_return_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[report] Computing properties status...
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 37)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 38)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_return_0.i, line 44)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_return_0.i, line 48)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_return_0.i, line 51)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_return_0.i, line 54)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_return_0.i, line 57)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_return_0.i, line 39)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 87)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 88)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_return_0.i, line 94)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_return_0.i, line 98)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_return_0.i, line 101)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_return_0.i, line 104)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_return_0.i, line 107)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_return_0.i, line 89)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'countOne'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 168)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 169)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_return_0.i, line 175)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_return_0.i, line 179)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_return_0.i, line 182)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_return_0.i, line 185)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_switch3_return_0.i, line 189)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_return_0.i, line 193)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_return_0.i, line 170)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 224)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 225)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_return_0.i, line 231)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_return_0.i, line 235)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_return_0.i, line 238)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_switch3_return_0.i, line 242)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_return_0.i, line 246)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_in' (file /tmp/aorai_test_switch3_return_0.i, line 250)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_return_0.i, line 254)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_return_0.i, line 226)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'count'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_pre_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 317)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 318)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_return_0.i, line 324)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_return_0.i, line 328)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_return_0.i, line 331)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_switch3_return_0.i, line 335)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_return_0.i, line 339)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_return_0.i, line 342)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_return_0.i, line 319)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main_post_func'
---------------------------------------------------------------------------------
-
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 372)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 373)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_return_0.i, line 379)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_return_0.i, line 383)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_init_out' (file /tmp/aorai_test_switch3_return_0.i, line 386)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_switch3_return_0.i, line 390)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_out' (file /tmp/aorai_test_switch3_return_0.i, line 394)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S2_out' (file /tmp/aorai_test_switch3_return_0.i, line 397)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_test_switch3_return_0.i, line 374)
-            by Wp.typed.
-[  Valid  ] Behavior 'buch_state_T0_S2_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_T0_init_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_in'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S1_out'
-            by Frama-C kernel.
-[  Valid  ] Behavior 'buch_state_accept_S2_out'
-            by Frama-C kernel.
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Properties of Function 'main'
---------------------------------------------------------------------------------
-
-[  Valid  ] Default behavior
-            by Frama-C kernel.
-
---------------------------------------------------------------------------------
---- Status Report Summary
---------------------------------------------------------------------------------
-    97 Completely validated
-    97 Total
---------------------------------------------------------------------------------