diff --git a/examples/src/test/resources/examples/mapexport/expected_output/requestData-jpg-no-bg.jpeg b/examples/src/test/resources/examples/mapexport/expected_output/requestData-jpg-no-bg.jpeg
deleted file mode 100644
index bc1a5c528e..0000000000
Binary files a/examples/src/test/resources/examples/mapexport/expected_output/requestData-jpg-no-bg.jpeg and /dev/null differ
diff --git a/examples/src/test/resources/examples/mapexport/expected_output/requestData-jpg.jpeg b/examples/src/test/resources/examples/mapexport/expected_output/requestData-jpg.jpeg
index 935fd1e0bd..5a2ec0127b 100644
Binary files a/examples/src/test/resources/examples/mapexport/expected_output/requestData-jpg.jpeg and b/examples/src/test/resources/examples/mapexport/expected_output/requestData-jpg.jpeg differ
diff --git a/examples/src/test/resources/examples/mapexport/expected_output/requestData-tiff.tiff b/examples/src/test/resources/examples/mapexport/expected_output/requestData-tiff.tiff
index e23fa68f96..71171efe55 100644
Binary files a/examples/src/test/resources/examples/mapexport/expected_output/requestData-tiff.tiff and b/examples/src/test/resources/examples/mapexport/expected_output/requestData-tiff.tiff differ
diff --git a/examples/src/test/resources/examples/mapexport/expected_output/requestData.png b/examples/src/test/resources/examples/mapexport/expected_output/requestData.png
index 65b276c769..023dba6a4d 100644
Binary files a/examples/src/test/resources/examples/mapexport/expected_output/requestData.png and b/examples/src/test/resources/examples/mapexport/expected_output/requestData.png differ
diff --git a/examples/src/test/resources/examples/mapexport/requestData-jpg-no-bg.json b/examples/src/test/resources/examples/mapexport/requestData-jpg-no-bg.json
deleted file mode 100644
index ae6a97b2d7..0000000000
--- a/examples/src/test/resources/examples/mapexport/requestData-jpg-no-bg.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "outputFormat": "jpeg",
-  "layout": "plain",
-  "attributes": {
-    "map": {
-      "width": 780,
-      "height": 660,
-      "projection": "EPSG:3857",
-      "dpi": 72,
-      "rotation": 0,
-      "center": [-8233518.5005945, 4980320.4059228],
-      "scale": 25000,
-      "layers": [
-        {
-          "baseURL": "http://geoserver:8080/wms",
-          "opacity": 1,
-          "type": "WMS",
-          "layers": ["tiger:tiger_roads"],
-          "imageFormat": "image/png",
-          "styles": ["line"],
-          "customParams": {
-            "TRANSPARENT": "true"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/examples/src/test/resources/examples/mapexport/requestData-jpg.json b/examples/src/test/resources/examples/mapexport/requestData-jpg.json
index 86cac9129d..ae6a97b2d7 100644
--- a/examples/src/test/resources/examples/mapexport/requestData-jpg.json
+++ b/examples/src/test/resources/examples/mapexport/requestData-jpg.json
@@ -21,62 +21,6 @@
           "customParams": {
             "TRANSPARENT": "true"
           }
-        },
-        {
-          "type": "WMTS",
-          "baseURL": "http://geoserver:8080/gwc/service/wmts",
-          "opacity": 1,
-          "layer": "tiger-ny",
-          "version": "1.0.0",
-          "requestEncoding": "KVP",
-          "dimensions": null,
-          "dimensionParams": {},
-          "matrixSet": "EPSG:900913",
-          "matrices": [
-            {
-              "identifier": "EPSG:900913:12",
-              "matrixSize": [4096, 4096],
-              "scaleDenominator": 136494.69334738597,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:13",
-              "matrixSize": [8192, 8192],
-              "scaleDenominator": 68247.34667369298,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:14",
-              "matrixSize": [16384, 16384],
-              "scaleDenominator": 34123.67333684649,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:15",
-              "matrixSize": [32768, 32768],
-              "scaleDenominator": 17061.836668423246,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:16",
-              "matrixSize": [65536, 65536],
-              "scaleDenominator": 8530.918334211623,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:17",
-              "matrixSize": [131072, 131072],
-              "scaleDenominator": 4265.4591671058115,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            }
-          ],
-          "imageFormat": "image/png"
         }
       ]
     }
diff --git a/examples/src/test/resources/examples/mapexport/requestData-tiff.json b/examples/src/test/resources/examples/mapexport/requestData-tiff.json
index f043e7adeb..b6be335298 100644
--- a/examples/src/test/resources/examples/mapexport/requestData-tiff.json
+++ b/examples/src/test/resources/examples/mapexport/requestData-tiff.json
@@ -21,62 +21,6 @@
           "customParams": {
             "TRANSPARENT": "true"
           }
-        },
-        {
-          "type": "WMTS",
-          "baseURL": "http://geoserver:8080/gwc/service/wmts",
-          "opacity": 1,
-          "layer": "tiger-ny",
-          "version": "1.0.0",
-          "requestEncoding": "KVP",
-          "dimensions": null,
-          "dimensionParams": {},
-          "matrixSet": "EPSG:900913",
-          "matrices": [
-            {
-              "identifier": "EPSG:900913:12",
-              "matrixSize": [4096, 4096],
-              "scaleDenominator": 136494.69334738597,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:13",
-              "matrixSize": [8192, 8192],
-              "scaleDenominator": 68247.34667369298,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:14",
-              "matrixSize": [16384, 16384],
-              "scaleDenominator": 34123.67333684649,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:15",
-              "matrixSize": [32768, 32768],
-              "scaleDenominator": 17061.836668423246,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:16",
-              "matrixSize": [65536, 65536],
-              "scaleDenominator": 8530.918334211623,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:17",
-              "matrixSize": [131072, 131072],
-              "scaleDenominator": 4265.4591671058115,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            }
-          ],
-          "imageFormat": "image/png"
         }
       ]
     }
diff --git a/examples/src/test/resources/examples/mapexport/requestData.json b/examples/src/test/resources/examples/mapexport/requestData.json
index afbc3dc418..0c90365b95 100644
--- a/examples/src/test/resources/examples/mapexport/requestData.json
+++ b/examples/src/test/resources/examples/mapexport/requestData.json
@@ -44,62 +44,6 @@
           "customParams": {
             "TRANSPARENT": "true"
           }
-        },
-        {
-          "type": "WMTS",
-          "baseURL": "http://geoserver:8080/gwc/service/wmts",
-          "opacity": 1,
-          "layer": "tiger-ny",
-          "version": "1.0.0",
-          "requestEncoding": "KVP",
-          "dimensions": null,
-          "dimensionParams": {},
-          "matrixSet": "EPSG:900913",
-          "matrices": [
-            {
-              "identifier": "EPSG:900913:12",
-              "matrixSize": [4096, 4096],
-              "scaleDenominator": 136494.69334738597,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:13",
-              "matrixSize": [8192, 8192],
-              "scaleDenominator": 68247.34667369298,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:14",
-              "matrixSize": [16384, 16384],
-              "scaleDenominator": 34123.67333684649,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:15",
-              "matrixSize": [32768, 32768],
-              "scaleDenominator": 17061.836668423246,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:16",
-              "matrixSize": [65536, 65536],
-              "scaleDenominator": 8530.918334211623,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:17",
-              "matrixSize": [131072, 131072],
-              "scaleDenominator": 4265.4591671058115,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            }
-          ],
-          "imageFormat": "image/png"
         }
       ]
     }
diff --git a/examples/src/test/resources/examples/mapexport/requestData_pdf.json b/examples/src/test/resources/examples/mapexport/requestData_pdf.json
index ca1bbf0531..4424bef485 100644
--- a/examples/src/test/resources/examples/mapexport/requestData_pdf.json
+++ b/examples/src/test/resources/examples/mapexport/requestData_pdf.json
@@ -44,62 +44,6 @@
           "customParams": {
             "TRANSPARENT": "true"
           }
-        },
-        {
-          "type": "WMTS",
-          "baseURL": "http://geoserver:8080/gwc/service/wmts",
-          "opacity": 1,
-          "layer": "tiger-ny",
-          "version": "1.0.0",
-          "requestEncoding": "KVP",
-          "dimensions": null,
-          "dimensionParams": {},
-          "matrixSet": "EPSG:900913",
-          "matrices": [
-            {
-              "identifier": "EPSG:900913:12",
-              "matrixSize": [4096, 4096],
-              "scaleDenominator": 136494.69334738597,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:13",
-              "matrixSize": [8192, 8192],
-              "scaleDenominator": 68247.34667369298,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:14",
-              "matrixSize": [16384, 16384],
-              "scaleDenominator": 34123.67333684649,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:15",
-              "matrixSize": [32768, 32768],
-              "scaleDenominator": 17061.836668423246,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:16",
-              "matrixSize": [65536, 65536],
-              "scaleDenominator": 8530.918334211623,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            },
-            {
-              "identifier": "EPSG:900913:17",
-              "matrixSize": [131072, 131072],
-              "scaleDenominator": 4265.4591671058115,
-              "tileSize": [256, 256],
-              "topLeftCorner": [-20037508.34, 20037508]
-            }
-          ],
-          "imageFormat": "image/png"
         }
       ]
     }