Clean up test data folders (#399)

* Clean up test data folders * Make ruff * Rename IO folder to lowercase * Update tests
IAMconsortium · Sep 24, 2024 · 9314fef · 9314fef
1 parent d2b0cb7
commit 9314fef
Show file tree

Hide file tree

Showing 114 changed files with 179 additions and 118 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -26,12 +26,16 @@
 
 @pytest.fixture(scope="session")
 def simple_definition():
-    yield DataStructureDefinition(TEST_DATA_DIR / "validation_nc")
+    yield DataStructureDefinition(
+        TEST_DATA_DIR / "data_structure_definition" / "validation_nc"
+    )
 
 
 @pytest.fixture(scope="session")
 def extras_definition():
-    yield DataStructureDefinition(TEST_DATA_DIR / "extras_nc")
+    yield DataStructureDefinition(
+        TEST_DATA_DIR / "data_structure_definition" / "extras_nc"
+    )
 
 
 @pytest.fixture(scope="function")

diff --git a/tests/data/add-missing-variables/data.xlsx → .../data/cli/add-missing-variables/data.xlsx b/tests/data/add-missing-variables/data.xlsx → .../data/cli/add-missing-variables/data.xlsx
diff --git a/...mpty_definitions_dir/definitions/.gitkeep → ...mpty_definitions_dir/definitions/.gitkeep b/...mpty_definitions_dir/definitions/.gitkeep → ...mpty_definitions_dir/definitions/.gitkeep
diff --git a/tests/data/invalid_yaml/foo.yaml → tests/data/cli/invalid_yaml/foo.yaml b/tests/data/invalid_yaml/foo.yaml → tests/data/cli/invalid_yaml/foo.yaml
diff --git a/...imensions/definitions/region/regions.yaml → ...imensions/definitions/region/regions.yaml b/...imensions/definitions/region/regions.yaml → ...imensions/definitions/region/regions.yaml
diff --git a/...sions/definitions/scenario/scenarios.yaml → ...sions/definitions/scenario/scenarios.yaml b/...sions/definitions/scenario/scenarios.yaml → ...sions/definitions/scenario/scenarios.yaml
diff --git a/...sions/definitions/variable/variables.yaml → ...sions/definitions/variable/variables.yaml b/...sions/definitions/variable/variables.yaml → ...sions/definitions/variable/variables.yaml
diff --git a/...efault_dimensions/mappings/mapping_1.yaml → ...efault_dimensions/mappings/mapping_1.yaml b/...efault_dimensions/mappings/mapping_1.yaml → ...efault_dimensions/mappings/mapping_1.yaml
diff --git a/...efault_dimensions/mappings/mapping_2.yaml → ...efault_dimensions/mappings/mapping_2.yaml b/...efault_dimensions/mappings/mapping_2.yaml → ...efault_dimensions/mappings/mapping_2.yaml
diff --git a/...ta/nomenclature_configs/variable/.gitkeep → ...ions_one_empty/definitions/empty/.gitkeep b/...ta/nomenclature_configs/variable/.gitkeep → ...ions_one_empty/definitions/empty/.gitkeep
diff --git a/...one_empty/definitions/region/regions.yaml → ...one_empty/definitions/region/regions.yaml b/...one_empty/definitions/region/regions.yaml → ...one_empty/definitions/region/regions.yaml
diff --git a/...empty/definitions/variable/variables.yaml → ...empty/definitions/variable/variables.yaml b/...empty/definitions/variable/variables.yaml → ...empty/definitions/variable/variables.yaml
diff --git a/...ensions_one_empty/mappings/mapping_1.yaml → ...ensions_one_empty/mappings/mapping_1.yaml b/...ensions_one_empty/mappings/mapping_1.yaml → ...ensions_one_empty/mappings/mapping_1.yaml
diff --git a/...ensions_one_empty/mappings/mapping_2.yaml → ...ensions_one_empty/mappings/mapping_2.yaml b/...ensions_one_empty/mappings/mapping_2.yaml → ...ensions_one_empty/mappings/mapping_2.yaml
diff --git a/...n-default_folders/def/region/regions.yaml → ...n-default_folders/def/region/regions.yaml b/...n-default_folders/def/region/regions.yaml → ...n-default_folders/def/region/regions.yaml
diff --git a/...fault_folders/def/variable/variables.yaml → ...fault_folders/def/variable/variables.yaml b/...fault_folders/def/variable/variables.yaml → ...fault_folders/def/variable/variables.yaml
diff --git a/...ta/non-default_folders/map/mapping_1.yaml → ...li/non-default_folders/map/mapping_1.yaml b/...ta/non-default_folders/map/mapping_1.yaml → ...li/non-default_folders/map/mapping_1.yaml
diff --git a/...ta/non-default_folders/map/mapping_2.yaml → ...li/non-default_folders/map/mapping_2.yaml b/...ta/non-default_folders/map/mapping_2.yaml → ...li/non-default_folders/map/mapping_2.yaml
diff --git a/...alidation/definitions/region/regions.yaml → ...alidation/definitions/region/regions.yaml b/...alidation/definitions/region/regions.yaml → ...alidation/definitions/region/regions.yaml
diff --git a/...ation/definitions/variable/variables.yaml → ...ation/definitions/variable/variables.yaml b/...ation/definitions/variable/variables.yaml → ...ation/definitions/variable/variables.yaml
diff --git a/...ucture_validation/mappings/mapping_1.yaml → ...ucture_validation/mappings/mapping_1.yaml b/...ucture_validation/mappings/mapping_1.yaml → ...ucture_validation/mappings/mapping_1.yaml
diff --git a/...ucture_validation/mappings/mapping_2.yaml → ...ucture_validation/mappings/mapping_2.yaml b/...ucture_validation/mappings/mapping_2.yaml → ...ucture_validation/mappings/mapping_2.yaml
diff --git a/...a/custom_dimension_nc/region/regions.yaml → ...ion_fails/definitions/region/regions.yaml b/...a/custom_dimension_nc/region/regions.yaml → ...ion_fails/definitions/region/regions.yaml
diff --git a/...fails/definitions/variable/variables.yaml → ...fails/definitions/variable/variables.yaml b/...fails/definitions/variable/variables.yaml → ...fails/definitions/variable/variables.yaml
diff --git a/..._validation_fails/mappings/mapping_1.yaml → ..._validation_fails/mappings/mapping_1.yaml b/..._validation_fails/mappings/mapping_1.yaml → ..._validation_fails/mappings/mapping_1.yaml
diff --git a/..._validation_fails/mappings/mapping_2.yaml → ..._validation_fails/mappings/mapping_2.yaml b/..._validation_fails/mappings/mapping_2.yaml → ..._validation_fails/mappings/mapping_2.yaml
diff --git a/..._mappings/definitions/region/regions.yaml → ..._mappings/definitions/region/regions.yaml b/..._mappings/definitions/region/regions.yaml → ..._mappings/definitions/region/regions.yaml
diff --git a/...pings/definitions/variable/variables.yaml → ...pings/definitions/variable/variables.yaml b/...pings/definitions/variable/variables.yaml → ...pings/definitions/variable/variables.yaml
diff --git a/...code-list/variable/duplicate_entries.yaml → ...code-list/variable/duplicate_entries.yaml b/...code-list/variable/duplicate_entries.yaml → ...code-list/variable/duplicate_entries.yaml
diff --git a/tests/data/duplicate_code_raises/bar.yaml → ...a/codelist/duplicate_code_raises/bar.yaml b/tests/data/duplicate_code_raises/bar.yaml → ...a/codelist/duplicate_code_raises/bar.yaml
diff --git a/tests/data/duplicate_code_raises/foo.yaml → ...a/codelist/duplicate_code_raises/foo.yaml b/tests/data/duplicate_code_raises/foo.yaml → ...a/codelist/duplicate_code_raises/foo.yaml
diff --git a/tests/data/duplicate_tag_raises/tag_1.yaml → .../codelist/duplicate_tag_raises/tag_1.yaml b/tests/data/duplicate_tag_raises/tag_1.yaml → .../codelist/duplicate_tag_raises/tag_1.yaml
diff --git a/tests/data/duplicate_tag_raises/tag_2.yaml → .../codelist/duplicate_tag_raises/tag_2.yaml b/tests/data/duplicate_tag_raises/tag_2.yaml → .../codelist/duplicate_tag_raises/tag_2.yaml
diff --git a/...space/definitions/scenario/scenarios.yaml → ...space/definitions/scenario/scenarios.yaml b/...space/definitions/scenario/scenarios.yaml → ...space/definitions/scenario/scenarios.yaml
diff --git a/...name_arg_conflict/variable/variables.yaml → ...name_arg_conflict/variable/variables.yaml b/...name_arg_conflict/variable/variables.yaml → ...name_arg_conflict/variable/variables.yaml
diff --git a/..._undefined_target/variable/variables.yaml → ..._undefined_target/variable/variables.yaml b/..._undefined_target/variable/variables.yaml → ..._undefined_target/variable/variables.yaml
diff --git a/...st/unknown_weight/variable/variables.yaml → ...st/unknown_weight/variable/variables.yaml b/...st/unknown_weight/variable/variables.yaml → ...st/unknown_weight/variable/variables.yaml
diff --git a/...ata/general_filtering/basic_codelist.yaml → ...ist/general_filtering/basic_codelist.yaml b/...ata/general_filtering/basic_codelist.yaml → ...ist/general_filtering/basic_codelist.yaml
diff --git a/...acter/definitions/scenario/scenarios.yaml → ...acter/definitions/scenario/scenarios.yaml b/...acter/definitions/scenario/scenarios.yaml → ...acter/definitions/scenario/scenarios.yaml
diff --git a/.../meta/meta_indicators_allowed_values.yaml → .../meta/meta_indicators_allowed_values.yaml b/.../meta/meta_indicators_allowed_values.yaml → .../meta/meta_indicators_allowed_values.yaml
diff --git a/...data/multiple_unit_codelist/variable.yaml → ...list/multiple_unit_codelist/variable.yaml b/...data/multiple_unit_codelist/variable.yaml → ...list/multiple_unit_codelist/variable.yaml
diff --git a/...s_attribute_non-existing_name/region.yaml → ...s_attribute_non-existing_name/region.yaml b/...s_attribute_non-existing_name/region.yaml → ...s_attribute_non-existing_name/region.yaml
diff --git a/...egion_codelist/norway_as_bool/region.yaml → ...egion_codelist/norway_as_bool/region.yaml b/...egion_codelist/norway_as_bool/region.yaml → ...egion_codelist/norway_as_bool/region.yaml
diff --git a/...s/data/region_codelist/simple/region.yaml → ...delist/region_codelist/simple/region.yaml b/...s/data/region_codelist/simple/region.yaml → ...delist/region_codelist/simple/region.yaml
diff --git a/..._to_filter_codelist/region_filtering.yaml → ..._to_filter_codelist/region_filtering.yaml b/..._to_filter_codelist/region_filtering.yaml → ..._to_filter_codelist/region_filtering.yaml
diff --git a/tests/data/simple_codelist/foo.yaml → tests/data/codelist/simple_codelist/foo.yaml b/tests/data/simple_codelist/foo.yaml → tests/data/codelist/simple_codelist/foo.yaml
diff --git a/...ustom_dimension_nc/variable/tag_fuel.yaml → ...ay_tag/definitions/variable/tag_fuel.yaml b/...ustom_dimension_nc/variable/tag_fuel.yaml → ...ay_tag/definitions/variable/tag_fuel.yaml
diff --git a/...y_tag/definitions/variable/variables.yaml → ...y_tag/definitions/variable/variables.yaml b/...y_tag/definitions/variable/variables.yaml → ...y_tag/definitions/variable/variables.yaml
diff --git a/tests/data/tagged_codelist/foo.yaml → tests/data/codelist/tagged_codelist/foo.yaml b/tests/data/tagged_codelist/foo.yaml → tests/data/codelist/tagged_codelist/foo.yaml
diff --git a/...s/data/tagged_codelist/foo_attr_list.yaml → ...delist/tagged_codelist/foo_attr_list.yaml b/...s/data/tagged_codelist/foo_attr_list.yaml → ...delist/tagged_codelist/foo_attr_list.yaml
diff --git a/tests/data/tagged_codelist/tag_sector.yaml → .../codelist/tagged_codelist/tag_sector.yaml b/tests/data/tagged_codelist/tag_sector.yaml → .../codelist/tagged_codelist/tag_sector.yaml
diff --git a/tests/data/tagged_codelist/tag_source.yaml → .../codelist/tagged_codelist/tag_source.yaml b/tests/data/tagged_codelist/tag_source.yaml → .../codelist/tagged_codelist/tag_source.yaml
diff --git a/tests/data/tagged_codelist/tag_species.yaml → ...codelist/tagged_codelist/tag_species.yaml b/tests/data/tagged_codelist/tag_species.yaml → ...codelist/tagged_codelist/tag_species.yaml
diff --git a/...t_complex_attr/variable_complex_attr.yaml → ...t_complex_attr/variable_complex_attr.yaml b/...t_complex_attr/variable_complex_attr.yaml → ...t_complex_attr/variable_complex_attr.yaml
diff --git a/...data/nomenclature_configs/dimensions.yaml → tests/data/config/dimensions.yaml b/...data/nomenclature_configs/dimensions.yaml → tests/data/config/dimensions.yaml
diff --git a/...e_stacked_external_repo/nomenclature.yaml → ...e_stacked_external_repo/nomenclature.yaml b/...e_stacked_external_repo/nomenclature.yaml → ...e_stacked_external_repo/nomenclature.yaml
diff --git a/...ral-config-only-country/nomenclature.yaml → ...ral-config-only-country/nomenclature.yaml b/...ral-config-only-country/nomenclature.yaml → ...ral-config-only-country/nomenclature.yaml
diff --git a/...eneral-config-only-nuts/nomenclature.yaml → ...eneral-config-only-nuts/nomenclature.yaml b/...eneral-config-only-nuts/nomenclature.yaml → ...eneral-config-only-nuts/nomenclature.yaml
diff --git a/...ata/general-config-only/nomenclature.yaml → ...fig/general-config-only/nomenclature.yaml b/...ata/general-config-only/nomenclature.yaml → ...fig/general-config-only/nomenclature.yaml
diff --git a/...al-config/definitions/region/regions.yaml → ...al-config/definitions/region/regions.yaml b/...al-config/definitions/region/regions.yaml → ...al-config/definitions/region/regions.yaml
diff --git a/tests/data/general-config/nomenclature.yaml → ...a/config/general-config/nomenclature.yaml b/tests/data/general-config/nomenclature.yaml → ...a/config/general-config/nomenclature.yaml
diff --git a/...omenclature_configs/hash_and_release.yaml → tests/data/config/hash_and_release.yaml b/...omenclature_configs/hash_and_release.yaml → tests/data/config/hash_and_release.yaml
diff --git a/...e_configs/multiple_repos_for_mapping.yaml → ...ta/config/multiple_repos_for_mapping.yaml b/...e_configs/multiple_repos_for_mapping.yaml → ...ta/config/multiple_repos_for_mapping.yaml
diff --git a/...configs/multiple_repos_per_dimension.yaml → .../config/multiple_repos_per_dimension.yaml b/...configs/multiple_repos_per_dimension.yaml → .../config/multiple_repos_per_dimension.yaml
diff --git a/...ta/nomenclature_configs/unknown_repo.yaml → tests/data/config/unknown_repo.yaml b/...ta/nomenclature_configs/unknown_repo.yaml → tests/data/config/unknown_repo.yaml
diff --git a/...ions_one_empty/definitions/empty/.gitkeep → tests/data/config/variable/.gitkeep b/...ions_one_empty/definitions/empty/.gitkeep → tests/data/config/variable/.gitkeep
diff --git a/tests/data/extras_nc/region/regions.yaml → ...n/custom_dimension_nc/region/regions.yaml b/tests/data/extras_nc/region/regions.yaml → ...n/custom_dimension_nc/region/regions.yaml
diff --git a/...stom_dimension_nc/scenario/scenarios.yaml → ...stom_dimension_nc/scenario/scenarios.yaml b/...stom_dimension_nc/scenario/scenarios.yaml → ...stom_dimension_nc/scenario/scenarios.yaml
diff --git a/...ay_tag/definitions/variable/tag_fuel.yaml → ...ustom_dimension_nc/variable/tag_fuel.yaml b/...ay_tag/definitions/variable/tag_fuel.yaml → ...ustom_dimension_nc/variable/tag_fuel.yaml
diff --git a/...stom_dimension_nc/variable/variables.yaml → ...stom_dimension_nc/variable/variables.yaml b/...stom_dimension_nc/variable/variables.yaml → ...stom_dimension_nc/variable/variables.yaml
diff --git a/...ion_fails/definitions/region/regions.yaml → ..._definition/extras_nc/region/regions.yaml b/...ion_fails/definitions/region/regions.yaml → ..._definition/extras_nc/region/regions.yaml
diff --git a/tests/data/extras_nc/variable/variables.yaml → ...inition/extras_nc/variable/variables.yaml b/tests/data/extras_nc/variable/variables.yaml → ...inition/extras_nc/variable/variables.yaml
diff --git a/tests/data/validation_nc/region/regions.yaml → ...inition/validation_nc/region/regions.yaml b/tests/data/validation_nc/region/regions.yaml → ...inition/validation_nc/region/regions.yaml
diff --git a/...data/validation_nc/variable/tag_fuel.yaml → ...tion/validation_nc/variable/tag_fuel.yaml b/...data/validation_nc/variable/tag_fuel.yaml → ...tion/validation_nc/variable/tag_fuel.yaml
diff --git a/...ata/validation_nc/variable/variables.yaml → ...ion/validation_nc/variable/variables.yaml b/...ata/validation_nc/variable/variables.yaml → ...ion/validation_nc/variable/variables.yaml
diff --git a/tests/data/excel_io/validation_nc.xlsx → tests/data/io/excel_io/validation_nc.xlsx b/tests/data/excel_io/validation_nc.xlsx → tests/data/io/excel_io/validation_nc.xlsx
diff --git a/...ta/excel_io/validation_nc_duplicates.xlsx → ...io/excel_io/validation_nc_duplicates.xlsx b/...ta/excel_io/validation_nc_duplicates.xlsx → ...io/excel_io/validation_nc_duplicates.xlsx
diff --git a/tests/data/excel_io/validation_nc_flat.yaml → .../data/io/excel_io/validation_nc_flat.yaml b/tests/data/excel_io/validation_nc_flat.yaml → .../data/io/excel_io/validation_nc_flat.yaml
diff --git a/...data/excel_io/validation_nc_list_arg.xlsx → ...a/io/excel_io/validation_nc_list_arg.xlsx b/...data/excel_io/validation_nc_list_arg.xlsx → ...a/io/excel_io/validation_nc_list_arg.xlsx
diff --git a/...data/excel_io/validation_nc_list_arg.yaml → ...a/io/excel_io/validation_nc_list_arg.yaml b/...data/excel_io/validation_nc_list_arg.yaml → ...a/io/excel_io/validation_nc_list_arg.yaml
diff --git a/.../meta/meta_indicators_allowed_values.yaml → .../meta/meta_indicators_allowed_values.yaml b/.../meta/meta_indicators_allowed_values.yaml → .../meta/meta_indicators_allowed_values.yaml
diff --git a/...ions2/meta/meta_indicators_test_data.yaml → ...ions2/meta/meta_indicators_test_data.yaml b/...ions2/meta/meta_indicators_test_data.yaml → ...ions2/meta/meta_indicators_test_data.yaml
diff --git a/...ions3/meta/meta_indicators_more_data.yaml → ...ions3/meta/meta_indicators_more_data.yaml b/...ions3/meta/meta_indicators_more_data.yaml → ...ions3/meta/meta_indicators_more_data.yaml
diff --git a/..._aggregation/excel_mapping_reference.yaml → ..._aggregation/excel_mapping_reference.yaml b/..._aggregation/excel_mapping_reference.yaml → ..._aggregation/excel_mapping_reference.yaml
diff --git a/...aggregation/excel_model_registration.xlsx → ...aggregation/excel_model_registration.xlsx b/...aggregation/excel_model_registration.xlsx → ...aggregation/excel_model_registration.xlsx
diff --git a/...ion/illegal_mapping_conflict_regions.yaml → ...ion/illegal_mapping_conflict_regions.yaml b/...ion/illegal_mapping_conflict_regions.yaml → ...ion/illegal_mapping_conflict_regions.yaml
diff --git a/...ion/illegal_mapping_duplicate_common.yaml → ...ion/illegal_mapping_duplicate_common.yaml b/...ion/illegal_mapping_duplicate_common.yaml → ...ion/illegal_mapping_duplicate_common.yaml
diff --git a/...on/illegal_mapping_illegal_attribute.yaml → ...on/illegal_mapping_illegal_attribute.yaml b/...on/illegal_mapping_illegal_attribute.yaml → ...on/illegal_mapping_illegal_attribute.yaml
diff --git a/.../illegal_mapping_invalid_format_dict.yaml → .../illegal_mapping_invalid_format_dict.yaml b/.../illegal_mapping_invalid_format_dict.yaml → .../illegal_mapping_invalid_format_dict.yaml
diff --git a/...gregation/illegal_mapping_model_only.yaml → ...gregation/illegal_mapping_model_only.yaml b/...gregation/illegal_mapping_model_only.yaml → ...gregation/illegal_mapping_model_only.yaml
diff --git a/...illegal_mapping_native_duplicate_key.yaml → ...illegal_mapping_native_duplicate_key.yaml b/...illegal_mapping_native_duplicate_key.yaml → ...illegal_mapping_native_duplicate_key.yaml
diff --git a/...l_mapping_native_rename_key_conflict.yaml → ...l_mapping_native_rename_key_conflict.yaml b/...l_mapping_native_rename_key_conflict.yaml → ...l_mapping_native_rename_key_conflict.yaml
diff --git a/...ping_native_rename_target_conflict_1.yaml → ...ping_native_rename_target_conflict_1.yaml b/...ping_native_rename_target_conflict_1.yaml → ...ping_native_rename_target_conflict_1.yaml
diff --git a/...ping_native_rename_target_conflict_2.yaml → ...ping_native_rename_target_conflict_2.yaml b/...ping_native_rename_target_conflict_2.yaml → ...ping_native_rename_target_conflict_2.yaml
diff --git a/...a/region_aggregation/working_mapping.yaml → ...g/region_aggregation/working_mapping.yaml b/...a/region_aggregation/working_mapping.yaml → ...g/region_aggregation/working_mapping.yaml
diff --git a/.../regionprocessor_duplicate/mapping_1.yaml → .../regionprocessor_duplicate/mapping_1.yaml b/.../regionprocessor_duplicate/mapping_1.yaml → .../regionprocessor_duplicate/mapping_1.yaml
diff --git a/.../regionprocessor_duplicate/mapping_2.yaml → .../regionprocessor_duplicate/mapping_2.yaml b/.../regionprocessor_duplicate/mapping_2.yaml → .../regionprocessor_duplicate/mapping_2.yaml
diff --git a/...egion_overlap/exclude_common_overlap.yaml → ...egion_overlap/exclude_common_overlap.yaml b/...egion_overlap/exclude_common_overlap.yaml → ...egion_overlap/exclude_common_overlap.yaml
diff --git a/...egion_overlap/exclude_native_overlap.yaml → ...egion_overlap/exclude_native_overlap.yaml b/...egion_overlap/exclude_native_overlap.yaml → ...egion_overlap/exclude_native_overlap.yaml
diff --git a/...egionprocessor_not_defined/mapping_1.yaml → ...egionprocessor_not_defined/mapping_1.yaml b/...egionprocessor_not_defined/mapping_1.yaml → ...egionprocessor_not_defined/mapping_1.yaml
diff --git a/...egionprocessor_not_defined/mapping_2.yaml → ...egionprocessor_not_defined/mapping_2.yaml b/...egionprocessor_not_defined/mapping_2.yaml → ...egionprocessor_not_defined/mapping_2.yaml
diff --git a/...nprocessor_unexpected_region/model_a.yaml → ...nprocessor_unexpected_region/model_a.yaml b/...nprocessor_unexpected_region/model_a.yaml → ...nprocessor_unexpected_region/model_a.yaml
diff --git a/...ata/regionprocessor_working/mapping_1.yml → ...ing/regionprocessor_working/mapping_1.yml b/...ata/regionprocessor_working/mapping_1.yml → ...ing/regionprocessor_working/mapping_1.yml
diff --git a/...ta/regionprocessor_working/mapping_2.yaml → ...ng/regionprocessor_working/mapping_2.yaml b/...ta/regionprocessor_working/mapping_2.yaml → ...ng/regionprocessor_working/mapping_2.yaml
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -15,6 +15,8 @@
 
 from conftest import TEST_DATA_DIR
 
+MODULE_TEST_DATA_DIR = TEST_DATA_DIR / "cli"
+
 runner = CliRunner()
 
 
@@ -54,20 +56,24 @@ def test_cli_valid_yaml():
     """Check that CLI runs through, when all yaml files in `path`
     can be parsed without errors"""
     result_valid = runner.invoke(
-        cli, ["validate-yaml", str(TEST_DATA_DIR / "duplicate_code_raises")]
+        cli,
+        [
+            "validate-yaml",
+            str(TEST_DATA_DIR / "codelist" / "duplicate_code_raises"),
+        ],
     )
     assert result_valid.exit_code == 0
 
 
 def test_cli_valid_yaml_fails():
     """Check that CLI raises expected error when parsing an invalid yaml"""
     result_invalid = runner.invoke(
-        cli, ["validate-yaml", str(TEST_DATA_DIR / "invalid_yaml")]
+        cli, ["validate-yaml", str(MODULE_TEST_DATA_DIR / "invalid_yaml")]
     )
     assert result_invalid.exit_code == 1
     match = "Parsing the yaml files failed. Please check the log for details."
     with pytest.raises(AssertionError, match=match):
-        assert_valid_yaml(TEST_DATA_DIR / "invalid_yaml")
+        assert_valid_yaml(MODULE_TEST_DATA_DIR / "invalid_yaml")
 
 
 def test_cli_valid_project_path():
@@ -81,15 +87,25 @@ def test_cli_valid_project():
     """Check that CLI runs through with existing "definitions" and "mappings"
     directory"""
     result_valid = runner.invoke(
-        cli, ["validate-project", str(TEST_DATA_DIR / "structure_validation")]
+        cli,
+        [
+            "validate-project",
+            str(
+                MODULE_TEST_DATA_DIR / "structure_validation",
+            ),
+        ],
     )
     assert result_valid.exit_code == 0
 
 
 def test_cli_invalid_region():
     """Test that errors are correctly propagated"""
     obs = runner.invoke(
-        cli, ["validate-project", str(TEST_DATA_DIR / "structure_validation_fails")]
+        cli,
+        [
+            "validate-project",
+            str(MODULE_TEST_DATA_DIR / "structure_validation_fails"),
+        ],
     )
     assert obs.exit_code == 1
     assert isinstance(obs.exception, pydantic.ValidationError)
@@ -100,7 +116,7 @@ def test_cli_valid_project_fails():
     """Check that CLI expected error when "definitions" directory doesn't exist"""
     path = TEST_DATA_DIR / "invalid_yaml" / "definitions"
     result_invalid = runner.invoke(
-        cli, ["validate-project", str(TEST_DATA_DIR / "invalid_yaml")]
+        cli, ["validate-project", str(MODULE_TEST_DATA_DIR / "invalid_yaml")]
     )
     assert result_invalid.exit_code == 1
 
@@ -109,7 +125,7 @@ def print_helper(_path):
 
     with pytest.raises(NotADirectoryError, match=print_helper(path)):
         assert_valid_structure(
-            TEST_DATA_DIR / "invalid_yaml", "mappings", "definitions"
+            MODULE_TEST_DATA_DIR / "invalid_yaml", "mappings", "definitions"
         )
 
 
@@ -120,7 +136,7 @@ def test_cli_non_default_folders():
         cli,
         [
             "validate-project",
-            str(TEST_DATA_DIR / "non-default_folders"),
+            str(MODULE_TEST_DATA_DIR / "non-default_folders"),
             "--definitions",
             "def",
             "--mappings",
@@ -134,7 +150,13 @@ def test_cli_non_default_folders_fails():
     """Check that CLI raises expected error when non-default "definitions" and
     "mappings" directory names are not given"""
     result_valid = runner.invoke(
-        cli, ["validate-project", str(TEST_DATA_DIR / "non-default_folders")]
+        cli,
+        [
+            "validate-project",
+            str(
+                MODULE_TEST_DATA_DIR / "non-default_folders",
+            ),
+        ],
     )
     assert result_valid.exit_code == 1
 
@@ -146,7 +168,7 @@ def test_cli_wrong_definitions_name():
         cli,
         [
             "validate-project",
-            str(TEST_DATA_DIR / "structure_validation"),
+            str(MODULE_TEST_DATA_DIR / "structure_validation"),
             "--definitions",
             "def",
         ],
@@ -161,7 +183,7 @@ def test_cli_custom_dimensions_runs():
         cli,
         [
             "validate-project",
-            str(TEST_DATA_DIR / "non-default_dimensions"),
+            str(MODULE_TEST_DATA_DIR / "non-default_dimensions"),
             "--dimension",
             "variable",
             "--dimension",
@@ -181,7 +203,7 @@ def test_cli_custom_dimensions_fails():
         cli,
         [
             "validate-project",
-            str(TEST_DATA_DIR / "non-default_dimensions"),
+            str(MODULE_TEST_DATA_DIR / "non-default_dimensions"),
             "--dimension",
             "foo",
         ],
@@ -199,7 +221,7 @@ def test_cli_empty_dimensions_run():
         cli,
         [
             "validate-project",
-            str(TEST_DATA_DIR / "non-default_dimensions_one_empty"),
+            str(MODULE_TEST_DATA_DIR / "non-default_dimensions_one_empty"),
             "--dimension",
             "variable",
             "--dimension",
@@ -214,7 +236,10 @@ def test_cli_empty_dimensions_fails():
 
     result_invalid = runner.invoke(
         cli,
-        ["validate-project", str(TEST_DATA_DIR / "non-default_dimensions_one_empty")],
+        [
+            "validate-project",
+            str(MODULE_TEST_DATA_DIR / "non-default_dimensions_one_empty"),
+        ],
     )
     assert result_invalid.exit_code == 1
     assert isinstance(result_invalid.exception, ValueError)
@@ -230,7 +255,7 @@ def test_cli_missing_mappings_runs():
             cli,
             [
                 "validate-project",
-                str(TEST_DATA_DIR / "structure_validation_no_mappings"),
+                str(MODULE_TEST_DATA_DIR / "structure_validation_no_mappings"),
             ],
         ).exit_code
         == 0
@@ -244,7 +269,7 @@ def test_cli_missing_mappings_fails():
         cli,
         [
             "validate-project",
-            str(TEST_DATA_DIR / "structure_validation_no_mappings"),
+            str(MODULE_TEST_DATA_DIR / "structure_validation_no_mappings"),
             "--mappings",
             "mappings",
         ],
@@ -276,7 +301,7 @@ def test_cli_empty_definitions_dir():
 
     cli_result = runner.invoke(
         cli,
-        ["validate-project", str(TEST_DATA_DIR / "empty_definitions_dir")],
+        ["validate-project", str(MODULE_TEST_DATA_DIR / "empty_definitions_dir")],
     )
 
     assert cli_result.exit_code == 1
@@ -343,7 +368,7 @@ def test_cli_export_to_excel(tmpdir):
             cli,
             [
                 "export-definitions",
-                str(TEST_DATA_DIR / "general-config"),
+                str(TEST_DATA_DIR / "config" / "general-config"),
                 str(file),
             ],
         ).exit_code
@@ -363,7 +388,7 @@ def test_cli_add_missing_variables(simple_definition, tmp_path):
         cli,
         [
             "list-missing-variables",
-            str(TEST_DATA_DIR / "add-missing-variables" / "data.xlsx"),
+            str(MODULE_TEST_DATA_DIR / "add-missing-variables" / "data.xlsx"),
             "--workflow-directory",
             str(tmp_path),
             "--target-file",