Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java	(revision 18991)
+++ trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java	(revision 18992)
@@ -75,4 +75,5 @@
                 "<id>OSM_Inspector-Geometry</id>\n" +
                 "<type>wms_endpoint</type>\n" +
+                "<category>qa</category>\n" +
                 "<url><![CDATA[" + tileServer.url("/capabilities") + "]]></url>\n" +
                 "<icon>data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsSAAALEgHS3X78AAAB5UlEQVQ4y4WTwWsTURDG" +
@@ -125,4 +126,5 @@
                 "        <id>geovekst-nib-historic</id>\n" +
                 "        <type>wms_endpoint</type>\n" +
+                "        <category>photo</category>\n" +
                 "        <country-code>NO</country-code>\n" +
                 "        <description lang=\"en\">Historic Norwegian orthophotos and maps, courtesy of Geovekst and Norkart.</description>\n" +
Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java	(revision 18991)
+++ trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java	(revision 18992)
@@ -18,11 +18,8 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.client.WireMock;
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Disabled;
@@ -48,4 +45,7 @@
 import org.openstreetmap.josm.tools.ReflectionUtils;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+
 /**
  * Unit tests for class {@link WMTSTileSource}.
@@ -276,7 +276,5 @@
         ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         ImageryInfo ontario = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Ontario.xml");
-        ontario.setDefaultLayers(Arrays.asList(new DefaultLayer[] {
-                new DefaultLayer(ImageryType.WMTS, "Basemap_Imagery_2014", null, "default028mm")
-        }));
+        ontario.setDefaultLayers(Collections.singletonList(new DefaultLayer(ImageryType.WMTS, "Basemap_Imagery_2014", null, "default028mm")));
         WMTSTileSource testSource = new WMTSTileSource(ontario);
         testSource.initProjection(ProjectionRegistry.getProjection());
@@ -293,7 +291,7 @@
         ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         ImageryInfo ontario = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Ontario.xml");
-        ontario.setDefaultLayers(Arrays.asList(new DefaultLayer[] {
+        ontario.setDefaultLayers(Collections.singletonList(
                 new DefaultLayer(ImageryType.WMTS, "Basemap_Imagery_2014", null, "GoogleMapsCompatible")
-        }));
+        ));
         WMTSTileSource testSource = new WMTSTileSource(ontario);
         testSource.initProjection(ProjectionRegistry.getProjection());
@@ -393,4 +391,5 @@
                 "<id>landsat</id>\n" +
                 "<type>wmts</type>\n" +
+                "<category>photo</category>\n" +
                 "<url><![CDATA[" + tileServer.url("/getcapabilities.xml") + "]]></url>\n" +
                 "<default-layers>" +