3 files changed, 10 insertions, 15 deletions
diff --git a/test/extractor/generic/test_constant.py b/test/extractor/generic/test_constant.py
index 7f72ccf..9dbaced 100644
--- a/test/extractor/generic/test_constant.py
+++ b/test/extractor/generic/test_constant.py
@@ -8,8 +8,7 @@ Author: Matthias Baumgartner, 2022
 import unittest
 
 # bsie imports
-from bsie.utils import ns
-from bsie.utils.node import Node
+from bsie.utils import node as _node, ns
 
 # objects to test
 from bsie.extractor.generic.constant import Constant
@@ -34,7 +33,7 @@ class TestConstant(unittest.TestCase):
             (ns.bse.comment, 'the quick brown fox jumps over the lazy dog.'),
             ]
         ext = Constant(schema, tuples)
-        node = Node(ns.bsfs.Entity, '') # Blank node
+        node = _node.Node(ns.bsfs.Entity, '') # 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).get_child(ns.bsfs.Entity)
diff --git a/test/extractor/generic/test_path.py b/test/extractor/generic/test_path.py
index aa21b04..d2b6c61 100644
--- a/test/extractor/generic/test_path.py
+++ b/test/extractor/generic/test_path.py
@@ -8,10 +8,8 @@ Author: Matthias Baumgartner, 2022
 import unittest
 
 # bsie imports
-from bsie import base
-from bsie.utils import ns
-from bsie.utils.bsfs import schema
-from bsie.utils.node import Node
+from bsie.base import extractor
+from bsie.utils import bsfs, node as _node, ns
 
 # objects to test
 from bsie.extractor.generic.path import Path
@@ -31,7 +29,7 @@ class TestPath(unittest.TestCase):
 
     def test_schema(self):
         self.assertEqual(Path().schema,
-            schema.Schema.from_string(base.extractor.SCHEMA_PREAMBLE + '''
+            bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + '''
                 bse:filename rdfs:subClassOf bsfs:Predicate ;
                     rdfs:domain bsfs:Entity ;
                     rdfs:range xsd:string ;
@@ -40,7 +38,7 @@ class TestPath(unittest.TestCase):
 
     def test_extract(self):
         ext = Path()
-        node = Node(ns.bsfs.Entity, '') # Blank node
+        node = _node.Node(ns.bsfs.File, '') # Blank node
         content = '/tmp/foo/bar'
         p_filename = ext.schema.predicate(ns.bse.filename)
         entity = ext.schema.node(ns.bsfs.Node).get_child(ns.bsfs.Entity)
diff --git a/test/extractor/generic/test_stat.py b/test/extractor/generic/test_stat.py
index bed5fab..6cfc57f 100644
--- a/test/extractor/generic/test_stat.py
+++ b/test/extractor/generic/test_stat.py
@@ -9,10 +9,8 @@ import os
 import unittest
 
 # bsie imports
-from bsie import base
-from bsie.utils import ns
-from bsie.utils.bsfs import schema
-from bsie.utils.node import Node
+from bsie.base import extractor
+from bsie.utils import bsfs, node as _node, ns
 
 # objects to test
 from bsie.extractor.generic.stat import Stat
@@ -32,7 +30,7 @@ class TestStat(unittest.TestCase):
 
     def test_schema(self):
         self.assertEqual(Stat().schema,
-            schema.Schema.from_string(base.extractor.SCHEMA_PREAMBLE + '''
+            bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + '''
                 bse:filesize rdfs:subClassOf bsfs:Predicate ;
                     rdfs:domain bsfs:Entity ;
                     rdfs:range xsd:integer ;
@@ -41,7 +39,7 @@ class TestStat(unittest.TestCase):
 
     def test_extract(self):
         ext = Stat()
-        node = Node(ns.bsfs.Entity, '') # Blank node
+        node = _node.Node(ns.bsfs.File, '') # Blank node
         content = os.stat(__file__)
         p_filesize = ext.schema.predicate(ns.bse.filesize)
         entity = ext.schema.node(ns.bsfs.Node).get_child(ns.bsfs.Entity)