C2SM · halungge · Oct 12, 2023 · Sep 27, 2023 · Sep 27, 2023 · Sep 27, 2023
diff --git a/model/atmosphere/advection/pyproject.toml b/model/atmosphere/advection/pyproject.toml
@@ -111,7 +111,7 @@ warn_unused_ignores = true
 
 [tool.pytest.ini_options]
 markers = 'slow_tests: marks tests as slow'
-testpaths = ['tests', 'advection_tests']
+testpaths = ['tests']
 
 [tool.setuptools.dynamic]
 version = {attr = 'icon4py.model.atmosphere.advection.__init__.__version__'}

diff --git a/...ere/advection/advection_tests/conftest.py → model/atmosphere/advection/tests/conftest.py b/...ere/advection/advection_tests/conftest.py → model/atmosphere/advection/tests/conftest.py
@@ -10,24 +10,11 @@
 # distribution for a copy of the license or check <https://www.gnu.org/licenses/>.
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
-import pytest
-from gt4py.next.program_processors.runners.roundtrip import executor
 
-from icon4py.model.common.test_utils.simple_mesh import SimpleMesh
-
-
-BACKENDS = {"embedded": executor}
-MESHES = {"simple_mesh": SimpleMesh()}
-
-
-@pytest.fixture(
-    ids=MESHES.keys(),
-    params=MESHES.values(),
+from icon4py.model.common.test_utils.helpers import backend, mesh  # noqa F401
+from icon4py.model.common.test_utils.pytest_config import (  # noqa: F401
+    pytest_addoption,
+    pytest_configure,
+    pytest_generate_tests,
+    pytest_runtest_setup,
 )
-def mesh(request):
-    return request.param
-
-
-@pytest.fixture(ids=BACKENDS.keys(), params=BACKENDS.values())
-def backend(request):
-    return request.param
diff --git a/...ere/advection/advection_tests/__init__.py → ...advection/tests/stencil_tests/__init__.py b/...ere/advection/advection_tests/__init__.py → ...advection/tests/stencil_tests/__init__.py
diff --git a/...ction_tests/test_btraj_dreg_stencil_01.py → ...encil_tests/test_btraj_dreg_stencil_01.py b/...ction_tests/test_btraj_dreg_stencil_01.py → ...encil_tests/test_btraj_dreg_stencil_01.py
diff --git a/...ction_tests/test_btraj_dreg_stencil_02.py → ...encil_tests/test_btraj_dreg_stencil_02.py b/...ction_tests/test_btraj_dreg_stencil_02.py → ...encil_tests/test_btraj_dreg_stencil_02.py
diff --git a/...ction_tests/test_btraj_dreg_stencil_03.py → ...encil_tests/test_btraj_dreg_stencil_03.py b/...ction_tests/test_btraj_dreg_stencil_03.py → ...encil_tests/test_btraj_dreg_stencil_03.py
diff --git a/.../test_divide_flux_area_list_stencil_01.py → .../test_divide_flux_area_list_stencil_01.py b/.../test_divide_flux_area_list_stencil_01.py → .../test_divide_flux_area_list_stencil_01.py
diff --git a/.../test_divide_flux_area_list_stencil_02.py → .../test_divide_flux_area_list_stencil_02.py b/.../test_divide_flux_area_list_stencil_02.py → .../test_divide_flux_area_list_stencil_02.py
diff --git a/...ion_tests/test_face_val_ppm_stencil_01.py → ...cil_tests/test_face_val_ppm_stencil_01.py b/...ion_tests/test_face_val_ppm_stencil_01.py → ...cil_tests/test_face_val_ppm_stencil_01.py
diff --git a/...ion_tests/test_face_val_ppm_stencil_02.py → ...cil_tests/test_face_val_ppm_stencil_02.py b/...ion_tests/test_face_val_ppm_stencil_02.py → ...cil_tests/test_face_val_ppm_stencil_02.py
diff --git a/...on_tests/test_face_val_ppm_stencil_02a.py → ...il_tests/test_face_val_ppm_stencil_02a.py b/...on_tests/test_face_val_ppm_stencil_02a.py → ...il_tests/test_face_val_ppm_stencil_02a.py
diff --git a/...on_tests/test_face_val_ppm_stencil_02b.py → ...il_tests/test_face_val_ppm_stencil_02b.py b/...on_tests/test_face_val_ppm_stencil_02b.py → ...il_tests/test_face_val_ppm_stencil_02b.py
diff --git a/...on_tests/test_face_val_ppm_stencil_02c.py → ...il_tests/test_face_val_ppm_stencil_02c.py b/...on_tests/test_face_val_ppm_stencil_02c.py → ...il_tests/test_face_val_ppm_stencil_02c.py
diff --git a/...ion_tests/test_face_val_ppm_stencil_05.py → ...cil_tests/test_face_val_ppm_stencil_05.py b/...ion_tests/test_face_val_ppm_stencil_05.py → ...cil_tests/test_face_val_ppm_stencil_05.py
diff --git a/...sts/test_hflux_ffsl_hybrid_stencil_01a.py → ...sts/test_hflux_ffsl_hybrid_stencil_01a.py b/...sts/test_hflux_ffsl_hybrid_stencil_01a.py → ...sts/test_hflux_ffsl_hybrid_stencil_01a.py
diff --git a/...ests/test_hflux_ffsl_hybrid_stencil_02.py → ...ests/test_hflux_ffsl_hybrid_stencil_02.py b/...ests/test_hflux_ffsl_hybrid_stencil_02.py → ...ests/test_hflux_ffsl_hybrid_stencil_02.py
diff --git a/...tests/test_hflx_limiter_mo_stencil_01a.py → ...tests/test_hflx_limiter_mo_stencil_01a.py b/...tests/test_hflx_limiter_mo_stencil_01a.py → ...tests/test_hflx_limiter_mo_stencil_01a.py
diff --git a/...tests/test_hflx_limiter_mo_stencil_01b.py → ...tests/test_hflx_limiter_mo_stencil_01b.py b/...tests/test_hflx_limiter_mo_stencil_01b.py → ...tests/test_hflx_limiter_mo_stencil_01b.py
diff --git a/..._tests/test_hflx_limiter_mo_stencil_02.py → ..._tests/test_hflx_limiter_mo_stencil_02.py b/..._tests/test_hflx_limiter_mo_stencil_02.py → ..._tests/test_hflx_limiter_mo_stencil_02.py
diff --git a/..._tests/test_hflx_limiter_mo_stencil_03.py → ..._tests/test_hflx_limiter_mo_stencil_03.py b/..._tests/test_hflx_limiter_mo_stencil_03.py → ..._tests/test_hflx_limiter_mo_stencil_03.py
diff --git a/..._tests/test_hflx_limiter_mo_stencil_04.py → ..._tests/test_hflx_limiter_mo_stencil_04.py b/..._tests/test_hflx_limiter_mo_stencil_04.py → ..._tests/test_hflx_limiter_mo_stencil_04.py
diff --git a/..._tests/test_hflx_limiter_pd_stencil_01.py → ..._tests/test_hflx_limiter_pd_stencil_01.py b/..._tests/test_hflx_limiter_pd_stencil_01.py → ..._tests/test_hflx_limiter_pd_stencil_01.py
diff --git a/..._tests/test_hflx_limiter_pd_stencil_02.py → ..._tests/test_hflx_limiter_pd_stencil_02.py b/..._tests/test_hflx_limiter_pd_stencil_02.py → ..._tests/test_hflx_limiter_pd_stencil_02.py
diff --git a/...dvection_tests/test_hor_adv_stencil_01.py → .../stencil_tests/test_hor_adv_stencil_01.py b/...dvection_tests/test_hor_adv_stencil_01.py → .../stencil_tests/test_hor_adv_stencil_01.py
diff --git a/...mo_advection_traj_btraj_compute_o1_dsl.py → ...mo_advection_traj_btraj_compute_o1_dsl.py b/...mo_advection_traj_btraj_compute_o1_dsl.py → ...mo_advection_traj_btraj_compute_o1_dsl.py
diff --git a/...t_prep_gauss_quadrature_c_list_stencil.py → ...t_prep_gauss_quadrature_c_list_stencil.py b/...t_prep_gauss_quadrature_c_list_stencil.py → ...t_prep_gauss_quadrature_c_list_stencil.py
diff --git a/...s/test_prep_gauss_quadrature_c_stencil.py → ...s/test_prep_gauss_quadrature_c_stencil.py b/...s/test_prep_gauss_quadrature_c_stencil.py → ...s/test_prep_gauss_quadrature_c_stencil.py
diff --git a/...on_tests/test_rbf_intp_edge_stencil_01.py → ...il_tests/test_rbf_intp_edge_stencil_01.py b/...on_tests/test_rbf_intp_edge_stencil_01.py → ...il_tests/test_rbf_intp_edge_stencil_01.py
diff --git a/...ests/test_recon_lsq_cell_c_svd_stencil.py → ...ests/test_recon_lsq_cell_c_svd_stencil.py b/...ests/test_recon_lsq_cell_c_svd_stencil.py → ...ests/test_recon_lsq_cell_c_svd_stencil.py
diff --git a/...ests/test_recon_lsq_cell_l_svd_stencil.py → ...ests/test_recon_lsq_cell_l_svd_stencil.py b/...ests/test_recon_lsq_cell_l_svd_stencil.py → ...ests/test_recon_lsq_cell_l_svd_stencil.py
diff --git a/...ection/advection_tests/test_set_zero_c.py → ...on/tests/stencil_tests/test_set_zero_c.py b/...ection/advection_tests/test_set_zero_c.py → ...on/tests/stencil_tests/test_set_zero_c.py
diff --git a/...tion/advection_tests/test_set_zero_c_k.py → .../tests/stencil_tests/test_set_zero_c_k.py b/...tion/advection_tests/test_set_zero_c_k.py → .../tests/stencil_tests/test_set_zero_c_k.py
diff --git a/...n_tests/test_step_advection_stencil_01.py → ...l_tests/test_step_advection_stencil_01.py b/...n_tests/test_step_advection_stencil_01.py → ...l_tests/test_step_advection_stencil_01.py
diff --git a/...n_tests/test_step_advection_stencil_02.py → ...l_tests/test_step_advection_stencil_02.py b/...n_tests/test_step_advection_stencil_02.py → ...l_tests/test_step_advection_stencil_02.py
diff --git a/...n_tests/test_step_advection_stencil_03.py → ...l_tests/test_step_advection_stencil_03.py b/...n_tests/test_step_advection_stencil_03.py → ...l_tests/test_step_advection_stencil_03.py
diff --git a/...n_tests/test_step_advection_stencil_04.py → ...l_tests/test_step_advection_stencil_04.py b/...n_tests/test_step_advection_stencil_04.py → ...l_tests/test_step_advection_stencil_04.py
diff --git a/...ts/test_upwind_hflux_miura3_stencil_01.py → ...ts/test_upwind_hflux_miura3_stencil_01.py b/...ts/test_upwind_hflux_miura3_stencil_01.py → ...ts/test_upwind_hflux_miura3_stencil_01.py
diff --git a/...est_upwind_hflux_miura_cycl_stencil_01.py → ...est_upwind_hflux_miura_cycl_stencil_01.py b/...est_upwind_hflux_miura_cycl_stencil_01.py → ...est_upwind_hflux_miura_cycl_stencil_01.py
diff --git a/...est_upwind_hflux_miura_cycl_stencil_02.py → ...est_upwind_hflux_miura_cycl_stencil_02.py b/...est_upwind_hflux_miura_cycl_stencil_02.py → ...est_upwind_hflux_miura_cycl_stencil_02.py
diff --git a/...st_upwind_hflux_miura_cycl_stencil_03a.py → ...st_upwind_hflux_miura_cycl_stencil_03a.py b/...st_upwind_hflux_miura_cycl_stencil_03a.py → ...st_upwind_hflux_miura_cycl_stencil_03a.py
diff --git a/...st_upwind_hflux_miura_cycl_stencil_03b.py → ...st_upwind_hflux_miura_cycl_stencil_03b.py b/...st_upwind_hflux_miura_cycl_stencil_03b.py → ...st_upwind_hflux_miura_cycl_stencil_03b.py
diff --git a/...sts/test_upwind_hflux_miura_stencil_01.py → ...sts/test_upwind_hflux_miura_stencil_01.py b/...sts/test_upwind_hflux_miura_stencil_01.py → ...sts/test_upwind_hflux_miura_stencil_01.py
diff --git a/...tests/test_upwind_vflux_ppm_stencil_01.py → ...tests/test_upwind_vflux_ppm_stencil_01.py b/...tests/test_upwind_vflux_ppm_stencil_01.py → ...tests/test_upwind_vflux_ppm_stencil_01.py
diff --git a/...vection_tests/test_vert_adv_stencil_01.py → ...stencil_tests/test_vert_adv_stencil_01.py b/...vection_tests/test_vert_adv_stencil_01.py → ...stencil_tests/test_vert_adv_stencil_01.py
diff --git a/...n_tests/test_vlimit_prbl_sm_stencil_01.py → ...l_tests/test_vlimit_prbl_sm_stencil_01.py b/...n_tests/test_vlimit_prbl_sm_stencil_01.py → ...l_tests/test_vlimit_prbl_sm_stencil_01.py
diff --git a/...n_tests/test_vlimit_prbl_sm_stencil_02.py → ...l_tests/test_vlimit_prbl_sm_stencil_02.py b/...n_tests/test_vlimit_prbl_sm_stencil_02.py → ...l_tests/test_vlimit_prbl_sm_stencil_02.py
diff --git a/model/atmosphere/diffusion/pyproject.toml b/model/atmosphere/diffusion/pyproject.toml
@@ -56,7 +56,7 @@ target-version = ['py310']
 [tool.coverage]
 
 [tool.coverage.html]
-directory = 'diffusion_tests/_reports/coverage_html'
+directory = 'tests/_reports/coverage_html'
 
 [tool.coverage.paths]
 source = ['src/icon4py/model/']
@@ -109,10 +109,8 @@ warn_unused_ignores = true
 [tool.pytest]
 
 [tool.pytest.ini_options]
-markers = [
-  "datatest: test depending on serialized data generated by a full model run"
-]
-testpaths = ['tests', 'diffusion_tests']
+markers = ['datatest: test that use serialized data']
+testpaths = ['tests']
 
 [tool.setuptools.dynamic]
 version = {attr = 'icon4py.model.atmosphere.diffusion.__init__.__version__'}

diff --git a/model/atmosphere/diffusion/tests/conftest.py b/model/atmosphere/diffusion/tests/conftest.py
@@ -17,7 +17,8 @@
 Workaround for pytest not discovering those configuration function, when they are added to the
 diffusion_test/conftest.py folder
 """
-from icon4py.model.common.test_utils.pytest_config import (  # noqa: F401
+from icon4py.model.common.test_utils.helpers import backend, mesh  # noqa: F401 # fixtures
+from icon4py.model.common.test_utils.pytest_config import (  # noqa: F401 # pytest config
     pytest_addoption,
     pytest_configure,
     pytest_generate_tests,

diff --git a/...ere/diffusion/diffusion_tests/__init__.py → ...ffusion/tests/diffusion_tests/__init__.py b/...ere/diffusion/diffusion_tests/__init__.py → ...ffusion/tests/diffusion_tests/__init__.py
diff --git a/...ere/diffusion/diffusion_tests/conftest.py → ...ffusion/tests/diffusion_tests/conftest.py b/...ere/diffusion/diffusion_tests/conftest.py → ...ffusion/tests/diffusion_tests/conftest.py
@@ -14,8 +14,7 @@
 import pytest
 
 from icon4py.model.atmosphere.diffusion.diffusion import DiffusionConfig, DiffusionType
-from icon4py.model.common.test_utils.fixtures import (  # noqa: F401  # import fixtures from test_utils package
-    backend,
+from icon4py.model.common.test_utils.datatest_helpers import (  # noqa: F401  # import fixtures from test_utils package
     damping_height,
     data_provider,
     datapath,
@@ -25,7 +24,6 @@
     icon_grid,
     interpolation_savepoint,
     linit,
-    mesh,
     metrics_savepoint,
     ndyn_substeps,
     processor_props,
@@ -43,7 +41,7 @@
 
 @pytest.fixture
 def r04b09_diffusion_config(
-    ndyn_substeps,  # noqa: F811 # imported `ndyn_substeps` fxiture
+    ndyn_substeps,  # noqa: F811 # imported `ndyn_substeps` fixture
 ) -> DiffusionConfig:
     """
     Create DiffusionConfig matching MCH_CH_r04b09_dsl.

diff --git a/...ion/diffusion_tests/mpi_tests/__init__.py → ...sts/diffusion_tests/mpi_tests/__init__.py b/...ion/diffusion_tests/mpi_tests/__init__.py → ...sts/diffusion_tests/mpi_tests/__init__.py
diff --git a/...ests/mpi_tests/test_parallel_diffusion.py → ...ests/mpi_tests/test_parallel_diffusion.py b/...ests/mpi_tests/test_parallel_diffusion.py → ...ests/mpi_tests/test_parallel_diffusion.py
diff --git a/...ffusion/diffusion_tests/test_diffusion.py → ...n/tests/diffusion_tests/test_diffusion.py b/...ffusion/diffusion_tests/test_diffusion.py → ...n/tests/diffusion_tests/test_diffusion.py
diff --git a/.../diffusion_tests/test_diffusion_states.py → .../diffusion_tests/test_diffusion_states.py b/.../diffusion_tests/test_diffusion_states.py → .../diffusion_tests/test_diffusion_states.py
diff --git a/...n/diffusion_tests/test_diffusion_utils.py → ...s/diffusion_tests/test_diffusion_utils.py b/...n/diffusion_tests/test_diffusion_utils.py → ...s/diffusion_tests/test_diffusion_utils.py
diff --git a/...sphere/diffusion/diffusion_tests/utils.py → .../diffusion/tests/diffusion_tests/utils.py b/...sphere/diffusion/diffusion_tests/utils.py → .../diffusion/tests/diffusion_tests/utils.py
diff --git a/...t_apply_nabla2_and_nabla4_global_to_vn.py → ...t_apply_nabla2_and_nabla4_global_to_vn.py b/...t_apply_nabla2_and_nabla4_global_to_vn.py → ...t_apply_nabla2_and_nabla4_global_to_vn.py
diff --git a/...sts/test_apply_nabla2_and_nabla4_to_vn.py → ...sts/test_apply_nabla2_and_nabla4_to_vn.py b/...sts/test_apply_nabla2_and_nabla4_to_vn.py → ...sts/test_apply_nabla2_and_nabla4_to_vn.py
diff --git a/...apply_nabla2_to_vn_in_lateral_boundary.py → ...apply_nabla2_to_vn_in_lateral_boundary.py b/...apply_nabla2_to_vn_in_lateral_boundary.py → ...apply_nabla2_to_vn_in_lateral_boundary.py
diff --git a/...diffusion_tests/test_apply_nabla2_to_w.py → ...s/stencil_tests/test_apply_nabla2_to_w.py b/...diffusion_tests/test_apply_nabla2_to_w.py → ...s/stencil_tests/test_apply_nabla2_to_w.py
diff --git a/...ply_nabla2_to_w_in_upper_damping_layer.py → ...ply_nabla2_to_w_in_upper_damping_layer.py b/...ply_nabla2_to_w_in_upper_damping_layer.py → ...ply_nabla2_to_w_in_upper_damping_layer.py
diff --git a/...t_calculate_diagnostics_for_turbulence.py → ...t_calculate_diagnostics_for_turbulence.py b/...t_calculate_diagnostics_for_turbulence.py → ...t_calculate_diagnostics_for_turbulence.py
diff --git a/...te_horizontal_gradients_for_turbulence.py → ...te_horizontal_gradients_for_turbulence.py b/...te_horizontal_gradients_for_turbulence.py → ...te_horizontal_gradients_for_turbulence.py
diff --git a/...te_nabla2_and_smag_coefficients_for_vn.py → ...te_nabla2_and_smag_coefficients_for_vn.py b/...te_nabla2_and_smag_coefficients_for_vn.py → ...te_nabla2_and_smag_coefficients_for_vn.py
diff --git a/...sion_tests/test_calculate_nabla2_for_w.py → ...ncil_tests/test_calculate_nabla2_for_w.py b/...sion_tests/test_calculate_nabla2_for_w.py → ...ncil_tests/test_calculate_nabla2_for_w.py
diff --git a/...sion_tests/test_calculate_nabla2_for_z.py → ...ncil_tests/test_calculate_nabla2_for_z.py b/...sion_tests/test_calculate_nabla2_for_z.py → ...ncil_tests/test_calculate_nabla2_for_z.py
diff --git a/...n_tests/test_calculate_nabla2_of_theta.py → ...l_tests/test_calculate_nabla2_of_theta.py b/...n_tests/test_calculate_nabla2_of_theta.py → ...l_tests/test_calculate_nabla2_of_theta.py
diff --git a/.../diffusion_tests/test_calculate_nabla4.py → ...ts/stencil_tests/test_calculate_nabla4.py b/.../diffusion_tests/test_calculate_nabla4.py → ...ts/stencil_tests/test_calculate_nabla4.py
diff --git a/..._coefficient_for_grid_point_cold_pools.py → ..._coefficient_for_grid_point_cold_pools.py b/..._coefficient_for_grid_point_cold_pools.py → ..._coefficient_for_grid_point_cold_pools.py
diff --git a/..._for_grid_point_cold_pools_enhancement.py → ..._for_grid_point_cold_pools_enhancement.py b/..._for_grid_point_cold_pools_enhancement.py → ..._for_grid_point_cold_pools_enhancement.py
diff --git a/...rary_fields_for_turbulence_diagnostics.py → ...rary_fields_for_turbulence_diagnostics.py b/...rary_fields_for_turbulence_diagnostics.py → ...rary_fields_for_turbulence_diagnostics.py
diff --git a/...usion_nabla_of_theta_over_steep_points.py → ...usion_nabla_of_theta_over_steep_points.py b/...usion_nabla_of_theta_over_steep_points.py → ...usion_nabla_of_theta_over_steep_points.py
diff --git a/...sion_tests/test_update_theta_and_exner.py → ...ncil_tests/test_update_theta_and_exner.py b/...sion_tests/test_update_theta_and_exner.py → ...ncil_tests/test_update_theta_and_exner.py
diff --git a/model/atmosphere/dycore/tests/conftest.py b/model/atmosphere/dycore/tests/conftest.py
@@ -12,19 +12,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 
-from icon4py.model.common.test_utils.fixtures import (  # noqa F401
-    backend,
-    damping_height,
-    data_provider,
-    datapath,
-    download_ser_data,
-    grid_savepoint,
-    icon_grid,
-    linit,
-    mesh,
-    step_date_exit,
-    step_date_init,
-)
+from icon4py.model.common.test_utils.helpers import backend, mesh  # noqa F401
 from icon4py.model.common.test_utils.pytest_config import (  # noqa: F401
     pytest_addoption,
     pytest_configure,

diff --git a/...here/dycore/tests/test_compute_airmass.py → ...sts/stencil_tests/test_compute_airmass.py b/...here/dycore/tests/test_compute_airmass.py → ...sts/stencil_tests/test_compute_airmass.py
diff --git a/...ation_scalar_cells2verts_scalar_ri_dsl.py → ...ation_scalar_cells2verts_scalar_ri_dsl.py b/...ation_scalar_cells2verts_scalar_ri_dsl.py → ...ation_scalar_cells2verts_scalar_ri_dsl.py
diff --git a/.../test_mo_math_divrot_rot_vertex_ri_dsl.py → .../test_mo_math_divrot_rot_vertex_ri_dsl.py b/.../test_mo_math_divrot_rot_vertex_ri_dsl.py → .../test_mo_math_divrot_rot_vertex_ri_dsl.py
diff --git a/...th_gradients_grad_green_gauss_cell_dsl.py → ...th_gradients_grad_green_gauss_cell_dsl.py b/...th_gradients_grad_green_gauss_cell_dsl.py → ...th_gradients_grad_green_gauss_cell_dsl.py
diff --git a/...st_mo_solve_nonhydro_4th_order_divdamp.py → ...st_mo_solve_nonhydro_4th_order_divdamp.py b/...st_mo_solve_nonhydro_4th_order_divdamp.py → ...st_mo_solve_nonhydro_4th_order_divdamp.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_01.py → ...ests/test_mo_solve_nonhydro_stencil_01.py b/...ests/test_mo_solve_nonhydro_stencil_01.py → ...ests/test_mo_solve_nonhydro_stencil_01.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_02.py → ...ests/test_mo_solve_nonhydro_stencil_02.py b/...ests/test_mo_solve_nonhydro_stencil_02.py → ...ests/test_mo_solve_nonhydro_stencil_02.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_03.py → ...ests/test_mo_solve_nonhydro_stencil_03.py b/...ests/test_mo_solve_nonhydro_stencil_03.py → ...ests/test_mo_solve_nonhydro_stencil_03.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_04.py → ...ests/test_mo_solve_nonhydro_stencil_04.py b/...ests/test_mo_solve_nonhydro_stencil_04.py → ...ests/test_mo_solve_nonhydro_stencil_04.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_05.py → ...ests/test_mo_solve_nonhydro_stencil_05.py b/...ests/test_mo_solve_nonhydro_stencil_05.py → ...ests/test_mo_solve_nonhydro_stencil_05.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_06.py → ...ests/test_mo_solve_nonhydro_stencil_06.py b/...ests/test_mo_solve_nonhydro_stencil_06.py → ...ests/test_mo_solve_nonhydro_stencil_06.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_07.py → ...ests/test_mo_solve_nonhydro_stencil_07.py b/...ests/test_mo_solve_nonhydro_stencil_07.py → ...ests/test_mo_solve_nonhydro_stencil_07.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_08.py → ...ests/test_mo_solve_nonhydro_stencil_08.py b/...ests/test_mo_solve_nonhydro_stencil_08.py → ...ests/test_mo_solve_nonhydro_stencil_08.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_09.py → ...ests/test_mo_solve_nonhydro_stencil_09.py b/...ests/test_mo_solve_nonhydro_stencil_09.py → ...ests/test_mo_solve_nonhydro_stencil_09.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_10.py → ...ests/test_mo_solve_nonhydro_stencil_10.py b/...ests/test_mo_solve_nonhydro_stencil_10.py → ...ests/test_mo_solve_nonhydro_stencil_10.py
diff --git a/...est_mo_solve_nonhydro_stencil_11_lower.py → ...est_mo_solve_nonhydro_stencil_11_lower.py b/...est_mo_solve_nonhydro_stencil_11_lower.py → ...est_mo_solve_nonhydro_stencil_11_lower.py
diff --git a/...est_mo_solve_nonhydro_stencil_11_upper.py → ...est_mo_solve_nonhydro_stencil_11_upper.py b/...est_mo_solve_nonhydro_stencil_11_upper.py → ...est_mo_solve_nonhydro_stencil_11_upper.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_12.py → ...ests/test_mo_solve_nonhydro_stencil_12.py b/...ests/test_mo_solve_nonhydro_stencil_12.py → ...ests/test_mo_solve_nonhydro_stencil_12.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_13.py → ...ests/test_mo_solve_nonhydro_stencil_13.py b/...ests/test_mo_solve_nonhydro_stencil_13.py → ...ests/test_mo_solve_nonhydro_stencil_13.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_14.py → ...ests/test_mo_solve_nonhydro_stencil_14.py b/...ests/test_mo_solve_nonhydro_stencil_14.py → ...ests/test_mo_solve_nonhydro_stencil_14.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_15.py → ...ests/test_mo_solve_nonhydro_stencil_15.py b/...ests/test_mo_solve_nonhydro_stencil_15.py → ...ests/test_mo_solve_nonhydro_stencil_15.py
diff --git a/...onhydro_stencil_16_fused_btraj_traj_o1.py → ...onhydro_stencil_16_fused_btraj_traj_o1.py b/...onhydro_stencil_16_fused_btraj_traj_o1.py → ...onhydro_stencil_16_fused_btraj_traj_o1.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_17.py → ...ests/test_mo_solve_nonhydro_stencil_17.py b/...ests/test_mo_solve_nonhydro_stencil_17.py → ...ests/test_mo_solve_nonhydro_stencil_17.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_18.py → ...ests/test_mo_solve_nonhydro_stencil_18.py b/...ests/test_mo_solve_nonhydro_stencil_18.py → ...ests/test_mo_solve_nonhydro_stencil_18.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_19.py → ...ests/test_mo_solve_nonhydro_stencil_19.py b/...ests/test_mo_solve_nonhydro_stencil_19.py → ...ests/test_mo_solve_nonhydro_stencil_19.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_20.py → ...ests/test_mo_solve_nonhydro_stencil_20.py b/...ests/test_mo_solve_nonhydro_stencil_20.py → ...ests/test_mo_solve_nonhydro_stencil_20.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_21.py → ...ests/test_mo_solve_nonhydro_stencil_21.py b/...ests/test_mo_solve_nonhydro_stencil_21.py → ...ests/test_mo_solve_nonhydro_stencil_21.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_22.py → ...ests/test_mo_solve_nonhydro_stencil_22.py b/...ests/test_mo_solve_nonhydro_stencil_22.py → ...ests/test_mo_solve_nonhydro_stencil_22.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_23.py → ...ests/test_mo_solve_nonhydro_stencil_23.py b/...ests/test_mo_solve_nonhydro_stencil_23.py → ...ests/test_mo_solve_nonhydro_stencil_23.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_24.py → ...ests/test_mo_solve_nonhydro_stencil_24.py b/...ests/test_mo_solve_nonhydro_stencil_24.py → ...ests/test_mo_solve_nonhydro_stencil_24.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_25.py → ...ests/test_mo_solve_nonhydro_stencil_25.py b/...ests/test_mo_solve_nonhydro_stencil_25.py → ...ests/test_mo_solve_nonhydro_stencil_25.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_26.py → ...ests/test_mo_solve_nonhydro_stencil_26.py b/...ests/test_mo_solve_nonhydro_stencil_26.py → ...ests/test_mo_solve_nonhydro_stencil_26.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_27.py → ...ests/test_mo_solve_nonhydro_stencil_27.py b/...ests/test_mo_solve_nonhydro_stencil_27.py → ...ests/test_mo_solve_nonhydro_stencil_27.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_28.py → ...ests/test_mo_solve_nonhydro_stencil_28.py b/...ests/test_mo_solve_nonhydro_stencil_28.py → ...ests/test_mo_solve_nonhydro_stencil_28.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_29.py → ...ests/test_mo_solve_nonhydro_stencil_29.py b/...ests/test_mo_solve_nonhydro_stencil_29.py → ...ests/test_mo_solve_nonhydro_stencil_29.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_30.py → ...ests/test_mo_solve_nonhydro_stencil_30.py b/...ests/test_mo_solve_nonhydro_stencil_30.py → ...ests/test_mo_solve_nonhydro_stencil_30.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_31.py → ...ests/test_mo_solve_nonhydro_stencil_31.py b/...ests/test_mo_solve_nonhydro_stencil_31.py → ...ests/test_mo_solve_nonhydro_stencil_31.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_32.py → ...ests/test_mo_solve_nonhydro_stencil_32.py b/...ests/test_mo_solve_nonhydro_stencil_32.py → ...ests/test_mo_solve_nonhydro_stencil_32.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_33.py → ...ests/test_mo_solve_nonhydro_stencil_33.py b/...ests/test_mo_solve_nonhydro_stencil_33.py → ...ests/test_mo_solve_nonhydro_stencil_33.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_34.py → ...ests/test_mo_solve_nonhydro_stencil_34.py b/...ests/test_mo_solve_nonhydro_stencil_34.py → ...ests/test_mo_solve_nonhydro_stencil_34.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_35.py → ...ests/test_mo_solve_nonhydro_stencil_35.py b/...ests/test_mo_solve_nonhydro_stencil_35.py → ...ests/test_mo_solve_nonhydro_stencil_35.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_36.py → ...ests/test_mo_solve_nonhydro_stencil_36.py b/...ests/test_mo_solve_nonhydro_stencil_36.py → ...ests/test_mo_solve_nonhydro_stencil_36.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_37.py → ...ests/test_mo_solve_nonhydro_stencil_37.py b/...ests/test_mo_solve_nonhydro_stencil_37.py → ...ests/test_mo_solve_nonhydro_stencil_37.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_38.py → ...ests/test_mo_solve_nonhydro_stencil_38.py b/...ests/test_mo_solve_nonhydro_stencil_38.py → ...ests/test_mo_solve_nonhydro_stencil_38.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_39.py → ...ests/test_mo_solve_nonhydro_stencil_39.py b/...ests/test_mo_solve_nonhydro_stencil_39.py → ...ests/test_mo_solve_nonhydro_stencil_39.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_40.py → ...ests/test_mo_solve_nonhydro_stencil_40.py b/...ests/test_mo_solve_nonhydro_stencil_40.py → ...ests/test_mo_solve_nonhydro_stencil_40.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_41.py → ...ests/test_mo_solve_nonhydro_stencil_41.py b/...ests/test_mo_solve_nonhydro_stencil_41.py → ...ests/test_mo_solve_nonhydro_stencil_41.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_42.py → ...ests/test_mo_solve_nonhydro_stencil_42.py b/...ests/test_mo_solve_nonhydro_stencil_42.py → ...ests/test_mo_solve_nonhydro_stencil_42.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_43.py → ...ests/test_mo_solve_nonhydro_stencil_43.py b/...ests/test_mo_solve_nonhydro_stencil_43.py → ...ests/test_mo_solve_nonhydro_stencil_43.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_44.py → ...ests/test_mo_solve_nonhydro_stencil_44.py b/...ests/test_mo_solve_nonhydro_stencil_44.py → ...ests/test_mo_solve_nonhydro_stencil_44.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_45.py → ...ests/test_mo_solve_nonhydro_stencil_45.py b/...ests/test_mo_solve_nonhydro_stencil_45.py → ...ests/test_mo_solve_nonhydro_stencil_45.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_46.py → ...ests/test_mo_solve_nonhydro_stencil_46.py b/...ests/test_mo_solve_nonhydro_stencil_46.py → ...ests/test_mo_solve_nonhydro_stencil_46.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_47.py → ...ests/test_mo_solve_nonhydro_stencil_47.py b/...ests/test_mo_solve_nonhydro_stencil_47.py → ...ests/test_mo_solve_nonhydro_stencil_47.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_48.py → ...ests/test_mo_solve_nonhydro_stencil_48.py b/...ests/test_mo_solve_nonhydro_stencil_48.py → ...ests/test_mo_solve_nonhydro_stencil_48.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_49.py → ...ests/test_mo_solve_nonhydro_stencil_49.py b/...ests/test_mo_solve_nonhydro_stencil_49.py → ...ests/test_mo_solve_nonhydro_stencil_49.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_50.py → ...ests/test_mo_solve_nonhydro_stencil_50.py b/...ests/test_mo_solve_nonhydro_stencil_50.py → ...ests/test_mo_solve_nonhydro_stencil_50.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_51.py → ...ests/test_mo_solve_nonhydro_stencil_51.py b/...ests/test_mo_solve_nonhydro_stencil_51.py → ...ests/test_mo_solve_nonhydro_stencil_51.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_52.py → ...ests/test_mo_solve_nonhydro_stencil_52.py b/...ests/test_mo_solve_nonhydro_stencil_52.py → ...ests/test_mo_solve_nonhydro_stencil_52.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_53.py → ...ests/test_mo_solve_nonhydro_stencil_53.py b/...ests/test_mo_solve_nonhydro_stencil_53.py → ...ests/test_mo_solve_nonhydro_stencil_53.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_54.py → ...ests/test_mo_solve_nonhydro_stencil_54.py b/...ests/test_mo_solve_nonhydro_stencil_54.py → ...ests/test_mo_solve_nonhydro_stencil_54.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_55.py → ...ests/test_mo_solve_nonhydro_stencil_55.py b/...ests/test_mo_solve_nonhydro_stencil_55.py → ...ests/test_mo_solve_nonhydro_stencil_55.py
diff --git a/...s/test_mo_solve_nonhydro_stencil_56_63.py → ...s/test_mo_solve_nonhydro_stencil_56_63.py b/...s/test_mo_solve_nonhydro_stencil_56_63.py → ...s/test_mo_solve_nonhydro_stencil_56_63.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_57.py → ...ests/test_mo_solve_nonhydro_stencil_57.py b/...ests/test_mo_solve_nonhydro_stencil_57.py → ...ests/test_mo_solve_nonhydro_stencil_57.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_58.py → ...ests/test_mo_solve_nonhydro_stencil_58.py b/...ests/test_mo_solve_nonhydro_stencil_58.py → ...ests/test_mo_solve_nonhydro_stencil_58.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_59.py → ...ests/test_mo_solve_nonhydro_stencil_59.py b/...ests/test_mo_solve_nonhydro_stencil_59.py → ...ests/test_mo_solve_nonhydro_stencil_59.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_60.py → ...ests/test_mo_solve_nonhydro_stencil_60.py b/...ests/test_mo_solve_nonhydro_stencil_60.py → ...ests/test_mo_solve_nonhydro_stencil_60.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_61.py → ...ests/test_mo_solve_nonhydro_stencil_61.py b/...ests/test_mo_solve_nonhydro_stencil_61.py → ...ests/test_mo_solve_nonhydro_stencil_61.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_62.py → ...ests/test_mo_solve_nonhydro_stencil_62.py b/...ests/test_mo_solve_nonhydro_stencil_62.py → ...ests/test_mo_solve_nonhydro_stencil_62.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_64.py → ...ests/test_mo_solve_nonhydro_stencil_64.py b/...ests/test_mo_solve_nonhydro_stencil_64.py → ...ests/test_mo_solve_nonhydro_stencil_64.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_65.py → ...ests/test_mo_solve_nonhydro_stencil_65.py b/...ests/test_mo_solve_nonhydro_stencil_65.py → ...ests/test_mo_solve_nonhydro_stencil_65.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_66.py → ...ests/test_mo_solve_nonhydro_stencil_66.py b/...ests/test_mo_solve_nonhydro_stencil_66.py → ...ests/test_mo_solve_nonhydro_stencil_66.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_67.py → ...ests/test_mo_solve_nonhydro_stencil_67.py b/...ests/test_mo_solve_nonhydro_stencil_67.py → ...ests/test_mo_solve_nonhydro_stencil_67.py
diff --git a/...ests/test_mo_solve_nonhydro_stencil_68.py → ...ests/test_mo_solve_nonhydro_stencil_68.py b/...ests/test_mo_solve_nonhydro_stencil_68.py → ...ests/test_mo_solve_nonhydro_stencil_68.py
diff --git a/.../test_mo_velocity_advection_stencil_01.py → .../test_mo_velocity_advection_stencil_01.py b/.../test_mo_velocity_advection_stencil_01.py → .../test_mo_velocity_advection_stencil_01.py
diff --git a/.../test_mo_velocity_advection_stencil_02.py → .../test_mo_velocity_advection_stencil_02.py b/.../test_mo_velocity_advection_stencil_02.py → .../test_mo_velocity_advection_stencil_02.py
diff --git a/.../test_mo_velocity_advection_stencil_03.py → .../test_mo_velocity_advection_stencil_03.py b/.../test_mo_velocity_advection_stencil_03.py → .../test_mo_velocity_advection_stencil_03.py
diff --git a/.../test_mo_velocity_advection_stencil_04.py → .../test_mo_velocity_advection_stencil_04.py b/.../test_mo_velocity_advection_stencil_04.py → .../test_mo_velocity_advection_stencil_04.py
diff --git a/.../test_mo_velocity_advection_stencil_05.py → .../test_mo_velocity_advection_stencil_05.py b/.../test_mo_velocity_advection_stencil_05.py → .../test_mo_velocity_advection_stencil_05.py
diff --git a/.../test_mo_velocity_advection_stencil_06.py → .../test_mo_velocity_advection_stencil_06.py b/.../test_mo_velocity_advection_stencil_06.py → .../test_mo_velocity_advection_stencil_06.py
diff --git a/.../test_mo_velocity_advection_stencil_07.py → .../test_mo_velocity_advection_stencil_07.py b/.../test_mo_velocity_advection_stencil_07.py → .../test_mo_velocity_advection_stencil_07.py
diff --git a/.../test_mo_velocity_advection_stencil_08.py → .../test_mo_velocity_advection_stencil_08.py b/.../test_mo_velocity_advection_stencil_08.py → .../test_mo_velocity_advection_stencil_08.py
diff --git a/.../test_mo_velocity_advection_stencil_09.py → .../test_mo_velocity_advection_stencil_09.py b/.../test_mo_velocity_advection_stencil_09.py → .../test_mo_velocity_advection_stencil_09.py
diff --git a/.../test_mo_velocity_advection_stencil_10.py → .../test_mo_velocity_advection_stencil_10.py b/.../test_mo_velocity_advection_stencil_10.py → .../test_mo_velocity_advection_stencil_10.py
diff --git a/.../test_mo_velocity_advection_stencil_11.py → .../test_mo_velocity_advection_stencil_11.py b/.../test_mo_velocity_advection_stencil_11.py → .../test_mo_velocity_advection_stencil_11.py
diff --git a/.../test_mo_velocity_advection_stencil_12.py → .../test_mo_velocity_advection_stencil_12.py b/.../test_mo_velocity_advection_stencil_12.py → .../test_mo_velocity_advection_stencil_12.py
diff --git a/.../test_mo_velocity_advection_stencil_13.py → .../test_mo_velocity_advection_stencil_13.py b/.../test_mo_velocity_advection_stencil_13.py → .../test_mo_velocity_advection_stencil_13.py
diff --git a/.../test_mo_velocity_advection_stencil_14.py → .../test_mo_velocity_advection_stencil_14.py b/.../test_mo_velocity_advection_stencil_14.py → .../test_mo_velocity_advection_stencil_14.py
diff --git a/.../test_mo_velocity_advection_stencil_15.py → .../test_mo_velocity_advection_stencil_15.py b/.../test_mo_velocity_advection_stencil_15.py → .../test_mo_velocity_advection_stencil_15.py
diff --git a/.../test_mo_velocity_advection_stencil_16.py → .../test_mo_velocity_advection_stencil_16.py b/.../test_mo_velocity_advection_stencil_16.py → .../test_mo_velocity_advection_stencil_16.py
diff --git a/.../test_mo_velocity_advection_stencil_17.py → .../test_mo_velocity_advection_stencil_17.py b/.../test_mo_velocity_advection_stencil_17.py → .../test_mo_velocity_advection_stencil_17.py
diff --git a/.../test_mo_velocity_advection_stencil_18.py → .../test_mo_velocity_advection_stencil_18.py b/.../test_mo_velocity_advection_stencil_18.py → .../test_mo_velocity_advection_stencil_18.py
diff --git a/.../test_mo_velocity_advection_stencil_19.py → .../test_mo_velocity_advection_stencil_19.py b/.../test_mo_velocity_advection_stencil_19.py → .../test_mo_velocity_advection_stencil_19.py
diff --git a/.../test_mo_velocity_advection_stencil_20.py → .../test_mo_velocity_advection_stencil_20.py b/.../test_mo_velocity_advection_stencil_20.py → .../test_mo_velocity_advection_stencil_20.py
diff --git a/...on4py/model/common/test_utils/fixtures.py → ...del/common/test_utils/datatest_helpers.py b/...on4py/model/common/test_utils/fixtures.py → ...del/common/test_utils/datatest_helpers.py
@@ -57,8 +57,12 @@ def download_ser_data(request, processor_props, ranked_data_path, pytestconfig):
 
     Session scoped fixture which is a prerequisite of all the other fixtures in this file.
     """
-    if not pytestconfig.getoption("datatest"):
-        pytest.skip("not running datatest marked tests")
+    try:
+        has_data_marker = any(map(lambda i: i.iter_markers(name="datatest"), request.node.items))
+        if not has_data_marker or not request.config.getoption("datatest"):
+            pytest.skip("not running datatest marked tests")
+    except ValueError:
+        pass
 
     try:
         uri = data_uris[processor_props.comm_size]

diff --git a/model/common/src/icon4py/model/common/test_utils/helpers.py b/model/common/src/icon4py/model/common/test_utils/helpers.py
@@ -29,6 +29,22 @@
 from .simple_mesh import SimpleMesh
 
 
+MESHES = {"simple_mesh": SimpleMesh()}
+
+
+@pytest.fixture(
+    ids=MESHES.keys(),
+    params=MESHES.values(),
+)
+def mesh(request):
+    return request.param
+
+
+@pytest.fixture
+def backend(request):
+    return request.param
+
+
 def _shape(
     mesh,
     *dims: gt_common.Dimension,

diff --git a/model/common/tests/conftest.py b/model/common/tests/conftest.py
@@ -10,56 +10,17 @@
 # distribution for a copy of the license or check <https://www.gnu.org/licenses/>.
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
-import pytest
 
-from icon4py.model.common.test_utils.data_handling import download_and_extract
-from icon4py.model.common.test_utils.fixtures import (  # noqa: F401
-    backend,
-    base_path,
-    damping_height,
-    data_provider,
-    datapath,
-    decomposition_info,
-    download_ser_data,
-    grid_savepoint,
-    icon_grid,
-    interpolation_savepoint,
-    mesh,
-    processor_props,
-    ranked_data_path,
-)
-from icon4py.model.common.test_utils.pytest_config import (  # noqa: F401
+"""
+Initialize pytest.
+
+Workaround for pytest not discovering those configuration function, when they are added to the
+diffusion_test/conftest.py folder
+"""
+from icon4py.model.common.test_utils.helpers import backend, mesh  # noqa: F401 # fixtures
+from icon4py.model.common.test_utils.pytest_config import (  # noqa: F401 # pytest config
     pytest_addoption,
     pytest_configure,
     pytest_generate_tests,
     pytest_runtest_setup,
 )
-
-
-grids_path = base_path.joinpath("grids")
-r04b09_dsl_grid_path = grids_path.joinpath("mch_ch_r04b09_dsl")
-r04b09_dsl_data_file = r04b09_dsl_grid_path.joinpath("mch_ch_r04b09_dsl_grids_v1.tar.gz").name
-r02b04_global_grid_path = grids_path.joinpath("r02b04_global")
-r02b04_global_data_file = r02b04_global_grid_path.joinpath("icon_grid_0013_R02B04_G.tar.gz").name
-
-
-mch_ch_r04b09_dsl_grid_uri = "https://polybox.ethz.ch/index.php/s/hD232znfEPBh4Oh/download"
-r02b04_global_grid_uri = "https://polybox.ethz.ch/index.php/s/0EM8O8U53GKGsst/download"
-
-
-@pytest.fixture()
-def r04b09_dsl_gridfile(get_grid_files):
-    return r04b09_dsl_grid_path.joinpath("grid.nc")
-
-
-@pytest.fixture(scope="session")
-def get_grid_files(pytestconfig):
-    """
-    Get the grid files used for testing.
-
-    Session scoped fixture which is a prerequisite of all the other fixtures in this file.
-    """
-    if not pytestconfig.getoption("datatest"):
-        pytest.skip("not running datatest marked tests")
-    download_and_extract(mch_ch_r04b09_dsl_grid_uri, r04b09_dsl_grid_path, r04b09_dsl_data_file)
-    download_and_extract(r02b04_global_grid_uri, r02b04_global_grid_path, r02b04_global_data_file)
diff --git a/...ommon/tests/mpi_tests/test_definitions.py → ...s/decomposition_tests/test_definitions.py b/...ommon/tests/mpi_tests/test_definitions.py → ...s/decomposition_tests/test_definitions.py
@@ -16,9 +16,12 @@
     SingleNodeExchange,
     create_exchange,
 )
+from icon4py.model.common.test_utils.datatest_helpers import (  # noqa: F401 # import fixtures form test_utils
+    processor_props,
+)
 
 
-def test_create_single_node_runtime_without_mpi(processor_props):
+def test_create_single_node_runtime_without_mpi(processor_props):  # noqa: F811 # fixture
     decomposition_info = DecompositionInfo(klevels=10)
     exchange = create_exchange(processor_props, decomposition_info)
 

diff --git a/...tests/mpi_tests/test_mpi_decomposition.py → ...mposition_tests/test_mpi_decomposition.py b/...tests/mpi_tests/test_mpi_decomposition.py → ...mposition_tests/test_mpi_decomposition.py
@@ -28,6 +28,15 @@
 )
 from icon4py.model.common.decomposition.mpi_decomposition import GHexMultiNodeExchange
 from icon4py.model.common.dimension import CellDim, EdgeDim, VertexDim
+from icon4py.model.common.test_utils.datatest_helpers import (  # noqa: F401 # import fixtures from test_utils
+    data_provider,
+    datapath,
+    decomposition_info,
+    download_ser_data,
+    grid_savepoint,
+    icon_grid,
+    ranked_data_path,
+)
 from icon4py.model.common.test_utils.parallel_helpers import (  # noqa: F401  # import fixtures from test_utils package
     check_comm_size,
     processor_props,
@@ -66,9 +75,9 @@ def test_decomposition_info_masked(
     owned,
     total,
     caplog,
-    download_ser_data,
-    decomposition_info,
-    processor_props,  # noqa: F811  # fixture
+    download_ser_data,  # noqa: F811 # fixture
+    decomposition_info,  # noqa: F811 # fixture
+    processor_props,  # noqa: F811 # fixture
 ):
     check_comm_size(processor_props, sizes=[2])
     my_rank = processor_props.rank
@@ -85,7 +94,6 @@ def test_decomposition_info_masked(
     _assert_index_partitioning(all_indices, halo_indices, owned_indices)
 
 
-# @pytest.mark.skipif(props.comm_size != 2, reason="runs on 2 nodes only")
 def _assert_index_partitioning(all_indices, halo_indices, owned_indices):
     owned_list = owned_indices.tolist()
     halos_list = halo_indices.tolist()
@@ -112,8 +120,9 @@ def test_decomposition_info_local_index(
     owned,
     total,
     caplog,
-    decomposition_info,
-    processor_props,  # noqa: F811  # fixture
+    download_ser_data,  # noqa: F811 #fixture
+    decomposition_info,  # noqa: F811 #fixture
+    processor_props,  # noqa: F811 #fixture
 ):
     check_comm_size(processor_props, sizes=[2])
     my_rank = processor_props.rank
@@ -162,10 +171,10 @@ def test_domain_descriptor_id_are_globally_unique(num, processor_props):  # noqa
 @pytest.mark.datatest
 def test_decomposition_info_matches_gridsize(
     caplog,
-    download_ser_data,
-    decomposition_info,
-    icon_grid,
-    processor_props,  # noqa: F811  # fixture
+    download_ser_data,  # noqa: F811 #fixture
+    decomposition_info,  # noqa: F811 #fixture
+    icon_grid,  # noqa: F811 #fixture
+    processor_props,  # noqa: F811 #fixture
 ):
     check_comm_size(processor_props)
     assert (
@@ -195,3 +204,13 @@ def test_create_multi_node_runtime_with_mpi(
         assert isinstance(exchange, GHexMultiNodeExchange)
     else:
         assert isinstance(exchange, SingleNodeExchange)
+
+
+@pytest.mark.parametrize("processor_props", [False], indirect=True)
+def test_create_single_node_runtime_without_mpi(
+    processor_props, decomposition_info  # noqa: F811 # fixture
+):
+    props = processor_props
+    exchange = create_exchange(props, decomposition_info)
+
+    assert isinstance(exchange, SingleNodeExchange)
diff --git a/model/common/tests/grid_tests/conftest.py b/model/common/tests/grid_tests/conftest.py
@@ -0,0 +1,57 @@
+# ICON4Py - ICON inspired code in Python and GT4Py
+#
+# Copyright (c) 2022, ETH Zurich and MeteoSwiss
+# All rights reserved.
+#
+# This file is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or any later
+# version. See the LICENSE.txt file at the top-level directory of this
+# distribution for a copy of the license or check <https://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+import pytest
+
+from icon4py.model.common.test_utils.data_handling import download_and_extract
+from icon4py.model.common.test_utils.datatest_helpers import (  # noqa: F401
+    base_path,
+    damping_height,
+    data_provider,
+    datapath,
+    decomposition_info,
+    download_ser_data,
+    grid_savepoint,
+    icon_grid,
+    interpolation_savepoint,
+    processor_props,
+    ranked_data_path,
+)
+
+
+grids_path = base_path.joinpath("grids")
+r04b09_dsl_grid_path = grids_path.joinpath("mch_ch_r04b09_dsl")
+r04b09_dsl_data_file = r04b09_dsl_grid_path.joinpath("mch_ch_r04b09_dsl_grids_v1.tar.gz").name
+r02b04_global_grid_path = grids_path.joinpath("r02b04_global")
+r02b04_global_data_file = r02b04_global_grid_path.joinpath("icon_grid_0013_R02B04_G.tar.gz").name
+
+
+mch_ch_r04b09_dsl_grid_uri = "https://polybox.ethz.ch/index.php/s/hD232znfEPBh4Oh/download"
+r02b04_global_grid_uri = "https://polybox.ethz.ch/index.php/s/0EM8O8U53GKGsst/download"
+
+
+@pytest.fixture()
+def r04b09_dsl_gridfile(get_grid_files):
+    return r04b09_dsl_grid_path.joinpath("grid.nc")
+
+
+@pytest.fixture(scope="session")
+def get_grid_files(pytestconfig):
+    """
+    Get the grid files used for testing.
+
+    Session scoped fixture which is a prerequisite of all the other fixtures in this file.
+    """
+    if not pytestconfig.getoption("datatest"):
+        pytest.skip("not running datatest marked tests")
+    download_and_extract(mch_ch_r04b09_dsl_grid_uri, r04b09_dsl_grid_path, r04b09_dsl_data_file)
+    download_and_extract(r02b04_global_grid_uri, r02b04_global_grid_path, r02b04_global_data_file)
diff --git a/model/common/tests/test_grid_manager.py → ...mon/tests/grid_tests/test_grid_manager.py b/model/common/tests/test_grid_manager.py → ...mon/tests/grid_tests/test_grid_manager.py
diff --git a/model/common/tests/test_icon_grid.py → ...common/tests/grid_tests/test_icon_grid.py b/model/common/tests/test_icon_grid.py → ...common/tests/grid_tests/test_icon_grid.py
diff --git a/model/common/tests/test_vertical.py → .../common/tests/grid_tests/test_vertical.py b/model/common/tests/test_vertical.py → .../common/tests/grid_tests/test_vertical.py
diff --git a/...common/tests/test_interpolation_fields.py → ...lation_tests/test_interpolation_fields.py b/...common/tests/test_interpolation_fields.py → ...lation_tests/test_interpolation_fields.py
@@ -29,10 +29,22 @@
 from icon4py.model.common.dimension import EdgeDim
 from icon4py.model.common.grid.horizontal import HorizontalMarkerIndex
 from icon4py.model.common.interpolation.interpolation_fields import compute_c_lin_e
+from icon4py.model.common.test_utils.datatest_helpers import (  # noqa: F401  # import fixtures from test_utils package
+    data_provider,
+    datapath,
+    download_ser_data,
+    grid_savepoint,
+    icon_grid,
+    interpolation_savepoint,
+    processor_props,
+    ranked_data_path,
+)
 
 
 @pytest.mark.datatest
-def test_compute_c_lin_e(grid_savepoint, interpolation_savepoint, icon_grid):
+def test_compute_c_lin_e(
+    grid_savepoint, interpolation_savepoint, icon_grid  # noqa: F811  # fixture
+):
     inv_dual_edge_length = grid_savepoint.inv_dual_edge_length()
     edge_cell_length = grid_savepoint.edge_cell_length()
     owner_mask = grid_savepoint.e_owner_mask()