diff --git a/hepdata_converter/testsuite/test_yodawriter.py b/hepdata_converter/testsuite/test_yodawriter.py
index 0fd697d..99d3524 100644
--- a/hepdata_converter/testsuite/test_yodawriter.py
+++ b/hepdata_converter/testsuite/test_yodawriter.py
@@ -63,8 +63,8 @@ def test_parse_pattern_unmatch(self, yaml_simple_path, yoda_template):
         with open(output_file_path, 'r') as f:
             self.assertMultiLineAlmostEqual(f, yoda_template)
 
-    @insert_path('yaml_no_dependent')
-    @insert_data_as_file('yoda/no_dependent.yoda')
+    @insert_path('yaml_no_independent')
+    @insert_data_as_file('yoda/no_independent.yoda')
     def test_parse_no_dependent(self, yaml_simple_path, yoda_template):
         output_file_path = os.path.join(self.current_tmp, 'datafile.yoda')
         hepdata_converter.convert(yaml_simple_path, output_file_path,
diff --git a/hepdata_converter/testsuite/testdata/yaml_no_dependent/ph1_pt.yaml b/hepdata_converter/testsuite/testdata/yaml_no_independent/ph1_pt.yaml
similarity index 100%
rename from hepdata_converter/testsuite/testdata/yaml_no_dependent/ph1_pt.yaml
rename to hepdata_converter/testsuite/testdata/yaml_no_independent/ph1_pt.yaml
diff --git a/hepdata_converter/testsuite/testdata/yaml_no_dependent/ph2_pt.yaml b/hepdata_converter/testsuite/testdata/yaml_no_independent/ph2_pt.yaml
similarity index 100%
rename from hepdata_converter/testsuite/testdata/yaml_no_dependent/ph2_pt.yaml
rename to hepdata_converter/testsuite/testdata/yaml_no_independent/ph2_pt.yaml
diff --git a/hepdata_converter/testsuite/testdata/yaml_no_dependent/submission.yaml b/hepdata_converter/testsuite/testdata/yaml_no_independent/submission.yaml
similarity index 100%
rename from hepdata_converter/testsuite/testdata/yaml_no_dependent/submission.yaml
rename to hepdata_converter/testsuite/testdata/yaml_no_independent/submission.yaml
diff --git a/hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_costs.yaml b/hepdata_converter/testsuite/testdata/yaml_no_independent/yy_costs.yaml
similarity index 100%
rename from hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_costs.yaml
rename to hepdata_converter/testsuite/testdata/yaml_no_independent/yy_costs.yaml
diff --git a/hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_m.yaml b/hepdata_converter/testsuite/testdata/yaml_no_independent/yy_m.yaml
similarity index 100%
rename from hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_m.yaml
rename to hepdata_converter/testsuite/testdata/yaml_no_independent/yy_m.yaml
diff --git a/hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_phistar.yaml b/hepdata_converter/testsuite/testdata/yaml_no_independent/yy_phistar.yaml
similarity index 100%
rename from hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_phistar.yaml
rename to hepdata_converter/testsuite/testdata/yaml_no_independent/yy_phistar.yaml
diff --git a/hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_pimdphi.yaml b/hepdata_converter/testsuite/testdata/yaml_no_independent/yy_pimdphi.yaml
similarity index 100%
rename from hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_pimdphi.yaml
rename to hepdata_converter/testsuite/testdata/yaml_no_independent/yy_pimdphi.yaml
diff --git a/hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_pt.yaml b/hepdata_converter/testsuite/testdata/yaml_no_independent/yy_pt.yaml
similarity index 100%
rename from hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_pt.yaml
rename to hepdata_converter/testsuite/testdata/yaml_no_independent/yy_pt.yaml
diff --git a/hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_ptt.yaml b/hepdata_converter/testsuite/testdata/yaml_no_independent/yy_ptt.yaml
similarity index 100%
rename from hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_ptt.yaml
rename to hepdata_converter/testsuite/testdata/yaml_no_independent/yy_ptt.yaml
diff --git a/hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_xs.yaml b/hepdata_converter/testsuite/testdata/yaml_no_independent/yy_xs.yaml
similarity index 100%
rename from hepdata_converter/testsuite/testdata/yaml_no_dependent/yy_xs.yaml
rename to hepdata_converter/testsuite/testdata/yaml_no_independent/yy_xs.yaml
diff --git a/hepdata_converter/testsuite/testdata/yoda/no_dependent.yoda b/hepdata_converter/testsuite/testdata/yoda/no_independent.yoda
similarity index 100%
rename from hepdata_converter/testsuite/testdata/yoda/no_dependent.yoda
rename to hepdata_converter/testsuite/testdata/yoda/no_independent.yoda