diff --git a/ci/scripts/test.sh b/ci/scripts/test.sh
index c1152750805f2e5701302a3b2364fdd36a33735d..8051a5ccd50f7621d68a24b88470eae5d1ff07c3 100755
--- a/ci/scripts/test.sh
+++ b/ci/scripts/test.sh
@@ -70,7 +70,7 @@ DO_LONG_TESTS=${DO_LONG_TESTS:-false}
 COMMON_TEST_OPTIONS=''
 TEST_DIR="$HYSOP_DIR"
 COMMON_EXAMPLE_OPTIONS='-VNC -cp default -maxit 2'
-EXAMPLE_DIR="$HYSOP_DIR/../examples"
+EXAMPLE_DIR="$HYSOP_DIR/../hysop_examples/examples"
 
 hysop_test() {
      test=$1
diff --git a/hysop/core/graph/computational_graph.py b/hysop/core/graph/computational_graph.py
index 6aaffae39f327badcbf93ef33ebf3c0a2a9c39cb..d95fde0e6469a4d99b0741112341498f5832e81e 100644
--- a/hysop/core/graph/computational_graph.py
+++ b/hysop/core/graph/computational_graph.py
@@ -359,14 +359,14 @@ class ComputationalGraph(ComputationalGraphNode):
         for field in self.fields:
             field_topologies = {}
             for (i, node) in enumerate(self.nodes):
-                if field in op.input_fields:
-                    topo = op.input_fields[field]
-                    field_topologies.setdefault(topo, []).append(op)
-                if field in op.output_fields:
-                    topo = op.output_fields[field]
-                    field_topologies.setdefault(topo, []).append(op)
+                if field in node.input_fields:
+                    topo = node.input_fields[field]
+                    field_topologies.setdefault(topo, []).append(node)
+                if field in node.output_fields:
+                    topo = node.output_fields[field]
+                    field_topologies.setdefault(topo, []).append(node)
             for topo in sorted(field_topologies.keys(), key=lambda x: x.tag):
-                pnames = set(op.pretty_name.decode('utf-8') for op in field_topologies[topo])
+                pnames = set(node.pretty_name.decode('utf-8') for node in field_topologies[topo])
                 pnames = sorted(pnames)
                 nbyline = 4
                 nentries = len(pnames)//nbyline