3 files changed, 10 insertions, 7 deletions
diff --git a/test/extractor/generic/test_constant.py b/test/extractor/generic/test_constant.py
index 77ee02b..ea18385 100644
--- a/test/extractor/generic/test_constant.py
+++ b/test/extractor/generic/test_constant.py
@@ -3,7 +3,8 @@
 import unittest
 
 # bsie imports
-from bsie.utils import node as _node, ns
+from bsie.matcher import nodes
+from bsie.utils import ns
 
 # objects to test
 from bsie.extractor.generic.constant import Constant
@@ -28,7 +29,7 @@ class TestConstant(unittest.TestCase):
             (ns.bse.comment, 'the quick brown fox jumps over the lazy dog.'),
             ]
         ext = Constant(schema, tuples)
-        node = _node.Node(ns.bsn.Entity, '') # Blank node
+        node = nodes.Entity(ucid='abc123') # Blank node
         p_author = ext.schema.predicate(ns.bse.author)
         p_comment = ext.schema.predicate(ns.bse.comment)
         entity = ext.schema.node(ns.bsfs.Node).child(ns.bsn.Entity)
diff --git a/test/extractor/generic/test_path.py b/test/extractor/generic/test_path.py
index 569703d..132b670 100644
--- a/test/extractor/generic/test_path.py
+++ b/test/extractor/generic/test_path.py
@@ -5,7 +5,8 @@ import unittest
 
 # bsie imports
 from bsie.extractor import base
-from bsie.utils import bsfs, node as _node, ns
+from bsie.matcher import nodes
+from bsie.utils import bsfs, ns
 
 # objects to test
 from bsie.extractor.generic.path import Path
@@ -40,7 +41,7 @@ class TestPath(unittest.TestCase):
 
     def test_extract(self):
         ext = Path()
-        node = _node.Node(ns.bsn.Entity, '') # Blank node
+        node = nodes.Entity(ucid='abc123')
         content = '/tmp/foo/bar'
         p_filename = ext.schema.predicate(ns.bse.filename)
         p_dirname = ext.schema.predicate(ns.bse.dirname)
@@ -68,7 +69,7 @@ class TestPath(unittest.TestCase):
         self.assertSetEqual(set(ext.extract(node, '', (p_filename, p_dirname))),
             {(node, p_filename, ''), (node, p_dirname, os.path.dirname(os.getcwd()))})
         # errors are suppressed
-        self.assertSetEqual(set(ext.extract(node, None, (p_filename, ))), set())
+        self.assertSetEqual(set(ext.extract(node, None, (p_filename, p_dirname))), set())
 
 
 ## main ##
diff --git a/test/extractor/generic/test_stat.py b/test/extractor/generic/test_stat.py
index 0e83e24..38a9c0c 100644
--- a/test/extractor/generic/test_stat.py
+++ b/test/extractor/generic/test_stat.py
@@ -5,7 +5,8 @@ import unittest
 
 # bsie imports
 from bsie.extractor import base
-from bsie.utils import bsfs, node as _node, ns
+from bsie.matcher import nodes
+from bsie.utils import bsfs, ns
 
 # objects to test
 from bsie.extractor.generic.stat import Stat
@@ -34,7 +35,7 @@ class TestStat(unittest.TestCase):
 
     def test_extract(self):
         ext = Stat()
-        node = _node.Node(ns.bsn.Entity, '') # Blank node
+        node = nodes.Entity(ucid='abc123')
         content = os.stat(__file__)
         p_filesize = ext.schema.predicate(ns.bse.filesize)
         entity = ext.schema.node(ns.bsfs.Node).child(ns.bsn.Entity)