diff --git a/src/plugins/dive/tests/dive/oracle/callstack_strategy.res.oracle b/src/plugins/dive/tests/dive/oracle/callstack_strategy.res.oracle
index db657295bfd9d9d309b339f60ed6409519da4dfe..de74d0e71cbc624ac141f2ac234818c9303e05be 100644
--- a/src/plugins/dive/tests/dive/oracle/callstack_strategy.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/callstack_strategy.res.oracle
@@ -3,7 +3,7 @@
 [eva] Computing initial state
 [eva] Initial state computed
 [eva:alarm] tests/dive/callstack_strategy.i:11: Warning: 
-  non-finite float value. assert \is_finite((float)(y + z));
+  non-finite float value. assert \is_finite(\add_float(y, z));
 [eva] done for function main
 [eva:summary] ====== ANALYSIS SUMMARY ======
   ----------------------------------------------------------------------------
diff --git a/src/plugins/dive/tests/dive/oracle/global.res.oracle b/src/plugins/dive/tests/dive/oracle/global.res.oracle
index 933b0df87f2c341c34072b6ca3f58c49deb76151..d46beb72b6935e11987bfde52dfdcb6906017be3 100644
--- a/src/plugins/dive/tests/dive/oracle/global.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/global.res.oracle
@@ -3,7 +3,7 @@
 [eva] Computing initial state
 [eva] Initial state computed
 [eva:alarm] tests/dive/global.i:11: Warning: 
-  non-finite float value. assert \is_finite((float)(g + x));
+  non-finite float value. assert \is_finite(\add_float(g, x));
 [eva] done for function main
 [eva:summary] ====== ANALYSIS SUMMARY ======
   ----------------------------------------------------------------------------
diff --git a/src/plugins/dive/tests/dive/oracle/per_callstack.res.oracle b/src/plugins/dive/tests/dive/oracle/per_callstack.res.oracle
index b306565b38eeb7b82126c7e0cc749d9ee4448dde..bd8ebb87aa38c0d1b4a7b7eef17528671dad13af 100644
--- a/src/plugins/dive/tests/dive/oracle/per_callstack.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/per_callstack.res.oracle
@@ -3,9 +3,9 @@
 [eva] Computing initial state
 [eva] Initial state computed
 [eva:alarm] tests/dive/per_callstack.i:15: Warning: 
-  non-finite float value. assert \is_finite((float)(x + y));
+  non-finite float value. assert \is_finite(\add_float(x, y));
 [eva:alarm] tests/dive/per_callstack.i:15: Warning: 
-  non-finite float value. assert \is_finite((float)((float)(x + y) + z));
+  non-finite float value. assert \is_finite(\add_float(\add_float(x, y), z));
 [eva] done for function main
 [eva:summary] ====== ANALYSIS SUMMARY ======
   ----------------------------------------------------------------------------
diff --git a/src/plugins/dive/tests/dive/oracle/unfocused_callers.res.oracle b/src/plugins/dive/tests/dive/oracle/unfocused_callers.res.oracle
index fc3e53ef11284936db7ab278e1997e77eb6fba32..8e9668ded4a93d97d4cd4671892ea6ad8dd14280 100644
--- a/src/plugins/dive/tests/dive/oracle/unfocused_callers.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/unfocused_callers.res.oracle
@@ -4,11 +4,11 @@
 [eva] Initial state computed
 [eva:alarm] tests/dive/unfocused_callers.i:16: Warning: 
   non-finite float value.
-  assert \is_finite((float)(tmp + tmp_0));
+  assert \is_finite(\add_float(tmp, tmp_0));
   (tmp from f1(x), tmp_0 from f2(x))
 [eva:alarm] tests/dive/unfocused_callers.i:16: Warning: 
   non-finite float value.
-  assert \is_finite((float)((float)(tmp + tmp_0) + tmp_1));
+  assert \is_finite(\add_float(\add_float(tmp, tmp_0), tmp_1));
   (tmp from f1(x), tmp_0 from f2(x), tmp_1 from f3(x))
 [eva] done for function main
 [eva:summary] ====== ANALYSIS SUMMARY ======
diff --git a/src/plugins/dive/tests/dive/oracle/various.dot b/src/plugins/dive/tests/dive/oracle/various.dot
index da2d98fbed893e0a2069d64653a1eea2ce491e12..14afa37a197041f2c10b38f50cf371264a6fbdd0 100644
--- a/src/plugins/dive/tests/dive/oracle/various.dot
+++ b/src/plugins/dive/tests/dive/oracle/various.dot
@@ -23,10 +23,10 @@ digraph G {
         style="filled", ];
   cp26 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
         style="filled", ];
-  cp30 [label=<is_nan_or_infinite: \is_finite((float)((double)((double)y * 2.0)))>,
+  cp30 [label=<is_nan_or_infinite: \is_finite((float)\mul_double((double)y, (double)2.0))>,
         fillcolor="#FF0000", color="#FF0000", shape=doubleoctagon,
         style="filled,bold", ];
-  cp32 [label=<is_nan_or_infinite: \is_finite((float)(y + w))>,
+  cp32 [label=<is_nan_or_infinite: \is_finite(\add_float(y, w))>,
         fillcolor="#FF0000", color="#FF0000", shape=doubleoctagon,
         style="filled,bold", ];
   
diff --git a/src/plugins/dive/tests/dive/oracle/various.res.oracle b/src/plugins/dive/tests/dive/oracle/various.res.oracle
index da2ba410c6a0709cb754f4bd5ea365e2e7606c1c..f85c474b7ad82da6ab2816618e7c8d41a65ff3e2 100644
--- a/src/plugins/dive/tests/dive/oracle/various.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/various.res.oracle
@@ -5,9 +5,9 @@
 [eva] tests/dive/various.i:10: starting to merge loop iterations
 [eva:alarm] tests/dive/various.i:13: Warning: 
   non-finite float value.
-  assert \is_finite((float)((double)((double)y * 2.0)));
+  assert \is_finite((float)\mul_double((double)y, (double)2.0));
 [eva:alarm] tests/dive/various.i:27: Warning: 
-  non-finite float value. assert \is_finite((float)(y + w));
+  non-finite float value. assert \is_finite(\add_float(y, w));
 [eva] done for function main
 [eva:summary] ====== ANALYSIS SUMMARY ======
   ----------------------------------------------------------------------------