diff --git a/src/plugins/dive/tests/dive/oracle/assigned_param.dot b/src/plugins/dive/tests/dive/oracle/assigned_param.dot
index 2ffb22543ad4d2a0c92f2989024561eb1da7b354..9c450998aa96b118100c617d14f02d76294918e1 100644
--- a/src/plugins/dive/tests/dive/oracle/assigned_param.dot
+++ b/src/plugins/dive/tests/dive/oracle/assigned_param.dot
@@ -1,20 +1,20 @@
 digraph G {
-  cp0 [style="invis,dotted", ];
-  cp1 [label=<w>, shape=box, ];
-  cp2 [style="invis,dotted", ];
-  cp3 [label=<x>, shape=box, ];
-  cp4 [label=<z>, shape=box, ];
+  cp0 [label=<w>, shape=box, ];
+  cp1 [label=<x>, shape=box, ];
+  cp3 [label=<z>, shape=box, ];
   cp5 [label=<x>, shape=box, ];
-  cp6 [label=<z>, shape=box, ];
+  cp7 [label=<z>, shape=box, ];
+  cp9 [style="invis,dotted", ];
+  cp10 [style="invis,dotted", ];
   
-  subgraph cluster_cs_1 { label=<main>; cp6;cp5;cp1;cp0;
-    subgraph cluster_cs_2 { label=<f>; cp4;cp3;cp2;
+  subgraph cluster_cs_1 { label=<main>; cp9;cp7;cp5;cp0;
+    subgraph cluster_cs_2 { label=<f>; cp10;cp3;cp1;
        };
      };
   
+  cp1 -> cp0;
   cp3 -> cp1;
-  cp4 -> cp3;
-  cp5 -> cp3;
-  cp6 -> cp4;
+  cp5 -> cp1;
+  cp7 -> cp3;
   
   }
\ No newline at end of file
diff --git a/src/plugins/dive/tests/dive/oracle/const.dot b/src/plugins/dive/tests/dive/oracle/const.dot
index 77a97450c8d3923dc6dd52732a250adad491d251..0a766f76f0495ad538823b55b966b9a37078c764 100644
--- a/src/plugins/dive/tests/dive/oracle/const.dot
+++ b/src/plugins/dive/tests/dive/oracle/const.dot
@@ -1,25 +1,25 @@
 digraph G {
-  cp0 [style="invis,dotted", ];
-  cp1 [label=<res>, shape=box, ];
-  cp2 [style="invis,dotted", ];
-  cp3 [label=<__retres>, shape=box, ];
-  cp4 [label=<c>, shape=box, ];
+  cp0 [label=<res>, shape=box, ];
+  cp1 [label=<__retres>, shape=box, ];
+  cp3 [label=<c>, shape=box, ];
   cp5 [label=<w>, shape=box, ];
-  cp6 [label=<x>, shape=box, ];
-  cp7 [label=<y>, shape=box, ];
-  cp8 [label=<i>, shape=box, style="dotted", ];
+  cp7 [label=<x>, shape=box, ];
+  cp9 [label=<y>, shape=box, ];
+  cp11 [label=<i>, shape=box, style="dotted", ];
+  cp14 [style="invis,dotted", ];
+  cp15 [style="invis,dotted", ];
   
-  subgraph cluster_cs_1 { label=<main>; cp8;cp1;cp0;
-    subgraph cluster_cs_2 { label=<f>; cp7;cp6;cp5;cp4;cp3;cp2;
+  subgraph cluster_cs_1 { label=<main>; cp14;cp11;cp0;
+    subgraph cluster_cs_2 { label=<f>; cp15;cp9;cp7;cp5;cp3;cp1;
        };
      };
   
+  cp1 -> cp0;
   cp3 -> cp1;
-  cp4 -> cp3;
-  cp5 -> cp3;
-  cp6 -> cp4;
-  cp7 -> cp5;
-  cp8 -> cp6;
-  cp8 -> cp7;
+  cp5 -> cp1;
+  cp7 -> cp3;
+  cp9 -> cp5;
+  cp11 -> cp7;
+  cp11 -> cp9;
   
   }
\ No newline at end of file
diff --git a/src/plugins/dive/tests/dive/oracle/global.dot b/src/plugins/dive/tests/dive/oracle/global.dot
index e5d9191e202a8921e5487f4b55984c229f3fffa0..6bfc454a9bf8c4717ef0421d8dd9d19ad3a171c1 100644
--- a/src/plugins/dive/tests/dive/oracle/global.dot
+++ b/src/plugins/dive/tests/dive/oracle/global.dot
@@ -1,22 +1,21 @@
 digraph G {
-  cp0 [style="invis,dotted", ];
-  cp1 [label=<z>, shape=box, ];
-  cp2 [style="invis,dotted", ];
-  cp3 [label=<g>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+  cp0 [label=<z>, shape=box, ];
+  cp1 [label=<g>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
-  cp4 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+  cp3 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
   cp5 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
-       style="filled", ];
+       style="filled,dotted", ];
+  cp7 [style="invis,dotted", ];
+  cp8 [style="invis,dotted", ];
   
-  subgraph cluster_cs_1 { label=<main>; cp5;cp4;cp1;cp0;
+  subgraph cluster_cs_1 { label=<main>; cp7;cp5;cp3;cp0;
      };
-  subgraph cluster_file_1 { label=<tests/dive/global.i>; cp3;cp2;
+  subgraph cluster_file_1 { label=<tests/dive/global.i>; cp8;cp1;
      };
   
-  cp3 -> cp1;
-  cp4 -> cp1;
-  cp4 -> cp5;
-  cp5 -> cp3;
+  cp1 -> cp0;
+  cp3 -> cp0;
+  cp5 -> cp1;
   
   }
\ No newline at end of file
diff --git a/src/plugins/dive/tests/dive/oracle/pointed_param.dot b/src/plugins/dive/tests/dive/oracle/pointed_param.dot
index c5707eefb70853f35d3f473f099d879746a9bcc6..dadfd9a1f4993bfafafae37e6abb418ffdbb2ac9 100644
--- a/src/plugins/dive/tests/dive/oracle/pointed_param.dot
+++ b/src/plugins/dive/tests/dive/oracle/pointed_param.dot
@@ -1,30 +1,30 @@
 digraph G {
-  cp0 [style="invis,dotted", ];
-  cp1 [label=<y>, shape=box, ];
-  cp2 [label=<tmp>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+  cp0 [label=<y>, shape=box, ];
+  cp1 [label=<tmp>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
-  cp3 [style="invis,dotted", ];
-  cp4 [label=<tmp>, shape=box, ];
-  cp5 [style="invis,dotted", ];
-  cp6 [label=<tmp>, shape=box, ];
-  cp7 [style="invis,dotted", ];
-  cp8 [label=<__retres>, shape=box, ];
+  cp3 [label=<tmp>, shape=box, ];
+  cp5 [label=<tmp>, shape=box, ];
+  cp7 [label=<__retres>, shape=box, ];
   cp9 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled,dotted", ];
+  cp11 [style="invis,dotted", ];
+  cp12 [style="invis,dotted", ];
+  cp13 [style="invis,dotted", ];
+  cp14 [style="invis,dotted", ];
   
-  subgraph cluster_cs_1 { label=<main>; cp2;cp1;cp0;
-    subgraph cluster_cs_2 { label=<f>; cp9;cp4;cp3;
-      subgraph cluster_cs_3 { label=<g>; cp6;cp5;
-        subgraph cluster_cs_4 { label=<h>; cp8;cp7;
+  subgraph cluster_cs_1 { label=<main>; cp11;cp1;cp0;
+    subgraph cluster_cs_2 { label=<f>; cp12;cp9;cp3;
+      subgraph cluster_cs_3 { label=<g>; cp13;cp5;
+        subgraph cluster_cs_4 { label=<h>; cp14;cp7;
            };
          };
        };
      };
   
-  cp2 -> cp1;
-  cp4 -> cp2;
-  cp6 -> cp4;
-  cp8 -> cp6;
-  cp9 -> cp8;
+  cp1 -> cp0;
+  cp3 -> cp1;
+  cp5 -> cp3;
+  cp7 -> cp5;
+  cp9 -> cp7;
   
   }
\ No newline at end of file
diff --git a/src/plugins/dive/tests/dive/oracle/pointers_to_local.dot b/src/plugins/dive/tests/dive/oracle/pointers_to_local.dot
index 4977207ae324f71e0fd13ff9c7d007a205752b30..741dc456cadf39f24c01970ec99ee2ddb2bf66bb 100644
--- a/src/plugins/dive/tests/dive/oracle/pointers_to_local.dot
+++ b/src/plugins/dive/tests/dive/oracle/pointers_to_local.dot
@@ -1,28 +1,28 @@
 digraph G {
-  cp0 [style="invis,dotted", ];
+  cp0 [label=<x>, shape=box, fillcolor="#AACCFF", color="#88AAFF",
+       style="filled", ];
   cp1 [label=<x>, shape=box, fillcolor="#AACCFF", color="#88AAFF",
        style="filled", ];
-  cp2 [style="invis,dotted", ];
-  cp3 [style="invis,dotted", ];
   cp4 [label=<x>, shape=box, fillcolor="#AACCFF", color="#88AAFF",
        style="filled", ];
-  cp5 [style="invis,dotted", ];
-  cp6 [label=<x>, shape=box, fillcolor="#AACCFF", color="#88AAFF",
-       style="filled", ];
+  cp8 [style="invis,dotted", ];
+  cp9 [style="invis,dotted", ];
+  cp10 [style="invis,dotted", ];
+  cp11 [style="invis,dotted", ];
   
-  subgraph cluster_cs_1 { label=<main>; cp1;cp0;
-    subgraph cluster_cs_2 { label=<f1>; cp2;
-      subgraph cluster_cs_3 { label=<g>; cp4;cp3;
+  subgraph cluster_cs_1 { label=<main>; cp8;cp0;
+    subgraph cluster_cs_2 { label=<f1>; cp9;
+      subgraph cluster_cs_3 { label=<g>; cp10;cp1;
          };
        };
-    subgraph cluster_cs_4 { label=<f2>; cp6;cp5;
+    subgraph cluster_cs_4 { label=<f2>; cp11;cp4;
        };
      };
   
-  cp1 -> cp1;
-  cp1 -> cp4;
-  cp1 -> cp6;
-  cp4 -> cp1;
-  cp6 -> cp1;
+  cp0 -> cp0;
+  cp0 -> cp1;
+  cp0 -> cp4;
+  cp1 -> cp0;
+  cp4 -> cp0;
   
   }
\ No newline at end of file
diff --git a/src/plugins/dive/tests/dive/oracle/unfocused_callers.dot b/src/plugins/dive/tests/dive/oracle/unfocused_callers.dot
index 873a1fc647974a1c3af1cdf7b6e77de7696df778..594da3bbe32977b4b761603909c0d2a0329854dc 100644
--- a/src/plugins/dive/tests/dive/oracle/unfocused_callers.dot
+++ b/src/plugins/dive/tests/dive/oracle/unfocused_callers.dot
@@ -1,35 +1,35 @@
 digraph G {
-  cp0 [style="invis,dotted", ];
-  cp1 [label=<x>, shape=box, ];
-  cp2 [style="invis,dotted", ];
+  cp0 [label=<x>, shape=box, ];
+  cp1 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+       style="filled", ];
   cp3 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
-  cp4 [style="invis,dotted", ];
   cp5 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
-  cp6 [style="invis,dotted", ];
   cp7 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
-  cp8 [style="invis,dotted", ];
-  cp9 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
-       style="filled", ];
+  cp11 [style="invis,dotted", ];
+  cp12 [style="invis,dotted", ];
+  cp13 [style="invis,dotted", ];
+  cp14 [style="invis,dotted", ];
+  cp15 [style="invis,dotted", ];
   
-  subgraph cluster_cs_1 { label=<g>; cp1;cp0;
+  subgraph cluster_cs_1 { label=<g>; cp11;cp0;
      };
-  subgraph cluster_cs_2 { label=<f3>; cp3;cp2;
+  subgraph cluster_cs_2 { label=<f3>; cp12;cp1;
      };
-  subgraph cluster_cs_3 { label=<f2>; cp5;cp4;
+  subgraph cluster_cs_3 { label=<f2>; cp13;cp3;
      };
-  subgraph cluster_cs_4 { label=<f1>; cp7;cp6;
+  subgraph cluster_cs_4 { label=<f1>; cp14;cp5;
      };
-  subgraph cluster_cs_5 { label=<main>; cp9;cp8;
+  subgraph cluster_cs_5 { label=<main>; cp15;cp7;
      };
   
-  cp3 -> cp1;
-  cp5 -> cp1;
+  cp1 -> cp0;
+  cp3 -> cp0;
+  cp5 -> cp0;
   cp7 -> cp1;
-  cp9 -> cp3;
-  cp9 -> cp5;
-  cp9 -> cp7;
+  cp7 -> cp3;
+  cp7 -> cp5;
   
   }
\ No newline at end of file
diff --git a/src/plugins/dive/tests/dive/oracle/various.dot b/src/plugins/dive/tests/dive/oracle/various.dot
index 31b252bcf8546a5a4192b39cca87fa1d0fdfae63..bed90b4407951eeb389bba396aafc92ef3b84660 100644
--- a/src/plugins/dive/tests/dive/oracle/various.dot
+++ b/src/plugins/dive/tests/dive/oracle/various.dot
@@ -1,70 +1,70 @@
 digraph G {
-  cp0 [style="invis,dotted", ];
-  cp1 [label=<x2>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+  cp0 [label=<x2>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
-  cp2 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+  cp1 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
-  cp3 [style="invis,dotted", ];
-  cp4 [label=<x>, shape=box, fillcolor="#AACCFF", color="#88AAFF",
+  cp3 [label=<x>, shape=box, fillcolor="#AACCFF", color="#88AAFF",
        style="filled", ];
-  cp5 [style="invis,dotted", ];
-  cp6 [label=<g>, shape=box, fillcolor="#AACCFF", color="#88AAFF",
+  cp7 [label=<g>, shape=box, fillcolor="#AACCFF", color="#88AAFF",
        style="filled", ];
-  cp7 [label=<z>, shape=box, ];
-  cp8 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
-       style="filled", ];
-  cp9 [label=<w>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
-       style="filled", ];
-  cp10 [style="invis,dotted", ];
-  cp11 [label=<x2>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+  cp9 [label=<z>, shape=box, ];
+  cp10 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+        style="filled", ];
+  cp12 [label=<w>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+        style="filled", ];
+  cp14 [label=<x2>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
         style="filled", ];
-  cp12 [label=<tmp_0>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+  cp16 [label=<tmp_0>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
         style="filled", ];
-  cp13 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+  cp18 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
         style="filled", ];
-  cp14 [label=<pf>, shape=box, ];
-  cp15 [style="invis,dotted", ];
-  cp16 [label=<x2>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+  cp21 [label=<pf>, shape=box, ];
+  cp23 [label=<x2>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
         style="filled", ];
-  cp17 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+  cp26 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
         style="filled", ];
-  cp18 [label=<is_nan_or_infinite: \is_finite((float)((double)((double)y * 2.0)))>,
+  cp30 [label=<is_nan_or_infinite: \is_finite((float)((double)((double)y * 2.0)))>,
         fillcolor="#FF0000", color="#FF0000", shape=doubleoctagon,
         style="filled,bold", ];
-  cp19 [label=<is_nan_or_infinite: \is_finite((float)(y + w))>,
+  cp32 [label=<is_nan_or_infinite: \is_finite((float)(y + w))>,
         fillcolor="#FF0000", color="#FF0000", shape=doubleoctagon,
         style="filled,bold", ];
+  cp35 [style="invis,dotted", ];
+  cp36 [style="invis,dotted", ];
+  cp37 [style="invis,dotted", ];
+  cp38 [style="invis,dotted", ];
+  cp39 [style="invis,dotted", ];
   
-  subgraph cluster_cs_1 { label=<f>; cp18;cp2;cp1;cp0;
+  subgraph cluster_cs_1 { label=<f>; cp35;cp30;cp1;cp0;
      };
-  subgraph cluster_cs_2 { label=<main>; cp19;cp14;cp12;cp9;cp8;cp7;cp4;cp3;
-    subgraph cluster_cs_3 { label=<f>; cp13;cp11;cp10;
+  subgraph cluster_cs_2 { label=<main>; cp36;cp32;cp21;cp16;cp12;cp10;cp9;cp3;
+    subgraph cluster_cs_3 { label=<f>; cp38;cp18;cp14;
        };
-    subgraph cluster_cs_4 { label=<f>; cp17;cp16;cp15;
+    subgraph cluster_cs_4 { label=<f>; cp39;cp26;cp23;
        };
      };
-  subgraph cluster_file_1 { label=<tests/dive/various.i>; cp6;cp5;
+  subgraph cluster_file_1 { label=<tests/dive/various.i>; cp37;cp7;
      };
   
-  cp1 -> cp2;
-  cp2 -> cp1;
-  cp2 -> cp18;
-  cp4 -> cp1;
-  cp4 -> cp4;
-  cp4 -> cp11;
-  cp4 -> cp16;
-  cp6 -> cp4;
-  cp8 -> cp7;
-  cp8 -> cp19;
-  cp9 -> cp7;
-  cp9 -> cp19;
-  cp11 -> cp8;
-  cp11 -> cp13;
+  cp0 -> cp1;
+  cp1 -> cp0;
+  cp1 -> cp30;
+  cp3 -> cp0;
+  cp3 -> cp3;
+  cp3 -> cp14;
+  cp3 -> cp23;
+  cp7 -> cp3;
+  cp10 -> cp9;
+  cp10 -> cp32;
   cp12 -> cp9;
-  cp13 -> cp11;
-  cp14 -> cp12 [color="#00FF00", ];
+  cp12 -> cp32;
+  cp14 -> cp10;
+  cp14 -> cp18;
   cp16 -> cp12;
-  cp16 -> cp17;
-  cp17 -> cp16;
+  cp18 -> cp14;
+  cp21 -> cp16 [color="#00FF00", ];
+  cp23 -> cp16;
+  cp23 -> cp26;
+  cp26 -> cp23;
   
   }
\ No newline at end of file
diff --git a/src/plugins/dive/tests/test_config b/src/plugins/dive/tests/test_config
index 6a140cd0a5065e39488810465eac7b173f481984..9ff9387337545ed97c88920ed5c79a722351eaa8 100644
--- a/src/plugins/dive/tests/test_config
+++ b/src/plugins/dive/tests/test_config
@@ -1,2 +1,3 @@
 LOG: @PTEST_NAME@.dot
 OPT: -no-autoload-plugins -load-module from,inout,eva,variadic,scope,dive -check -eva-msg-key=-initial-state -eva-no-show-progress -dive-output-dot @PTEST_RESULT@/@PTEST_NAME@
+FILTER: perl -0777 -pe 's/\[server[^[]*//g'