5 files changed, 8 insertions, 12 deletions
diff --git a/tests/unit/loader/__init__.py b/tests/unit/loader/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/tests/unit/loader/__init__.py
+++ /dev/null
diff --git a/tests/unit/loader/metric_test.py b/tests/unit/loader/metric_test.py
index 26f144af..619d5e00 100644
--- a/tests/unit/loader/metric_test.py
+++ b/tests/unit/loader/metric_test.py
@@ -28,11 +28,10 @@ def init_test(metric_spec):
 
 
 def list_all_test(benchmarks_root):
-    metric_list = MetricSpec.list_all(paths=[benchmarks_root])
-    assert len(list(metric_list)) is 6
+    metric_list = list(MetricSpec.list_all(paths=[benchmarks_root]))
+    assert len(metric_list) is 6
     for desc in metric_list:
         assert BaseProp.NAME in desc
-        assert BaseProp.DESCRIPTION in desc
         assert BaseProp.ABSPATH in desc
         assert BaseProp.ABSPATH is not None
 
@@ -40,6 +39,5 @@ def list_all_test(benchmarks_root):
 def content_test(metric_spec):
     content = metric_spec.content
     assert BaseProp.NAME in content
-    assert BaseProp.DESCRIPTION in content
     assert BaseProp.WORKLOADS in content
     assert isinstance(content[BaseProp.WORKLOADS], list)
diff --git a/tests/unit/loader/plan_test.py b/tests/unit/loader/plan_test.py
index 4872b4cd..70ae2ad5 100644
--- a/tests/unit/loader/plan_test.py
+++ b/tests/unit/loader/plan_test.py
@@ -29,11 +29,10 @@ def test_init(plan):
 
 
 def test_list_all(benchmarks_root):
-    plan_list = Plan.list_all(paths=[benchmarks_root])
-    assert len(list(plan_list)) is 1
+    plan_list = list(Plan.list_all(paths=[benchmarks_root]))
+    assert len(plan_list) is 2
     for desc in plan_list:
         assert PlanProp.NAME in desc
-        assert PlanProp.CONTENT in desc
         assert PlanProp.ABSPATH in desc
         assert PlanProp.ABSPATH is not None
 
diff --git a/tests/unit/loader/qpi_test.py b/tests/unit/loader/qpi_test.py
index 3328b43a..b53030d4 100644
--- a/tests/unit/loader/qpi_test.py
+++ b/tests/unit/loader/qpi_test.py
@@ -30,11 +30,10 @@ 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 2
+    qpi_spec_list = list(QPISpec.list_all(paths=[benchmarks_root]))
+    assert len(qpi_spec_list) is 2
     for item in qpi_spec_list:
         assert SpecProp.NAME in item
-        assert SpecProp.CONTENT in item
         assert SpecProp.ABSPATH in item
         assert SpecProp.ABSPATH is not None
 
diff --git a/tests/unit/loader/yaml_file_test.py b/tests/unit/loader/yaml_file_test.py
index 17836946..0f0632c4 100644
--- a/tests/unit/loader/yaml_file_test.py
+++ b/tests/unit/loader/yaml_file_test.py
@@ -10,7 +10,7 @@
 import os
 import pytest
 
-from qtip.base.error import InvalidContent
+from qtip.base.error import InvalidContentError
 from qtip.loader.yaml_file import YamlFileLoader
 
 
@@ -28,6 +28,6 @@ def test_init(yaml_root, filename, expected):
 
 
 def test_invalid_content(yaml_root):
-    with pytest.raises(InvalidContent) as excinfo:
+    with pytest.raises(InvalidContentError) as excinfo:
         YamlFileLoader('invalid.yaml', [yaml_root])
     assert 'invalid.yaml' in excinfo.value.filename