3 files changed, 8 insertions, 9 deletions
diff --git a/src/server-tests/neo4j_test_util.py b/src/server-tests/neo4j_test_util.py
index 3aa03b46..74e6db44 100644
--- a/src/server-tests/neo4j_test_util.py
+++ b/src/server-tests/neo4j_test_util.py
@@ -5,6 +5,7 @@ import uuid
 
 from db_op import DB_op, DBO_cypher_query
 import neo4j_cypher
+import neo4j_schema
 
 class DBO_flush_db(DBO_cypher_query):
     """
@@ -69,4 +70,4 @@ def rand_label(prefix='T_', length=8):
     return ret
 
 def rand_label__doc(length=8):
-    return rand_label(prefix=neo4j_cypher.META_LABEL__RZ_DOC_PREFIX, length=length)
+    return rand_label(prefix=neo4j_schema.META_LABEL__RZDOC_NS_PREFIX, length=length)
diff --git a/src/server-tests/test_db_controller.py b/src/server-tests/test_db_controller.py
index d07bd2cc..f423077c 100644
--- a/src/server-tests/test_db_controller.py
+++ b/src/server-tests/test_db_controller.py
@@ -2,9 +2,8 @@ import logging
 import unittest
 
 import db_controller as dbc
-from db_op import DBO_add_link_set
+from db_op import DBO_add_link_set, DBO_block_chain__commit
 from db_op import DBO_add_node_set
-from db_op import DBO_block_chain__commit
 from db_op import DBO_block_chain__list
 from db_op import DBO_diff_commit__attr
 from db_op import DBO_diff_commit__topo
diff --git a/src/server-tests/test_neo4j_cypher.py b/src/server-tests/test_neo4j_cypher.py
index c63cc618..3bab58d6 100644
--- a/src/server-tests/test_neo4j_cypher.py
+++ b/src/server-tests/test_neo4j_cypher.py
@@ -5,15 +5,14 @@ from db_op import DBO_rz_clone, DBO_add_node_set, DBO_add_link_set, \
     DBO_rm_node_set, DB_composed_op
 import test_util
 from model.graph import Attr_Diff, Topo_Diff
-from test_util import generate_random_node_dict, generate_random_link_dict
+from test_util import generate_random_node_dict, generate_random_link_dict,\
+    generate_random_RZDoc
 import neo4j_test_util
 from neo4j_util import meta_attr_list_to_meta_attr_map
-import logging
 from rz_server import Config, init_log
-import re
-from neo4j_cypher import Cypher_Parser, DB_Query, QT_Node_Filter__Doc_ID_Label
-import neo4j_cypher
+from neo4j_cypher import Cypher_Parser, DB_Query, QT_RZDOC_NS_Filter
 import sys
+from model.model import RZDoc
 
 class Test_DB_Op(unittest.TestCase):
 
@@ -131,7 +130,7 @@ class Test_DB_Op(unittest.TestCase):
         dbq_set = [dbq]
 
         #dbq_set = dbq_set[:1]
-        self.test_T__common(dbq_set, QT_Node_Filter__Doc_ID_Label, test_label)
+        self.test_T__common(dbq_set, QT_RZDOC_NS_Filter, test_rzdoc)
 
     def test_T__common(self, dbq_set, T, *args):
         self.log.debug('\n')