diff --git a/src/plugins/aorai/aorai_utils.ml b/src/plugins/aorai/aorai_utils.ml
index 8ace0513ae632217120f86caaa07cee32e0dd722..4c43cd2143eebf689b23be3e5a9853cb3f622233 100644
--- a/src/plugins/aorai/aorai_utils.ml
+++ b/src/plugins/aorai/aorai_utils.ml
@@ -1704,10 +1704,7 @@ let auto_func_behaviors loc f st state =
   Aorai_option.debug
     "func behavior for %a (%s)" Kernel_function.pretty f call_or_ret;
   let (states, _) as auto = Data_for_aorai.getAutomata() in
-  (* requires is not needed for pre_func, as it is enforced by the
-     requires of the original C function itself (and the call to pre_func
-     by definition the first instruction of the function).
-  *)
+  let requires = auto_func_preconditions loc f st state in
   let post_cond =
     let called_pre =
       Logic_const.new_predicate
@@ -1735,9 +1732,6 @@ let auto_func_behaviors loc f st state =
     (* let old_pred = Aorai_utils.mk_old_state_pred loc in *)
     [(Normal, called_pre); (Normal, called_pre_2)]
   in
-  let requires =
-    if st = Promelaast.Call then [] else auto_func_preconditions loc f st state
-  in
   let mk_behavior (assigns, behaviors) status =
     let new_assigns, new_behaviors =
       mk_behavior ~loc auto f st state status
diff --git a/src/plugins/aorai/tests/aorai/oracle/assigns.0.res.oracle b/src/plugins/aorai/tests/aorai/oracle/assigns.0.res.oracle
index ef6224bb447e03550381c8c205c6feb41da0f37e..587631cdbf4b3e377b840611ff496de8c6814733 100644
--- a/src/plugins/aorai/tests/aorai/oracle/assigns.0.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/assigns.0.res.oracle
@@ -19,7 +19,9 @@ int X;
 /*@ ghost int Sf = 0; */
 /*@ ghost int in_main = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ Sf ∧ 0 ≡ S1 ∧ 0 ≡ S2 ∧ 0 ≡ S_in_f ∧ 0 ≡ in_main;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_f;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, S2, S_in_f, Sf,
              in_main;
@@ -146,7 +148,9 @@ void f(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ S1 ∧ 0 ≡ S2 ∧ 0 ≡ S_in_f ∧ 0 ≡ Sf ∧ 0 ≡ in_main;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, S2, S_in_f, Sf,
              in_main;
diff --git a/src/plugins/aorai/tests/aorai/oracle/assigns.1.res.oracle b/src/plugins/aorai/tests/aorai/oracle/assigns.1.res.oracle
index 5f5602cdd80d5cc5e3123a0fe3281b1fd19fbe99..c6501e5664e85b37841806f7963b170b08c65f45 100644
--- a/src/plugins/aorai/tests/aorai/oracle/assigns.1.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/assigns.1.res.oracle
@@ -33,7 +33,8 @@ int X;
 /*@ ghost enum aorai_OpStatusList aorai_CurOpStatus = aorai_Called; */
 /*@ ghost int aorai_CurStates = S1; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires aorai_CurStates ≡ Sf;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_f;
      assigns aorai_CurOpStatus, aorai_CurOperation, aorai_CurStates;
      
@@ -123,7 +124,8 @@ void f(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires aorai_CurStates ≡ S1;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, aorai_CurStates;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/bts1289.0.res.oracle b/src/plugins/aorai/tests/aorai/oracle/bts1289.0.res.oracle
index 97ad07ce779b14e27de99125e07e9e9b2bd71f11..a313805caf47651715eb72d737ff22d1aa670a63 100644
--- a/src/plugins/aorai/tests/aorai/oracle/bts1289.0.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/bts1289.0.res.oracle
@@ -15,7 +15,8 @@ enum aorai_OpStatusList {
 /*@ ghost enum aorai_OpStatusList aorai_CurOpStatus = aorai_Called; */
 /*@ ghost int S = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires \false;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_a;
      assigns aorai_CurOpStatus, aorai_CurOperation, S;
      
@@ -69,7 +70,8 @@ void a(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires \false;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/bts1289.1.res.oracle b/src/plugins/aorai/tests/aorai/oracle/bts1289.1.res.oracle
index 566b9dc7ab47ef19917278a6e3bc53664b0d291a..0e1b58e415e22e647e96dd4122c6bc403b1bcb14 100644
--- a/src/plugins/aorai/tests/aorai/oracle/bts1289.1.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/bts1289.1.res.oracle
@@ -18,7 +18,10 @@ enum aorai_OpStatusList {
 /*@ ghost int aorai_intermediate_state_0 = 0; */
 /*@ ghost int init = 1; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       (1 ≡ S ∨ 1 ≡ T) ∧ 0 ≡ aorai_intermediate_state ∧
+       0 ≡ aorai_intermediate_state_0 ∧ 0 ≡ init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_a;
      assigns aorai_CurOpStatus, aorai_CurOperation, S, T,
              aorai_intermediate_state, aorai_intermediate_state_0, init;
@@ -181,7 +184,10 @@ void a(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ init ∧ 0 ≡ S ∧ 0 ≡ T ∧
+       0 ≡ aorai_intermediate_state ∧ 0 ≡ aorai_intermediate_state_0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S, T,
              aorai_intermediate_state, aorai_intermediate_state_0, init;
diff --git a/src/plugins/aorai/tests/aorai/oracle/declared_function.res.oracle b/src/plugins/aorai/tests/aorai/oracle/declared_function.res.oracle
index 9d37fe0b6442bed85a03f3b4a22d895bf153f3ca..7b00c3f64fecbe874659161d8d987a6e160fae2c 100644
--- a/src/plugins/aorai/tests/aorai/oracle/declared_function.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/declared_function.res.oracle
@@ -46,7 +46,8 @@ check lemma I_deterministic_trans{L}:
  */
 /*@ ghost int aorai_CurStates = I; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires aorai_CurStates ≡ I;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, aorai_CurStates;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/deterministic.res.oracle b/src/plugins/aorai/tests/aorai/oracle/deterministic.res.oracle
index 75acb9204ee5a6aee059455def9e02c64419a037..03ffe79dc58e46b95e3bbf8943e14beeb6f46b90 100644
--- a/src/plugins/aorai/tests/aorai/oracle/deterministic.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/deterministic.res.oracle
@@ -63,7 +63,9 @@ check lemma S0_deterministic_trans{L}:
  */
 /*@ ghost int aorai_CurStates = Si; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires aorai_CurStates ≡ S3;
+     requires aorai_CurStates ≡ S3 ⇒ x ≡ 5 ∨ x ≡ 4;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_g;
      assigns aorai_CurOpStatus, aorai_CurOperation, aorai_CurStates;
      
@@ -191,7 +193,9 @@ void g(int x)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires aorai_CurStates ≡ S1;
+     requires aorai_CurStates ≡ S1 ⇒ x ≡ 4;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_f;
      assigns aorai_CurOpStatus, aorai_CurOperation, aorai_CurStates;
      
@@ -310,7 +314,9 @@ int f(int x)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires aorai_CurStates ≡ S0;
+     requires aorai_CurStates ≡ S0 ⇒ c ≡ 0 ∨ c ≢ 0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_real_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, aorai_CurStates;
      
@@ -429,7 +435,8 @@ int real_main(int c)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires aorai_CurStates ≡ Si;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, aorai_CurStates;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/formals.res.oracle b/src/plugins/aorai/tests/aorai/oracle/formals.res.oracle
index f7b7f60952fc0de58218d819587217b5ac8e2cb3..55923d34f281cd32b37030daf68a3585dc3a410b 100644
--- a/src/plugins/aorai/tests/aorai/oracle/formals.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/formals.res.oracle
@@ -77,7 +77,9 @@ check lemma aorai_intermediate_state_deterministic_trans{L}:
       \at(aorai_x,L) ≢ 1));
  */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires aorai_CurStates ≡ main_0;
+     requires aorai_CurStates ≡ main_0 ⇒ x ≡ 3 ∨ x ≡ 1;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_f;
      assigns aorai_x_0, aorai_x, aorai_CurOpStatus, aorai_CurOperation,
              aorai_CurStates;
@@ -295,7 +297,10 @@ int f(int x)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       aorai_CurStates ≡ OK ∨
+       aorai_CurStates ≡ aorai_intermediate_state_0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_g;
      assigns aorai_y, aorai_CurOpStatus, aorai_CurOperation, aorai_CurStates;
      
@@ -473,7 +478,8 @@ int g(int y)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires aorai_CurStates ≡ init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, aorai_CurStates;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/generate_assigns_bts1290.res.oracle b/src/plugins/aorai/tests/aorai/oracle/generate_assigns_bts1290.res.oracle
index f256e74d9cbfec7dfa9e9d2917fffe6deff0149e..f822ad621a1f063e86bd0af5f86bb9adea43a345 100644
--- a/src/plugins/aorai/tests/aorai/oracle/generate_assigns_bts1290.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/generate_assigns_bts1290.res.oracle
@@ -13,7 +13,8 @@ enum aorai_OpStatusList {
 /*@ ghost enum aorai_OpStatusList aorai_CurOpStatus = aorai_Called; */
 /*@ ghost int S = 1; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ S;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/goto.res.oracle b/src/plugins/aorai/tests/aorai/oracle/goto.res.oracle
index 0043d14bb25bf9672874239bd7375191989faa0d..4fbc7da4bc899a5ac4d94b6fdda4afa1694d72de 100644
--- a/src/plugins/aorai/tests/aorai/oracle/goto.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/goto.res.oracle
@@ -28,7 +28,11 @@ int rr = 1;
 /*@ ghost int accept_all = 0; */
 /*@ ghost int accept_init = 1; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ accept_S2 ∧ 0 ≡ accept_S3 ∧ 0 ≡ accept_S4 ∧
+       0 ≡ accept_S5 ∧ 0 ≡ accept_S6 ∧ 0 ≡ accept_all ∧
+       0 ≡ accept_init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opa;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S2, accept_S3,
              accept_S4, accept_S5, accept_S6, accept_all, accept_init;
@@ -193,7 +197,11 @@ void opa(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ accept_S4 ∧ 0 ≡ accept_S2 ∧ 0 ≡ accept_S3 ∧
+       0 ≡ accept_S5 ∧ 0 ≡ accept_S6 ∧ 0 ≡ accept_all ∧
+       0 ≡ accept_init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opb;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S2, accept_S3,
              accept_S4, accept_S5, accept_S6, accept_all, accept_init;
@@ -354,7 +362,8 @@ void opb(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires \false;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opc;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S2, accept_S3,
              accept_S4, accept_S5, accept_S6, accept_all, accept_init;
@@ -514,7 +523,11 @@ void opc(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ accept_init ∧ 0 ≡ accept_S2 ∧ 0 ≡ accept_S3 ∧
+       0 ≡ accept_S4 ∧ 0 ≡ accept_S5 ∧ 0 ≡ accept_S6 ∧
+       0 ≡ accept_all;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S2, accept_S3,
              accept_S4, accept_S5, accept_S6, accept_all, accept_init;
diff --git a/src/plugins/aorai/tests/aorai/oracle/hoare_seq.res.oracle b/src/plugins/aorai/tests/aorai/oracle/hoare_seq.res.oracle
index 9025e381a6c817d1455ffe392d0de9f1382755bc..18c655cce2c59fd9064f89f6ed6b63c72c9d744e 100644
--- a/src/plugins/aorai/tests/aorai/oracle/hoare_seq.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/hoare_seq.res.oracle
@@ -20,7 +20,11 @@ enum aorai_OpStatusList {
 /*@ ghost int aorai_intermediate_state_2 = 0; */
 /*@ ghost int aorai_reject = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ aorai_intermediate_state_0 ∧ 0 ≡ S0 ∧ 0 ≡ Sf ∧
+       0 ≡ aorai_intermediate_state_1 ∧
+       0 ≡ aorai_intermediate_state_2 ∧ 0 ≡ aorai_reject;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_f;
      assigns aorai_CurOpStatus, aorai_CurOperation, S0, Sf,
              aorai_intermediate_state, aorai_intermediate_state_0,
@@ -227,7 +231,13 @@ void f(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ S0 ∧ 0 ≡ Sf ∧ 0 ≡ aorai_intermediate_state ∧
+       0 ≡ aorai_intermediate_state_0 ∧
+       0 ≡ aorai_intermediate_state_1 ∧
+       0 ≡ aorai_intermediate_state_2 ∧ 0 ≡ aorai_reject;
+     requires 1 ≡ S0 ⇒ c ≤ 0 ∨ c > 0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S0, Sf,
              aorai_intermediate_state, aorai_intermediate_state_0,
diff --git a/src/plugins/aorai/tests/aorai/oracle/incorrect.res.oracle b/src/plugins/aorai/tests/aorai/oracle/incorrect.res.oracle
index f0441fa89f01c774e4a8ac2e8e94708bf91e14b0..62b6e9a75cc2e8b3dfeb92af6e68e33f5c6d02fa 100644
--- a/src/plugins/aorai/tests/aorai/oracle/incorrect.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/incorrect.res.oracle
@@ -23,7 +23,8 @@ int f(void);
 /*@ ghost enum aorai_OpStatusList aorai_CurOpStatus = aorai_Called; */
 /*@ ghost int aorai_CurStates = s0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires \false;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, aorai_CurStates;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/loop_bts1050.res.oracle b/src/plugins/aorai/tests/aorai/oracle/loop_bts1050.res.oracle
index a6f3f8f7d8a6c963688ebbb9b7231ae346ab2944..f4ec0edda45a5b3cdb0edf3b601818f2689d2653 100644
--- a/src/plugins/aorai/tests/aorai/oracle/loop_bts1050.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/loop_bts1050.res.oracle
@@ -22,7 +22,14 @@ enum aorai_OpStatusList {
 /*@ ghost int aorai_intermediate_state_3 = 0; */
 /*@ ghost int aorai_counter = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       (1 ≡ aorai_intermediate_state ∨ 1 ≡ aorai_intermediate_state_0) ∧
+       0 ≡ S0 ∧ 0 ≡ Sf ∧ 0 ≡ aorai_intermediate_state_1 ∧
+       0 ≡ aorai_intermediate_state_2 ∧ 0 ≡ aorai_intermediate_state_3;
+     requires 1 ≡ aorai_intermediate_state_0 ⇒ aorai_counter < 5;
+     requires
+       0 ≡ aorai_intermediate_state ∨ 0 ≡ aorai_intermediate_state_0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_f;
      assigns aorai_counter, aorai_CurOpStatus, aorai_CurOperation, S0, Sf,
              aorai_intermediate_state, aorai_intermediate_state_0,
@@ -220,7 +227,12 @@ void f(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ aorai_intermediate_state_2 ∧ 0 ≡ S0 ∧ 0 ≡ Sf ∧
+       0 ≡ aorai_intermediate_state ∧
+       0 ≡ aorai_intermediate_state_0 ∧
+       0 ≡ aorai_intermediate_state_1 ∧ 0 ≡ aorai_intermediate_state_3;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_g;
      assigns aorai_CurOpStatus, aorai_CurOperation, S0, Sf,
              aorai_intermediate_state, aorai_intermediate_state_0,
@@ -388,7 +400,12 @@ void g(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ S0 ∧ 0 ≡ Sf ∧ 0 ≡ aorai_intermediate_state ∧
+       0 ≡ aorai_intermediate_state_0 ∧
+       0 ≡ aorai_intermediate_state_1 ∧
+       0 ≡ aorai_intermediate_state_2 ∧ 0 ≡ aorai_intermediate_state_3;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S0, Sf,
              aorai_intermediate_state, aorai_intermediate_state_0,
diff --git a/src/plugins/aorai/tests/aorai/oracle/monostate.res.oracle b/src/plugins/aorai/tests/aorai/oracle/monostate.res.oracle
index 00d9af27024d4c9f1ab797e12c8459678891dfb0..678af350fd7113676fc7b5fed075ebe1b93095d2 100644
--- a/src/plugins/aorai/tests/aorai/oracle/monostate.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/monostate.res.oracle
@@ -39,7 +39,8 @@ check lemma Init_deterministic_trans{L}:
  */
 /*@ ghost int aorai_CurStates = Init; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires \false;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_f;
      assigns aorai_CurOpStatus, aorai_CurOperation, aorai_CurStates;
      
@@ -128,7 +129,8 @@ void f(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires \false;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, aorai_CurStates;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/not_prm.res.oracle b/src/plugins/aorai/tests/aorai/oracle/not_prm.res.oracle
index ba7d90bbeced0d8b23285c47292b045b98b3e073..f8d92a9b563fdf9512b524ee09ceb1d18005dca1 100644
--- a/src/plugins/aorai/tests/aorai/oracle/not_prm.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/not_prm.res.oracle
@@ -14,7 +14,9 @@ enum aorai_OpStatusList {
 /*@ ghost int S0 = 1; */
 /*@ ghost int Sf = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ S0 ∧ 0 ≡ Sf;
+     requires 1 ≡ S0 ⇒ x ≥ 4;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_f;
      assigns aorai_CurOpStatus, aorai_CurOperation, S0, Sf;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/other.res.oracle b/src/plugins/aorai/tests/aorai/oracle/other.res.oracle
index 480cdbac3e337e91a9a7e27ca0dee315fdfe892b..ad7f48504f1b3b471917a56a6f4f8596245aefe0 100644
--- a/src/plugins/aorai/tests/aorai/oracle/other.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/other.res.oracle
@@ -18,7 +18,9 @@ int x = 0;
 /*@ ghost int last = 0; */
 /*@ ghost int step1 = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ init ∨ 1 ≡ last ∨ 1 ≡ step1;
+     requires 1 ≡ last ⇒ x ≡ 3 ∨ (x ≢ 4 ∧ x ≢ 3) ∨ x ≡ 4;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_f;
      assigns aorai_CurOpStatus, aorai_CurOperation, init, last, step1;
      
@@ -264,7 +266,9 @@ void f(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ init ∨ 1 ≡ last ∨ 1 ≡ step1;
+     requires 1 ≡ last ⇒ x ≡ 3 ∨ (x ≢ 4 ∧ x ≢ 3) ∨ x ≡ 4;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_g;
      assigns aorai_CurOpStatus, aorai_CurOperation, init, last, step1;
      
@@ -510,7 +514,8 @@ void g(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ init ∧ 0 ≡ last ∧ 0 ≡ step1;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, init, last, step1;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/seq.res.oracle b/src/plugins/aorai/tests/aorai/oracle/seq.res.oracle
index 6640fa2d480d2331da9cf76d2b78ae199029d41d..5fc4bc1ae7b69ebef9e6addbf82dc6d42867862d 100644
--- a/src/plugins/aorai/tests/aorai/oracle/seq.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/seq.res.oracle
@@ -22,7 +22,12 @@ enum aorai_OpStatusList {
 /*@ ghost int aorai_intermediate_state_3 = 0; */
 /*@ ghost int aorai_counter = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ aorai_intermediate_state ∧ 0 ≡ S0 ∧ 0 ≡ Sf ∧
+       0 ≡ aorai_intermediate_state_0 ∧
+       0 ≡ aorai_intermediate_state_1 ∧
+       0 ≡ aorai_intermediate_state_2 ∧ 0 ≡ aorai_intermediate_state_3;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_f;
      assigns aorai_CurOpStatus, aorai_CurOperation, S0, Sf,
              aorai_intermediate_state, aorai_intermediate_state_0,
@@ -191,7 +196,19 @@ void f(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       (1 ≡ aorai_intermediate_state ∨ 1 ≡ aorai_intermediate_state_0 ∨
+        1 ≡ aorai_intermediate_state_2) ∧
+       0 ≡ S0 ∧ 0 ≡ Sf ∧ 0 ≡ aorai_intermediate_state_1 ∧
+       0 ≡ aorai_intermediate_state_3;
+     requires 1 ≡ aorai_intermediate_state_2 ⇒ aorai_counter < 2;
+     requires
+       0 ≡ aorai_intermediate_state ∨ 0 ≡ aorai_intermediate_state_2;
+     requires
+       0 ≡ aorai_intermediate_state ∨ 0 ≡ aorai_intermediate_state_0;
+     requires
+       0 ≡ aorai_intermediate_state_0 ∨ 0 ≡ aorai_intermediate_state_2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_g;
      assigns aorai_counter, aorai_CurOpStatus, aorai_CurOperation, S0, Sf,
              aorai_intermediate_state, aorai_intermediate_state_0,
@@ -407,7 +424,12 @@ void g(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ S0 ∧ 0 ≡ Sf ∧ 0 ≡ aorai_intermediate_state ∧
+       0 ≡ aorai_intermediate_state_0 ∧
+       0 ≡ aorai_intermediate_state_1 ∧
+       0 ≡ aorai_intermediate_state_2 ∧ 0 ≡ aorai_intermediate_state_3;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S0, Sf,
              aorai_intermediate_state, aorai_intermediate_state_0,
diff --git a/src/plugins/aorai/tests/aorai/oracle/seq_loop.res.oracle b/src/plugins/aorai/tests/aorai/oracle/seq_loop.res.oracle
index b71bd8809d29cfc3d80253833fb03a144991aa1f..d2de21821b3d81ed010a05d33dee104216f8102d 100644
--- a/src/plugins/aorai/tests/aorai/oracle/seq_loop.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/seq_loop.res.oracle
@@ -22,7 +22,14 @@ enum aorai_OpStatusList {
 /*@ ghost int aorai_intermediate_state_3 = 0; */
 /*@ ghost int aorai_counter = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       (1 ≡ aorai_intermediate_state ∨ 1 ≡ aorai_intermediate_state_0) ∧
+       0 ≡ S0 ∧ 0 ≡ Sf ∧ 0 ≡ aorai_intermediate_state_1 ∧
+       0 ≡ aorai_intermediate_state_2 ∧ 0 ≡ aorai_intermediate_state_3;
+     requires 1 ≡ aorai_intermediate_state_0 ⇒ aorai_counter < 5;
+     requires
+       0 ≡ aorai_intermediate_state ∨ 0 ≡ aorai_intermediate_state_0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_f;
      assigns aorai_counter, aorai_CurOpStatus, aorai_CurOperation, S0, Sf,
              aorai_intermediate_state, aorai_intermediate_state_0,
@@ -220,7 +227,12 @@ void f(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ aorai_intermediate_state_2 ∧ 0 ≡ S0 ∧ 0 ≡ Sf ∧
+       0 ≡ aorai_intermediate_state ∧
+       0 ≡ aorai_intermediate_state_0 ∧
+       0 ≡ aorai_intermediate_state_1 ∧ 0 ≡ aorai_intermediate_state_3;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_g;
      assigns aorai_CurOpStatus, aorai_CurOperation, S0, Sf,
              aorai_intermediate_state, aorai_intermediate_state_0,
@@ -388,7 +400,12 @@ void g(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ S0 ∧ 0 ≡ Sf ∧ 0 ≡ aorai_intermediate_state ∧
+       0 ≡ aorai_intermediate_state_0 ∧
+       0 ≡ aorai_intermediate_state_1 ∧
+       0 ≡ aorai_intermediate_state_2 ∧ 0 ≡ aorai_intermediate_state_3;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S0, Sf,
              aorai_intermediate_state, aorai_intermediate_state_0,
diff --git a/src/plugins/aorai/tests/aorai/oracle/single_call.res.oracle b/src/plugins/aorai/tests/aorai/oracle/single_call.res.oracle
index cfb4234eb0cc7b8041bf606a33047a0e78c41e62..d93f86515a7c9e02f5d2762a5fff86a604f82b2b 100644
--- a/src/plugins/aorai/tests/aorai/oracle/single_call.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/single_call.res.oracle
@@ -15,7 +15,8 @@ enum aorai_OpStatusList {
 /*@ ghost int Sf = 0; */
 /*@ ghost int aorai_intermediate_state = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ S0 ∧ 0 ≡ Sf ∧ 0 ≡ aorai_intermediate_state;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S0, Sf,
              aorai_intermediate_state;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_acces_params.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_acces_params.res.oracle
index 3e646c93b8ae727e15a415e503375931b43eb550..ad696afccfd8cc459fb46df5f66bcb8dec19b9df 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_acces_params.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_acces_params.res.oracle
@@ -24,7 +24,11 @@ int rr = 1;
 /*@ ghost int SF = 0; */
 /*@ ghost int mainst = 1; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ S1 ∧ 0 ≡ S2 ∧ 0 ≡ S3 ∧ 0 ≡ S4 ∧ 0 ≡ SF ∧
+       0 ≡ mainst;
+     requires 1 ≡ S1 ⇒ i ≥ 0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opa;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, S2, S3, S4, SF,
              mainst;
@@ -175,7 +179,10 @@ void opa(int i, int j)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ S3 ∧ 0 ≡ S1 ∧ 0 ≡ S2 ∧ 0 ≡ S4 ∧ 0 ≡ SF ∧
+       0 ≡ mainst;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opb;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, S2, S3, S4, SF,
              mainst;
@@ -325,7 +332,10 @@ int opb(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ mainst ∧ 0 ≡ S1 ∧ 0 ≡ S2 ∧ 0 ≡ S3 ∧ 0 ≡ S4 ∧
+       0 ≡ SF;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, S2, S3, S4, SF,
              mainst;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_acces_params2.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_acces_params2.res.oracle
index a45dd2a4943de29c09a912eaecf6499f6a60da54..49f7c5b25ad5468a630d043c4404cd1b7bf174fa 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_acces_params2.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_acces_params2.res.oracle
@@ -25,7 +25,11 @@ int rr = 1;
 /*@ ghost int S6 = 0; */
 /*@ ghost int S7 = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ S2 ∧ 0 ≡ S1 ∧ 0 ≡ S3 ∧ 0 ≡ S4 ∧ 0 ≡ S5 ∧
+       0 ≡ S6 ∧ 0 ≡ S7;
+     requires 1 ≡ S2 ⇒ r ≥ 0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opa;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, S2, S3, S4, S5, S6,
              S7;
@@ -196,7 +200,10 @@ int opa(int r)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ S4 ∧ 0 ≡ S1 ∧ 0 ≡ S2 ∧ 0 ≡ S3 ∧ 0 ≡ S5 ∧
+       0 ≡ S6 ∧ 0 ≡ S7;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opb;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, S2, S3, S4, S5, S6,
              S7;
@@ -359,7 +366,8 @@ void opb(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires \false;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opc;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, S2, S3, S4, S5, S6,
              S7;
@@ -522,7 +530,10 @@ void opc(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ S1 ∧ 0 ≡ S2 ∧ 0 ≡ S3 ∧ 0 ≡ S4 ∧ 0 ≡ S5 ∧
+       0 ≡ S6 ∧ 0 ≡ S7;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, S2, S3, S4, S5, S6,
              S7;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_boucle.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_boucle.res.oracle
index a418b2f7c9e83d32274eff23ee3173ea9cba90cf..9a56e5059141c412172fb9ae3fa460bb37851880 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_boucle.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_boucle.res.oracle
@@ -22,7 +22,8 @@ extern int call_to_an_undefined_function(void);
 /*@ ghost int T0_init = 1; */
 /*@ ghost int accept_S1 = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires (1 ≡ T0_S2 ∨ 1 ≡ accept_S1) ∧ 0 ≡ T0_init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_a;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1;
@@ -126,7 +127,8 @@ int a(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires (1 ≡ T0_S2 ∨ 1 ≡ accept_S1) ∧ 0 ≡ T0_init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_b;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1;
@@ -231,7 +233,8 @@ int b(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ T0_init ∧ 0 ≡ T0_S2 ∧ 0 ≡ accept_S1;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_boucle1.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_boucle1.res.oracle
index 4fd824e2ad33bdb3a46508999084d5f048ad25a6..df9bd42ac2648170ce8e13f89b9cc3d44ab6ef18 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_boucle1.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_boucle1.res.oracle
@@ -25,7 +25,10 @@ int status = 0;
 /*@ ghost int accept_S4 = 0; */
 /*@ ghost int accept_init = 1; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ accept_S4 ∧ 0 ≡ accept_S1 ∧ 0 ≡ accept_S2 ∧
+       0 ≡ accept_S3 ∧ 0 ≡ accept_init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_commit_trans;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S1, accept_S2,
              accept_S3, accept_S4, accept_init;
@@ -161,7 +164,10 @@ int commit_trans(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ accept_S2 ∧ 0 ≡ accept_S1 ∧ 0 ≡ accept_S3 ∧
+       0 ≡ accept_S4 ∧ 0 ≡ accept_init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_init_trans;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S1, accept_S2,
              accept_S3, accept_S4, accept_init;
@@ -310,7 +316,10 @@ int init_trans(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ accept_init ∧ 0 ≡ accept_S1 ∧ 0 ≡ accept_S2 ∧
+       0 ≡ accept_S3 ∧ 0 ≡ accept_S4;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S1, accept_S2,
              accept_S3, accept_S4, accept_init;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_boucle2.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_boucle2.res.oracle
index 4b6cca74dbc83f17871fb61da2e0b92b388a9e8a..22b1adb03b4f7da3929240d53bab9b59e6ab176f 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_boucle2.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_boucle2.res.oracle
@@ -24,7 +24,10 @@ int rr = 1;
 /*@ ghost int accept_S5 = 0; */
 /*@ ghost int accept_all = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ T0_S2 ∧ 0 ≡ T0_init ∧ 0 ≡ accept_S3 ∧
+       0 ≡ accept_S4 ∧ 0 ≡ accept_S5 ∧ 0 ≡ accept_all;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opa;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S3, accept_S4, accept_S5, accept_all;
@@ -183,7 +186,10 @@ void opa(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ accept_S3 ∧ 0 ≡ T0_S2 ∧ 0 ≡ T0_init ∧
+       0 ≡ accept_S4 ∧ 0 ≡ accept_S5 ∧ 0 ≡ accept_all;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opb;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S3, accept_S4, accept_S5, accept_all;
@@ -328,7 +334,10 @@ void opb(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ T0_init ∧ 0 ≡ T0_S2 ∧ 0 ≡ accept_S3 ∧
+       0 ≡ accept_S4 ∧ 0 ≡ accept_S5 ∧ 0 ≡ accept_all;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S3, accept_S4, accept_S5, accept_all;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_boucle3.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_boucle3.res.oracle
index 611da850e54cd7f992ea6c81baa61527aff85002..8b3518d3db8a3cb2bcc22db417f4549797392789 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_boucle3.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_boucle3.res.oracle
@@ -23,7 +23,10 @@ int rr = 1;
 /*@ ghost int accept_S3 = 0; */
 /*@ ghost int accept_all = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       (1 ≡ T0_S4 ∨ 1 ≡ T1_S2) ∧ 0 ≡ T0_init ∧
+       0 ≡ accept_S3 ∧ 0 ≡ accept_all;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opa;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S4, T0_init, T1_S2,
              accept_S3, accept_all;
@@ -189,7 +192,11 @@ void opa(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ T1_S2 ∧ 0 ≡ T0_S4 ∧ 0 ≡ T0_init ∧ 0 ≡ accept_S3 ∧
+       0 ≡ accept_all;
+     requires 1 ≡ T1_S2 ⇒ rr ≡ 51;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opb;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S4, T0_init, T1_S2,
              accept_S3, accept_all;
@@ -323,7 +330,10 @@ void opb(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ T0_init ∧ 0 ≡ T0_S4 ∧ 0 ≡ T1_S2 ∧ 0 ≡ accept_S3 ∧
+       0 ≡ accept_all;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S4, T0_init, T1_S2,
              accept_S3, accept_all;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_boucle_rechercheTableau.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_boucle_rechercheTableau.res.oracle
index 4b0631f98f1d319c24ddf6be7b3fbfd24241c367..49a1be8807f96a252a379b0fc677353e8d3d2b65 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_boucle_rechercheTableau.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_boucle_rechercheTableau.res.oracle
@@ -21,7 +21,8 @@ enum aorai_OpStatusList {
 /*@ ghost int Idle = 1; */
 /*@ ghost int WillDoFoo = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ Idle ∧ 0 ≡ End ∧ 0 ≡ WillDoFoo;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_isPresent;
      assigns aorai_CurOpStatus, aorai_CurOperation, End, Idle, WillDoFoo;
      
@@ -168,7 +169,8 @@ int isPresent(int *t, int max, int val)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ WillDoFoo ∧ 0 ≡ End ∧ 0 ≡ Idle;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_foo;
      assigns aorai_CurOpStatus, aorai_CurOperation, End, Idle, WillDoFoo;
      
@@ -262,7 +264,8 @@ void foo(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ Idle ∧ 0 ≡ End ∧ 0 ≡ WillDoFoo;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, End, Idle, WillDoFoo;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_factorial.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_factorial.res.oracle
index bc2b324895728405c00ffa43fcb51fd18cd6c681..ceb7709726c121a7f69a5bbc8247be0be7402c2d 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_factorial.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_factorial.res.oracle
@@ -17,7 +17,8 @@ enum aorai_OpStatusList {
 /*@ ghost int accept_S2 = 0; */
 /*@ ghost int accept_init = 1; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ accept_S1 ∧ 0 ≡ accept_S2 ∧ 0 ≡ accept_init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_decode_int;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S1, accept_S2,
              accept_init;
@@ -185,7 +186,8 @@ int decode_int(char *s)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires (1 ≡ accept_S1 ∨ 1 ≡ accept_S2) ∧ 0 ≡ accept_init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_factorial;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S1, accept_S2,
              accept_init;
@@ -306,7 +308,8 @@ int factorial(int value)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ accept_init ∧ 0 ≡ accept_S1 ∧ 0 ≡ accept_S2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S1, accept_S2,
              accept_init;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_factorial2.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_factorial2.res.oracle
index 13d491bf7faf1f26825db7ca0ca991ba715d9315..68c37c23c9cdb73b438d4009ded72e36cc29d04e 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_factorial2.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_factorial2.res.oracle
@@ -17,7 +17,8 @@ enum aorai_OpStatusList {
 /*@ ghost int S2 = 0; */
 /*@ ghost int main_0 = 1; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ S1 ∧ 0 ≡ S2 ∧ 0 ≡ main_0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_decode_int;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, S2, main_0;
      
@@ -184,7 +185,9 @@ int decode_int(char *s)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires (1 ≡ S1 ∨ 1 ≡ S2) ∧ 0 ≡ main_0;
+     requires 1 ≡ S1 ⇒ 1 ≢ 0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_factorial;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, S2, main_0;
      
@@ -304,7 +307,8 @@ int factorial(int value)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ main_0 ∧ 0 ≡ S1 ∧ 0 ≡ S2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, S2, main_0;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_recursion1.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_recursion1.res.oracle
index bcd5caca7e911c3bfa1d4622186c5f95c7ed4f95..c2bd185f1366ca54eb563f5dfbc820490d2fce39 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_recursion1.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_recursion1.res.oracle
@@ -51,7 +51,8 @@ predicate valid_string{L}(char *s) =
 /*@ ghost int T0_init = 1; */
 /*@ ghost int accept_S1 = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ T0_S2 ∧ 0 ≡ T0_init ∧ 0 ≡ accept_S1;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_countOne;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1;
@@ -163,7 +164,8 @@ int countOne(char *argv)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ accept_S1 ∧ 0 ≡ T0_S2 ∧ 0 ≡ T0_init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_count;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1;
@@ -269,7 +271,8 @@ int count(int argc, char **argv)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ T0_init ∧ 0 ≡ T0_S2 ∧ 0 ≡ accept_S1;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_recursion2.0.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_recursion2.0.res.oracle
index efa580f6bc6e5aae0b60ae36c26c5fc05bdf1b01..06415a77d5fc0015f312d5fdbff3816f966bf442 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_recursion2.0.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_recursion2.0.res.oracle
@@ -67,7 +67,9 @@ int global_argc = 0;
 /*@ ghost int T1 = 0; */
 /*@ ghost int accept_T2 = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires (1 ≡ S1 ∨ 1 ≡ T1) ∧ 0 ≡ T0_init ∧ 0 ≡ accept_T2;
+     requires 1 ≡ T1 ⇒ global_argc > 0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_count;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, T0_init, T1,
              accept_T2;
@@ -196,7 +198,8 @@ int count(char *argv)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ S1 ∧ 0 ≡ T0_init ∧ 0 ≡ T1 ∧ 0 ≡ accept_T2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_sumOne;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, T0_init, T1,
              accept_T2;
@@ -327,7 +330,8 @@ int sumOne(char *t, int length)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ T0_init ∧ 0 ≡ S1 ∧ 0 ≡ T1 ∧ 0 ≡ accept_T2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, T0_init, T1,
              accept_T2;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_recursion2.1.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_recursion2.1.res.oracle
index 8b5a200aeaa8f8ae1ec8d1f931528ee7fdc52242..f7476480b9e0afec0b414d38e8d41106750e61c2 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_recursion2.1.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_recursion2.1.res.oracle
@@ -67,7 +67,9 @@ int global_argc = 0;
 /*@ ghost int T1 = 0; */
 /*@ ghost int accept_T2 = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires (1 ≡ S1 ∨ 1 ≡ T1) ∧ 0 ≡ T0_init ∧ 0 ≡ accept_T2;
+     requires 1 ≡ T1 ⇒ global_argc > 0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_count;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, T0_init, T1,
              accept_T2;
@@ -196,7 +198,8 @@ int count(char *argv)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ S1 ∧ 0 ≡ T0_init ∧ 0 ≡ T1 ∧ 0 ≡ accept_T2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_sumOne;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, T0_init, T1,
              accept_T2;
@@ -327,7 +330,8 @@ int sumOne(char *t, int length)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ T0_init ∧ 0 ≡ S1 ∧ 0 ≡ T1 ∧ 0 ≡ accept_T2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, T0_init, T1,
              accept_T2;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_recursion4.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_recursion4.res.oracle
index 09a6e371c266a733e453905cbb7c6d3a06323cbe..3a5c6d3807794b18ddee0f7cf99b49ebca9ccf80 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_recursion4.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_recursion4.res.oracle
@@ -18,7 +18,8 @@ enum aorai_OpStatusList {
 /*@ ghost int Idle = 1; */
 /*@ ghost int WillDoFoo = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ Idle ∧ 0 ≡ End ∧ 0 ≡ WillDoFoo;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_isPresent;
      assigns aorai_CurOpStatus, aorai_CurOperation, End, Idle, WillDoFoo;
      
@@ -174,7 +175,8 @@ int isPresent(int *t, int size, int val)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ WillDoFoo ∧ 0 ≡ End ∧ 0 ≡ Idle;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_foo;
      assigns aorai_CurOpStatus, aorai_CurOperation, End, Idle, WillDoFoo;
      
@@ -268,7 +270,8 @@ void foo(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ Idle ∧ 0 ≡ End ∧ 0 ≡ WillDoFoo;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, End, Idle, WillDoFoo;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_recursion5.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_recursion5.res.oracle
index b5c3e5aa9304fc5c42d1db1f402c63097c595463..8bc2cd519afb0fe2dc55feb7cabb5469e06a1b1e 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_recursion5.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_recursion5.res.oracle
@@ -23,7 +23,9 @@ enum aorai_OpStatusList {
 /*@ ghost int IgnoreFoo = 0; */
 /*@ ghost int WillDoFoo = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ Idle ∧ 0 ≡ End ∧ 0 ≡ IgnoreFoo ∧ 0 ≡ WillDoFoo;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_isPresentRec;
      assigns aorai_CurOpStatus, aorai_CurOperation, End, Idle, IgnoreFoo,
              WillDoFoo;
@@ -197,7 +199,9 @@ int isPresentRec(int *t, int i, int max, int val)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ Idle ∧ 0 ≡ End ∧ 0 ≡ IgnoreFoo ∧ 0 ≡ WillDoFoo;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_isPresent;
      assigns aorai_CurOpStatus, aorai_CurOperation, End, Idle, IgnoreFoo,
              WillDoFoo;
@@ -335,7 +339,9 @@ int isPresent(int *t, int max, int val)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ WillDoFoo ∧ 0 ≡ End ∧ 0 ≡ Idle ∧ 0 ≡ IgnoreFoo;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_foo;
      assigns aorai_CurOpStatus, aorai_CurOperation, End, Idle, IgnoreFoo,
              WillDoFoo;
@@ -447,7 +453,9 @@ void foo(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ Idle ∧ 0 ≡ End ∧ 0 ≡ IgnoreFoo ∧ 0 ≡ WillDoFoo;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, End, Idle, IgnoreFoo,
              WillDoFoo;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_struct.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_struct.res.oracle
index 485f555e125d20c2ae094c7edfeb9fb49284ef75..e03f82652406ebc3c89d48ee0adc9cc516e6194b 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_struct.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_struct.res.oracle
@@ -21,7 +21,9 @@ int myAge = 0;
 /*@ ghost int S1 = 0; */
 /*@ ghost int main_0 = 1; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ S1 ∧ 0 ≡ main_0;
+     requires 1 ≡ S1 ⇒ nobody.Age ≡ 1;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_increment;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, main_0;
      
@@ -110,7 +112,9 @@ void increment(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ main_0 ∧ 0 ≡ S1;
+     requires 1 ≡ main_0 ⇒ nobody.Age ≡ 0;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, S1, main_0;
      
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_switch2.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_switch2.res.oracle
index cf43cbba6f083bd3c2f9f92301ec727ef15d74fe..81a8063b0a89f5ae9f35f66dd9b94c13774662dc 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_switch2.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_switch2.res.oracle
@@ -30,7 +30,11 @@ int rr = 1;
 /*@ ghost int accept_all = 0; */
 /*@ ghost int accept_init = 1; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ accept_S2 ∧ 0 ≡ accept_S3 ∧ 0 ≡ accept_S4 ∧
+       0 ≡ accept_S5 ∧ 0 ≡ accept_S6 ∧ 0 ≡ accept_all ∧
+       0 ≡ accept_init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opa;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S2, accept_S3,
              accept_S4, accept_S5, accept_S6, accept_all, accept_init;
@@ -195,7 +199,11 @@ void opa(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ accept_S4 ∧ 0 ≡ accept_S2 ∧ 0 ≡ accept_S3 ∧
+       0 ≡ accept_S5 ∧ 0 ≡ accept_S6 ∧ 0 ≡ accept_all ∧
+       0 ≡ accept_init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opb;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S2, accept_S3,
              accept_S4, accept_S5, accept_S6, accept_all, accept_init;
@@ -356,7 +364,8 @@ void opb(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires \false;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_opc;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S2, accept_S3,
              accept_S4, accept_S5, accept_S6, accept_all, accept_init;
@@ -516,7 +525,11 @@ void opc(void)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ accept_init ∧ 0 ≡ accept_S2 ∧ 0 ≡ accept_S3 ∧
+       0 ≡ accept_S4 ∧ 0 ≡ accept_S5 ∧ 0 ≡ accept_S6 ∧
+       0 ≡ accept_all;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, accept_S2, accept_S3,
              accept_S4, accept_S5, accept_S6, accept_all, accept_init;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_switch3.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_switch3.res.oracle
index 7c650ba0861a05cd096cf028417e699e2328cf20..d21f9f44bf7cdcd0d6f2fb6909ae487cf131a084 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_switch3.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_switch3.res.oracle
@@ -18,7 +18,10 @@ enum aorai_OpStatusList {
 /*@ ghost int accept_S1 = 0; */
 /*@ ghost int accept_S2 = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       (1 ≡ T0_S2 ∨ 1 ≡ accept_S2) ∧ 0 ≡ T0_init ∧
+       0 ≡ accept_S1;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_countOne;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1, accept_S2;
@@ -143,7 +146,10 @@ int countOne(char *argv)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       (1 ≡ T0_S2 ∨ 1 ≡ accept_S1) ∧ 0 ≡ T0_init ∧
+       0 ≡ accept_S2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_count;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1, accept_S2;
@@ -294,7 +300,9 @@ int count(int argc, char **argv)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ T0_init ∧ 0 ≡ T0_S2 ∧ 0 ≡ accept_S1 ∧ 0 ≡ accept_S2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1, accept_S2;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_switch3_et_recursion.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_switch3_et_recursion.res.oracle
index 36ea60d0a6ebc872ec3f26d8f37a0aa53d8a46a6..14157f96c419376155b697c5442f360bbddf5d50 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_switch3_et_recursion.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_switch3_et_recursion.res.oracle
@@ -19,7 +19,8 @@ enum aorai_OpStatusList {
 /*@ ghost int T0_init = 1; */
 /*@ ghost int accept_S1 = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ T0_S2 ∧ 0 ≡ T0_init ∧ 0 ≡ accept_S1;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_countOne;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1;
@@ -123,7 +124,8 @@ int countOne(char *argv)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ accept_S1 ∧ 0 ≡ T0_S2 ∧ 0 ≡ T0_init;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_count;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1;
@@ -231,7 +233,8 @@ int count(int argc, char **argv)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires 1 ≡ T0_init ∧ 0 ≡ T0_S2 ∧ 0 ≡ accept_S1;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_switch3_if.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_switch3_if.res.oracle
index d0d98a3a8d87ccdcc08c916ad90c03ecdb9c8459..9f10f0b8669625d2a83dcb82c929cf63e94d592e 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_switch3_if.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_switch3_if.res.oracle
@@ -18,7 +18,10 @@ enum aorai_OpStatusList {
 /*@ ghost int accept_S1 = 0; */
 /*@ ghost int accept_S2 = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       (1 ≡ T0_S2 ∨ 1 ≡ accept_S2) ∧ 0 ≡ T0_init ∧
+       0 ≡ accept_S1;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_countOne;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1, accept_S2;
@@ -141,7 +144,10 @@ int countOne(char *argv)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       (1 ≡ T0_S2 ∨ 1 ≡ accept_S1) ∧ 0 ≡ T0_init ∧
+       0 ≡ accept_S2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_count;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1, accept_S2;
@@ -292,7 +298,9 @@ int count(int argc, char **argv)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ T0_init ∧ 0 ≡ T0_S2 ∧ 0 ≡ accept_S1 ∧ 0 ≡ accept_S2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1, accept_S2;
diff --git a/src/plugins/aorai/tests/aorai/oracle/test_switch3_return.res.oracle b/src/plugins/aorai/tests/aorai/oracle/test_switch3_return.res.oracle
index e3f099446489b1a2263da75cbaf33a37c1ef68fe..79aae782b2d78024cf2e4e2a15d19c52b1ab871b 100644
--- a/src/plugins/aorai/tests/aorai/oracle/test_switch3_return.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle/test_switch3_return.res.oracle
@@ -18,7 +18,10 @@ enum aorai_OpStatusList {
 /*@ ghost int accept_S1 = 0; */
 /*@ ghost int accept_S2 = 0; */
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       (1 ≡ T0_S2 ∨ 1 ≡ accept_S2) ∧ 0 ≡ T0_init ∧
+       0 ≡ accept_S1;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_countOne;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1, accept_S2;
@@ -148,7 +151,10 @@ int countOne(char *argv)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       (1 ≡ T0_S2 ∨ 1 ≡ accept_S1) ∧ 0 ≡ T0_init ∧
+       0 ≡ accept_S2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_count;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1, accept_S2;
@@ -299,7 +305,9 @@ int count(int argc, char **argv)
 }
 
 /*@ ghost
-  /@ ensures aorai_CurOpStatus ≡ aorai_Called;
+  /@ requires
+       1 ≡ T0_init ∧ 0 ≡ T0_S2 ∧ 0 ≡ accept_S1 ∧ 0 ≡ accept_S2;
+     ensures aorai_CurOpStatus ≡ aorai_Called;
      ensures aorai_CurOperation ≡ op_main;
      assigns aorai_CurOpStatus, aorai_CurOperation, T0_S2, T0_init,
              accept_S1, accept_S2;
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 bf0900f85f91d188a9b51f3b85a8f8cbc4398425..3f6ceb60607d908e25e26ad1f0f878395b5efa16 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
@@ -8,23 +8,23 @@
 --- Properties of Function 'f_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 35)
+[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 37)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 36)
+[  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 41)
+[  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 44)
+[  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 48)
+[  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 52)
+[  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 55)
+[  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 58)
+[  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 37)
+[  Valid  ] Assigns (file /tmp/aorai_assigns_0.i, line 39)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
@@ -45,23 +45,23 @@
 --- Properties of Function 'f_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 92)
+[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 94)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 93)
+[  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 98)
+[  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 101)
+[  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 104)
+[  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 107)
+[  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 111)
+[  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 115)
+[  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 94)
+[  Valid  ] Assigns (file /tmp/aorai_assigns_0.i, line 96)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
@@ -89,23 +89,23 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 162)
+[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 166)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 163)
+[  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 168)
+[  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 171)
+[  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 174)
+[  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 178)
+[  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 182)
+[  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 185)
+[  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 164)
+[  Valid  ] Assigns (file /tmp/aorai_assigns_0.i, line 168)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
@@ -126,23 +126,23 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 219)
+[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 223)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_0.i, line 220)
+[  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 225)
+[  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 229)
+[  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 233)
+[  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 236)
+[  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 239)
+[  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 242)
+[  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 221)
+[  Valid  ] Assigns (file /tmp/aorai_assigns_0.i, line 225)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
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 2fa5ba8ad6eda99ada4e3d66ab973a74fde93e36..82ad8993e78f11e81583de0b417996c5905738af 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
@@ -8,36 +8,36 @@
 --- Properties of Function 'f_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 49)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 50)
             by Wp.typed.
-[    -    ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_assigns_1.i, line 54)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_assigns_1.i, line 57)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in_f_in' (file /tmp/aorai_assigns_1.i, line 61)
+[  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.
-[    -    ] Post-condition for 'buch_state_S_in_f_out' (file /tmp/aorai_assigns_1.i, line 65)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_assigns_1.i, line 68)
+[  Valid  ] Post-condition for 'buch_state_S_in_f_out' (file /tmp/aorai_assigns_1.i, line 66)
             by Wp.typed.
-[    -    ] Post-condition for 'buch_state_in_main_out' (file /tmp/aorai_assigns_1.i, line 71)
-            tried with Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_assigns_1.i, line 51)
+[  Valid  ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_assigns_1.i, line 69)
             by Wp.typed.
-[    -    ] Behavior 'buch_state_S1_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S2_out'
-            tried with Frama-C kernel.
+[  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.
-[    -    ] Behavior 'buch_state_S_in_f_out'
-            tried with 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.
-[    -    ] Behavior 'buch_state_in_main_out'
-            tried with Frama-C kernel.
+[  Valid  ] Behavior 'buch_state_in_main_out'
+            by Frama-C kernel.
 [  Valid  ] Default behavior
             by Frama-C kernel.
 
@@ -45,23 +45,23 @@
 --- Properties of Function 'f_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 88)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 89)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_assigns_1.i, line 93)
+[  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 96)
+[  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 99)
+[  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 102)
+[  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 106)
+[  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 110)
+[  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 90)
+[  Valid  ] Assigns (file /tmp/aorai_assigns_1.i, line 91)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
@@ -89,36 +89,36 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 139)
+[  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 (file /tmp/aorai_assigns_1.i, line 140)
+[  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_S1_out' (file /tmp/aorai_assigns_1.i, line 144)
+[  Valid  ] Post-condition for 'buch_state_S_in_f_out' (file /tmp/aorai_assigns_1.i, line 152)
             by Wp.typed.
-[    -    ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_assigns_1.i, line 147)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S_in_f_out' (file /tmp/aorai_assigns_1.i, line 150)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_assigns_1.i, line 154)
+[  Valid  ] Post-condition for 'buch_state_Sf_in' (file /tmp/aorai_assigns_1.i, line 156)
             by Wp.typed.
-[    -    ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_assigns_1.i, line 158)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_in_main_out' (file /tmp/aorai_assigns_1.i, line 161)
-            tried with Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_assigns_1.i, line 141)
+[  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.
-[    -    ] Behavior 'buch_state_S2_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S_in_f_out'
-            tried with 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.
-[    -    ] Behavior 'buch_state_Sf_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_in_main_out'
-            tried with 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.
 
@@ -126,23 +126,23 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 178)
+[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 180)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_assigns_1.i, line 179)
+[  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 183)
+[  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 187)
+[  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 191)
+[  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 194)
+[  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 197)
+[  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 200)
+[  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 180)
+[  Valid  ] Assigns (file /tmp/aorai_assigns_1.i, line 182)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
@@ -162,7 +162,6 @@
 --------------------------------------------------------------------------------
 --- Status Report Summary
 --------------------------------------------------------------------------------
-    49 Completely validated
-    16 To be validated
+    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 5597a758be24131d4a67d208914a8965356e9e4f..eb643f6c43db733cafc11cc51e6c5270f587a89c 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
@@ -9,13 +9,13 @@
 --- Properties of Function 'a_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 30)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 31)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_out' (file /tmp/aorai_bts1289_0.i, line 35)
+[  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 32)
+[  Valid  ] Assigns (file /tmp/aorai_bts1289_0.i, line 33)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S_out'
             by Frama-C kernel.
@@ -26,13 +26,13 @@
 --- Properties of Function 'a_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 52)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 53)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_out' (file /tmp/aorai_bts1289_0.i, line 57)
+[  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 54)
+[  Valid  ] Assigns (file /tmp/aorai_bts1289_0.i, line 55)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S_out'
             by Frama-C kernel.
@@ -50,13 +50,13 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 84)
+[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 86)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 85)
+[  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 89)
+[  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 86)
+[  Valid  ] Assigns (file /tmp/aorai_bts1289_0.i, line 88)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S_out'
             by Frama-C kernel.
@@ -67,13 +67,13 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 106)
+[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 108)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_0.i, line 107)
+[  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 111)
+[  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 108)
+[  Valid  ] Assigns (file /tmp/aorai_bts1289_0.i, line 110)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S_out'
             by Frama-C kernel.
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 514afab4c5fb7faeb2cf870bc42a31866dbb959b..e4a09da5c63607378f9d08d32ca37bb97e5653b3 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
@@ -8,25 +8,25 @@
 --- Properties of Function 'a_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 34)
+[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 38)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 35)
+[  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 40)
+[  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 43)
+[  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 47)
+[  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 51)
+[  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 55)
+[  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 59)
+[  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 62)
+[  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 36)
+[  Valid  ] Assigns (file /tmp/aorai_bts1289_1.i, line 40)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S_out'
             by Frama-C kernel.
@@ -49,25 +49,25 @@
 --- Properties of Function 'a_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 99)
+[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 103)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 100)
+[  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 106)
+[  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 110)
+[  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 114)
+[  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 118)
+[  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 121)
+[  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 124)
+[  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 127)
+[  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 101)
+[  Valid  ] Assigns (file /tmp/aorai_bts1289_1.i, line 105)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S_in'
             by Frama-C kernel.
@@ -97,23 +97,23 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 198)
+[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 206)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 199)
+[  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 205)
+[  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 209)
+[  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 212)
+[  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 215)
+[  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 218)
+[  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 221)
+[  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 200)
+[  Valid  ] Assigns (file /tmp/aorai_bts1289_1.i, line 208)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S_in'
             by Frama-C kernel.
@@ -134,23 +134,23 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 257)
+[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 265)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_bts1289_1.i, line 258)
+[  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 264)
+[  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 268)
+[  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 271)
+[  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 274)
+[  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 277)
+[  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 280)
+[  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 259)
+[  Valid  ] Assigns (file /tmp/aorai_bts1289_1.i, line 267)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S_in'
             by Frama-C kernel.
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 b5da80c965c9347f4136781d4432c722c068041b..bc88b696896e5a1658cccb9945903ee4b344624e 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
@@ -21,15 +21,15 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_declared_function_0.i, line 63)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_declared_function_0.i, line 64)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_I_in' (file /tmp/aorai_declared_function_0.i, line 69)
+[  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 73)
+[  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 65)
+[  Valid  ] Assigns (file /tmp/aorai_declared_function_0.i, line 66)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_I_in'
             by Frama-C kernel.
@@ -42,15 +42,15 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_declared_function_0.i, line 94)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_declared_function_0.i, line 95)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_I_in' (file /tmp/aorai_declared_function_0.i, line 100)
+[  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 104)
+[  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 96)
+[  Valid  ] Assigns (file /tmp/aorai_declared_function_0.i, line 97)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_I_in'
             by Frama-C kernel.
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 058f40effada474e9ff59d552c5a3def22f17bc9..c6932196d269808397296a27ec4369363e5eed86 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/deterministic.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/deterministic.res.oracle
@@ -8,52 +8,52 @@
 --- Properties of Function 'g_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 80)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 81)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_deterministic_0.i, line 85)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_deterministic_0.i, line 88)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 91)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_deterministic_0.i, line 94)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S4_in' (file /tmp/aorai_deterministic_0.i, line 98)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_deterministic_0.i, line 102)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S5_in' (file /tmp/aorai_deterministic_0.i, line 106)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_deterministic_0.i, line 110)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_deterministic_0.i, line 113)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_Si_out' (file /tmp/aorai_deterministic_0.i, line 116)
-            tried with Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 82)
-            by Wp.typed.
-[    -    ] Behavior 'buch_state_S0_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S1_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S2_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S3_out'
-            tried with Frama-C kernel.
+[  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.
-[    -    ] Behavior 'buch_state_S4_out'
-            tried with Frama-C kernel.
+[  Valid  ] Behavior 'buch_state_S4_out'
+            by Frama-C kernel.
 [  Valid  ] Behavior 'buch_state_S5_in'
             by Frama-C kernel.
-[    -    ] Behavior 'buch_state_S5_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_Sf_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_Si_out'
-            tried with 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.
 
@@ -61,31 +61,31 @@
 --- Properties of Function 'g_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 134)
+[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 136)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 135)
+[  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 139)
+[  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 143)
+[  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 147)
+[  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 150)
+[  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 154)
+[  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 158)
+[  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 161)
+[  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 164)
+[  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 167)
+[  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 170)
+[  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 136)
+[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 138)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -121,48 +121,48 @@
 --- Properties of Function 'f_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 206)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 207)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_deterministic_0.i, line 211)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_deterministic_0.i, line 214)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 217)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S3_in' (file /tmp/aorai_deterministic_0.i, line 221)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_deterministic_0.i, line 225)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_deterministic_0.i, line 228)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_deterministic_0.i, line 231)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_deterministic_0.i, line 234)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_Si_out' (file /tmp/aorai_deterministic_0.i, line 237)
-            tried with Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 208)
-            by Wp.typed.
-[    -    ] Behavior 'buch_state_S0_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S1_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S2_out'
-            tried with Frama-C kernel.
+[  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.
-[    -    ] Behavior 'buch_state_S3_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S4_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S5_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_Sf_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_Si_out'
-            tried with 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.
 
@@ -170,29 +170,29 @@
 --- Properties of Function 'f_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 255)
+[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 259)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 256)
+[  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 260)
+[  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 263)
+[  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 267)
+[  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 271)
+[  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 274)
+[  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 277)
+[  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 280)
+[  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 283)
+[  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 286)
+[  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 257)
+[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 261)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -226,52 +226,52 @@
 --- Properties of Function 'real_main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 322)
+[  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 (file /tmp/aorai_deterministic_0.i, line 323)
+[  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_S0_out' (file /tmp/aorai_deterministic_0.i, line 327)
+[  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_S1_in' (file /tmp/aorai_deterministic_0.i, line 331)
+[  Valid  ] Post-condition for 'buch_state_S2_in' (file /tmp/aorai_deterministic_0.i, line 345)
             by Wp.typed.
-[    -    ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_deterministic_0.i, line 335)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S2_in' (file /tmp/aorai_deterministic_0.i, line 339)
+[  Valid  ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 349)
             by Wp.typed.
-[    -    ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 343)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_deterministic_0.i, line 346)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_deterministic_0.i, line 349)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_deterministic_0.i, line 352)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_deterministic_0.i, line 355)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_Si_out' (file /tmp/aorai_deterministic_0.i, line 358)
-            tried with Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 324)
+[  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.
-[    -    ] Behavior 'buch_state_S1_out'
-            tried with Frama-C kernel.
+[  Valid  ] Behavior 'buch_state_S1_out'
+            by Frama-C kernel.
 [  Valid  ] Behavior 'buch_state_S2_in'
             by Frama-C kernel.
-[    -    ] Behavior 'buch_state_S2_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S3_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S4_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S5_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_Sf_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_Si_out'
-            tried with 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.
 
@@ -279,29 +279,29 @@
 --- Properties of Function 'real_main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 376)
+[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 382)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 377)
+[  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 381)
+[  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 384)
+[  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 387)
+[  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 390)
+[  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 393)
+[  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 396)
+[  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 400)
+[  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 404)
+[  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 407)
+[  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 378)
+[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 384)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -335,46 +335,46 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 439)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 440)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_in' (file /tmp/aorai_deterministic_0.i, line 445)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_deterministic_0.i, line 449)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S1_out' (file /tmp/aorai_deterministic_0.i, line 452)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S2_out' (file /tmp/aorai_deterministic_0.i, line 455)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S3_out' (file /tmp/aorai_deterministic_0.i, line 458)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S4_out' (file /tmp/aorai_deterministic_0.i, line 461)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_S5_out' (file /tmp/aorai_deterministic_0.i, line 464)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_Sf_out' (file /tmp/aorai_deterministic_0.i, line 467)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_Si_out' (file /tmp/aorai_deterministic_0.i, line 470)
-            by Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 441)
+[  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.
-[    -    ] Behavior 'buch_state_S0_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S1_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S2_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S3_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S4_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_S5_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_Sf_out'
-            tried with 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
@@ -384,29 +384,29 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 487)
+[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 494)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_deterministic_0.i, line 488)
+[  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 492)
+[  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 495)
+[  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 498)
+[  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 501)
+[  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 504)
+[  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 507)
+[  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 511)
+[  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 515)
+[  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 518)
+[  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 489)
+[  Valid  ] Assigns (file /tmp/aorai_deterministic_0.i, line 496)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -439,7 +439,6 @@
 --------------------------------------------------------------------------------
 --- Status Report Summary
 --------------------------------------------------------------------------------
-   126 Completely validated
-    60 To be validated
+   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 0edf09a3f373f8c7fe83d1f74312febee66891c5..415bc01cd89590f2b66d8c7e05bda894720da535 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/formals.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/formals.res.oracle
@@ -8,60 +8,60 @@
 --- Properties of Function 'f_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 93)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 94)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_OK_out' (file /tmp/aorai_formals_0.i, line 99)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_in_0' (file /tmp/aorai_formals_0.i, line 103)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_in_0' (file /tmp/aorai_formals_0.i, line 104)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_formals_0.i, line 108)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_formals_0.i, line 109)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_formals_0.i, line 112)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_formals_0.i, line 115)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_in_0' (file /tmp/aorai_formals_0.i, line 119)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_in_0' (file /tmp/aorai_formals_0.i, line 120)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_formals_0.i, line 124)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_formals_0.i, line 125)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_reject_out' (file /tmp/aorai_formals_0.i, line 128)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_formals_0.i, line 131)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_formals_0.i, line 134)
-            tried with Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_formals_0.i, line 95)
-            by Wp.typed.
-[    -    ] Behavior 'buch_state_OK_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            tried with Frama-C kernel.
+[  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.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            tried with 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.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_reject_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_init_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_main_0_out'
-            tried with 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.
 
@@ -69,33 +69,33 @@
 --- Properties of Function 'f_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 166)
+[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 168)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 167)
+[  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 173)
+[  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 179)
+[  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 182)
+[  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 187)
+[  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 192)
+[  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 195)
+[  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 198)
+[  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 204)
+[  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 211)
+[  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 214)
+[  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 217)
+[  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 168)
+[  Valid  ] Assigns (file /tmp/aorai_formals_0.i, line 170)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_OK_in'
             by Frama-C kernel.
@@ -126,37 +126,37 @@
 --- Properties of Function 'g_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 301)
+[  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 (file /tmp/aorai_formals_0.i, line 302)
+[  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_OK_in' (file /tmp/aorai_formals_0.i, line 307)
+[  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_OK_out' (file /tmp/aorai_formals_0.i, line 311)
+[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_0' (file /tmp/aorai_formals_0.i, line 327)
             by Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_formals_0.i, line 314)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_formals_0.i, line 317)
+[  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_in_0' (file /tmp/aorai_formals_0.i, line 321)
+[  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_1_in_0' (file /tmp/aorai_formals_0.i, line 322)
+[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_formals_0.i, line 335)
             by Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_formals_0.i, line 326)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_formals_0.i, line 327)
+[  Valid  ] Post-condition for 'buch_state_aorai_reject_in' (file /tmp/aorai_formals_0.i, line 339)
             by Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_formals_0.i, line 330)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_reject_in' (file /tmp/aorai_formals_0.i, line 334)
+[  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_aorai_reject_out' (file /tmp/aorai_formals_0.i, line 338)
+[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_formals_0.i, line 346)
             by Wp.typed.
-[    -    ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_formals_0.i, line 341)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_formals_0.i, line 344)
-            tried with Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_formals_0.i, line 303)
+[  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.
@@ -166,20 +166,20 @@
             by Frama-C kernel.
 [  Valid  ] Behavior 'buch_state_aorai_intermediate_state_1_in_0'
             by Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_out'
-            tried with 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.
-[    -    ] Behavior 'buch_state_init_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_main_0_out'
-            tried with 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.
 
@@ -187,31 +187,31 @@
 --- Properties of Function 'g_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 371)
+[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 376)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 372)
+[  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 379)
+[  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 386)
+[  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 389)
+[  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 392)
+[  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 395)
+[  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 398)
+[  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 404)
+[  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 411)
+[  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 414)
+[  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 417)
+[  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 373)
+[  Valid  ] Assigns (file /tmp/aorai_formals_0.i, line 378)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_OK_in'
             by Frama-C kernel.
@@ -240,48 +240,48 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 474)
-            by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 475)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_OK_out' (file /tmp/aorai_formals_0.i, line 479)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_out' (file /tmp/aorai_formals_0.i, line 482)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_0_out' (file /tmp/aorai_formals_0.i, line 485)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_1_out' (file /tmp/aorai_formals_0.i, line 488)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_2_out' (file /tmp/aorai_formals_0.i, line 491)
-            tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_reject_out' (file /tmp/aorai_formals_0.i, line 494)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_init_out' (file /tmp/aorai_formals_0.i, line 497)
-            by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_main_0_in' (file /tmp/aorai_formals_0.i, line 501)
-            by Wp.typed.
-[    -    ] Post-condition for 'buch_state_main_0_out' (file /tmp/aorai_formals_0.i, line 505)
-            tried with Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_formals_0.i, line 476)
-            by Wp.typed.
-[    -    ] Behavior 'buch_state_OK_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_0_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_1_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_2_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_intermediate_state_out'
-            tried with Frama-C kernel.
-[    -    ] Behavior 'buch_state_aorai_reject_out'
-            tried with Frama-C kernel.
+[  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.
-[    -    ] Behavior 'buch_state_main_0_out'
-            tried with Frama-C kernel.
+[  Valid  ] Behavior 'buch_state_main_0_out'
+            by Frama-C kernel.
 [  Valid  ] Default behavior
             by Frama-C kernel.
 
@@ -289,31 +289,31 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 522)
+[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 528)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_formals_0.i, line 523)
+[  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 528)
+[  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 532)
+[  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 535)
+[  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 538)
+[  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 541)
+[  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 544)
+[  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 548)
+[  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 552)
+[  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 555)
+[  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 558)
+[  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 524)
+[  Valid  ] Assigns (file /tmp/aorai_formals_0.i, line 530)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_OK_in'
             by Frama-C kernel.
@@ -341,7 +341,6 @@
 --------------------------------------------------------------------------------
 --- Status Report Summary
 --------------------------------------------------------------------------------
-   112 Completely validated
-    40 To be validated
+   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 1612655aa9e12b100021f8d1fb629a5eaf885214..cc83a3f3e7d07bcb0b2ed68b8073cb4c38a8ff29 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
@@ -8,15 +8,15 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_generate_assigns_bts1290_0.i, line 29)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_generate_assigns_bts1290_0.i, line 30)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in' (file /tmp/aorai_generate_assigns_bts1290_0.i, line 35)
+[  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 39)
+[  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 31)
+[  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.
@@ -29,15 +29,15 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_generate_assigns_bts1290_0.i, line 56)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_generate_assigns_bts1290_0.i, line 57)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S_in' (file /tmp/aorai_generate_assigns_bts1290_0.i, line 62)
+[  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 66)
+[  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 58)
+[  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.
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 f77b85543d2d2379ac66ede90ec43ce1754e45bd..db107e5cb92b1c5a84880d3ec09ff418089321f6 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/goto.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/goto.res.oracle
@@ -12,27 +12,27 @@
 --- Properties of Function 'opa_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 42)
+[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 46)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 43)
+[  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 48)
+[  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 52)
+[  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 56)
+[  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 59)
+[  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 62)
+[  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 65)
+[  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 68)
+[  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 71)
+[  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 44)
+[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 48)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_accept_S2_out'
             by Frama-C kernel.
@@ -57,27 +57,27 @@
 --- Properties of Function 'opa_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 115)
+[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 119)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 116)
+[  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 121)
+[  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 124)
+[  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 128)
+[  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 132)
+[  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 135)
+[  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 138)
+[  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 141)
+[  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 144)
+[  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 117)
+[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 121)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_accept_S2_out'
             by Frama-C kernel.
@@ -109,27 +109,27 @@
 --- Properties of Function 'opb_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 207)
+[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 215)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 208)
+[  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 213)
+[  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 216)
+[  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 219)
+[  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 223)
+[  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 227)
+[  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 230)
+[  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 233)
+[  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 236)
+[  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 209)
+[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 217)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_accept_S2_out'
             by Frama-C kernel.
@@ -154,27 +154,27 @@
 --- Properties of Function 'opb_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 280)
+[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 288)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 281)
+[  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 286)
+[  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 289)
+[  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 292)
+[  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 295)
+[  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 299)
+[  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 303)
+[  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 306)
+[  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 309)
+[  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 282)
+[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 290)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_accept_S2_out'
             by Frama-C kernel.
@@ -206,25 +206,25 @@
 --- Properties of Function 'opc_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 368)
+[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 377)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 369)
+[  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 374)
+[  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 377)
+[  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 380)
+[  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 383)
+[  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 386)
+[  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 389)
+[  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 392)
+[  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 370)
+[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 379)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_accept_S2_out'
             by Frama-C kernel.
@@ -247,25 +247,25 @@
 --- Properties of Function 'opc_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 433)
+[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 442)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 434)
+[  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 439)
+[  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 442)
+[  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 445)
+[  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 448)
+[  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 451)
+[  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 454)
+[  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 457)
+[  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 435)
+[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 444)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_accept_S2_out'
             by Frama-C kernel.
@@ -295,27 +295,27 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 528)
+[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 541)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 529)
+[  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 535)
+[  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 539)
+[  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 542)
+[  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 545)
+[  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 548)
+[  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 551)
+[  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 554)
+[  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 557)
+[  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 530)
+[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 543)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_accept_S2_in'
             by Frama-C kernel.
@@ -340,27 +340,27 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 601)
+[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 614)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_goto_0.i, line 602)
+[  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 607)
+[  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 610)
+[  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 613)
+[  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 616)
+[  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 619)
+[  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 623)
+[  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 627)
+[  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 630)
+[  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 603)
+[  Valid  ] Assigns (file /tmp/aorai_goto_0.i, line 616)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_accept_S2_out'
             by Frama-C kernel.
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 ce2b6a6fbdbe188d7486e3b114a550522f8d52f9..a00b3bb62e40942a879ef020241b0aef805c8ecd 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
@@ -8,29 +8,29 @@
 --- Properties of Function 'f_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_hoare_seq_0.i, line 36)
+[  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 37)
+[  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 44)
+[  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 47)
+[  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 50)
+[  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 53)
+[  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 57)
+[  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 61)
+[  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 64)
+[  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 68)
+[  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 72)
+[  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 38)
+[  Valid  ] Assigns (file /tmp/aorai_hoare_seq_0.i, line 42)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -57,29 +57,29 @@
 --- Properties of Function 'f_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_hoare_seq_0.i, line 118)
+[  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 119)
+[  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 126)
+[  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 129)
+[  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 132)
+[  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 135)
+[  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 138)
+[  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 142)
+[  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 146)
+[  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 150)
+[  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 154)
+[  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 120)
+[  Valid  ] Assigns (file /tmp/aorai_hoare_seq_0.i, line 124)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -106,29 +106,29 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_hoare_seq_0.i, line 243)
+[  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 244)
+[  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 251)
+[  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 254)
+[  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 258)
+[  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 262)
+[    -    ] 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 266)
+[  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 270)
+[  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 273)
+[  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 276)
+[  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 279)
+[  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 245)
+[  Valid  ] Assigns (file /tmp/aorai_hoare_seq_0.i, line 256)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -155,29 +155,29 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_hoare_seq_0.i, line 326)
+[  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 327)
+[  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 334)
+[  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 340)
+[  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 346)
+[  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 349)
+[  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 352)
+[  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 355)
+[  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 358)
+[  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 365)
+[  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 372)
+[  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 328)
+[  Valid  ] Assigns (file /tmp/aorai_hoare_seq_0.i, line 339)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
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 b0ccf45eaf4161d5c99de5306533716a87090169..f4fdd9fc7467e0ce9616ddb71c46963bfcfa196e 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/incorrect.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/incorrect.res.oracle
@@ -3,7 +3,7 @@
 [aorai] Warning: Call to main does not follow automaton's specification. This path is assumed to be dead
 [kernel] Parsing /tmp/aorai_incorrect_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[kernel:annot:missing-spec] /tmp/aorai_incorrect_0.i:60: Warning: 
+[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...
 
@@ -22,16 +22,16 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_incorrect_0.i, line 38)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_incorrect_0.i, line 39)
             by Wp.typed.
-[    -    ] Post-condition for 'buch_state_s0_out' (file /tmp/aorai_incorrect_0.i, line 43)
-            tried with Wp.typed.
-[  Valid  ] Assigns (file /tmp/aorai_incorrect_0.i, line 40)
+[  Valid  ] Post-condition (file /tmp/aorai_incorrect_0.i, line 40)
             by Wp.typed.
-[    -    ] Behavior 'buch_state_s0_out'
-            tried with Frama-C kernel.
+[  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.
 
@@ -39,13 +39,13 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_incorrect_0.i, line 59)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_incorrect_0.i, line 60)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_s0_out' (file /tmp/aorai_incorrect_0.i, line 64)
+[  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 61)
+[  Valid  ] Assigns (file /tmp/aorai_incorrect_0.i, line 62)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_s0_out'
             by Frama-C kernel.
@@ -62,7 +62,7 @@
 --------------------------------------------------------------------------------
 --- Status Report Summary
 --------------------------------------------------------------------------------
-    11 Completely validated
-     5 To be validated
+    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 06fc76c442f1367df7c5be6072ad73884c0aa6ea..b8965f6fff472f3381f445aad41caeb5bf6fa8c3 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
@@ -8,35 +8,35 @@
 --- Properties of Function 'f_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 38)
+[  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 39)
+[  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 46)
+[  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 49)
+[  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 52)
+[  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 55)
+[  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 59)
+[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_0' (file /tmp/aorai_loop_bts1050_0.i, line 66)
             tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_0' (file /tmp/aorai_loop_bts1050_0.i, line 60)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_1' (file /tmp/aorai_loop_bts1050_0.i, line 64)
+[  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 65)
+[  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 71)
+[  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 72)
+[  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 75)
+[  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 78)
+[  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 40)
+[  Valid  ] Assigns (file /tmp/aorai_loop_bts1050_0.i, line 47)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -63,27 +63,27 @@
 --- Properties of Function 'f_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 127)
+[  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 128)
+[  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 135)
+[  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 138)
+[  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 141)
+[  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 144)
+[  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 147)
+[  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 151)
+[  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 155)
+[  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 158)
+[  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 129)
+[  Valid  ] Assigns (file /tmp/aorai_loop_bts1050_0.i, line 136)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -115,27 +115,27 @@
 --- Properties of Function 'g_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 232)
+[  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 233)
+[  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 240)
+[  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 243)
+[  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 246)
+[  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 249)
+[  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 252)
+[  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 255)
+[  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 259)
+[  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 263)
+[  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 234)
+[  Valid  ] Assigns (file /tmp/aorai_loop_bts1050_0.i, line 246)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -160,27 +160,27 @@
 --- Properties of Function 'g_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 309)
+[  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 310)
+[  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 317)
+[  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 320)
+[  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 323)
+[  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 327)
+[  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 331)
+[  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 334)
+[  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 337)
+[  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 340)
+[  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 311)
+[  Valid  ] Assigns (file /tmp/aorai_loop_bts1050_0.i, line 323)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -212,27 +212,27 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 401)
+[  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 402)
+[  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 409)
+[  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 412)
+[  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 416)
+[  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 420)
+[  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 423)
+[  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 426)
+[  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 429)
+[  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 432)
+[  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 403)
+[  Valid  ] Assigns (file /tmp/aorai_loop_bts1050_0.i, line 421)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -257,27 +257,27 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_loop_bts1050_0.i, line 477)
+[  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 478)
+[  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 485)
+[  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 490)
+[  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 495)
+[  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 498)
+[  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 501)
+[  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 504)
+[  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 507)
+[  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 510)
+[  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 479)
+[  Valid  ] Assigns (file /tmp/aorai_loop_bts1050_0.i, line 497)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -308,7 +308,7 @@
 --------------------------------------------------------------------------------
 --- Status Report Summary
 --------------------------------------------------------------------------------
-   125 Completely validated
-     3 To be validated
+   126 Completely validated
+     2 To be validated
    128 Total
 --------------------------------------------------------------------------------
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 73fd79dcc665035f30336d021e345e24c505ded1..fe44203edb2a5a73756d89b4aba4ce5a0db35037 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
@@ -8,17 +8,17 @@
 --- Properties of Function 'f_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_not_prm_0.i, line 30)
+[  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 31)
+[  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 35)
+[  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 39)
+[  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 43)
+[  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 32)
+[  Valid  ] Assigns (file /tmp/aorai_not_prm_0.i, line 34)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -33,17 +33,17 @@
 --- Properties of Function 'f_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_not_prm_0.i, line 64)
+[  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 65)
+[  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 69)
+[  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 73)
+[  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 77)
+[  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 66)
+[  Valid  ] Assigns (file /tmp/aorai_not_prm_0.i, line 68)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
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 34218372ad9f6e3dd03a43c3e8c6bf5a15a39785..627597f041a428493950ee9b1c7b3c804f5ff196 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/other.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/other.res.oracle
@@ -8,23 +8,23 @@
 --- Properties of Function 'f_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 34)
+[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 36)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 35)
+[  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 40)
+[  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 44)
+[  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 49)
+[  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 55)
+[  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 61)
+[  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 67)
+[  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 36)
+[  Valid  ] Assigns (file /tmp/aorai_other_0.i, line 38)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_init_in'
             by Frama-C kernel.
@@ -45,23 +45,23 @@
 --- Properties of Function 'f_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 97)
+[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 99)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 98)
+[  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 103)
+[  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 107)
+[  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 112)
+[  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 118)
+[  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 124)
+[  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 130)
+[  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 99)
+[  Valid  ] Assigns (file /tmp/aorai_other_0.i, line 101)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_init_in'
             by Frama-C kernel.
@@ -89,23 +89,23 @@
 --- Properties of Function 'g_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 222)
+[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 226)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 223)
+[  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 228)
+[  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 232)
+[  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 237)
+[  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 243)
+[  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 249)
+[  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 255)
+[  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 224)
+[  Valid  ] Assigns (file /tmp/aorai_other_0.i, line 228)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_init_in'
             by Frama-C kernel.
@@ -126,23 +126,23 @@
 --- Properties of Function 'g_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 285)
+[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 289)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 286)
+[  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 291)
+[  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 295)
+[  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 300)
+[  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 306)
+[  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 312)
+[  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 318)
+[  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 287)
+[  Valid  ] Assigns (file /tmp/aorai_other_0.i, line 291)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_init_in'
             by Frama-C kernel.
@@ -170,21 +170,21 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 410)
+[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 415)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 411)
+[  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 416)
+[  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 420)
+[  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 423)
+[  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 427)
+[  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 431)
+[  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 412)
+[  Valid  ] Assigns (file /tmp/aorai_other_0.i, line 417)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_init_in'
             by Frama-C kernel.
@@ -203,23 +203,23 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 457)
+[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 462)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_other_0.i, line 458)
+[  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 463)
+[  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 467)
+[  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 472)
+[  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 478)
+[  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 484)
+[  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 490)
+[  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 459)
+[  Valid  ] Assigns (file /tmp/aorai_other_0.i, line 464)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_init_in'
             by Frama-C kernel.
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 1ae82747bad756b22faeccb03521f4e03cdf1836..1eb9f2fb9845b027dba2d000d69949c27c35a5d0 100644
--- a/src/plugins/aorai/tests/aorai/oracle_prove/seq.res.oracle
+++ b/src/plugins/aorai/tests/aorai/oracle_prove/seq.res.oracle
@@ -8,27 +8,27 @@
 --- Properties of Function 'f_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 38)
+[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 43)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 39)
+[  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 46)
+[  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 49)
+[  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 52)
+[  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 55)
+[  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 59)
+[  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 63)
+[  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 66)
+[  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 69)
+[  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 40)
+[  Valid  ] Assigns (file /tmp/aorai_seq_0.i, line 45)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -53,27 +53,27 @@
 --- Properties of Function 'f_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 115)
+[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 120)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 116)
+[  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 123)
+[  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 126)
+[  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 129)
+[  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 133)
+[  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 137)
+[  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 140)
+[  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 143)
+[  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 146)
+[  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 117)
+[  Valid  ] Assigns (file /tmp/aorai_seq_0.i, line 122)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -105,39 +105,39 @@
 --- Properties of Function 'g_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 207)
+[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 224)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 208)
+[  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 215)
+[  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 218)
+[  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 221)
+[  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 224)
+[  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 227)
+[  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 230)
+[  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 234)
+[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_3_in_0' (file /tmp/aorai_seq_0.i, line 251)
             tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_3_in_0' (file /tmp/aorai_seq_0.i, line 235)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_3_in_1' (file /tmp/aorai_seq_0.i, line 239)
+[  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 240)
+[  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 244)
+[  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 245)
+[  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 251)
+[  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 252)
+[  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 209)
+[  Valid  ] Assigns (file /tmp/aorai_seq_0.i, line 226)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -166,27 +166,27 @@
 --- Properties of Function 'g_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 303)
+[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 320)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 304)
+[  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 311)
+[  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 314)
+[  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 317)
+[  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 320)
+[  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 323)
+[  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 327)
+[  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 331)
+[  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 334)
+[  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 305)
+[  Valid  ] Assigns (file /tmp/aorai_seq_0.i, line 322)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -218,27 +218,27 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 418)
+[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 441)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 419)
+[  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 426)
+[  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 429)
+[  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 433)
+[  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 437)
+[  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 440)
+[  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 443)
+[  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 446)
+[  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 449)
+[  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 420)
+[  Valid  ] Assigns (file /tmp/aorai_seq_0.i, line 443)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -263,27 +263,27 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 496)
+[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 519)
             by Wp.typed.
-[  Valid  ] Post-condition (file /tmp/aorai_seq_0.i, line 497)
+[  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 504)
+[  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 508)
+[  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 512)
+[  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 515)
+[  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 518)
+[  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 521)
+[  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 524)
+[  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 527)
+[  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 498)
+[  Valid  ] Assigns (file /tmp/aorai_seq_0.i, line 521)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -314,7 +314,7 @@
 --------------------------------------------------------------------------------
 --- Status Report Summary
 --------------------------------------------------------------------------------
-   128 Completely validated
-     3 To be validated
+   129 Completely validated
+     2 To be validated
    131 Total
 --------------------------------------------------------------------------------
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 3d049e5a8690df99b944fe2c4ad9d87ec452bc1b..c3ab60aacd9343b558f539d3f06be87f6fa76141 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
@@ -8,35 +8,35 @@
 --- Properties of Function 'f_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 38)
+[  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 39)
+[  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 46)
+[  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 49)
+[  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 52)
+[  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 55)
+[  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 59)
+[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_0' (file /tmp/aorai_seq_loop_0.i, line 66)
             tried with Wp.typed.
-[    -    ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_0' (file /tmp/aorai_seq_loop_0.i, line 60)
-            tried with Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_aorai_intermediate_state_1_in_1' (file /tmp/aorai_seq_loop_0.i, line 64)
+[  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 65)
+[  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 71)
+[  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 72)
+[  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 75)
+[  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 78)
+[  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 40)
+[  Valid  ] Assigns (file /tmp/aorai_seq_loop_0.i, line 47)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -63,27 +63,27 @@
 --- Properties of Function 'f_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 127)
+[  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 128)
+[  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 135)
+[  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 138)
+[  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 141)
+[  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 144)
+[  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 147)
+[  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 151)
+[  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 155)
+[  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 158)
+[  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 129)
+[  Valid  ] Assigns (file /tmp/aorai_seq_loop_0.i, line 136)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -115,27 +115,27 @@
 --- Properties of Function 'g_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 232)
+[  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 233)
+[  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 240)
+[  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 243)
+[  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 246)
+[  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 249)
+[  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 252)
+[  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 255)
+[  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 259)
+[  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 263)
+[  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 234)
+[  Valid  ] Assigns (file /tmp/aorai_seq_loop_0.i, line 246)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -160,27 +160,27 @@
 --- Properties of Function 'g_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 309)
+[  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 310)
+[  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 317)
+[  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 320)
+[  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 323)
+[  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 327)
+[  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 331)
+[  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 334)
+[  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 337)
+[  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 340)
+[  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 311)
+[  Valid  ] Assigns (file /tmp/aorai_seq_loop_0.i, line 323)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -212,27 +212,27 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 401)
+[  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 402)
+[  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 409)
+[  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 412)
+[  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 416)
+[  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 420)
+[  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 423)
+[  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 426)
+[  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 429)
+[  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 432)
+[  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 403)
+[  Valid  ] Assigns (file /tmp/aorai_seq_loop_0.i, line 421)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -257,27 +257,27 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_seq_loop_0.i, line 477)
+[  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 478)
+[  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 485)
+[  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 490)
+[  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 495)
+[  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 498)
+[  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 501)
+[  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 504)
+[  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 507)
+[  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 510)
+[  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 479)
+[  Valid  ] Assigns (file /tmp/aorai_seq_loop_0.i, line 497)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -301,7 +301,7 @@
 --------------------------------------------------------------------------------
 --- Status Report Summary
 --------------------------------------------------------------------------------
-   124 Completely validated
-     3 To be validated
+   125 Completely validated
+     2 To be validated
    127 Total
 --------------------------------------------------------------------------------
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 8a438103317f7b8c347f2a0a4e3468943778fddf..dc1e3bfe79ca5df1a08619401145d8765531eabc 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
@@ -8,19 +8,19 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_single_call_0.i, line 31)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_single_call_0.i, line 32)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_single_call_0.i, line 37)
+[  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 40)
+[  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 44)
+[  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 48)
+[  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 33)
+[  Valid  ] Assigns (file /tmp/aorai_single_call_0.i, line 34)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
@@ -37,19 +37,19 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_single_call_0.i, line 74)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_single_call_0.i, line 75)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S0_out' (file /tmp/aorai_single_call_0.i, line 80)
+[  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 84)
+[  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 88)
+[  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 91)
+[  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 76)
+[  Valid  ] Assigns (file /tmp/aorai_single_call_0.i, line 77)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S0_out'
             by Frama-C kernel.
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 f109b2eef387c54a854a5c7d968f8f3ff1d9ad4e..0811518881ab85fccdc73c4c6e6a9fc36a52d52e 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
@@ -10,25 +10,25 @@
 --- Properties of Function 'opa_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 40)
+[  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 41)
+[  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 46)
+[  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 50)
+[  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 54)
+[  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 57)
+[  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 60)
+[  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 63)
+[  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 66)
+[  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 42)
+[  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.
@@ -51,25 +51,25 @@
 --- Properties of Function 'opa_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 105)
+[  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 106)
+[  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 111)
+[  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 114)
+[  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 118)
+[  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 122)
+[  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 125)
+[  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 128)
+[  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 131)
+[  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 107)
+[  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.
@@ -99,25 +99,25 @@
 --- Properties of Function 'opb_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 189)
+[  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 190)
+[  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 195)
+[  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 198)
+[  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 201)
+[  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 205)
+[  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 209)
+[  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 212)
+[  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 215)
+[  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 191)
+[  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.
@@ -140,25 +140,25 @@
 --- Properties of Function 'opb_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 255)
+[  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 256)
+[  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 261)
+[  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 264)
+[  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 267)
+[  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 270)
+[  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 274)
+[  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 278)
+[  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 281)
+[  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 257)
+[  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.
@@ -188,25 +188,25 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 337)
+[  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 338)
+[  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 344)
+[  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 348)
+[  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 351)
+[  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 354)
+[  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 357)
+[  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 360)
+[  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 363)
+[  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 339)
+[  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.
@@ -229,25 +229,25 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params_0.i, line 402)
+[  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 403)
+[  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 408)
+[  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 411)
+[  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 414)
+[  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 417)
+[  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 421)
+[  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 425)
+[  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 428)
+[  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 404)
+[  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.
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 606a2a6a590aa8d188b9b59112293f601c812e7a..29e7c31415de9dc26da145123e822c68fa8bb72a 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
@@ -10,27 +10,27 @@
 --- Properties of Function 'opa_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 41)
+[  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 42)
+[  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 47)
+[  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 50)
+[  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 54)
+[  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 58)
+[  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 61)
+[  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 64)
+[  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 67)
+[  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 70)
+[  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 43)
+[  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.
@@ -55,27 +55,27 @@
 --- Properties of Function 'opa_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 115)
+[  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 116)
+[  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 121)
+[  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 124)
+[  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 127)
+[  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 131)
+[  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 135)
+[  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 138)
+[  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 141)
+[  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 144)
+[  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 117)
+[  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.
@@ -107,27 +107,27 @@
 --- Properties of Function 'opb_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 210)
+[  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 211)
+[  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 216)
+[  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 219)
+[  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 222)
+[  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 225)
+[  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 229)
+[  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 233)
+[  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 236)
+[  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 239)
+[  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 212)
+[  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.
@@ -152,27 +152,27 @@
 --- Properties of Function 'opb_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 283)
+[  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 284)
+[  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 289)
+[  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 292)
+[  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 295)
+[  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 298)
+[  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 301)
+[  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 305)
+[  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 309)
+[  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 312)
+[  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 285)
+[  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.
@@ -204,25 +204,25 @@
 --- Properties of Function 'opc_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 375)
+[  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 376)
+[  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 381)
+[  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 384)
+[  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 387)
+[  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 390)
+[  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 393)
+[  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 396)
+[  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 399)
+[  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 377)
+[  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.
@@ -245,25 +245,25 @@
 --- Properties of Function 'opc_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 440)
+[  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 441)
+[  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 446)
+[  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 449)
+[  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 452)
+[  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 455)
+[  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 458)
+[  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 461)
+[  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 464)
+[  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 442)
+[  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.
@@ -293,27 +293,27 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 538)
+[  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 539)
+[  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 544)
+[  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 548)
+[  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 552)
+[  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 555)
+[  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 558)
+[  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 561)
+[  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 564)
+[  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 567)
+[  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 540)
+[  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.
@@ -338,27 +338,27 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_acces_params2_0.i, line 611)
+[  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 612)
+[  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 617)
+[  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 620)
+[  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 623)
+[  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 626)
+[  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 629)
+[  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 632)
+[  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 636)
+[  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 640)
+[  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 613)
+[  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.
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 9567a3129718303ffaa6e5377250f7355f8b15fd..682ed874344dd7e1ee0fc62c92c3de5aeef7a86b 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
@@ -4,7 +4,7 @@
 [aorai] Welcome to the Aorai plugin
 [kernel] Parsing /tmp/aorai_test_boucle_0.i (no preprocessing)
 [wp] Warning: Missing RTE guards
-[kernel:annot:missing-spec] /tmp/aorai_test_boucle_0.i:80: Warning: 
+[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...
 
@@ -23,19 +23,19 @@
 --- Properties of Function 'a_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 36)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 37)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle_0.i, line 42)
+[  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 45)
+[  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 49)
+[  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 53)
+[  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 38)
+[  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.
@@ -52,19 +52,19 @@
 --- Properties of Function 'a_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 79)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 80)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_boucle_0.i, line 85)
+[  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 88)
+[  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 92)
+[  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 96)
+[  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 81)
+[  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.
@@ -81,19 +81,19 @@
 --- Properties of Function 'b_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 139)
+[  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 140)
+[  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 146)
+[  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 150)
+[  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 153)
+[  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 156)
+[  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 141)
+[  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.
@@ -110,19 +110,19 @@
 --- Properties of Function 'b_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 181)
+[  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 182)
+[  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 188)
+[  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 192)
+[  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 195)
+[  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 198)
+[  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 183)
+[  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.
@@ -139,19 +139,19 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 242)
+[  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 243)
+[  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 248)
+[  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 251)
+[  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 255)
+[  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 259)
+[  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 244)
+[  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.
@@ -168,19 +168,19 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_0.i, line 284)
+[  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 285)
+[  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 290)
+[  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 293)
+[  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 297)
+[  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 301)
+[  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 286)
+[  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.
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 be82e861730fc8d8955ea495a0b3b9f493f70d96..0b5635aa29b0ddca4dea072b00c0913a5aac47bf 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
@@ -12,23 +12,23 @@
 --- Properties of Function 'commit_trans_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 41)
+[  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 42)
+[  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 47)
+[  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 51)
+[  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 55)
+[  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 58)
+[  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 61)
+[  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 64)
+[  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 43)
+[  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.
@@ -49,23 +49,23 @@
 --- Properties of Function 'commit_trans_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 100)
+[  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 101)
+[  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 106)
+[  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 110)
+[  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 114)
+[  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 117)
+[  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 120)
+[  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 123)
+[  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 102)
+[  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.
@@ -93,23 +93,23 @@
 --- Properties of Function 'init_trans_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 179)
+[  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 180)
+[  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 185)
+[  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 189)
+[  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 193)
+[  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 196)
+[  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 199)
+[  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 202)
+[  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 181)
+[  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.
@@ -130,25 +130,25 @@
 --- Properties of Function 'init_trans_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 239)
+[  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 240)
+[  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 245)
+[  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 249)
+[  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 253)
+[  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 256)
+[  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 260)
+[  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 264)
+[  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 267)
+[  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 241)
+[  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.
@@ -178,23 +178,23 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 328)
+[  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 329)
+[  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 334)
+[  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 338)
+[  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 342)
+[  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 345)
+[  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 348)
+[  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 351)
+[  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 330)
+[  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.
@@ -215,27 +215,27 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle1_0.i, line 387)
+[  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 388)
+[  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 394)
+[  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 398)
+[  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 402)
+[  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 406)
+[  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 410)
+[  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 414)
+[  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 417)
+[  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 420)
+[  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 389)
+[  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.
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 48e6eb0c130b4263741c8bcde3c67edba3fa0daf..bf090ec3929b2af40f68dddd3efb920218d66f38 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
@@ -10,25 +10,25 @@
 --- Properties of Function 'opa_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 40)
+[  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 41)
+[  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 47)
+[  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 51)
+[  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 54)
+[  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 57)
+[  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 60)
+[  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 63)
+[  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 66)
+[  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 42)
+[  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.
@@ -51,27 +51,27 @@
 --- Properties of Function 'opa_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 106)
+[  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 107)
+[  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 113)
+[  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 117)
+[  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 120)
+[  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 124)
+[  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 128)
+[  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 131)
+[  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 134)
+[  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 137)
+[  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 108)
+[  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.
@@ -103,25 +103,25 @@
 --- Properties of Function 'opb_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 199)
+[  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 200)
+[  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 205)
+[  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 208)
+[  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 211)
+[  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 215)
+[  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 219)
+[  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 222)
+[  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 225)
+[  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 201)
+[  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.
@@ -144,25 +144,25 @@
 --- Properties of Function 'opb_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 265)
+[  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 266)
+[  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 271)
+[  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 274)
+[  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 277)
+[  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 280)
+[  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 284)
+[  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 288)
+[  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 291)
+[  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 267)
+[  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.
@@ -192,25 +192,25 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 346)
+[  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 347)
+[  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 353)
+[  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 357)
+[  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 360)
+[  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 363)
+[  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 366)
+[  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 369)
+[  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 372)
+[  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 348)
+[  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.
@@ -233,25 +233,25 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle2_0.i, line 412)
+[  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 413)
+[  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 418)
+[  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 421)
+[  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 424)
+[  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 427)
+[  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 430)
+[  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 434)
+[  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 438)
+[  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 414)
+[  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.
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 f1db04a551b9397c7add257cd7922c10badc7f6a..38668419cd8c2ba8f20176b8739a06dc9a68dcb0 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
@@ -10,25 +10,25 @@
 --- Properties of Function 'opa_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 39)
+[  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 40)
+[  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 46)
+[  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 50)
+[  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 53)
+[  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 57)
+[  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 61)
+[  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 64)
+[  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 67)
+[  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 41)
+[  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.
@@ -51,25 +51,25 @@
 --- Properties of Function 'opa_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 102)
+[  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 103)
+[  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 109)
+[  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 113)
+[  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 116)
+[  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 120)
+[  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 124)
+[  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 127)
+[  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 130)
+[  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 104)
+[  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.
@@ -99,23 +99,23 @@
 --- Properties of Function 'opb_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 205)
+[  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 206)
+[  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 211)
+[  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 214)
+[  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 217)
+[  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 221)
+[  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 225)
+[  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 228)
+[  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 207)
+[  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.
@@ -136,23 +136,23 @@
 --- Properties of Function 'opb_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 263)
+[  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 264)
+[  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 270)
+[  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 274)
+[  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 277)
+[  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 280)
+[  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 283)
+[  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 286)
+[  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 265)
+[  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.
@@ -180,23 +180,23 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 337)
+[  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 338)
+[  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 343)
+[  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 346)
+[  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 350)
+[  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 354)
+[  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 357)
+[  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 360)
+[  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 339)
+[  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.
@@ -217,25 +217,25 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle3_0.i, line 395)
+[  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 396)
+[  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 402)
+[  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 406)
+[  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 409)
+[  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 412)
+[  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 415)
+[  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 419)
+[  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 423)
+[  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 397)
+[  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.
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 a3741cc74d3f24b2bbcb09bc9bf86b9c76024138..56b9a30b4da5d3053db1afa5049de6bf7056fbea 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
@@ -12,19 +12,19 @@
 --- Properties of Function 'isPresent_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 33)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 34)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 38)
+[  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 42)
+[  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 46)
+[  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 49)
+[  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 35)
+[  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.
@@ -41,21 +41,21 @@
 --- Properties of Function 'isPresent_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 75)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 76)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 81)
+[  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 85)
+[  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 88)
+[  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 92)
+[  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 96)
+[  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 77)
+[  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.
@@ -74,19 +74,19 @@
 --- Properties of Function 'foo_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 176)
+[  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 177)
+[  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 182)
+[  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 186)
+[  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 189)
+[  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 192)
+[  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 178)
+[  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.
@@ -103,19 +103,19 @@
 --- Properties of Function 'foo_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 217)
+[  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 218)
+[  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 223)
+[  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 227)
+[  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 230)
+[  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 233)
+[  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 219)
+[  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.
@@ -139,19 +139,19 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 270)
+[  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 271)
+[  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 275)
+[  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 279)
+[  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 283)
+[  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 286)
+[  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 272)
+[  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.
@@ -168,19 +168,19 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_boucle_rechercheTableau_0.i, line 311)
+[  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 312)
+[  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 317)
+[  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 321)
+[  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 324)
+[  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 327)
+[  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 313)
+[  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.
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 8aa9c7d22fc21cfb6c3b20441862b0f4a86c4ec7..2b21ccd94da5796f491019cea462d6ddf41c0de9 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
@@ -8,19 +8,19 @@
 --- Properties of Function 'decode_int_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 33)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 34)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_factorial_0.i, line 40)
+[  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 44)
+[  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 47)
+[  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 50)
+[  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 35)
+[  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.
@@ -37,21 +37,21 @@
 --- Properties of Function 'decode_int_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 75)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 76)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_accept_S1_in' (file /tmp/aorai_test_factorial_0.i, line 82)
+[  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 86)
+[  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 90)
+[  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 94)
+[  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 97)
+[  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 77)
+[  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.
@@ -77,19 +77,19 @@
 --- Properties of Function 'factorial_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 199)
+[  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 200)
+[  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 205)
+[  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 209)
+[  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 213)
+[  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 216)
+[  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 201)
+[  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.
@@ -106,21 +106,21 @@
 --- Properties of Function 'factorial_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 242)
+[  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 243)
+[  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 249)
+[  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 253)
+[  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 257)
+[  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 261)
+[  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 264)
+[  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 244)
+[  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.
@@ -139,19 +139,19 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 317)
+[  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 318)
+[  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 324)
+[  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 328)
+[  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 331)
+[  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 334)
+[  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 319)
+[  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.
@@ -168,21 +168,21 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial_0.i, line 359)
+[  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 360)
+[  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 366)
+[  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 370)
+[  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 374)
+[  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 378)
+[  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 381)
+[  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 361)
+[  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.
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 d944c627895f896805e42b475bd6dbde213a7337..223c7eaa61d3d8e2e4a26a514756c63b791be999 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
@@ -8,19 +8,19 @@
 --- Properties of Function 'decode_int_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 33)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 34)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_factorial2_0.i, line 39)
+[  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 43)
+[  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 46)
+[  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 49)
+[  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 35)
+[  Valid  ] Assigns (file /tmp/aorai_test_factorial2_0.i, line 36)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
@@ -37,21 +37,21 @@
 --- Properties of Function 'decode_int_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 74)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 75)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_S1_in' (file /tmp/aorai_test_factorial2_0.i, line 80)
+[  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 84)
+[  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 88)
+[  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 92)
+[  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 95)
+[  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 76)
+[  Valid  ] Assigns (file /tmp/aorai_test_factorial2_0.i, line 77)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
@@ -77,19 +77,19 @@
 --- Properties of Function 'factorial_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 198)
+[  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 199)
+[  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 203)
+[  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 207)
+[  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 211)
+[  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 214)
+[  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 200)
+[  Valid  ] Assigns (file /tmp/aorai_test_factorial2_0.i, line 203)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
@@ -106,21 +106,21 @@
 --- Properties of Function 'factorial_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 239)
+[  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 240)
+[  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 245)
+[  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 249)
+[  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 253)
+[  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 257)
+[  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 260)
+[  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 241)
+[  Valid  ] Assigns (file /tmp/aorai_test_factorial2_0.i, line 244)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
@@ -139,19 +139,19 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 312)
+[  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 313)
+[  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 318)
+[  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 322)
+[  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 325)
+[  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 328)
+[  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 314)
+[  Valid  ] Assigns (file /tmp/aorai_test_factorial2_0.i, line 318)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
@@ -168,21 +168,21 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_factorial2_0.i, line 353)
+[  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 354)
+[  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 359)
+[  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 363)
+[  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 367)
+[  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 371)
+[  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 374)
+[  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 355)
+[  Valid  ] Assigns (file /tmp/aorai_test_factorial2_0.i, line 359)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
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 b9ef68d70690ea18ecebe6ceb96effba2321c8a5..1324ad5e028c9a0d3d481b09bebe9e992e519733 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
@@ -31,19 +31,19 @@
 --- Properties of Function 'countOne_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 61)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 62)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_recursion1_0.i, line 68)
+[  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 72)
+[  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 75)
+[  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 78)
+[  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 63)
+[  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.
@@ -60,19 +60,19 @@
 --- Properties of Function 'countOne_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 103)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 104)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_recursion1_0.i, line 110)
+[  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 114)
+[  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 117)
+[  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 120)
+[  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 105)
+[  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.
@@ -89,19 +89,19 @@
 --- Properties of Function 'count_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 173)
+[  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 174)
+[  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 180)
+[  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 184)
+[  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 187)
+[  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 190)
+[  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 175)
+[  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.
@@ -118,19 +118,19 @@
 --- Properties of Function 'count_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 215)
+[  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 216)
+[  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 221)
+[  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 224)
+[  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 228)
+[  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 232)
+[  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 217)
+[  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.
@@ -147,19 +147,19 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 279)
+[  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 280)
+[  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 285)
+[  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 288)
+[  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 292)
+[  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 296)
+[  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 281)
+[  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.
@@ -176,21 +176,21 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion1_0.i, line 321)
+[  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 322)
+[  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 328)
+[  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 332)
+[  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 335)
+[  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 339)
+[  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 343)
+[  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 323)
+[  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.
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 292d8b7027adbc657d49e8c2cfdf2b2e6e948118..c3782c51b839c14c2eae109469bc5f73f2a72dce 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
@@ -34,21 +34,21 @@
 --- Properties of Function 'count_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 83)
+[  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 84)
+[  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 90)
+[  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 94)
+[  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 97)
+[  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 100)
+[  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 103)
+[  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 85)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_0.i, line 87)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
@@ -67,21 +67,21 @@
 --- Properties of Function 'count_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 132)
+[  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 133)
+[  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 139)
+[  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 143)
+[  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 146)
+[  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 149)
+[  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 152)
+[  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 134)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_0.i, line 136)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
@@ -100,21 +100,21 @@
 --- Properties of Function 'sumOne_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 208)
+[  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 209)
+[  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 214)
+[  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 217)
+[  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 221)
+[  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 225)
+[  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 228)
+[  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 210)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_0.i, line 213)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
@@ -133,21 +133,21 @@
 --- Properties of Function 'sumOne_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 257)
+[  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 258)
+[  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 263)
+[  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 266)
+[  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 270)
+[  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 274)
+[  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 277)
+[  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 259)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_0.i, line 262)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
@@ -166,21 +166,21 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 339)
+[  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 340)
+[  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 345)
+[  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 348)
+[  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 352)
+[  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 356)
+[  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 359)
+[  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 341)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_0.i, line 345)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
@@ -199,23 +199,23 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_0.i, line 388)
+[  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 389)
+[  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 394)
+[  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 397)
+[  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 401)
+[  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 405)
+[  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 409)
+[  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 413)
+[  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 390)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_0.i, line 394)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
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 e3739901a99b40eac83930d2e181680bd47a03e6..8ea88394978c9d83b427bcbdb9c69bf8f3f6c85a 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
@@ -34,21 +34,21 @@
 --- Properties of Function 'count_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 83)
+[  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 84)
+[  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 90)
+[  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 94)
+[  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 97)
+[  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 100)
+[  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 103)
+[  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 85)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_1.i, line 87)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
@@ -67,21 +67,21 @@
 --- Properties of Function 'count_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 132)
+[  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 133)
+[  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 139)
+[  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 143)
+[  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 146)
+[  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 149)
+[  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 152)
+[  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 134)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_1.i, line 136)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
@@ -100,21 +100,21 @@
 --- Properties of Function 'sumOne_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 208)
+[  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 209)
+[  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 214)
+[  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 217)
+[  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 221)
+[  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 225)
+[  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 228)
+[  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 210)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_1.i, line 213)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
@@ -133,21 +133,21 @@
 --- Properties of Function 'sumOne_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 257)
+[  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 258)
+[  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 263)
+[  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 266)
+[  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 270)
+[  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 274)
+[  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 277)
+[  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 259)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_1.i, line 262)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
@@ -166,21 +166,21 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 339)
+[  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 340)
+[  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 345)
+[  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 348)
+[  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 352)
+[  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 356)
+[  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 359)
+[  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 341)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_1.i, line 345)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
@@ -199,23 +199,23 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion2_1.i, line 388)
+[  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 389)
+[  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 394)
+[  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 397)
+[  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 401)
+[  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 405)
+[  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 409)
+[  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 413)
+[  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 390)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion2_1.i, line 394)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_out'
             by Frama-C kernel.
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 2ea10b05de8ed0e9a4a751b56f0b3729d3ec64e5..9e4a6ae19e1c1560edb230b7ab6cfa35c43cd14e 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
@@ -8,19 +8,19 @@
 --- Properties of Function 'isPresent_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 34)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 35)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_out' (file /tmp/aorai_test_recursion4_0.i, line 39)
+[  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 43)
+[  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 47)
+[  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 50)
+[  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 36)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion4_0.i, line 37)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_out'
             by Frama-C kernel.
@@ -37,21 +37,21 @@
 --- Properties of Function 'isPresent_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 78)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 79)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_End_in' (file /tmp/aorai_test_recursion4_0.i, line 84)
+[  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 89)
+[  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 92)
+[  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 97)
+[  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 103)
+[  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 80)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion4_0.i, line 81)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_in'
             by Frama-C kernel.
@@ -70,19 +70,19 @@
 --- Properties of Function 'foo_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 176)
+[  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 177)
+[  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 182)
+[  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 186)
+[  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 189)
+[  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 192)
+[  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 178)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion4_0.i, line 180)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_in'
             by Frama-C kernel.
@@ -99,19 +99,19 @@
 --- Properties of Function 'foo_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 217)
+[  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 218)
+[  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 223)
+[  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 227)
+[  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 230)
+[  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 233)
+[  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 219)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion4_0.i, line 221)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_in'
             by Frama-C kernel.
@@ -135,19 +135,19 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 270)
+[  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 271)
+[  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 275)
+[  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 279)
+[  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 283)
+[  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 286)
+[  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 272)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion4_0.i, line 275)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_out'
             by Frama-C kernel.
@@ -164,19 +164,19 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion4_0.i, line 311)
+[  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 312)
+[  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 317)
+[  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 321)
+[  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 324)
+[  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 327)
+[  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 313)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion4_0.i, line 316)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_in'
             by Frama-C kernel.
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 41dddbfcba742bc74ce822f1aac2f246f10fdfb2..6468bb0de2f3efdb084763813fe3913b25c6d8e9 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
@@ -12,21 +12,21 @@
 --- Properties of Function 'isPresentRec_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 35)
+[  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 36)
+[  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 41)
+[  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 45)
+[  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 49)
+[  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 52)
+[  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 55)
+[  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 37)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 39)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_out'
             by Frama-C kernel.
@@ -45,23 +45,23 @@
 --- Properties of Function 'isPresentRec_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 88)
+[  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 89)
+[  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 94)
+[  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 97)
+[  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 102)
+[  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 108)
+[  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 113)
+[  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 119)
+[  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 90)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 92)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_out'
             by Frama-C kernel.
@@ -82,21 +82,21 @@
 --- Properties of Function 'isPresent_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 195)
+[  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 196)
+[  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 201)
+[  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 205)
+[  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 209)
+[  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 212)
+[  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 215)
+[  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 197)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 201)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_out'
             by Frama-C kernel.
@@ -115,23 +115,23 @@
 --- Properties of Function 'isPresent_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 247)
+[  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 248)
+[  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 254)
+[  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 258)
+[  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 261)
+[  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 264)
+[  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 268)
+[  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 272)
+[  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 249)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 253)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_in'
             by Frama-C kernel.
@@ -152,21 +152,21 @@
 --- Properties of Function 'foo_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 330)
+[  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 331)
+[  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 337)
+[  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 341)
+[  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 344)
+[  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 347)
+[  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 350)
+[  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 332)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 338)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_in'
             by Frama-C kernel.
@@ -185,21 +185,21 @@
 --- Properties of Function 'foo_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 380)
+[  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 381)
+[  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 387)
+[  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 391)
+[  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 394)
+[  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 397)
+[  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 400)
+[  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 382)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 388)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_in'
             by Frama-C kernel.
@@ -225,21 +225,21 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 442)
+[  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 443)
+[  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 448)
+[  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 452)
+[  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 456)
+[  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 459)
+[  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 462)
+[  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 444)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 452)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_out'
             by Frama-C kernel.
@@ -258,21 +258,21 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_recursion5_0.i, line 492)
+[  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 493)
+[  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 499)
+[  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 503)
+[  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 506)
+[  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 509)
+[  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 512)
+[  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 494)
+[  Valid  ] Assigns (file /tmp/aorai_test_recursion5_0.i, line 502)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_End_in'
             by Frama-C kernel.
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 1ca649f504a32ba1f4c0e3e2a34029d9fc19ae4a..8ab8082884ed877a19c027be0c80c52c1d0e32d4 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
@@ -8,17 +8,17 @@
 --- Properties of Function 'increment_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_struct_0.i, line 37)
+[  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 38)
+[  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 43)
+[  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 47)
+[  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 50)
+[  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 39)
+[  Valid  ] Assigns (file /tmp/aorai_test_struct_0.i, line 41)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
@@ -33,17 +33,17 @@
 --- Properties of Function 'increment_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_struct_0.i, line 72)
+[  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 73)
+[  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 78)
+[  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 82)
+[  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 85)
+[  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 74)
+[  Valid  ] Assigns (file /tmp/aorai_test_struct_0.i, line 76)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
@@ -65,17 +65,17 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_struct_0.i, line 122)
+[  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 123)
+[  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 128)
+[  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 132)
+[  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 135)
+[  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 124)
+[  Valid  ] Assigns (file /tmp/aorai_test_struct_0.i, line 128)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
@@ -90,17 +90,17 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_struct_0.i, line 157)
+[  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 158)
+[  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 163)
+[  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 167)
+[  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 170)
+[  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 159)
+[  Valid  ] Assigns (file /tmp/aorai_test_struct_0.i, line 163)
             by Wp.typed.
 [  Valid  ] Behavior 'buch_state_S1_in'
             by Frama-C kernel.
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 ccc86062eafd1c2c8391e240e4571a3404e204fc..2ba2aecbeb16bd5323600348dc78dde7e0d202f4 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
@@ -14,27 +14,27 @@
 --- Properties of Function 'opa_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 42)
+[  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 43)
+[  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 48)
+[  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 52)
+[  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 56)
+[  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 59)
+[  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 62)
+[  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 65)
+[  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 68)
+[  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 71)
+[  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 44)
+[  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.
@@ -59,27 +59,27 @@
 --- Properties of Function 'opa_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 115)
+[  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 116)
+[  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 121)
+[  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 124)
+[  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 128)
+[  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 132)
+[  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 135)
+[  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 138)
+[  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 141)
+[  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 144)
+[  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 117)
+[  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.
@@ -111,27 +111,27 @@
 --- Properties of Function 'opb_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 207)
+[  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 208)
+[  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 213)
+[  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 216)
+[  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 219)
+[  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 223)
+[  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 227)
+[  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 230)
+[  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 233)
+[  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 236)
+[  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 209)
+[  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.
@@ -156,27 +156,27 @@
 --- Properties of Function 'opb_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 280)
+[  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 281)
+[  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 286)
+[  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 289)
+[  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 292)
+[  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 295)
+[  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 299)
+[  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 303)
+[  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 306)
+[  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 309)
+[  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 282)
+[  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.
@@ -208,25 +208,25 @@
 --- Properties of Function 'opc_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 368)
+[  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 369)
+[  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 374)
+[  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 377)
+[  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 380)
+[  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 383)
+[  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 386)
+[  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 389)
+[  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 392)
+[  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 370)
+[  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.
@@ -249,25 +249,25 @@
 --- Properties of Function 'opc_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 433)
+[  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 434)
+[  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 439)
+[  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 442)
+[  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 445)
+[  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 448)
+[  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 451)
+[  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 454)
+[  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 457)
+[  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 435)
+[  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.
@@ -297,27 +297,27 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 528)
+[  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 529)
+[  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 535)
+[  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 539)
+[  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 542)
+[  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 545)
+[  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 548)
+[  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 551)
+[  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 554)
+[  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 557)
+[  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 530)
+[  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.
@@ -342,27 +342,27 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch2_0.i, line 601)
+[  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 602)
+[  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 607)
+[  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 610)
+[  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 613)
+[  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 616)
+[  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 619)
+[  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 623)
+[  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 627)
+[  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 630)
+[  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 603)
+[  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.
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 7e788b6d35585947bd6a241fdea310c157ba6e65..652b471f22401a002d09d3a44c21d2c17fa42cd7 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
@@ -8,21 +8,21 @@
 --- Properties of Function 'countOne_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 34)
+[  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 35)
+[  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 41)
+[  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 45)
+[  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 48)
+[  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 51)
+[  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 54)
+[  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 36)
+[  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.
@@ -41,21 +41,21 @@
 --- Properties of Function 'countOne_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 84)
+[  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 85)
+[  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 91)
+[  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 95)
+[  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 98)
+[  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 101)
+[  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 104)
+[  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 86)
+[  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.
@@ -81,23 +81,23 @@
 --- Properties of Function 'count_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 157)
+[  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 158)
+[  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 164)
+[  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 168)
+[  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 171)
+[  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 174)
+[  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 178)
+[  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 182)
+[  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 159)
+[  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.
@@ -118,25 +118,25 @@
 --- Properties of Function 'count_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 213)
+[  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 214)
+[  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 220)
+[  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 224)
+[  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 227)
+[  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 231)
+[  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 235)
+[  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 239)
+[  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 243)
+[  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 215)
+[  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.
@@ -166,23 +166,23 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 304)
+[  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 305)
+[  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 311)
+[  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 315)
+[  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 318)
+[  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 322)
+[  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 326)
+[  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 329)
+[  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 306)
+[  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.
@@ -203,23 +203,23 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_0.i, line 359)
+[  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 360)
+[  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 366)
+[  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 370)
+[  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 373)
+[  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 377)
+[  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 381)
+[  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 384)
+[  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 361)
+[  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.
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 45efb687ec4eab245c7d220406aa015ac60fd6d3..4e7437440fe3183f779f423b0a58fdbe5c55748d 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
@@ -10,19 +10,19 @@
 --- Properties of Function 'countOne_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 33)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 34)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_in' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 40)
+[  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 44)
+[  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 47)
+[  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 50)
+[  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 35)
+[  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.
@@ -39,17 +39,17 @@
 --- Properties of Function 'countOne_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 75)
-            by Wp.typed.
 [  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 76)
             by Wp.typed.
-[  Valid  ] Post-condition for 'buch_state_T0_S2_out' (file /tmp/aorai_test_switch3_et_recursion_0.i, line 81)
+[  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 84)
+[  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 87)
+[  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 77)
+[  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.
@@ -71,19 +71,19 @@
 --- Properties of Function 'count_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 137)
+[  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 138)
+[  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 144)
+[  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 148)
+[  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 151)
+[  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 154)
+[  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 139)
+[  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.
@@ -100,19 +100,19 @@
 --- Properties of Function 'count_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 179)
+[  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 180)
+[  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 185)
+[  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 188)
+[  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 192)
+[  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 196)
+[  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 181)
+[  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.
@@ -136,19 +136,19 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 245)
+[  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 246)
+[  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 251)
+[  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 254)
+[  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 258)
+[  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 262)
+[  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 247)
+[  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.
@@ -165,21 +165,21 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_et_recursion_0.i, line 287)
+[  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 288)
+[  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 294)
+[  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 298)
+[  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 301)
+[  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 305)
+[  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 309)
+[  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 289)
+[  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.
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 b1f91e94e77e6096137fdca528aaeb93d5dd70e8..d74231853de37de402974b8882a11fa6b98511bd 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
@@ -8,21 +8,21 @@
 --- Properties of Function 'countOne_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 34)
+[  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 35)
+[  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 41)
+[  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 45)
+[  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 48)
+[  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 51)
+[  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 54)
+[  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 36)
+[  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.
@@ -41,21 +41,21 @@
 --- Properties of Function 'countOne_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 84)
+[  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 85)
+[  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 91)
+[  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 95)
+[  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 98)
+[  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 101)
+[  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 104)
+[  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 86)
+[  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.
@@ -81,23 +81,23 @@
 --- Properties of Function 'count_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 155)
+[  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 156)
+[  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 162)
+[  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 166)
+[  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 169)
+[  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 172)
+[  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 176)
+[  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 180)
+[  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 157)
+[  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.
@@ -118,25 +118,25 @@
 --- Properties of Function 'count_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 211)
+[  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 212)
+[  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 218)
+[  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 222)
+[  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 225)
+[  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 229)
+[  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 233)
+[  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 237)
+[  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 241)
+[  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 213)
+[  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.
@@ -166,23 +166,23 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 302)
+[  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 303)
+[  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 309)
+[  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 313)
+[  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 316)
+[  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 320)
+[  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 324)
+[  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 327)
+[  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 304)
+[  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.
@@ -203,23 +203,23 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_if_0.i, line 357)
+[  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 358)
+[  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 364)
+[  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 368)
+[  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 371)
+[  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 375)
+[  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 379)
+[  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 382)
+[  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 359)
+[  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.
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 5e380310afddaeac0aae4efb3d241c366e89327f..6ee3eb3e4ef61010fb21e647aaa94e51b35dc395 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
@@ -8,21 +8,21 @@
 --- Properties of Function 'countOne_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 34)
+[  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 35)
+[  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 41)
+[  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 45)
+[  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 48)
+[  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 51)
+[  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 54)
+[  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 36)
+[  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.
@@ -41,21 +41,21 @@
 --- Properties of Function 'countOne_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 84)
+[  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 85)
+[  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 91)
+[  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 95)
+[  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 98)
+[  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 101)
+[  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 104)
+[  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 86)
+[  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.
@@ -81,23 +81,23 @@
 --- Properties of Function 'count_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 162)
+[  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 163)
+[  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 169)
+[  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 173)
+[  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 176)
+[  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 179)
+[  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 183)
+[  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 187)
+[  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 164)
+[  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.
@@ -118,25 +118,25 @@
 --- Properties of Function 'count_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 218)
+[  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 219)
+[  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 225)
+[  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 229)
+[  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 232)
+[  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 236)
+[  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 240)
+[  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 244)
+[  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 248)
+[  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 220)
+[  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.
@@ -166,23 +166,23 @@
 --- Properties of Function 'main_pre_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 309)
+[  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 310)
+[  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 316)
+[  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 320)
+[  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 323)
+[  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 327)
+[  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 331)
+[  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 334)
+[  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 311)
+[  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.
@@ -203,23 +203,23 @@
 --- Properties of Function 'main_post_func'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Post-condition (file /tmp/aorai_test_switch3_return_0.i, line 364)
+[  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 365)
+[  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 371)
+[  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 375)
+[  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 378)
+[  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 382)
+[  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 386)
+[  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 389)
+[  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 366)
+[  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.