diff --git a/abp/graphstate.py b/abp/graphstate.py
index 5392061..e9f26d7 100755
--- a/abp/graphstate.py
+++ b/abp/graphstate.py
@@ -30,7 +30,8 @@ class GraphState(object):
         :param vop: The default VOP for new qubits. Setting ``vop="identity"`` initializes qubits in :math:`|+\\rangle`. Setting ``vop="hadamard"`` initializes qubits in :math:`|0\\rangle`.
         """
 
-        self.adj, self.node = {}, {}
+        self.adj = {}
+        self.node = {}
         self.url = None
         try:
             # Cloning from a networkx graph
diff --git a/examples/visualization/raussendorf.py b/examples/visualization/raussendorf.py
index e691c9b..a25a0e8 100644
--- a/examples/visualization/raussendorf.py
+++ b/examples/visualization/raussendorf.py
@@ -49,7 +49,6 @@ psi = GraphState()
 for node in nodes:
     x, y, z = node
     color = "red" if (x+y+z) % 2 > 0  else "black"
-    print(color)
     psi.add_qubit(node, position=xyz(*node), color=color)
     psi.act_hadamard(node)
 
diff --git a/tests/test_nx.py b/tests/test_nx.py
deleted file mode 100644
index c28a45a..0000000
--- a/tests/test_nx.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import json
-import networkx as nx
-from abp import GraphState, NXGraphState
-from abp import clifford
-from abp.util import xyz
-import mock
-
-
-def test_json_basic():
-    """ Test that we can export to JSON """
-    g = mock.simple_graph()
-    js = g.to_json()
-    assert "adj" in js
-    assert "node" in js
-
-
-def test_tuple_keys():
-    """ Test that we can use tuple-ish keys """
-    g = NXGraphState()
-    g.add_qubit("string")
-    g.add_qubit((1, 2, 3))
-    g.add_edge((1, 2, 3), "string")
-    json.dumps(g.to_json(True))
-
-
-def networkx_test():
-    """ Test that NXGraphStates really behave like networkx graphs """
-    g = NXGraphState()
-    g.add_qubit(0, position=xyz(10, 0, 0))
-    g.add_qubit(1, position=xyz(1, 0, 0))
-    g.act_hadamard(0)
-    g.act_hadamard(1)
-    g.act_cz(0, 1)
-    g.copy()
-
-
-def test_from_nx():
-    """ Test that making graphs from networkx objects goes smoothly """
-    g = nx.random_geometric_graph(100, 2)
-    psi = NXGraphState(g)
-    assert psi.node[0]["vop"] == 0
-    assert len(psi.edges()) > 0
-    psi.measure(0, "px", detail=True)
-
-    psi = NXGraphState(nx.Graph(((0, 1),)))