diff --git a/tests/float/diff_equalities b/tests/float/diff_equalities
index a325ea42e823f78bfa6e8bda6a2f800337b834dc..2b65e74c9227a91b9a0bbb7b0ab5e13dc4861fca 100644
--- a/tests/float/diff_equalities
+++ b/tests/float/diff_equalities
@@ -27,11 +27,17 @@ diff tests/float/oracle/cond.res.oracle tests/float/oracle_equalities/cond.res.o
 >   dt ∈ [-0x1.4000000000000p3 .. 0x1.fffffe0000000p-1]
 Only in tests/float/oracle: fval_test.res.oracle
 diff tests/float/oracle/nonlin.1.res.oracle tests/float/oracle_equalities/nonlin.1.res.oracle
-60a61
-> [eva:nonlin] tests/float/nonlin.c:42: subdividing on a
-diff tests/float/oracle/nonlin.3.res.oracle tests/float/oracle_equalities/nonlin.3.res.oracle
-60a61
-> [eva:nonlin] tests/float/nonlin.c:42: subdividing on a
+61a62
+> [eva:nonlin] tests/float/nonlin.c:44: subdividing on a
+diff tests/float/oracle/nonlin.2.res.oracle tests/float/oracle_equalities/nonlin.2.res.oracle
+61a62
+> [eva:nonlin] tests/float/nonlin.c:44: subdividing on a
+diff tests/float/oracle/nonlin.4.res.oracle tests/float/oracle_equalities/nonlin.4.res.oracle
+61a62
+> [eva:nonlin] tests/float/nonlin.c:44: subdividing on a
+diff tests/float/oracle/nonlin.5.res.oracle tests/float/oracle_equalities/nonlin.5.res.oracle
+61a62
+> [eva:nonlin] tests/float/nonlin.c:44: subdividing on a
 diff tests/float/oracle/parse.res.oracle tests/float/oracle_equalities/parse.res.oracle
 21a22,23
 > [eva] tests/float/parse.i:37: Warning: 
diff --git a/tests/float/diff_octagons b/tests/float/diff_octagons
index 806b63f0fdd00d77aa58baea79238e5893426733..532ecb44df5be4239c1bb13a6996f93fe0487731 100644
--- a/tests/float/diff_octagons
+++ b/tests/float/diff_octagons
@@ -5,14 +5,26 @@ Only in tests/float/oracle: absorb_sav2.err
 Only in tests/float/oracle: absorb_sav2.res
 Only in tests/float/oracle: fval_test.res.oracle
 diff tests/float/oracle/nonlin.1.res.oracle tests/float/oracle_octagons/nonlin.1.res.oracle
-253a254,255
-> [eva:nonlin] tests/float/nonlin.c:101: non-linear 'f + f', lv 'f'
-> [eva:nonlin] tests/float/nonlin.c:101: subdividing on f
-257d258
-< [eva:nonlin] tests/float/nonlin.c:101: subdividing on f
-diff tests/float/oracle/nonlin.3.res.oracle tests/float/oracle_octagons/nonlin.3.res.oracle
-253a254,255
-> [eva:nonlin] tests/float/nonlin.c:101: non-linear 'f + f', lv 'f'
-> [eva:nonlin] tests/float/nonlin.c:101: subdividing on f
-257d258
-< [eva:nonlin] tests/float/nonlin.c:101: subdividing on f
+279a280,281
+> [eva:nonlin] tests/float/nonlin.c:113: non-linear 'f + f', lv 'f'
+> [eva:nonlin] tests/float/nonlin.c:113: subdividing on f
+283d284
+< [eva:nonlin] tests/float/nonlin.c:113: subdividing on f
+diff tests/float/oracle/nonlin.2.res.oracle tests/float/oracle_octagons/nonlin.2.res.oracle
+259a260,261
+> [eva:nonlin] tests/float/nonlin.c:113: non-linear 'f + f', lv 'f'
+> [eva:nonlin] tests/float/nonlin.c:113: subdividing on f
+263d264
+< [eva:nonlin] tests/float/nonlin.c:113: subdividing on f
+diff tests/float/oracle/nonlin.4.res.oracle tests/float/oracle_octagons/nonlin.4.res.oracle
+279a280,281
+> [eva:nonlin] tests/float/nonlin.c:113: non-linear 'f + f', lv 'f'
+> [eva:nonlin] tests/float/nonlin.c:113: subdividing on f
+283d284
+< [eva:nonlin] tests/float/nonlin.c:113: subdividing on f
+diff tests/float/oracle/nonlin.5.res.oracle tests/float/oracle_octagons/nonlin.5.res.oracle
+259a260,261
+> [eva:nonlin] tests/float/nonlin.c:113: non-linear 'f + f', lv 'f'
+> [eva:nonlin] tests/float/nonlin.c:113: subdividing on f
+263d264
+< [eva:nonlin] tests/float/nonlin.c:113: subdividing on f
diff --git a/tests/value/diff_octagons b/tests/value/diff_octagons
index bbfe54bcb923ce73f088bfe352c04bea33734168..a24807228bd0cf01a3b21383e795ebe3bff77c5b 100644
--- a/tests/value/diff_octagons
+++ b/tests/value/diff_octagons
@@ -239,22 +239,22 @@ diff tests/value/oracle/non_natural.res.oracle tests/value/oracle_octagons/non_n
 >   more than 200(12500) elements to enumerate. Approximating.
 diff tests/value/oracle/nonlin.res.oracle tests/value/oracle_octagons/nonlin.res.oracle
 105a106,107
-> [eva:nonlin] tests/value/nonlin.c:67: non-linear 'x * x', lv 'x'
-> [eva:nonlin] tests/value/nonlin.c:67: subdividing on x
+> [eva:nonlin] tests/value/nonlin.c:65: non-linear 'x * x', lv 'x'
+> [eva:nonlin] tests/value/nonlin.c:65: subdividing on x
 108a111,113
-> [eva:nonlin] tests/value/nonlin.c:68: subdividing on x
-> [eva:nonlin] tests/value/nonlin.c:68: non-linear 'y * y', lv 'y'
-> [eva:nonlin] tests/value/nonlin.c:68: subdividing on y
+> [eva:nonlin] tests/value/nonlin.c:66: subdividing on x
+> [eva:nonlin] tests/value/nonlin.c:66: non-linear 'y * y', lv 'y'
+> [eva:nonlin] tests/value/nonlin.c:66: subdividing on y
 111a117,118
-> [eva:nonlin] tests/value/nonlin.c:70: non-linear 'z * x + x * y', lv 'x'
-> [eva:nonlin] tests/value/nonlin.c:70: subdividing on x
+> [eva:nonlin] tests/value/nonlin.c:68: non-linear 'z * x + x * y', lv 'x'
+> [eva:nonlin] tests/value/nonlin.c:68: subdividing on x
 149a157,158
-> [eva:nonlin] tests/value/nonlin.c:114: non-linear 'x * x', lv 'x'
-> [eva:nonlin] tests/value/nonlin.c:114: subdividing on x
+> [eva:nonlin] tests/value/nonlin.c:112: non-linear 'x * x', lv 'x'
+> [eva:nonlin] tests/value/nonlin.c:112: subdividing on x
 152a162
-> [eva:nonlin] tests/value/nonlin.c:115: subdividing on x
+> [eva:nonlin] tests/value/nonlin.c:113: subdividing on x
 153a164
-> [eva:nonlin] tests/value/nonlin.c:117: subdividing on x
+> [eva:nonlin] tests/value/nonlin.c:115: subdividing on x
 diff tests/value/oracle/plevel.res.oracle tests/value/oracle_octagons/plevel.res.oracle
 12d11
 < [eva] Recording results for main