2 files changed, 26 insertions, 26 deletions
diff --git a/tests/unit/loader/metric_test.py b/tests/unit/loader/metric_test.py
index 5eced700..d2be0388 100644
--- a/tests/unit/loader/metric_test.py
+++ b/tests/unit/loader/metric_test.py
@@ -9,8 +9,8 @@
 
 import pytest
 
-from qtip.base.benchmark import Property
-from qtip.spec.metric import MetricSpec
+from qtip.base.constant import PropName
+from qtip.loader.metric import MetricSpec
 
 
 @pytest.fixture(scope='module')
@@ -29,17 +29,17 @@ def init_test(metric_spec):
 
 def list_all_test():
     metric_list = MetricSpec.list_all()
-    assert len(list(metric_list)) is 1
+    assert len(list(metric_list)) is 6
     for desc in metric_list:
-        assert Property.NAME in desc
-        assert Property.DESCRIPTION in desc
-        assert Property.ABSPATH in desc
-        assert Property.ABSPATH is not None
+        assert PropName.NAME in desc
+        assert PropName.DESCRIPTION in desc
+        assert PropName.ABSPATH in desc
+        assert PropName.ABSPATH is not None
 
 
 def content_test(metric):
-    content = metric.content()
-    assert Property.NAME in content
-    assert Property.DESCRIPTION in content
-    assert Property.WORKLOADS in content
-    assert isinstance(content[Property.WORKLOADS], list)
+    content = metric.content
+    assert PropName.NAME in content
+    assert PropName.DESCRIPTION in content
+    assert PropName.WORKLOADS in content
+    assert isinstance(content[PropName.WORKLOADS], list)
diff --git a/tests/unit/loader/qpi_test.py b/tests/unit/loader/qpi_test.py
index bfa1f580..c0d4b377 100644
--- a/tests/unit/loader/qpi_test.py
+++ b/tests/unit/loader/qpi_test.py
@@ -9,8 +9,8 @@
 
 import pytest
 
-from qtip.base.benchmark import Algorithm, Property
-from qtip.spec.qpi import QPISpec
+from qtip.base.constant import AlgoName, PropName
+from qtip.loader.qpi import QPISpec
 
 QPI_SPEC = 'compute.yaml'
 
@@ -31,22 +31,22 @@ def test_init(qpi_spec):
 
 def test_list_all(benchmarks_root):
     qpi_spec_list = QPISpec.list_all(paths=[benchmarks_root])
-    assert len(list(qpi_spec_list)) is 1
+    assert len(list(qpi_spec_list)) is 2
     for item in qpi_spec_list:
-        assert Property.NAME in item
-        assert Property.CONTENT in item
-        assert Property.ABSPATH in item
-        assert Property.ABSPATH is not None
+        assert PropName.NAME in item
+        assert PropName.CONTENT in item
+        assert PropName.ABSPATH in item
+        assert PropName.ABSPATH is not None
 
 
 def test_content(qpi_spec):
-    content = qpi_spec.content()
-    assert Property.DESCRIPTION in content
-    assert Property.ALGORITHM in content
-    assert Property.SECTIONS in content
+    content = qpi_spec.content
+    assert PropName.DESCRIPTION in content
+    assert PropName.ALGORITHM in content
+    assert PropName.SECTIONS in content
 
-    assert content[Property.ALGORITHM] in Algorithm.__dict__.values()
-    sections = content[Property.SECTIONS]
+    assert content[PropName.ALGORITHM] in AlgoName.__dict__.values()
+    sections = content[PropName.SECTIONS]
     assert isinstance(sections, list)
     for section in sections:
-        assert Property.NAME in section
+        assert PropName.NAME in section