diff --git a/test_data/images/gallery_tests.test_plot_COP_1d.TestCOP1DPlot.test_plot_COP_1d.0.png b/test_data/images/gallery_tests.test_plot_COP_1d.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_COP_1d.TestCOP1DPlot.test_plot_COP_1d.0.png
rename to test_data/images/gallery_tests.test_plot_COP_1d.0.png
diff --git a/test_data/images/gallery_tests.test_plot_COP_maps.TestCOPMaps.test_plot_cop_maps.0.png b/test_data/images/gallery_tests.test_plot_COP_maps.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_COP_maps.TestCOPMaps.test_plot_cop_maps.0.png
rename to test_data/images/gallery_tests.test_plot_COP_maps.0.png
diff --git a/test_data/images/gallery_tests.test_plot_SOI_filtering.TestSOIFiltering.test_plot_soi_filtering.0.png b/test_data/images/gallery_tests.test_plot_SOI_filtering.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_SOI_filtering.TestSOIFiltering.test_plot_soi_filtering.0.png
rename to test_data/images/gallery_tests.test_plot_SOI_filtering.0.png
diff --git a/test_data/images/gallery_tests.test_plot_TEC.TestTEC.test_plot_TEC.0.png b/test_data/images/gallery_tests.test_plot_TEC.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_TEC.TestTEC.test_plot_TEC.0.png
rename to test_data/images/gallery_tests.test_plot_TEC.0.png
diff --git a/test_data/images/gallery_tests.test_plot_anomaly_log_colouring.TestAnomalyLogColouring.test_plot_anomaly_log_colouring.0.png b/test_data/images/gallery_tests.test_plot_anomaly_log_colouring.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_anomaly_log_colouring.TestAnomalyLogColouring.test_plot_anomaly_log_colouring.0.png
rename to test_data/images/gallery_tests.test_plot_anomaly_log_colouring.0.png
diff --git a/test_data/images/gallery_tests.test_plot_atlantic_profiles.TestAtlanticProfiles.test_plot_atlantic_profiles.0.png b/test_data/images/gallery_tests.test_plot_atlantic_profiles.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_atlantic_profiles.TestAtlanticProfiles.test_plot_atlantic_profiles.0.png
rename to test_data/images/gallery_tests.test_plot_atlantic_profiles.0.png
diff --git a/test_data/images/gallery_tests.test_plot_atlantic_profiles.TestAtlanticProfiles.test_plot_atlantic_profiles.1.png b/test_data/images/gallery_tests.test_plot_atlantic_profiles.1.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_atlantic_profiles.TestAtlanticProfiles.test_plot_atlantic_profiles.1.png
rename to test_data/images/gallery_tests.test_plot_atlantic_profiles.1.png
diff --git a/test_data/images/gallery_tests.test_plot_coriolis.TestCoriolisPlot.test_plot_coriolis.0.png b/test_data/images/gallery_tests.test_plot_coriolis.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_coriolis.TestCoriolisPlot.test_plot_coriolis.0.png
rename to test_data/images/gallery_tests.test_plot_coriolis.0.png
diff --git a/test_data/images/gallery_tests.test_plot_cross_section.TestCrossSection.test_plot_cross_section.0.png b/test_data/images/gallery_tests.test_plot_cross_section.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_cross_section.TestCrossSection.test_plot_cross_section.0.png
rename to test_data/images/gallery_tests.test_plot_cross_section.0.png
diff --git a/test_data/images/gallery_tests.test_plot_cross_section.TestCrossSection.test_plot_cross_section.1.png b/test_data/images/gallery_tests.test_plot_cross_section.1.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_cross_section.TestCrossSection.test_plot_cross_section.1.png
rename to test_data/images/gallery_tests.test_plot_cross_section.1.png
diff --git a/test_data/images/gallery_tests.test_plot_custom_aggregation.TestCustomAggregation.test_plot_custom_aggregation.0.png b/test_data/images/gallery_tests.test_plot_custom_aggregation.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_custom_aggregation.TestCustomAggregation.test_plot_custom_aggregation.0.png
rename to test_data/images/gallery_tests.test_plot_custom_aggregation.0.png
diff --git a/test_data/images/gallery_tests.test_plot_custom_file_loading.TestCustomFileLoading.test_plot_custom_file_loading.0.png b/test_data/images/gallery_tests.test_plot_custom_file_loading.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_custom_file_loading.TestCustomFileLoading.test_plot_custom_file_loading.0.png
rename to test_data/images/gallery_tests.test_plot_custom_file_loading.0.png
diff --git a/test_data/images/gallery_tests.test_plot_deriving_phenomena.TestDerivingPhenomena.test_plot_deriving_phenomena.0.png b/test_data/images/gallery_tests.test_plot_deriving_phenomena.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_deriving_phenomena.TestDerivingPhenomena.test_plot_deriving_phenomena.0.png
rename to test_data/images/gallery_tests.test_plot_deriving_phenomena.0.png
diff --git a/test_data/images/gallery_tests.test_plot_global_map.TestGlobalMap.test_plot_global_map.0.png b/test_data/images/gallery_tests.test_plot_global_map.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_global_map.TestGlobalMap.test_plot_global_map.0.png
rename to test_data/images/gallery_tests.test_plot_global_map.0.png
diff --git a/test_data/images/gallery_tests.test_plot_hovmoller.TestGlobalMap.test_plot_hovmoller.0.png b/test_data/images/gallery_tests.test_plot_hovmoller.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_hovmoller.TestGlobalMap.test_plot_hovmoller.0.png
rename to test_data/images/gallery_tests.test_plot_hovmoller.0.png
diff --git a/test_data/images/gallery_tests.test_plot_inset.TestInsetPlot.test_plot_inset.0.png b/test_data/images/gallery_tests.test_plot_inset.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_inset.TestInsetPlot.test_plot_inset.0.png
rename to test_data/images/gallery_tests.test_plot_inset.0.png
diff --git a/test_data/images/gallery_tests.test_plot_lagged_ensemble.TestLaggedEnsemble.test_plot_lagged_ensemble.0.png b/test_data/images/gallery_tests.test_plot_lagged_ensemble.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_lagged_ensemble.TestLaggedEnsemble.test_plot_lagged_ensemble.0.png
rename to test_data/images/gallery_tests.test_plot_lagged_ensemble.0.png
diff --git a/test_data/images/gallery_tests.test_plot_lagged_ensemble.TestLaggedEnsemble.test_plot_lagged_ensemble.1.png b/test_data/images/gallery_tests.test_plot_lagged_ensemble.1.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_lagged_ensemble.TestLaggedEnsemble.test_plot_lagged_ensemble.1.png
rename to test_data/images/gallery_tests.test_plot_lagged_ensemble.1.png
diff --git a/test_data/images/gallery_tests.test_plot_lineplot_with_legend.TestLineplotWithLegend.test_plot_lineplot_with_legend.0.png b/test_data/images/gallery_tests.test_plot_lineplot_with_legend.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_lineplot_with_legend.TestLineplotWithLegend.test_plot_lineplot_with_legend.0.png
rename to test_data/images/gallery_tests.test_plot_lineplot_with_legend.0.png
diff --git a/test_data/images/gallery_tests.test_plot_load_nemo.TestLoadNemo.test_plot_load_nemo.0.png b/test_data/images/gallery_tests.test_plot_load_nemo.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_load_nemo.TestLoadNemo.test_plot_load_nemo.0.png
rename to test_data/images/gallery_tests.test_plot_load_nemo.0.png
diff --git a/test_data/images/gallery_tests.test_plot_orca_projection.TestOrcaProjection.test_plot_orca_projection.0.png b/test_data/images/gallery_tests.test_plot_orca_projection.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_orca_projection.TestOrcaProjection.test_plot_orca_projection.0.png
rename to test_data/images/gallery_tests.test_plot_orca_projection.0.png
diff --git a/test_data/images/gallery_tests.test_plot_orca_projection.TestOrcaProjection.test_plot_orca_projection.1.png b/test_data/images/gallery_tests.test_plot_orca_projection.1.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_orca_projection.TestOrcaProjection.test_plot_orca_projection.1.png
rename to test_data/images/gallery_tests.test_plot_orca_projection.1.png
diff --git a/test_data/images/gallery_tests.test_plot_orca_projection.TestOrcaProjection.test_plot_orca_projection.2.png b/test_data/images/gallery_tests.test_plot_orca_projection.2.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_orca_projection.TestOrcaProjection.test_plot_orca_projection.2.png
rename to test_data/images/gallery_tests.test_plot_orca_projection.2.png
diff --git a/test_data/images/gallery_tests.test_plot_orca_projection.TestOrcaProjection.test_plot_orca_projection.3.png b/test_data/images/gallery_tests.test_plot_orca_projection.3.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_orca_projection.TestOrcaProjection.test_plot_orca_projection.3.png
rename to test_data/images/gallery_tests.test_plot_orca_projection.3.png
diff --git a/test_data/images/gallery_tests.test_plot_polar_stereo.TestPolarStereo.test_plot_polar_stereo.0.png b/test_data/images/gallery_tests.test_plot_polar_stereo.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_polar_stereo.TestPolarStereo.test_plot_polar_stereo.0.png
rename to test_data/images/gallery_tests.test_plot_polar_stereo.0.png
diff --git a/test_data/images/gallery_tests.test_plot_polynomial_fit.TestPolynomialFit.test_plot_polynomial_fit.0.png b/test_data/images/gallery_tests.test_plot_polynomial_fit.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_polynomial_fit.TestPolynomialFit.test_plot_polynomial_fit.0.png
rename to test_data/images/gallery_tests.test_plot_polynomial_fit.0.png
diff --git a/test_data/images/gallery_tests.test_plot_projections_and_annotations.TestProjectionsAndAnnotations.test_plot_projections_and_annotations.0.png b/test_data/images/gallery_tests.test_plot_projections_and_annotations.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_projections_and_annotations.TestProjectionsAndAnnotations.test_plot_projections_and_annotations.0.png
rename to test_data/images/gallery_tests.test_plot_projections_and_annotations.0.png
diff --git a/test_data/images/gallery_tests.test_plot_projections_and_annotations.TestProjectionsAndAnnotations.test_plot_projections_and_annotations.1.png b/test_data/images/gallery_tests.test_plot_projections_and_annotations.1.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_projections_and_annotations.TestProjectionsAndAnnotations.test_plot_projections_and_annotations.1.png
rename to test_data/images/gallery_tests.test_plot_projections_and_annotations.1.png
diff --git a/test_data/images/gallery_tests.test_plot_rotated_pole_mapping.TestRotatedPoleMapping.test_plot_rotated_pole_mapping.0.png b/test_data/images/gallery_tests.test_plot_rotated_pole_mapping.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_rotated_pole_mapping.TestRotatedPoleMapping.test_plot_rotated_pole_mapping.0.png
rename to test_data/images/gallery_tests.test_plot_rotated_pole_mapping.0.png
diff --git a/test_data/images/gallery_tests.test_plot_rotated_pole_mapping.TestRotatedPoleMapping.test_plot_rotated_pole_mapping.1.png b/test_data/images/gallery_tests.test_plot_rotated_pole_mapping.1.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_rotated_pole_mapping.TestRotatedPoleMapping.test_plot_rotated_pole_mapping.1.png
rename to test_data/images/gallery_tests.test_plot_rotated_pole_mapping.1.png
diff --git a/test_data/images/gallery_tests.test_plot_rotated_pole_mapping.TestRotatedPoleMapping.test_plot_rotated_pole_mapping.2.png b/test_data/images/gallery_tests.test_plot_rotated_pole_mapping.2.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_rotated_pole_mapping.TestRotatedPoleMapping.test_plot_rotated_pole_mapping.2.png
rename to test_data/images/gallery_tests.test_plot_rotated_pole_mapping.2.png
diff --git a/test_data/images/gallery_tests.test_plot_rotated_pole_mapping.TestRotatedPoleMapping.test_plot_rotated_pole_mapping.3.png b/test_data/images/gallery_tests.test_plot_rotated_pole_mapping.3.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_rotated_pole_mapping.TestRotatedPoleMapping.test_plot_rotated_pole_mapping.3.png
rename to test_data/images/gallery_tests.test_plot_rotated_pole_mapping.3.png
diff --git a/test_data/images/gallery_tests.test_plot_wind_barbs.TestWindBarbs.test_wind_barbs.0.png b/test_data/images/gallery_tests.test_plot_wind_barbs.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_wind_barbs.TestWindBarbs.test_wind_barbs.0.png
rename to test_data/images/gallery_tests.test_plot_wind_barbs.0.png
diff --git a/test_data/images/gallery_tests.test_plot_wind_speed.TestWindSpeed.test_plot_wind_speed.0.png b/test_data/images/gallery_tests.test_plot_wind_speed.0.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_wind_speed.TestWindSpeed.test_plot_wind_speed.0.png
rename to test_data/images/gallery_tests.test_plot_wind_speed.0.png
diff --git a/test_data/images/gallery_tests.test_plot_wind_speed.TestWindSpeed.test_plot_wind_speed.1.png b/test_data/images/gallery_tests.test_plot_wind_speed.1.png
similarity index 100%
rename from test_data/images/gallery_tests.test_plot_wind_speed.TestWindSpeed.test_plot_wind_speed.1.png
rename to test_data/images/gallery_tests.test_plot_wind_speed.1.png