diff --git a/tests/testdata/control_images/diagrams/expected_piediagram/expected_piediagram_mask.png b/tests/testdata/control_images/diagrams/expected_piediagram/expected_piediagram_mask.png
index b9858123b12..e6fcd5d3a66 100644
Binary files a/tests/testdata/control_images/diagrams/expected_piediagram/expected_piediagram_mask.png and b/tests/testdata/control_images/diagrams/expected_piediagram/expected_piediagram_mask.png differ
diff --git a/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_alwaysshow/expected_piediagram_datadefined_alwaysshow_mask.png b/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_alwaysshow/expected_piediagram_datadefined_alwaysshow_mask.png
index 069e8e3d455..87167f25e58 100644
Binary files a/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_alwaysshow/expected_piediagram_datadefined_alwaysshow_mask.png and b/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_alwaysshow/expected_piediagram_datadefined_alwaysshow_mask.png differ
diff --git a/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_outline/expected_piediagram_datadefined_outline_mask.png b/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_outline/expected_piediagram_datadefined_outline_mask.png
index 4ed69b3b144..68b45d16ec3 100644
Binary files a/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_outline/expected_piediagram_datadefined_outline_mask.png and b/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_outline/expected_piediagram_datadefined_outline_mask.png differ
diff --git a/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_position/expected_piediagram_datadefined_position_mask.png b/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_position/expected_piediagram_datadefined_position_mask.png
index c408c7e0f80..3b19feb2776 100644
Binary files a/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_position/expected_piediagram_datadefined_position_mask.png and b/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_position/expected_piediagram_datadefined_position_mask.png differ
diff --git a/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_show/expected_piediagram_datadefined_show_mask.png b/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_show/expected_piediagram_datadefined_show_mask.png
index e4ead79445e..bcf4128d002 100644
Binary files a/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_show/expected_piediagram_datadefined_show_mask.png and b/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_show/expected_piediagram_datadefined_show_mask.png differ
diff --git a/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_startangle/expected_piediagram_datadefined_startangle_mask.png b/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_startangle/expected_piediagram_datadefined_startangle_mask.png
index 579b2b7d209..f4b083087f2 100644
Binary files a/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_startangle/expected_piediagram_datadefined_startangle_mask.png and b/tests/testdata/control_images/diagrams/expected_piediagram_datadefined_startangle/expected_piediagram_datadefined_startangle_mask.png differ
diff --git a/tests/testdata/control_images/diagrams/expected_textdiagram_datadefined_background/expected_textdiagram_datadefined_background_mask.png b/tests/testdata/control_images/diagrams/expected_textdiagram_datadefined_background/expected_textdiagram_datadefined_background_mask.png
index 63b6ea754d9..47bb94ec505 100644
Binary files a/tests/testdata/control_images/diagrams/expected_textdiagram_datadefined_background/expected_textdiagram_datadefined_background_mask.png and b/tests/testdata/control_images/diagrams/expected_textdiagram_datadefined_background/expected_textdiagram_datadefined_background_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_placement/sp_polygon_multiple_labels/sp_polygon_multiple_labels_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_polygon_multiple_labels/sp_polygon_multiple_labels_mask.png
index d279b85e1b1..8032a7164e3 100644
Binary files a/tests/testdata/control_images/expected_pal_placement/sp_polygon_multiple_labels/sp_polygon_multiple_labels_mask.png and b/tests/testdata/control_images/expected_pal_placement/sp_polygon_multiple_labels/sp_polygon_multiple_labels_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/above/sp_polygon_placement_perimeter.png b/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/above/sp_polygon_placement_perimeter.png
new file mode 100644
index 00000000000..e45cae22dab
Binary files /dev/null and b/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/above/sp_polygon_placement_perimeter.png differ
diff --git a/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/sp_polygon_placement_perimeter_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/above/sp_polygon_placement_perimeter_mask.png
similarity index 100%
rename from tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/sp_polygon_placement_perimeter_mask.png
rename to tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/above/sp_polygon_placement_perimeter_mask.png
diff --git a/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/sp_polygon_placement_perimeter.png b/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/below/sp_polygon_placement_perimeter.png
similarity index 100%
rename from tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/sp_polygon_placement_perimeter.png
rename to tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/below/sp_polygon_placement_perimeter.png
diff --git a/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/below/sp_polygon_placement_perimeter_mask.png b/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/below/sp_polygon_placement_perimeter_mask.png
new file mode 100644
index 00000000000..34b0bf675db
Binary files /dev/null and b/tests/testdata/control_images/expected_pal_placement/sp_polygon_placement_perimeter/below/sp_polygon_placement_perimeter_mask.png differ