Rename tests with with_mpi=true

diff --git a/tests/adolc/helper_scalar_coupled_3_components_01_1.with_mpi=true.mpirun=1.output b/tests/adolc/helper_scalar_coupled_3_components_01_1.mpirun=1.output
similarity index 100%
rename from tests/adolc/helper_scalar_coupled_3_components_01_1.with_mpi=true.mpirun=1.output
rename to tests/adolc/helper_scalar_coupled_3_components_01_1.mpirun=1.output

diff --git a/tests/adolc/helper_scalar_coupled_3_components_01_1.with_mpi=true.mpirun=2.output b/tests/adolc/helper_scalar_coupled_3_components_01_1.mpirun=2.output
similarity index 100%
rename from tests/adolc/helper_scalar_coupled_3_components_01_1.with_mpi=true.mpirun=2.output
rename to tests/adolc/helper_scalar_coupled_3_components_01_1.mpirun=2.output

diff --git a/tests/adolc/helper_scalar_coupled_3_components_01_2.with_mpi=true.mpirun=1.output b/tests/adolc/helper_scalar_coupled_3_components_01_2.mpirun=1.output
similarity index 100%
rename from tests/adolc/helper_scalar_coupled_3_components_01_2.with_mpi=true.mpirun=1.output
rename to tests/adolc/helper_scalar_coupled_3_components_01_2.mpirun=1.output

diff --git a/tests/adolc/helper_scalar_coupled_3_components_01_2.with_mpi=true.mpirun=2.output b/tests/adolc/helper_scalar_coupled_3_components_01_2.mpirun=2.output
similarity index 100%
rename from tests/adolc/helper_scalar_coupled_3_components_01_2.with_mpi=true.mpirun=2.output
rename to tests/adolc/helper_scalar_coupled_3_components_01_2.mpirun=2.output

diff --git a/tests/arpack/parpack_advection_diffusion_petsc.with_mpi=true.with_petsc=true.with_arpack_with_parpack=true.mpirun=3.with_petsc_with_complex=false.output b/tests/arpack/parpack_advection_diffusion_petsc.with_petsc=true.with_arpack_with_parpack=true.mpirun=3.with_petsc_with_complex=false.output
similarity index 100%
rename from tests/arpack/parpack_advection_diffusion_petsc.with_mpi=true.with_petsc=true.with_arpack_with_parpack=true.mpirun=3.with_petsc_with_complex=false.output
rename to tests/arpack/parpack_advection_diffusion_petsc.with_petsc=true.with_arpack_with_parpack=true.mpirun=3.with_petsc_with_complex=false.output

diff --git a/tests/arpack/parpack_advection_diffusion_trilinos.with_mpi=true.with_trilinos=true.with_arpack_with_parpack=true.mpirun=3.output b/tests/arpack/parpack_advection_diffusion_trilinos.with_trilinos=true.with_arpack_with_parpack=true.mpirun=3.output
similarity index 100%
rename from tests/arpack/parpack_advection_diffusion_trilinos.with_mpi=true.with_trilinos=true.with_arpack_with_parpack=true.mpirun=3.output
rename to tests/arpack/parpack_advection_diffusion_trilinos.with_trilinos=true.with_arpack_with_parpack=true.mpirun=3.output

diff --git a/tests/arpack/step-36_parpack.with_mpi=true.with_petsc=true.with_petsc_with_complex=false.with_arpack_with_parpack=true.mpirun=3.output b/tests/arpack/step-36_parpack.with_petsc=true.with_petsc_with_complex=false.with_arpack_with_parpack=true.mpirun=3.output
similarity index 100%
rename from tests/arpack/step-36_parpack.with_mpi=true.with_petsc=true.with_petsc_with_complex=false.with_arpack_with_parpack=true.mpirun=3.output
rename to tests/arpack/step-36_parpack.with_petsc=true.with_petsc_with_complex=false.with_arpack_with_parpack=true.mpirun=3.output

diff --git a/tests/arpack/step-36_parpack_mf.with_mpi=true.with_p4est=true.with_arpack_with_parpack=true.mpirun=3.output b/tests/arpack/step-36_parpack_mf.with_p4est=true.with_arpack_with_parpack=true.mpirun=3.output
similarity index 100%
rename from tests/arpack/step-36_parpack_mf.with_mpi=true.with_p4est=true.with_arpack_with_parpack=true.mpirun=3.output
rename to tests/arpack/step-36_parpack_mf.with_p4est=true.with_arpack_with_parpack=true.mpirun=3.output

diff --git a/tests/arpack/step-36_parpack_mf_02.with_mpi=true.with_p4est=true.with_arpack_with_parpack=true.mpirun=3.output b/tests/arpack/step-36_parpack_mf_02.with_p4est=true.with_arpack_with_parpack=true.mpirun=3.output
similarity index 100%
rename from tests/arpack/step-36_parpack_mf_02.with_mpi=true.with_p4est=true.with_arpack_with_parpack=true.mpirun=3.output
rename to tests/arpack/step-36_parpack_mf_02.with_p4est=true.with_arpack_with_parpack=true.mpirun=3.output

diff --git a/tests/arpack/step-36_parpack_mf_03.with_mpi=true.with_p4est=true.with_arpack_with_parpack=true.mpirun=3.output b/tests/arpack/step-36_parpack_mf_03.with_p4est=true.with_arpack_with_parpack=true.mpirun=3.output
similarity index 100%
rename from tests/arpack/step-36_parpack_mf_03.with_mpi=true.with_p4est=true.with_arpack_with_parpack=true.mpirun=3.output
rename to tests/arpack/step-36_parpack_mf_03.with_p4est=true.with_arpack_with_parpack=true.mpirun=3.output

diff --git a/tests/arpack/step-36_parpack_trilinos.with_mpi=true.with_trilinos=true.with_arpack_with_parpack=true.mpirun=3.output b/tests/arpack/step-36_parpack_trilinos.with_trilinos=true.with_arpack_with_parpack=true.mpirun=3.output
similarity index 100%
rename from tests/arpack/step-36_parpack_trilinos.with_mpi=true.with_trilinos=true.with_arpack_with_parpack=true.mpirun=3.output
rename to tests/arpack/step-36_parpack_trilinos.with_trilinos=true.with_arpack_with_parpack=true.mpirun=3.output

diff --git a/tests/base/timer_05.with_mpi=true.mpirun=1.output b/tests/base/timer_05.mpirun=1.output
similarity index 100%
rename from tests/base/timer_05.with_mpi=true.mpirun=1.output
rename to tests/base/timer_05.mpirun=1.output

diff --git a/tests/base/timer_09.with_mpi=true.mpirun=2.output b/tests/base/timer_09.mpirun=2.output
similarity index 100%
rename from tests/base/timer_09.with_mpi=true.mpirun=2.output
rename to tests/base/timer_09.mpirun=2.output

diff --git a/tests/base/timer_10.with_mpi=true.mpirun=2.output b/tests/base/timer_10.mpirun=2.output
similarity index 100%
rename from tests/base/timer_10.with_mpi=true.mpirun=2.output
rename to tests/base/timer_10.mpirun=2.output

diff --git a/tests/cuda/matrix_free_matrix_vector_10.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/cuda/matrix_free_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/cuda/matrix_free_matrix_vector_10.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/cuda/matrix_free_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/cuda/matrix_free_matrix_vector_10.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/cuda/matrix_free_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/cuda/matrix_free_matrix_vector_10.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/cuda/matrix_free_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=2.output

diff --git a/tests/cuda/matrix_free_matrix_vector_10a.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/cuda/matrix_free_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/cuda/matrix_free_matrix_vector_10a.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/cuda/matrix_free_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/cuda/matrix_free_matrix_vector_10a.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/cuda/matrix_free_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/cuda/matrix_free_matrix_vector_10a.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/cuda/matrix_free_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=2.output

diff --git a/tests/cuda/matrix_free_matrix_vector_25.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/cuda/matrix_free_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/cuda/matrix_free_matrix_vector_25.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/cuda/matrix_free_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/cuda/matrix_free_matrix_vector_25.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/cuda/matrix_free_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/cuda/matrix_free_matrix_vector_25.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/cuda/matrix_free_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=2.output

diff --git a/tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=1.output b/tests/cuda/precondition_03.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=1.output
similarity index 100%
rename from tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=1.output
rename to tests/cuda/precondition_03.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=1.output

diff --git a/tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=2.output b/tests/cuda/precondition_03.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=2.output
similarity index 100%
rename from tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=2.output
rename to tests/cuda/precondition_03.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=2.output

diff --git a/tests/dofs/clear_signal.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/dofs/clear_signal.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/dofs/clear_signal.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/dofs/clear_signal.with_p4est=true.mpirun=1.output

diff --git a/tests/fe/fe_enriched_color_02.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.output b/tests/fe/fe_enriched_color_02.with_trilinos=true.with_trilinos_with_zoltan=true.output
similarity index 100%
rename from tests/fe/fe_enriched_color_02.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.output
rename to tests/fe/fe_enriched_color_02.with_trilinos=true.with_trilinos_with_zoltan=true.output

diff --git a/tests/fe/fe_enriched_color_03.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.output b/tests/fe/fe_enriched_color_03.with_trilinos=true.with_trilinos_with_zoltan=true.output
similarity index 100%
rename from tests/fe/fe_enriched_color_03.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.output
rename to tests/fe/fe_enriched_color_03.with_trilinos=true.with_trilinos_with_zoltan=true.output

diff --git a/tests/fe/fe_enriched_color_04.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.output b/tests/fe/fe_enriched_color_04.with_trilinos=true.with_trilinos_with_zoltan=true.output
similarity index 100%
rename from tests/fe/fe_enriched_color_04.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.output
rename to tests/fe/fe_enriched_color_04.with_trilinos=true.with_trilinos_with_zoltan=true.output

diff --git a/tests/fe/fe_enriched_color_05.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.output b/tests/fe/fe_enriched_color_05.with_trilinos=true.with_trilinos_with_zoltan=true.output
similarity index 100%
rename from tests/fe/fe_enriched_color_05.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.output
rename to tests/fe/fe_enriched_color_05.with_trilinos=true.with_trilinos_with_zoltan=true.output

diff --git a/tests/fe/fe_enriched_color_06.with_trilinos=true.with_trilinos_wiith_zoltan=true.with_gsl=true.with_mpi=true.output b/tests/fe/fe_enriched_color_06.with_trilinos=true.with_trilinos_wiith_zoltan=true.with_gsl=true.output
similarity index 100%
rename from tests/fe/fe_enriched_color_06.with_trilinos=true.with_trilinos_wiith_zoltan=true.with_gsl=true.with_mpi=true.output
rename to tests/fe/fe_enriched_color_06.with_trilinos=true.with_trilinos_wiith_zoltan=true.with_gsl=true.output

diff --git a/tests/fe/fe_enriched_color_07.with_trilinos=true.with_muparser=true.with_trilinos_with_zoltan=true.with_petsc=true.with_petsc_with_complex=false.with_gsl=true.with_mpi=true.mpirun=2.output b/tests/fe/fe_enriched_color_07.with_trilinos=true.with_muparser=true.with_trilinos_with_zoltan=true.with_petsc=true.with_petsc_with_complex=false.with_gsl=true.mpirun=2.output
similarity index 100%
rename from tests/fe/fe_enriched_color_07.with_trilinos=true.with_muparser=true.with_trilinos_with_zoltan=true.with_petsc=true.with_petsc_with_complex=false.with_gsl=true.with_mpi=true.mpirun=2.output
rename to tests/fe/fe_enriched_color_07.with_trilinos=true.with_muparser=true.with_trilinos_with_zoltan=true.with_petsc=true.with_petsc_with_complex=false.with_gsl=true.mpirun=2.output

diff --git a/tests/fe/fe_enriched_color_08.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.output b/tests/fe/fe_enriched_color_08.with_trilinos=true.with_trilinos_with_zoltan=true.output
similarity index 100%
rename from tests/fe/fe_enriched_color_08.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.output
rename to tests/fe/fe_enriched_color_08.with_trilinos=true.with_trilinos_with_zoltan=true.output

diff --git a/tests/grid/build_global_description_tree.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/grid/build_global_description_tree.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/grid/build_global_description_tree.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/grid/build_global_description_tree.with_p4est=true.mpirun=1.output

diff --git a/tests/grid/build_global_description_tree.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/grid/build_global_description_tree.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/grid/build_global_description_tree.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/grid/build_global_description_tree.with_p4est=true.mpirun=2.output

diff --git a/tests/grid/distributed_compute_point_locations_02.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/grid/distributed_compute_point_locations_02.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/grid/distributed_compute_point_locations_02.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/grid/distributed_compute_point_locations_02.with_p4est=true.mpirun=2.output

diff --git a/tests/grid/distributed_compute_point_locations_02.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/grid/distributed_compute_point_locations_02.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/grid/distributed_compute_point_locations_02.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/grid/distributed_compute_point_locations_02.with_p4est=true.mpirun=3.output

diff --git a/tests/grid/distributed_compute_point_locations_03.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/grid/distributed_compute_point_locations_03.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/grid/distributed_compute_point_locations_03.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/grid/distributed_compute_point_locations_03.with_p4est=true.mpirun=2.output

diff --git a/tests/grid/distributed_compute_point_locations_03.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/grid/distributed_compute_point_locations_03.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/grid/distributed_compute_point_locations_03.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/grid/distributed_compute_point_locations_03.with_p4est=true.mpirun=3.output

diff --git a/tests/grid/global_ids_01.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/grid/global_ids_01.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/grid/global_ids_01.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/grid/global_ids_01.with_p4est=true.mpirun=1.output

diff --git a/tests/grid/global_ids_01.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/grid/global_ids_01.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/grid/global_ids_01.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/grid/global_ids_01.with_p4est=true.mpirun=4.output

diff --git a/tests/grid/global_ids_03.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/grid/global_ids_03.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/grid/global_ids_03.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/grid/global_ids_03.with_p4est=true.mpirun=1.output

diff --git a/tests/grid/global_ids_03.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/grid/global_ids_03.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/grid/global_ids_03.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/grid/global_ids_03.with_p4est=true.mpirun=4.output

diff --git a/tests/grid/grid_tools_cache_04.with_mpi=true.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output b/tests/grid/grid_tools_cache_04.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output
similarity index 100%
rename from tests/grid/grid_tools_cache_04.with_mpi=true.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output
rename to tests/grid/grid_tools_cache_04.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output

diff --git a/tests/grid/grid_tools_cache_04.with_mpi=true.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output b/tests/grid/grid_tools_cache_04.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output
similarity index 100%
rename from tests/grid/grid_tools_cache_04.with_mpi=true.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output
rename to tests/grid/grid_tools_cache_04.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output

diff --git a/tests/grid/maximal_cell_diameter_mpi.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/grid/maximal_cell_diameter_mpi.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/grid/maximal_cell_diameter_mpi.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/grid/maximal_cell_diameter_mpi.with_p4est=true.mpirun=4.output

diff --git a/tests/grid/minimal_cell_diameter_mpi.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/grid/minimal_cell_diameter_mpi.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/grid/minimal_cell_diameter_mpi.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/grid/minimal_cell_diameter_mpi.with_p4est=true.mpirun=4.output

diff --git a/tests/lac/diagonal_matrix_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/lac/diagonal_matrix_02.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/lac/diagonal_matrix_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/lac/diagonal_matrix_02.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/lac/diagonal_matrix_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/lac/diagonal_matrix_02.with_trilinos=true.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/lac/diagonal_matrix_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/lac/diagonal_matrix_02.with_trilinos=true.with_p4est=true.mpirun=3.output

diff --git a/tests/lac/diagonal_matrix_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=7.output b/tests/lac/diagonal_matrix_02.with_trilinos=true.with_p4est=true.mpirun=7.output
similarity index 100%
rename from tests/lac/diagonal_matrix_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=7.output
rename to tests/lac/diagonal_matrix_02.with_trilinos=true.with_p4est=true.mpirun=7.output

diff --git a/tests/lac/linear_operator_09.with_petsc=on.with_mpi=true.mpirun=2.output b/tests/lac/linear_operator_09.with_petsc=on.mpirun=2.output
similarity index 100%
rename from tests/lac/linear_operator_09.with_petsc=on.with_mpi=true.mpirun=2.output
rename to tests/lac/linear_operator_09.with_petsc=on.mpirun=2.output

diff --git a/tests/lac/linear_operator_09.with_petsc=on.with_mpi=true.mpirun=4.output b/tests/lac/linear_operator_09.with_petsc=on.mpirun=4.output
similarity index 100%
rename from tests/lac/linear_operator_09.with_petsc=on.with_mpi=true.mpirun=4.output
rename to tests/lac/linear_operator_09.with_petsc=on.mpirun=4.output

diff --git a/tests/lac/linear_operator_12.with_p4est=true.with_trilinos=on.with_mpi=true.mpirun=1.output b/tests/lac/linear_operator_12.with_p4est=true.with_trilinos=on.mpirun=1.output
similarity index 100%
rename from tests/lac/linear_operator_12.with_p4est=true.with_trilinos=on.with_mpi=true.mpirun=1.output
rename to tests/lac/linear_operator_12.with_p4est=true.with_trilinos=on.mpirun=1.output

diff --git a/tests/lac/linear_operator_12.with_p4est=true.with_trilinos=on.with_mpi=true.mpirun=2.output b/tests/lac/linear_operator_12.with_p4est=true.with_trilinos=on.mpirun=2.output
similarity index 100%
rename from tests/lac/linear_operator_12.with_p4est=true.with_trilinos=on.with_mpi=true.mpirun=2.output
rename to tests/lac/linear_operator_12.with_p4est=true.with_trilinos=on.mpirun=2.output

diff --git a/tests/lac/linear_operator_12a.with_p4est=true.with_trilinos=on.with_mpi=true.mpirun=1.output b/tests/lac/linear_operator_12a.with_p4est=true.with_trilinos=on.mpirun=1.output
similarity index 100%
rename from tests/lac/linear_operator_12a.with_p4est=true.with_trilinos=on.with_mpi=true.mpirun=1.output
rename to tests/lac/linear_operator_12a.with_p4est=true.with_trilinos=on.mpirun=1.output

diff --git a/tests/lac/linear_operator_12a.with_p4est=true.with_trilinos=on.with_mpi=true.mpirun=2.output b/tests/lac/linear_operator_12a.with_p4est=true.with_trilinos=on.mpirun=2.output
similarity index 100%
rename from tests/lac/linear_operator_12a.with_p4est=true.with_trilinos=on.with_mpi=true.mpirun=2.output
rename to tests/lac/linear_operator_12a.with_p4est=true.with_trilinos=on.mpirun=2.output

diff --git a/tests/lac/linear_operator_14.with_p4est=true.with_trilinos=on.with_mpi=true.mpirun=1.output b/tests/lac/linear_operator_14.with_p4est=true.with_trilinos=on.mpirun=1.output
similarity index 100%
rename from tests/lac/linear_operator_14.with_p4est=true.with_trilinos=on.with_mpi=true.mpirun=1.output
rename to tests/lac/linear_operator_14.with_p4est=true.with_trilinos=on.mpirun=1.output

diff --git a/tests/lac/linear_operator_14.with_p4est=true.with_trilinos=on.with_mpi=true.mpirun=2.output b/tests/lac/linear_operator_14.with_p4est=true.with_trilinos=on.mpirun=2.output
similarity index 100%
rename from tests/lac/linear_operator_14.with_p4est=true.with_trilinos=on.with_mpi=true.mpirun=2.output
rename to tests/lac/linear_operator_14.with_p4est=true.with_trilinos=on.mpirun=2.output

diff --git a/tests/lac/utilities_02.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=3.output b/tests/lac/utilities_02.with_p4est=true.with_lapack=true.mpirun=3.output
similarity index 100%
rename from tests/lac/utilities_02.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=3.output
rename to tests/lac/utilities_02.with_p4est=true.with_lapack=true.mpirun=3.output

diff --git a/tests/lac/vector_type_traits_is_serial_02.with_trilinos=true.with_mpi=true.output b/tests/lac/vector_type_traits_is_serial_02.with_trilinos=true.output
similarity index 100%
rename from tests/lac/vector_type_traits_is_serial_02.with_trilinos=true.with_mpi=true.output
rename to tests/lac/vector_type_traits_is_serial_02.with_trilinos=true.output

diff --git a/tests/mappings/mapping_fe_field_06.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/mappings/mapping_fe_field_06.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/mappings/mapping_fe_field_06.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/mappings/mapping_fe_field_06.with_p4est=true.mpirun=3.output

diff --git a/tests/mappings/mapping_q_cache_02.with_p4est=true.with_mpi=true.mpirun=2.output b/tests/mappings/mapping_q_cache_02.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/mappings/mapping_q_cache_02.with_p4est=true.with_mpi=true.mpirun=2.output
rename to tests/mappings/mapping_q_cache_02.with_p4est=true.mpirun=2.output

diff --git a/tests/mappings/mapping_q_cache_06.with_p4est=true.with_mpi=true.mpirun=1.output b/tests/mappings/mapping_q_cache_06.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/mappings/mapping_q_cache_06.with_p4est=true.with_mpi=true.mpirun=1.output
rename to tests/mappings/mapping_q_cache_06.with_p4est=true.mpirun=1.output

diff --git a/tests/mappings/mapping_q_cache_06.with_p4est=true.with_mpi=true.mpirun=4.output b/tests/mappings/mapping_q_cache_06.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/mappings/mapping_q_cache_06.with_p4est=true.with_mpi=true.mpirun=4.output
rename to tests/mappings/mapping_q_cache_06.with_p4est=true.mpirun=4.output

diff --git a/tests/mappings/mapping_q_cache_07.with_p4est=true.with_mpi=true.mpirun=1.output b/tests/mappings/mapping_q_cache_07.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/mappings/mapping_q_cache_07.with_p4est=true.with_mpi=true.mpirun=1.output
rename to tests/mappings/mapping_q_cache_07.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/compare_faces_by_cells.with_p4est=true.with_mpi=true.mpirun=1.output b/tests/matrix_free/compare_faces_by_cells.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/compare_faces_by_cells.with_p4est=true.with_mpi=true.mpirun=1.output
rename to tests/matrix_free/compare_faces_by_cells.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/compare_faces_by_cells.with_p4est=true.with_mpi=true.mpirun=5.output b/tests/matrix_free/compare_faces_by_cells.with_p4est=true.mpirun=5.output
similarity index 100%
rename from tests/matrix_free/compare_faces_by_cells.with_p4est=true.with_mpi=true.mpirun=5.output
rename to tests/matrix_free/compare_faces_by_cells.with_p4est=true.mpirun=5.output

diff --git a/tests/matrix_free/compute_diagonal_01.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/compute_diagonal_01.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/compute_diagonal_01.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/compute_diagonal_01.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/compute_diagonal_01.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/compute_diagonal_01.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/compute_diagonal_01.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/compute_diagonal_01.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/compute_diagonal_03.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/compute_diagonal_03.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/compute_diagonal_03.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/compute_diagonal_03.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/compute_diagonal_04.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/compute_diagonal_04.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/compute_diagonal_04.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/compute_diagonal_04.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/compute_diagonal_05.with_mpi=true.mpirun=1.output b/tests/matrix_free/compute_diagonal_05.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/compute_diagonal_05.with_mpi=true.mpirun=1.output
rename to tests/matrix_free/compute_diagonal_05.mpirun=1.output

diff --git a/tests/matrix_free/dg_pbc_01.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/dg_pbc_01.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/dg_pbc_01.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/dg_pbc_01.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/dg_pbc_01.with_mpi=true.with_p4est=true.mpirun=7.output b/tests/matrix_free/dg_pbc_01.with_p4est=true.mpirun=7.output
similarity index 100%
rename from tests/matrix_free/dg_pbc_01.with_mpi=true.with_p4est=true.mpirun=7.output
rename to tests/matrix_free/dg_pbc_01.with_p4est=true.mpirun=7.output

diff --git a/tests/matrix_free/dg_pbc_02.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/dg_pbc_02.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/dg_pbc_02.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/dg_pbc_02.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/dg_pbc_02.with_mpi=true.with_p4est=true.mpirun=7.output b/tests/matrix_free/dg_pbc_02.with_p4est=true.mpirun=7.output
similarity index 100%
rename from tests/matrix_free/dg_pbc_02.with_mpi=true.with_p4est=true.mpirun=7.output
rename to tests/matrix_free/dg_pbc_02.with_p4est=true.mpirun=7.output

diff --git a/tests/matrix_free/dg_pbc_02.with_mpi=true.with_p4est=true.mpirun=7.output.avx b/tests/matrix_free/dg_pbc_02.with_p4est=true.mpirun=7.output.avx
similarity index 100%
rename from tests/matrix_free/dg_pbc_02.with_mpi=true.with_p4est=true.mpirun=7.output.avx
rename to tests/matrix_free/dg_pbc_02.with_p4est=true.mpirun=7.output.avx

diff --git a/tests/matrix_free/dg_pbc_02.with_mpi=true.with_p4est=true.mpirun=7.output.avx512 b/tests/matrix_free/dg_pbc_02.with_p4est=true.mpirun=7.output.avx512
similarity index 100%
rename from tests/matrix_free/dg_pbc_02.with_mpi=true.with_p4est=true.mpirun=7.output.avx512
rename to tests/matrix_free/dg_pbc_02.with_p4est=true.mpirun=7.output.avx512

diff --git a/tests/matrix_free/dg_pbc_02.with_mpi=true.with_p4est=true.mpirun=7.output.novec b/tests/matrix_free/dg_pbc_02.with_p4est=true.mpirun=7.output.novec
similarity index 100%
rename from tests/matrix_free/dg_pbc_02.with_mpi=true.with_p4est=true.mpirun=7.output.novec
rename to tests/matrix_free/dg_pbc_02.with_p4est=true.mpirun=7.output.novec

diff --git a/tests/matrix_free/dof_info_01.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/dof_info_01.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/dof_info_01.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/dof_info_01.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/dof_info_01.with_mpi=true.with_p4est=true.mpirun=1.output.vec0 b/tests/matrix_free/dof_info_01.with_p4est=true.mpirun=1.output.vec0
similarity index 100%
rename from tests/matrix_free/dof_info_01.with_mpi=true.with_p4est=true.mpirun=1.output.vec0
rename to tests/matrix_free/dof_info_01.with_p4est=true.mpirun=1.output.vec0

diff --git a/tests/matrix_free/dof_info_01.with_mpi=true.with_p4est=true.mpirun=1.output.vec1 b/tests/matrix_free/dof_info_01.with_p4est=true.mpirun=1.output.vec1
similarity index 100%
rename from tests/matrix_free/dof_info_01.with_mpi=true.with_p4est=true.mpirun=1.output.vec1
rename to tests/matrix_free/dof_info_01.with_p4est=true.mpirun=1.output.vec1

diff --git a/tests/matrix_free/dof_info_01.with_mpi=true.with_p4est=true.mpirun=1.output.vec3 b/tests/matrix_free/dof_info_01.with_p4est=true.mpirun=1.output.vec3
similarity index 100%
rename from tests/matrix_free/dof_info_01.with_mpi=true.with_p4est=true.mpirun=1.output.vec3
rename to tests/matrix_free/dof_info_01.with_p4est=true.mpirun=1.output.vec3

diff --git a/tests/matrix_free/dof_info_02.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/dof_info_02.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/dof_info_02.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/dof_info_02.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/dof_info_02.with_mpi=true.with_p4est=true.mpirun=1.output.vec0 b/tests/matrix_free/dof_info_02.with_p4est=true.mpirun=1.output.vec0
similarity index 100%
rename from tests/matrix_free/dof_info_02.with_mpi=true.with_p4est=true.mpirun=1.output.vec0
rename to tests/matrix_free/dof_info_02.with_p4est=true.mpirun=1.output.vec0

diff --git a/tests/matrix_free/dof_info_02.with_mpi=true.with_p4est=true.mpirun=1.output.vec1 b/tests/matrix_free/dof_info_02.with_p4est=true.mpirun=1.output.vec1
similarity index 100%
rename from tests/matrix_free/dof_info_02.with_mpi=true.with_p4est=true.mpirun=1.output.vec1
rename to tests/matrix_free/dof_info_02.with_p4est=true.mpirun=1.output.vec1

diff --git a/tests/matrix_free/dof_info_02.with_mpi=true.with_p4est=true.mpirun=1.output.vec3 b/tests/matrix_free/dof_info_02.with_p4est=true.mpirun=1.output.vec3
similarity index 100%
rename from tests/matrix_free/dof_info_02.with_mpi=true.with_p4est=true.mpirun=1.output.vec3
rename to tests/matrix_free/dof_info_02.with_p4est=true.mpirun=1.output.vec3

diff --git a/tests/matrix_free/face_setup_01.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/face_setup_01.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/face_setup_01.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/face_setup_01.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/face_setup_01.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/matrix_free/face_setup_01.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/matrix_free/face_setup_01.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/matrix_free/face_setup_01.with_p4est=true.mpirun=2.output

diff --git a/tests/matrix_free/laplace_operator_01.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/laplace_operator_01.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/laplace_operator_01.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/laplace_operator_01.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/laplace_operator_01.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/laplace_operator_01.with_trilinos=true.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/laplace_operator_01.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/laplace_operator_01.with_trilinos=true.with_p4est=true.mpirun=4.output

diff --git a/tests/matrix_free/laplace_operator_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/laplace_operator_02.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/laplace_operator_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/laplace_operator_02.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/laplace_operator_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/laplace_operator_02.with_trilinos=true.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/laplace_operator_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/laplace_operator_02.with_trilinos=true.with_p4est=true.mpirun=4.output

diff --git a/tests/matrix_free/laplace_operator_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/laplace_operator_03.with_trilinos=true.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/laplace_operator_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/laplace_operator_03.with_trilinos=true.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/loop_boundary.with_p4est=true.with_mpi=true.mpirun=1.output b/tests/matrix_free/loop_boundary.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/loop_boundary.with_p4est=true.with_mpi=true.mpirun=1.output
rename to tests/matrix_free/loop_boundary.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/loop_boundary.with_p4est=true.with_mpi=true.mpirun=2.output b/tests/matrix_free/loop_boundary.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/matrix_free/loop_boundary.with_p4est=true.with_mpi=true.mpirun=2.output
rename to tests/matrix_free/loop_boundary.with_p4est=true.mpirun=2.output

diff --git a/tests/matrix_free/mass_operator_01.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/mass_operator_01.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/mass_operator_01.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/mass_operator_01.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/mass_operator_01.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/mass_operator_01.with_trilinos=true.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/mass_operator_01.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/mass_operator_01.with_trilinos=true.with_p4est=true.mpirun=4.output

diff --git a/tests/matrix_free/mass_operator_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/mass_operator_02.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/mass_operator_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/mass_operator_02.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/mass_operator_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/mass_operator_02.with_trilinos=true.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/mass_operator_02.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/mass_operator_02.with_trilinos=true.with_p4est=true.mpirun=4.output

diff --git a/tests/matrix_free/mass_operator_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/mass_operator_03.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/mass_operator_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/mass_operator_03.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/mass_operator_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/mass_operator_03.with_trilinos=true.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/mass_operator_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/mass_operator_03.with_trilinos=true.with_p4est=true.mpirun=4.output

diff --git a/tests/matrix_free/mass_operator_04.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/mass_operator_04.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/mass_operator_04.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/mass_operator_04.with_p4est=true.mpirun=4.output

diff --git a/tests/matrix_free/matrix_vector_10.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_10.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/matrix_vector_10.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=10.output b/tests/matrix_free/matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=10.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_10.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=10.output
rename to tests/matrix_free/matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=10.output

diff --git a/tests/matrix_free/matrix_vector_10.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_10.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=4.output

diff --git a/tests/matrix_free/matrix_vector_11.with_mpi=true.with_p4est=true.mpirun=10.output b/tests/matrix_free/matrix_vector_11.with_p4est=true.mpirun=10.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_11.with_mpi=true.with_p4est=true.mpirun=10.output
rename to tests/matrix_free/matrix_vector_11.with_p4est=true.mpirun=10.output

diff --git a/tests/matrix_free/matrix_vector_11.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/matrix_vector_11.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_11.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/matrix_vector_11.with_p4est=true.mpirun=4.output

diff --git a/tests/matrix_free/matrix_vector_12.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/matrix_vector_12.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_12.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/matrix_vector_12.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/matrix_vector_12.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=10.output b/tests/matrix_free/matrix_vector_12.with_trilinos=true.with_p4est=true.mpirun=10.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_12.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=10.output
rename to tests/matrix_free/matrix_vector_12.with_trilinos=true.with_p4est=true.mpirun=10.output

diff --git a/tests/matrix_free/matrix_vector_12.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/matrix_vector_12.with_trilinos=true.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_12.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/matrix_vector_12.with_trilinos=true.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/matrix_vector_13.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/matrix_vector_13.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_13.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/matrix_vector_13.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/matrix_vector_13.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/matrix_free/matrix_vector_13.with_trilinos=true.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_13.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/matrix_free/matrix_vector_13.with_trilinos=true.with_p4est=true.mpirun=2.output

diff --git a/tests/matrix_free/matrix_vector_19.with_metis=true.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/matrix_vector_19.with_metis=true.with_trilinos=true.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_19.with_metis=true.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/matrix_vector_19.with_metis=true.with_trilinos=true.with_p4est=true.mpirun=4.output

diff --git a/tests/matrix_free/matrix_vector_22.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/matrix_vector_22.with_trilinos=true.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_22.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/matrix_vector_22.with_trilinos=true.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/matrix_vector_23.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/matrix_vector_23.with_trilinos=true.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_23.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/matrix_vector_23.with_trilinos=true.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/matrix_vector_blocks.with_mpi=true.with_p4est=true.mpirun=5.output b/tests/matrix_free/matrix_vector_blocks.with_p4est=true.mpirun=5.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_blocks.with_mpi=true.with_p4est=true.mpirun=5.output
rename to tests/matrix_free/matrix_vector_blocks.with_p4est=true.mpirun=5.output

diff --git a/tests/matrix_free/matrix_vector_faces_10.with_mpi=true.with_p4est=true.mpirun=5.output b/tests/matrix_free/matrix_vector_faces_10.with_p4est=true.mpirun=5.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_10.with_mpi=true.with_p4est=true.mpirun=5.output
rename to tests/matrix_free/matrix_vector_faces_10.with_p4est=true.mpirun=5.output

diff --git a/tests/matrix_free/matrix_vector_faces_11.with_mpi=true.with_p4est=true.mpirun=5.output b/tests/matrix_free/matrix_vector_faces_11.with_p4est=true.mpirun=5.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_11.with_mpi=true.with_p4est=true.mpirun=5.output
rename to tests/matrix_free/matrix_vector_faces_11.with_p4est=true.mpirun=5.output

diff --git a/tests/matrix_free/matrix_vector_faces_13.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/matrix_vector_faces_13.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_13.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/matrix_vector_faces_13.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/matrix_vector_faces_13.with_mpi=true.with_p4est=true.mpirun=5.output b/tests/matrix_free/matrix_vector_faces_13.with_p4est=true.mpirun=5.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_13.with_mpi=true.with_p4est=true.mpirun=5.output
rename to tests/matrix_free/matrix_vector_faces_13.with_p4est=true.mpirun=5.output

diff --git a/tests/matrix_free/matrix_vector_faces_14.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/matrix_free/matrix_vector_faces_14.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_14.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/matrix_free/matrix_vector_faces_14.with_p4est=true.mpirun=2.output

diff --git a/tests/matrix_free/matrix_vector_faces_14.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/matrix_vector_faces_14.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_14.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/matrix_vector_faces_14.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/matrix_vector_faces_15.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/matrix_vector_faces_15.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_15.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/matrix_vector_faces_15.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/matrix_vector_faces_15.with_mpi=true.with_p4est=true.mpirun=5.output b/tests/matrix_free/matrix_vector_faces_15.with_p4est=true.mpirun=5.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_15.with_mpi=true.with_p4est=true.mpirun=5.output
rename to tests/matrix_free/matrix_vector_faces_15.with_p4est=true.mpirun=5.output

diff --git a/tests/matrix_free/matrix_vector_faces_16.with_mpi=true.with_p4est=true.mpirun=11.output b/tests/matrix_free/matrix_vector_faces_16.with_p4est=true.mpirun=11.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_16.with_mpi=true.with_p4est=true.mpirun=11.output
rename to tests/matrix_free/matrix_vector_faces_16.with_p4est=true.mpirun=11.output

diff --git a/tests/matrix_free/matrix_vector_faces_17.with_mpi=true.with_p4est=true.mpirun=5.output b/tests/matrix_free/matrix_vector_faces_17.with_p4est=true.mpirun=5.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_17.with_mpi=true.with_p4est=true.mpirun=5.output
rename to tests/matrix_free/matrix_vector_faces_17.with_p4est=true.mpirun=5.output

diff --git a/tests/matrix_free/matrix_vector_faces_18.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/matrix_vector_faces_18.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_18.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/matrix_vector_faces_18.with_p4est=true.mpirun=4.output

diff --git a/tests/matrix_free/matrix_vector_faces_19.with_mpi=true.with_p4est=true.mpirun=5.output b/tests/matrix_free/matrix_vector_faces_19.with_p4est=true.mpirun=5.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_19.with_mpi=true.with_p4est=true.mpirun=5.output
rename to tests/matrix_free/matrix_vector_faces_19.with_p4est=true.mpirun=5.output

diff --git a/tests/matrix_free/matrix_vector_faces_20.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/matrix_vector_faces_20.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_20.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/matrix_vector_faces_20.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/matrix_vector_faces_21.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/matrix_vector_faces_21.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_21.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/matrix_vector_faces_21.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/matrix_vector_faces_22.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/matrix_vector_faces_22.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_22.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/matrix_vector_faces_22.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/matrix_vector_faces_23.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/matrix_vector_faces_23.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_23.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/matrix_vector_faces_23.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/matrix_vector_faces_24.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/matrix_free/matrix_vector_faces_24.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_24.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/matrix_free/matrix_vector_faces_24.with_p4est=true.mpirun=2.output

diff --git a/tests/matrix_free/matrix_vector_faces_29.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/matrix_free/matrix_vector_faces_29.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_29.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/matrix_free/matrix_vector_faces_29.with_p4est=true.mpirun=2.output

diff --git a/tests/matrix_free/matrix_vector_faces_30.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/matrix_vector_faces_30.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_30.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/matrix_vector_faces_30.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/matrix_vector_faces_31.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/matrix_vector_faces_31.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_31.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/matrix_vector_faces_31.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/matrix_vector_faces_32.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/matrix_vector_faces_32.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_faces_32.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/matrix_vector_faces_32.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/matrix_vector_hp_parallel_01.with_mpi=true.with_p4est=true.mpirun=1.with_trilinos=true.output b/tests/matrix_free/matrix_vector_hp_parallel_01.with_p4est=true.mpirun=1.with_trilinos=true.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_hp_parallel_01.with_mpi=true.with_p4est=true.mpirun=1.with_trilinos=true.output
rename to tests/matrix_free/matrix_vector_hp_parallel_01.with_p4est=true.mpirun=1.with_trilinos=true.output

diff --git a/tests/matrix_free/matrix_vector_hp_parallel_01.with_mpi=true.with_p4est=true.mpirun=5.with_trilinos=true.output b/tests/matrix_free/matrix_vector_hp_parallel_01.with_p4est=true.mpirun=5.with_trilinos=true.output
similarity index 100%
rename from tests/matrix_free/matrix_vector_hp_parallel_01.with_mpi=true.with_p4est=true.mpirun=5.with_trilinos=true.output
rename to tests/matrix_free/matrix_vector_hp_parallel_01.with_p4est=true.mpirun=5.with_trilinos=true.output

diff --git a/tests/matrix_free/multigrid_dg_periodic.with_lapack=true.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/multigrid_dg_periodic.with_lapack=true.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/multigrid_dg_periodic.with_lapack=true.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/multigrid_dg_periodic.with_lapack=true.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/multigrid_dg_periodic.with_lapack=true.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/multigrid_dg_periodic.with_lapack=true.with_trilinos=true.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/multigrid_dg_periodic.with_lapack=true.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/multigrid_dg_periodic.with_lapack=true.with_trilinos=true.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/multigrid_dg_periodic.with_lapack=true.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=5.output b/tests/matrix_free/multigrid_dg_periodic.with_lapack=true.with_trilinos=true.with_p4est=true.mpirun=5.output
similarity index 100%
rename from tests/matrix_free/multigrid_dg_periodic.with_lapack=true.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=5.output
rename to tests/matrix_free/multigrid_dg_periodic.with_lapack=true.with_trilinos=true.with_p4est=true.mpirun=5.output

diff --git a/tests/matrix_free/multigrid_dg_sip_01.with_lapack=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/multigrid_dg_sip_01.with_lapack=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/multigrid_dg_sip_01.with_lapack=true.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/multigrid_dg_sip_01.with_lapack=true.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/multigrid_dg_sip_01.with_lapack=true.with_mpi=true.with_p4est=true.mpirun=5.output b/tests/matrix_free/multigrid_dg_sip_01.with_lapack=true.with_p4est=true.mpirun=5.output
similarity index 100%
rename from tests/matrix_free/multigrid_dg_sip_01.with_lapack=true.with_mpi=true.with_p4est=true.mpirun=5.output
rename to tests/matrix_free/multigrid_dg_sip_01.with_lapack=true.with_p4est=true.mpirun=5.output

diff --git a/tests/matrix_free/multigrid_dg_sip_02.with_lapack=true.with_mpi=true.with_p4est=true.mpirun=5.output b/tests/matrix_free/multigrid_dg_sip_02.with_lapack=true.with_p4est=true.mpirun=5.output
similarity index 100%
rename from tests/matrix_free/multigrid_dg_sip_02.with_lapack=true.with_mpi=true.with_p4est=true.mpirun=5.output
rename to tests/matrix_free/multigrid_dg_sip_02.with_lapack=true.with_p4est=true.mpirun=5.output

diff --git a/tests/matrix_free/parallel_multigrid.with_mpi=true.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid.with_mpi=true.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=3.output
rename to tests/matrix_free/parallel_multigrid.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=3.output

diff --git a/tests/matrix_free/parallel_multigrid.with_mpi=true.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=7.output b/tests/matrix_free/parallel_multigrid.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=7.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid.with_mpi=true.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=7.output
rename to tests/matrix_free/parallel_multigrid.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=7.output

diff --git a/tests/matrix_free/parallel_multigrid_02.with_mpi=true.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid_02.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_02.with_mpi=true.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=3.output
rename to tests/matrix_free/parallel_multigrid_02.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=3.output

diff --git a/tests/matrix_free/parallel_multigrid_02.with_mpi=true.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=7.output b/tests/matrix_free/parallel_multigrid_02.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=7.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_02.with_mpi=true.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=7.output
rename to tests/matrix_free/parallel_multigrid_02.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=7.output

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_01.with_mpi=true.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid_adaptive_01.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_adaptive_01.with_mpi=true.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=3.output
rename to tests/matrix_free/parallel_multigrid_adaptive_01.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=3.output

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_01.with_mpi=true.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=7.output b/tests/matrix_free/parallel_multigrid_adaptive_01.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=7.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_adaptive_01.with_mpi=true.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=7.output
rename to tests/matrix_free/parallel_multigrid_adaptive_01.with_p4est=true.with_trilinos=true.with_lapack=true.mpirun=7.output

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_02.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid_adaptive_02.with_p4est=true.with_lapack=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_adaptive_02.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=3.output
rename to tests/matrix_free/parallel_multigrid_adaptive_02.with_p4est=true.with_lapack=true.mpirun=3.output

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_02.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=7.output b/tests/matrix_free/parallel_multigrid_adaptive_02.with_p4est=true.with_lapack=true.mpirun=7.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_adaptive_02.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=7.output
rename to tests/matrix_free/parallel_multigrid_adaptive_02.with_p4est=true.with_lapack=true.mpirun=7.output

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=4.output b/tests/matrix_free/parallel_multigrid_adaptive_03.with_p4est=true.with_lapack=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_adaptive_03.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=4.output
rename to tests/matrix_free/parallel_multigrid_adaptive_03.with_p4est=true.with_lapack=true.mpirun=4.output

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_04.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid_adaptive_04.with_p4est=true.with_lapack=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_adaptive_04.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=3.output
rename to tests/matrix_free/parallel_multigrid_adaptive_04.with_p4est=true.with_lapack=true.mpirun=3.output

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_05.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=4.output b/tests/matrix_free/parallel_multigrid_adaptive_05.with_p4est=true.with_lapack=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_adaptive_05.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=4.output
rename to tests/matrix_free/parallel_multigrid_adaptive_05.with_p4est=true.with_lapack=true.mpirun=4.output

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid_adaptive_06.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_adaptive_06.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/parallel_multigrid_adaptive_06.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06ref.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid_adaptive_06ref.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_adaptive_06ref.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/parallel_multigrid_adaptive_06ref.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_07.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid_adaptive_07.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_adaptive_07.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/parallel_multigrid_adaptive_07.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_08.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid_adaptive_08.with_p4est=true.with_lapack=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_adaptive_08.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=3.output
rename to tests/matrix_free/parallel_multigrid_adaptive_08.with_p4est=true.with_lapack=true.mpirun=3.output

diff --git a/tests/matrix_free/parallel_multigrid_fullydistributed.with_lapack=true.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid_fullydistributed.with_lapack=true.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_fullydistributed.with_lapack=true.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/parallel_multigrid_fullydistributed.with_lapack=true.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/parallel_multigrid_mf.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=7.output b/tests/matrix_free/parallel_multigrid_mf.with_p4est=true.with_lapack=true.mpirun=7.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_mf.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=7.output
rename to tests/matrix_free/parallel_multigrid_mf.with_p4est=true.with_lapack=true.mpirun=7.output

diff --git a/tests/matrix_free/parallel_multigrid_mf_02.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid_mf_02.with_p4est=true.with_lapack=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/parallel_multigrid_mf_02.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=3.output
rename to tests/matrix_free/parallel_multigrid_mf_02.with_p4est=true.with_lapack=true.mpirun=3.output

diff --git a/tests/matrix_free/partitioner_01.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/matrix_free/partitioner_01.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/matrix_free/partitioner_01.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/matrix_free/partitioner_01.with_p4est=true.mpirun=2.output

diff --git a/tests/matrix_free/pre_and_post_loops_01.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/pre_and_post_loops_01.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/pre_and_post_loops_01.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/pre_and_post_loops_01.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/pre_and_post_loops_01.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/pre_and_post_loops_01.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/pre_and_post_loops_01.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/pre_and_post_loops_01.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/pre_and_post_loops_02.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/pre_and_post_loops_02.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/pre_and_post_loops_02.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/pre_and_post_loops_02.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/pre_and_post_loops_03.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/pre_and_post_loops_03.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/pre_and_post_loops_03.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/pre_and_post_loops_03.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/pre_and_post_loops_04.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/matrix_free/pre_and_post_loops_04.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/matrix_free/pre_and_post_loops_04.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/matrix_free/pre_and_post_loops_04.with_p4est=true.mpirun=2.output

diff --git a/tests/matrix_free/pre_and_post_loops_05.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/matrix_free/pre_and_post_loops_05.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/matrix_free/pre_and_post_loops_05.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/matrix_free/pre_and_post_loops_05.with_p4est=true.mpirun=2.output

diff --git a/tests/matrix_free/pre_and_post_loops_06.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/matrix_free/pre_and_post_loops_06.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/pre_and_post_loops_06.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/matrix_free/pre_and_post_loops_06.with_p4est=true.mpirun=1.output

diff --git a/tests/matrix_free/pre_and_post_loops_06.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/matrix_free/pre_and_post_loops_06.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/matrix_free/pre_and_post_loops_06.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/matrix_free/pre_and_post_loops_06.with_p4est=true.mpirun=3.output

diff --git a/tests/matrix_free/read_cell_data_02.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/matrix_free/read_cell_data_02.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/matrix_free/read_cell_data_02.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/matrix_free/read_cell_data_02.with_p4est=true.mpirun=2.output

diff --git a/tests/matrix_free/step-37-inhomogeneous-1.with_lapack=true.with_mpi=true.mpirun=4.with_p4est=true.output b/tests/matrix_free/step-37-inhomogeneous-1.with_lapack=true.mpirun=4.with_p4est=true.output
similarity index 100%
rename from tests/matrix_free/step-37-inhomogeneous-1.with_lapack=true.with_mpi=true.mpirun=4.with_p4est=true.output
rename to tests/matrix_free/step-37-inhomogeneous-1.with_lapack=true.mpirun=4.with_p4est=true.output

diff --git a/tests/matrix_free/step-48.with_mpi=true.mpirun=1.output b/tests/matrix_free/step-48.mpirun=1.output
similarity index 100%
rename from tests/matrix_free/step-48.with_mpi=true.mpirun=1.output
rename to tests/matrix_free/step-48.mpirun=1.output

diff --git a/tests/matrix_free/step-48.with_mpi=true.with_p4est=true.mpirun=10.output b/tests/matrix_free/step-48.with_p4est=true.mpirun=10.output
similarity index 100%
rename from tests/matrix_free/step-48.with_mpi=true.with_p4est=true.mpirun=10.output
rename to tests/matrix_free/step-48.with_p4est=true.mpirun=10.output

diff --git a/tests/matrix_free/step-48.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/step-48.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/step-48.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/step-48.with_p4est=true.mpirun=4.output

diff --git a/tests/matrix_free/step-48c.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/step-48c.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/step-48c.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/step-48c.with_p4est=true.mpirun=4.output

diff --git a/tests/matrix_free/stokes_computation.with_lapack=true.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/stokes_computation.with_lapack=true.with_p4est=true.mpirun=4.output
similarity index 100%
rename from tests/matrix_free/stokes_computation.with_lapack=true.with_mpi=true.with_p4est=true.mpirun=4.output
rename to tests/matrix_free/stokes_computation.with_lapack=true.with_p4est=true.mpirun=4.output

diff --git a/tests/mpi/hp_cell_weights_03.with_mpi=true.with_metis=true.mpirun=2.output b/tests/mpi/hp_cell_weights_03.with_metis=true.mpirun=2.output
similarity index 100%
rename from tests/mpi/hp_cell_weights_03.with_mpi=true.with_metis=true.mpirun=2.output
rename to tests/mpi/hp_cell_weights_03.with_metis=true.mpirun=2.output

diff --git a/tests/mpi/hp_cell_weights_03.with_mpi=true.with_metis=true.mpirun=2.output.1 b/tests/mpi/hp_cell_weights_03.with_metis=true.mpirun=2.output.1
similarity index 100%
rename from tests/mpi/hp_cell_weights_03.with_mpi=true.with_metis=true.mpirun=2.output.1
rename to tests/mpi/hp_cell_weights_03.with_metis=true.mpirun=2.output.1

diff --git a/tests/mpi/hp_cell_weights_04.with_mpi=true.with_metis=true.mpirun=2.output b/tests/mpi/hp_cell_weights_04.with_metis=true.mpirun=2.output
similarity index 100%
rename from tests/mpi/hp_cell_weights_04.with_mpi=true.with_metis=true.mpirun=2.output
rename to tests/mpi/hp_cell_weights_04.with_metis=true.mpirun=2.output

diff --git a/tests/mpi/hp_cell_weights_04.with_mpi=true.with_metis=true.mpirun=2.output.1 b/tests/mpi/hp_cell_weights_04.with_metis=true.mpirun=2.output.1
similarity index 100%
rename from tests/mpi/hp_cell_weights_04.with_mpi=true.with_metis=true.mpirun=2.output.1
rename to tests/mpi/hp_cell_weights_04.with_metis=true.mpirun=2.output.1

diff --git a/tests/mpi/hp_refinement_01.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output b/tests/mpi/hp_refinement_01.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output
similarity index 100%
rename from tests/mpi/hp_refinement_01.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output
rename to tests/mpi/hp_refinement_01.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output

diff --git a/tests/mpi/hp_refinement_02.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output b/tests/mpi/hp_refinement_02.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output
similarity index 100%
rename from tests/mpi/hp_refinement_02.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output
rename to tests/mpi/hp_refinement_02.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output

diff --git a/tests/mpi/solution_transfer_07.with_mpi=true.mpirun=2.output b/tests/mpi/solution_transfer_07.mpirun=2.output
similarity index 100%
rename from tests/mpi/solution_transfer_07.with_mpi=true.mpirun=2.output
rename to tests/mpi/solution_transfer_07.mpirun=2.output

diff --git a/tests/mpi/solution_transfer_08.with_mpi=true.mpirun=2.output b/tests/mpi/solution_transfer_08.mpirun=2.output
similarity index 100%
rename from tests/mpi/solution_transfer_08.with_mpi=true.mpirun=2.output
rename to tests/mpi/solution_transfer_08.mpirun=2.output

diff --git a/tests/mpi/solution_transfer_09.with_mpi=true.mpirun=2.output b/tests/mpi/solution_transfer_09.mpirun=2.output
similarity index 100%
rename from tests/mpi/solution_transfer_09.with_mpi=true.mpirun=2.output
rename to tests/mpi/solution_transfer_09.mpirun=2.output

diff --git a/tests/mpi/solution_transfer_10.with_mpi=true.mpirun=2.output b/tests/mpi/solution_transfer_10.mpirun=2.output
similarity index 100%
rename from tests/mpi/solution_transfer_10.with_mpi=true.mpirun=2.output
rename to tests/mpi/solution_transfer_10.mpirun=2.output

diff --git a/tests/multigrid/distribute_bug_01.with_mpi=true.with_p4est=true.mpirun=13.output b/tests/multigrid/distribute_bug_01.with_p4est=true.mpirun=13.output
similarity index 100%
rename from tests/multigrid/distribute_bug_01.with_mpi=true.with_p4est=true.mpirun=13.output
rename to tests/multigrid/distribute_bug_01.with_p4est=true.mpirun=13.output

diff --git a/tests/multigrid/distribute_bug_01.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/multigrid/distribute_bug_01.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/multigrid/distribute_bug_01.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/multigrid/distribute_bug_01.with_p4est=true.mpirun=2.output

diff --git a/tests/multigrid/distribute_bug_01.with_mpi=true.with_p4est=true.mpirun=20.output b/tests/multigrid/distribute_bug_01.with_p4est=true.mpirun=20.output
similarity index 100%
rename from tests/multigrid/distribute_bug_01.with_mpi=true.with_p4est=true.mpirun=20.output
rename to tests/multigrid/distribute_bug_01.with_p4est=true.mpirun=20.output

diff --git a/tests/multigrid/distribute_bug_01.with_mpi=true.with_p4est=true.mpirun=6.output b/tests/multigrid/distribute_bug_01.with_p4est=true.mpirun=6.output
similarity index 100%
rename from tests/multigrid/distribute_bug_01.with_mpi=true.with_p4est=true.mpirun=6.output
rename to tests/multigrid/distribute_bug_01.with_p4est=true.mpirun=6.output

diff --git a/tests/multigrid/dof_05.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/multigrid/dof_05.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/multigrid/dof_05.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/multigrid/dof_05.with_p4est=true.mpirun=3.output

diff --git a/tests/multigrid/events_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output b/tests/multigrid/events_01.with_p4est=true.with_trilinos=true.mpirun=1.output
similarity index 100%
rename from tests/multigrid/events_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output
rename to tests/multigrid/events_01.with_p4est=true.with_trilinos=true.mpirun=1.output

diff --git a/tests/multigrid/interface_matrix_entry_01.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/multigrid/interface_matrix_entry_01.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/multigrid/interface_matrix_entry_01.with_mpi=true.with_p4est=true.mpirun=1.output
rename to tests/multigrid/interface_matrix_entry_01.with_p4est=true.mpirun=1.output

diff --git a/tests/multigrid/max_level_for_coarse_mesh.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/multigrid/max_level_for_coarse_mesh.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/multigrid/max_level_for_coarse_mesh.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/multigrid/max_level_for_coarse_mesh.with_p4est=true.mpirun=3.output

diff --git a/tests/multigrid/mg_coarse_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output b/tests/multigrid/mg_coarse_01.with_p4est=true.with_trilinos=true.mpirun=1.output
similarity index 100%
rename from tests/multigrid/mg_coarse_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output
rename to tests/multigrid/mg_coarse_01.with_p4est=true.with_trilinos=true.mpirun=1.output

diff --git a/tests/multigrid/mg_coarse_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=3.output b/tests/multigrid/mg_coarse_01.with_p4est=true.with_trilinos=true.mpirun=3.output
similarity index 100%
rename from tests/multigrid/mg_coarse_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=3.output
rename to tests/multigrid/mg_coarse_01.with_p4est=true.with_trilinos=true.mpirun=3.output

diff --git a/tests/multigrid/step-16-50-mpi-linear-operator.with_mpi=true.with_trilinos=true.with_p4est=true.mpirun=3.output b/tests/multigrid/step-16-50-mpi-linear-operator.with_trilinos=true.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/multigrid/step-16-50-mpi-linear-operator.with_mpi=true.with_trilinos=true.with_p4est=true.mpirun=3.output
rename to tests/multigrid/step-16-50-mpi-linear-operator.with_trilinos=true.with_p4est=true.mpirun=3.output

diff --git a/tests/multigrid/step-16-50-mpi-smoother.with_mpi=true.with_trilinos=true.with_p4est=true.mpirun=3.output b/tests/multigrid/step-16-50-mpi-smoother.with_trilinos=true.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/multigrid/step-16-50-mpi-smoother.with_mpi=true.with_trilinos=true.with_p4est=true.mpirun=3.output
rename to tests/multigrid/step-16-50-mpi-smoother.with_trilinos=true.with_p4est=true.mpirun=3.output

diff --git a/tests/multigrid/step-16-50-mpi.with_mpi=true.with_trilinos=true.with_p4est=true.mpirun=1.output b/tests/multigrid/step-16-50-mpi.with_trilinos=true.with_p4est=true.mpirun=1.output
similarity index 100%
rename from tests/multigrid/step-16-50-mpi.with_mpi=true.with_trilinos=true.with_p4est=true.mpirun=1.output
rename to tests/multigrid/step-16-50-mpi.with_trilinos=true.with_p4est=true.mpirun=1.output

diff --git a/tests/multigrid/step-16-50-mpi.with_mpi=true.with_trilinos=true.with_p4est=true.mpirun=3.output b/tests/multigrid/step-16-50-mpi.with_trilinos=true.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/multigrid/step-16-50-mpi.with_mpi=true.with_trilinos=true.with_p4est=true.mpirun=3.output
rename to tests/multigrid/step-16-50-mpi.with_trilinos=true.with_p4est=true.mpirun=3.output

diff --git a/tests/multigrid/step-16-50-mpi.with_mpi=true.with_trilinos=true.with_p4est=true.mpirun=7.output b/tests/multigrid/step-16-50-mpi.with_trilinos=true.with_p4est=true.mpirun=7.output
similarity index 100%
rename from tests/multigrid/step-16-50-mpi.with_mpi=true.with_trilinos=true.with_p4est=true.mpirun=7.output
rename to tests/multigrid/step-16-50-mpi.with_trilinos=true.with_p4est=true.mpirun=7.output

diff --git a/tests/multigrid/step-50_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output b/tests/multigrid/step-50_01.with_p4est=true.with_trilinos=true.mpirun=1.output
similarity index 100%
rename from tests/multigrid/step-50_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output
rename to tests/multigrid/step-50_01.with_p4est=true.with_trilinos=true.mpirun=1.output

diff --git a/tests/multigrid/step-50_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output b/tests/multigrid/step-50_01.with_p4est=true.with_trilinos=true.mpirun=5.output
similarity index 100%
rename from tests/multigrid/step-50_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output
rename to tests/multigrid/step-50_01.with_p4est=true.with_trilinos=true.mpirun=5.output

diff --git a/tests/multigrid/step-50_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=8.output b/tests/multigrid/step-50_01.with_p4est=true.with_trilinos=true.mpirun=8.output
similarity index 100%
rename from tests/multigrid/step-50_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=8.output
rename to tests/multigrid/step-50_01.with_p4est=true.with_trilinos=true.mpirun=8.output

diff --git a/tests/multigrid/step-50_02.with_mpi=true.with_trilinos=true.mpirun=3.output b/tests/multigrid/step-50_02.with_trilinos=true.mpirun=3.output
similarity index 100%
rename from tests/multigrid/step-50_02.with_mpi=true.with_trilinos=true.mpirun=3.output
rename to tests/multigrid/step-50_02.with_trilinos=true.mpirun=3.output

diff --git a/tests/multigrid/transfer_05.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/multigrid/transfer_05.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/multigrid/transfer_05.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/multigrid/transfer_05.with_p4est=true.mpirun=3.output

diff --git a/tests/multigrid/transfer_06.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/multigrid/transfer_06.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/multigrid/transfer_06.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/multigrid/transfer_06.with_p4est=true.mpirun=3.output

diff --git a/tests/multigrid/transfer_matrix_free_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output b/tests/multigrid/transfer_matrix_free_01.with_p4est=true.with_trilinos=true.mpirun=1.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output
rename to tests/multigrid/transfer_matrix_free_01.with_p4est=true.with_trilinos=true.mpirun=1.output

diff --git a/tests/multigrid/transfer_matrix_free_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=4.output b/tests/multigrid/transfer_matrix_free_01.with_p4est=true.with_trilinos=true.mpirun=4.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=4.output
rename to tests/multigrid/transfer_matrix_free_01.with_p4est=true.with_trilinos=true.mpirun=4.output

diff --git a/tests/multigrid/transfer_matrix_free_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=7.output b/tests/multigrid/transfer_matrix_free_01.with_p4est=true.with_trilinos=true.mpirun=7.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_01.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=7.output
rename to tests/multigrid/transfer_matrix_free_01.with_p4est=true.with_trilinos=true.mpirun=7.output

diff --git a/tests/multigrid/transfer_matrix_free_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output b/tests/multigrid/transfer_matrix_free_02.with_p4est=true.with_trilinos=true.mpirun=1.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output
rename to tests/multigrid/transfer_matrix_free_02.with_p4est=true.with_trilinos=true.mpirun=1.output

diff --git a/tests/multigrid/transfer_matrix_free_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output b/tests/multigrid/transfer_matrix_free_02.with_p4est=true.with_trilinos=true.mpirun=5.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output
rename to tests/multigrid/transfer_matrix_free_02.with_p4est=true.with_trilinos=true.mpirun=5.output

diff --git a/tests/multigrid/transfer_matrix_free_02_block.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output b/tests/multigrid/transfer_matrix_free_02_block.with_p4est=true.with_trilinos=true.mpirun=5.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_02_block.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output
rename to tests/multigrid/transfer_matrix_free_02_block.with_p4est=true.with_trilinos=true.mpirun=5.output

diff --git a/tests/multigrid/transfer_matrix_free_02_block_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output b/tests/multigrid/transfer_matrix_free_02_block_02.with_p4est=true.with_trilinos=true.mpirun=5.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_02_block_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output
rename to tests/multigrid/transfer_matrix_free_02_block_02.with_p4est=true.with_trilinos=true.mpirun=5.output

diff --git a/tests/multigrid/transfer_matrix_free_03.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output b/tests/multigrid/transfer_matrix_free_03.with_p4est=true.with_trilinos=true.mpirun=5.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_03.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output
rename to tests/multigrid/transfer_matrix_free_03.with_p4est=true.with_trilinos=true.mpirun=5.output

diff --git a/tests/multigrid/transfer_matrix_free_04.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output b/tests/multigrid/transfer_matrix_free_04.with_p4est=true.with_trilinos=true.mpirun=1.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_04.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output
rename to tests/multigrid/transfer_matrix_free_04.with_p4est=true.with_trilinos=true.mpirun=1.output

diff --git a/tests/multigrid/transfer_matrix_free_04.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=4.output b/tests/multigrid/transfer_matrix_free_04.with_p4est=true.with_trilinos=true.mpirun=4.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_04.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=4.output
rename to tests/multigrid/transfer_matrix_free_04.with_p4est=true.with_trilinos=true.mpirun=4.output

diff --git a/tests/multigrid/transfer_matrix_free_04.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=7.output b/tests/multigrid/transfer_matrix_free_04.with_p4est=true.with_trilinos=true.mpirun=7.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_04.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=7.output
rename to tests/multigrid/transfer_matrix_free_04.with_p4est=true.with_trilinos=true.mpirun=7.output

diff --git a/tests/multigrid/transfer_matrix_free_05.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output b/tests/multigrid/transfer_matrix_free_05.with_p4est=true.with_trilinos=true.mpirun=1.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_05.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=1.output
rename to tests/multigrid/transfer_matrix_free_05.with_p4est=true.with_trilinos=true.mpirun=1.output

diff --git a/tests/multigrid/transfer_matrix_free_05.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output b/tests/multigrid/transfer_matrix_free_05.with_p4est=true.with_trilinos=true.mpirun=5.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_05.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output
rename to tests/multigrid/transfer_matrix_free_05.with_p4est=true.with_trilinos=true.mpirun=5.output

diff --git a/tests/multigrid/transfer_matrix_free_06.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=10.output b/tests/multigrid/transfer_matrix_free_06.with_p4est=true.with_trilinos=true.mpirun=10.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_06.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=10.output
rename to tests/multigrid/transfer_matrix_free_06.with_p4est=true.with_trilinos=true.mpirun=10.output

diff --git a/tests/multigrid/transfer_matrix_free_06.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output b/tests/multigrid/transfer_matrix_free_06.with_p4est=true.with_trilinos=true.mpirun=5.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_06.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output
rename to tests/multigrid/transfer_matrix_free_06.with_p4est=true.with_trilinos=true.mpirun=5.output

diff --git a/tests/multigrid/transfer_matrix_free_07.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output b/tests/multigrid/transfer_matrix_free_07.with_p4est=true.with_trilinos=true.mpirun=5.output
similarity index 100%
rename from tests/multigrid/transfer_matrix_free_07.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=5.output
rename to tests/multigrid/transfer_matrix_free_07.with_p4est=true.with_trilinos=true.mpirun=5.output

diff --git a/tests/multigrid/workload_imbalance.with_mpi=true.with_p4est=true.mpirun=3.output b/tests/multigrid/workload_imbalance.with_p4est=true.mpirun=3.output
similarity index 100%
rename from tests/multigrid/workload_imbalance.with_mpi=true.with_p4est=true.mpirun=3.output
rename to tests/multigrid/workload_imbalance.with_p4est=true.mpirun=3.output

diff --git a/tests/numerics/subtract_mean_value_02.with_mpi=true.mpirun=2.output b/tests/numerics/subtract_mean_value_02.mpirun=2.output
similarity index 100%
rename from tests/numerics/subtract_mean_value_02.with_mpi=true.mpirun=2.output
rename to tests/numerics/subtract_mean_value_02.mpirun=2.output

diff --git a/tests/petsc/copy_parallel_vector.with_mpi=true.mpirun=4.output b/tests/petsc/copy_parallel_vector.mpirun=4.output
similarity index 100%
rename from tests/petsc/copy_parallel_vector.with_mpi=true.mpirun=4.output
rename to tests/petsc/copy_parallel_vector.mpirun=4.output

diff --git a/tests/petsc/copy_to_dealvec_block.with_mpi=true.mpirun=4.output b/tests/petsc/copy_to_dealvec_block.mpirun=4.output
similarity index 100%
rename from tests/petsc/copy_to_dealvec_block.with_mpi=true.mpirun=4.output
rename to tests/petsc/copy_to_dealvec_block.mpirun=4.output

diff --git a/tests/petsc/reinit_preconditioner_01.with_petsc_with_hypre=true.with_64bit_indices=off.with_mpi=true.mpirun=3.output b/tests/petsc/reinit_preconditioner_01.with_petsc_with_hypre=true.with_64bit_indices=off.mpirun=3.output
similarity index 100%
rename from tests/petsc/reinit_preconditioner_01.with_petsc_with_hypre=true.with_64bit_indices=off.with_mpi=true.mpirun=3.output
rename to tests/petsc/reinit_preconditioner_01.with_petsc_with_hypre=true.with_64bit_indices=off.mpirun=3.output

diff --git a/tests/petsc/subtract_mean_value_03.with_petsc=true.with_mpi=true.mpirun=2.output b/tests/petsc/subtract_mean_value_03.with_petsc=true.mpirun=2.output
similarity index 100%
rename from tests/petsc/subtract_mean_value_03.with_petsc=true.with_mpi=true.mpirun=2.output
rename to tests/petsc/subtract_mean_value_03.with_petsc=true.mpirun=2.output

diff --git a/tests/petsc_complex/assemble_01.with_mpi=true.mpirun=1.output b/tests/petsc_complex/assemble_01.mpirun=1.output
similarity index 100%
rename from tests/petsc_complex/assemble_01.with_mpi=true.mpirun=1.output
rename to tests/petsc_complex/assemble_01.mpirun=1.output

diff --git a/tests/sacado/helper_scalar_coupled_3_components_01_1.with_mpi=true.mpirun=1.output b/tests/sacado/helper_scalar_coupled_3_components_01_1.mpirun=1.output
similarity index 100%
rename from tests/sacado/helper_scalar_coupled_3_components_01_1.with_mpi=true.mpirun=1.output
rename to tests/sacado/helper_scalar_coupled_3_components_01_1.mpirun=1.output

diff --git a/tests/sacado/helper_scalar_coupled_3_components_01_1.with_mpi=true.mpirun=2.output b/tests/sacado/helper_scalar_coupled_3_components_01_1.mpirun=2.output
similarity index 100%
rename from tests/sacado/helper_scalar_coupled_3_components_01_1.with_mpi=true.mpirun=2.output
rename to tests/sacado/helper_scalar_coupled_3_components_01_1.mpirun=2.output

diff --git a/tests/sacado/helper_scalar_coupled_3_components_01_2.with_mpi=true.mpirun=1.output b/tests/sacado/helper_scalar_coupled_3_components_01_2.mpirun=1.output
similarity index 100%
rename from tests/sacado/helper_scalar_coupled_3_components_01_2.with_mpi=true.mpirun=1.output
rename to tests/sacado/helper_scalar_coupled_3_components_01_2.mpirun=1.output

diff --git a/tests/sacado/helper_scalar_coupled_3_components_01_2.with_mpi=true.mpirun=2.output b/tests/sacado/helper_scalar_coupled_3_components_01_2.mpirun=2.output
similarity index 100%
rename from tests/sacado/helper_scalar_coupled_3_components_01_2.with_mpi=true.mpirun=2.output
rename to tests/sacado/helper_scalar_coupled_3_components_01_2.mpirun=2.output

diff --git a/tests/sacado/helper_scalar_coupled_3_components_01_3.with_mpi=true.mpirun=2.output b/tests/sacado/helper_scalar_coupled_3_components_01_3.mpirun=2.output
similarity index 100%
rename from tests/sacado/helper_scalar_coupled_3_components_01_3.with_mpi=true.mpirun=2.output
rename to tests/sacado/helper_scalar_coupled_3_components_01_3.mpirun=2.output

diff --git a/tests/sacado/helper_scalar_coupled_3_components_01_4.with_mpi=true.mpirun=1.output b/tests/sacado/helper_scalar_coupled_3_components_01_4.mpirun=1.output
similarity index 100%
rename from tests/sacado/helper_scalar_coupled_3_components_01_4.with_mpi=true.mpirun=1.output
rename to tests/sacado/helper_scalar_coupled_3_components_01_4.mpirun=1.output

diff --git a/tests/sacado/helper_scalar_coupled_3_components_01_4.with_mpi=true.mpirun=2.output b/tests/sacado/helper_scalar_coupled_3_components_01_4.mpirun=2.output
similarity index 100%
rename from tests/sacado/helper_scalar_coupled_3_components_01_4.with_mpi=true.mpirun=2.output
rename to tests/sacado/helper_scalar_coupled_3_components_01_4.mpirun=2.output

diff --git a/tests/sharedtria/cell_data_transfer_01.with_mpi=true.with_petsc=true.mpirun=1.output b/tests/sharedtria/cell_data_transfer_01.with_petsc=true.mpirun=1.output
similarity index 100%
rename from tests/sharedtria/cell_data_transfer_01.with_mpi=true.with_petsc=true.mpirun=1.output
rename to tests/sharedtria/cell_data_transfer_01.with_petsc=true.mpirun=1.output

diff --git a/tests/sharedtria/cell_data_transfer_01.with_mpi=true.with_petsc=true.mpirun=2.output b/tests/sharedtria/cell_data_transfer_01.with_petsc=true.mpirun=2.output
similarity index 100%
rename from tests/sharedtria/cell_data_transfer_01.with_mpi=true.with_petsc=true.mpirun=2.output
rename to tests/sharedtria/cell_data_transfer_01.with_petsc=true.mpirun=2.output

diff --git a/tests/sharedtria/cell_data_transfer_02.with_mpi=true.with_petsc=true.mpirun=1.output b/tests/sharedtria/cell_data_transfer_02.with_petsc=true.mpirun=1.output
similarity index 100%
rename from tests/sharedtria/cell_data_transfer_02.with_mpi=true.with_petsc=true.mpirun=1.output
rename to tests/sharedtria/cell_data_transfer_02.with_petsc=true.mpirun=1.output

diff --git a/tests/sharedtria/cell_data_transfer_02.with_mpi=true.with_petsc=true.mpirun=2.output b/tests/sharedtria/cell_data_transfer_02.with_petsc=true.mpirun=2.output
similarity index 100%
rename from tests/sharedtria/cell_data_transfer_02.with_mpi=true.with_petsc=true.mpirun=2.output
rename to tests/sharedtria/cell_data_transfer_02.with_petsc=true.mpirun=2.output

diff --git a/tests/sharedtria/hp_choose_p_over_h.with_mpi=true.mpirun=2.output b/tests/sharedtria/hp_choose_p_over_h.mpirun=2.output
similarity index 100%
rename from tests/sharedtria/hp_choose_p_over_h.with_mpi=true.mpirun=2.output
rename to tests/sharedtria/hp_choose_p_over_h.mpirun=2.output

diff --git a/tests/sharedtria/limit_p_level_difference_01.with_mpi=true.mpirun=1.output b/tests/sharedtria/limit_p_level_difference_01.mpirun=1.output
similarity index 100%
rename from tests/sharedtria/limit_p_level_difference_01.with_mpi=true.mpirun=1.output
rename to tests/sharedtria/limit_p_level_difference_01.mpirun=1.output

diff --git a/tests/sharedtria/limit_p_level_difference_01.with_mpi=true.mpirun=4.output b/tests/sharedtria/limit_p_level_difference_01.mpirun=4.output
similarity index 100%
rename from tests/sharedtria/limit_p_level_difference_01.with_mpi=true.mpirun=4.output
rename to tests/sharedtria/limit_p_level_difference_01.mpirun=4.output

diff --git a/tests/sharedtria/limit_p_level_difference_02.with_mpi=true.mpirun=1.output b/tests/sharedtria/limit_p_level_difference_02.mpirun=1.output
similarity index 100%
rename from tests/sharedtria/limit_p_level_difference_02.with_mpi=true.mpirun=1.output
rename to tests/sharedtria/limit_p_level_difference_02.mpirun=1.output

diff --git a/tests/sharedtria/limit_p_level_difference_02.with_mpi=true.mpirun=4.output b/tests/sharedtria/limit_p_level_difference_02.mpirun=4.output
similarity index 100%
rename from tests/sharedtria/limit_p_level_difference_02.with_mpi=true.mpirun=4.output
rename to tests/sharedtria/limit_p_level_difference_02.mpirun=4.output

diff --git a/tests/sharedtria/limit_p_level_difference_03.with_mpi=true.mpirun=1.output b/tests/sharedtria/limit_p_level_difference_03.mpirun=1.output
similarity index 100%
rename from tests/sharedtria/limit_p_level_difference_03.with_mpi=true.mpirun=1.output
rename to tests/sharedtria/limit_p_level_difference_03.mpirun=1.output

diff --git a/tests/sharedtria/limit_p_level_difference_03.with_mpi=true.mpirun=4.output b/tests/sharedtria/limit_p_level_difference_03.mpirun=4.output
similarity index 100%
rename from tests/sharedtria/limit_p_level_difference_03.with_mpi=true.mpirun=4.output
rename to tests/sharedtria/limit_p_level_difference_03.mpirun=4.output

diff --git a/tests/sharedtria/limit_p_level_difference_04.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output b/tests/sharedtria/limit_p_level_difference_04.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output
similarity index 100%
rename from tests/sharedtria/limit_p_level_difference_04.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output
rename to tests/sharedtria/limit_p_level_difference_04.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output

diff --git a/tests/sharedtria/limit_p_level_difference_04.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output b/tests/sharedtria/limit_p_level_difference_04.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output
similarity index 100%
rename from tests/sharedtria/limit_p_level_difference_04.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output
rename to tests/sharedtria/limit_p_level_difference_04.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output

diff --git a/tests/slepc/step-36_parallel.with_mpi=true.with_petsc_with_hypre=true.with_slepc=true.mpirun=3.output b/tests/slepc/step-36_parallel.with_petsc_with_hypre=true.with_slepc=true.mpirun=3.output
similarity index 100%
rename from tests/slepc/step-36_parallel.with_mpi=true.with_petsc_with_hypre=true.with_slepc=true.mpirun=3.output
rename to tests/slepc/step-36_parallel.with_petsc_with_hypre=true.with_slepc=true.mpirun=3.output

diff --git a/tests/slepc/step-36_parallel_02.with_mpi=true.with_petsc_with_hypre=true.with_petsc_with_mumps=true.with_slepc=true.mpirun=3.output b/tests/slepc/step-36_parallel_02.with_petsc_with_hypre=true.with_petsc_with_mumps=true.with_slepc=true.mpirun=3.output
similarity index 100%
rename from tests/slepc/step-36_parallel_02.with_mpi=true.with_petsc_with_hypre=true.with_petsc_with_mumps=true.with_slepc=true.mpirun=3.output
rename to tests/slepc/step-36_parallel_02.with_petsc_with_hypre=true.with_petsc_with_mumps=true.with_slepc=true.mpirun=3.output

diff --git a/tests/slepc/step-36_parallel_03.with_mpi=true.with_petsc_with_hypre=true.with_slepc=true.mpirun=3.output b/tests/slepc/step-36_parallel_03.with_petsc_with_hypre=true.with_slepc=true.mpirun=3.output
similarity index 100%
rename from tests/slepc/step-36_parallel_03.with_mpi=true.with_petsc_with_hypre=true.with_slepc=true.mpirun=3.output
rename to tests/slepc/step-36_parallel_03.with_petsc_with_hypre=true.with_slepc=true.mpirun=3.output

diff --git a/tests/sundials/n_vector.with_sundials.geq.5.0.0.with_mpi=true.mpirun=2.with_trilinos=true.with_petsc=true.output b/tests/sundials/n_vector.with_sundials.geq.5.0.0.mpirun=2.with_trilinos=true.with_petsc=true.output
similarity index 100%
rename from tests/sundials/n_vector.with_sundials.geq.5.0.0.with_mpi=true.mpirun=2.with_trilinos=true.with_petsc=true.output
rename to tests/sundials/n_vector.with_sundials.geq.5.0.0.mpirun=2.with_trilinos=true.with_petsc=true.output

diff --git a/tests/trilinos/add_matrices_01.with_mpi=true.mpirun=3.output b/tests/trilinos/add_matrices_01.mpirun=3.output
similarity index 100%
rename from tests/trilinos/add_matrices_01.with_mpi=true.mpirun=3.output
rename to tests/trilinos/add_matrices_01.mpirun=3.output

diff --git a/tests/trilinos/add_matrices_02.with_mpi=true.mpirun=3.output b/tests/trilinos/add_matrices_02.mpirun=3.output
similarity index 100%
rename from tests/trilinos/add_matrices_02.with_mpi=true.mpirun=3.output
rename to tests/trilinos/add_matrices_02.mpirun=3.output

diff --git a/tests/trilinos/add_matrices_03.with_mpi=true.mpirun=3.output b/tests/trilinos/add_matrices_03.mpirun=3.output
similarity index 100%
rename from tests/trilinos/add_matrices_03.with_mpi=true.mpirun=3.output
rename to tests/trilinos/add_matrices_03.mpirun=3.output

diff --git a/tests/trilinos/copy_to_dealvec_block.with_mpi=true.mpirun=4.output b/tests/trilinos/copy_to_dealvec_block.mpirun=4.output
similarity index 100%
rename from tests/trilinos/copy_to_dealvec_block.with_mpi=true.mpirun=4.output
rename to tests/trilinos/copy_to_dealvec_block.mpirun=4.output

diff --git a/tests/trilinos/direct_solver_3.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/trilinos/direct_solver_3.with_p4est=true.mpirun=2.output
similarity index 100%
rename from tests/trilinos/direct_solver_3.with_mpi=true.with_p4est=true.mpirun=2.output
rename to tests/trilinos/direct_solver_3.with_p4est=true.mpirun=2.output

diff --git a/tests/trilinos/n_nonzeros_02_parallel.with_p4est=true.mpirun=9.with_trilinos=true.with_mpi=true.output b/tests/trilinos/n_nonzeros_02_parallel.with_p4est=true.mpirun=9.with_trilinos=true.output
similarity index 100%
rename from tests/trilinos/n_nonzeros_02_parallel.with_p4est=true.mpirun=9.with_trilinos=true.with_mpi=true.output
rename to tests/trilinos/n_nonzeros_02_parallel.with_p4est=true.mpirun=9.with_trilinos=true.output

diff --git a/tests/trilinos/sparse_matrix_add_03.with_trilinos=true.with_mpi=true.mpirun=3.output b/tests/trilinos/sparse_matrix_add_03.with_trilinos=true.mpirun=3.output
similarity index 100%
rename from tests/trilinos/sparse_matrix_add_03.with_trilinos=true.with_mpi=true.mpirun=3.output
rename to tests/trilinos/sparse_matrix_add_03.with_trilinos=true.mpirun=3.output

diff --git a/tests/trilinos/sparse_matrix_copy_from_02.with_trilinos=true.with_mpi=true.mpirun=3.output b/tests/trilinos/sparse_matrix_copy_from_02.with_trilinos=true.mpirun=3.output
similarity index 100%
rename from tests/trilinos/sparse_matrix_copy_from_02.with_trilinos=true.with_mpi=true.mpirun=3.output
rename to tests/trilinos/sparse_matrix_copy_from_02.with_trilinos=true.mpirun=3.output

diff --git a/tests/trilinos/sparsity_pattern_06.with_trilinos=true.with_mpi=true.mpirun=3.output b/tests/trilinos/sparsity_pattern_06.with_trilinos=true.mpirun=3.output
similarity index 100%
rename from tests/trilinos/sparsity_pattern_06.with_trilinos=true.with_mpi=true.mpirun=3.output
rename to tests/trilinos/sparsity_pattern_06.with_trilinos=true.mpirun=3.output

diff --git a/tests/trilinos/subtract_mean_value_04.with_trilinos=true.with_mpi=true.mpirun=2.output b/tests/trilinos/subtract_mean_value_04.with_trilinos=true.mpirun=2.output
similarity index 100%
rename from tests/trilinos/subtract_mean_value_04.with_trilinos=true.with_mpi=true.mpirun=2.output
rename to tests/trilinos/subtract_mean_value_04.with_trilinos=true.mpirun=2.output