Index: /trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java	(revision 10220)
+++ /trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java	(revision 10221)
@@ -67,5 +67,5 @@
         assertEquals(info.noTileHeaders, expect);
         final Set<String> eTag = info.noTileHeaders.get("ETag");
-        assertEquals(eTag, new HashSet<String>(Arrays.asList("foo", "bar")));
+        assertEquals(eTag, new HashSet<>(Arrays.asList("foo", "bar")));
     }
 
Index: /trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java	(revision 10220)
+++ /trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java	(revision 10221)
@@ -16,5 +16,4 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.CustomProjection;
-import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
 
@@ -35,4 +34,7 @@
     }
 
+    /**
+     * Test EPSG:3857
+     */
     @Test
     public void testEPSG3857() {
@@ -56,4 +58,7 @@
     }
 
+    /**
+     * Test EPSG:4326
+     */
     @Test
     public void testEPSG4326() {
@@ -68,4 +73,7 @@
     }
 
+    /**
+     * Test EPSG:4326 - wide bounds
+     */
     @Test
     public void testEPSG4326_widebounds() {
@@ -77,4 +85,7 @@
     }
 
+    /**
+     * Test EPSG:4326 - narrow bounds
+     */
     @Test
     public void testEPSG4326_narrowbounds() {
@@ -86,4 +97,7 @@
     }
 
+    /**
+     * Test EPSG:2180
+     */
     @Test
     public void testEPSG2180() {
@@ -99,4 +113,7 @@
     }
 
+    /**
+     * Test EPSG:3006 with bounds
+     */
     @Test
     public void testEPSG3006_withbounds() {
@@ -111,4 +128,7 @@
     }
 
+    /**
+     * Test EPSG:3006 without bounds
+     */
     @Test
     public void testEPSG3006_withoutbounds() {
@@ -188,5 +208,4 @@
 
     private void verifyTileSquarness(TemplatedWMSTileSource source, int x, int y, int z) {
-        Projection proj = Main.getProjection();
         /**
          * t1 | t2
@@ -217,6 +236,5 @@
 
     private TemplatedWMSTileSource getSource() {
-        TemplatedWMSTileSource source = new TemplatedWMSTileSource(testImageryWMS);
-        return source;
+        return new TemplatedWMSTileSource(testImageryWMS);
     }
 }
Index: /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java	(revision 10220)
+++ /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java	(revision 10221)
@@ -58,5 +58,5 @@
 
     @Test
-    public void testPseudoMercator() throws MalformedURLException, IOException {
+    public void testPseudoMercator() throws IOException {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         WMTSTileSource testSource = new WMTSTileSource(testImageryPSEUDO_MERCATOR);
@@ -88,5 +88,5 @@
 
     @Test
-    public void testWALLONIE() throws MalformedURLException, IOException {
+    public void testWALLONIE() throws IOException {
         Main.setProjection(Projections.getProjectionByCode("EPSG:31370"));
         WMTSTileSource testSource = new WMTSTileSource(testImageryWALLONIE);
@@ -108,5 +108,5 @@
     @Test
     @Ignore("disable this test, needs further working") // XXX
-    public void testWALLONIENoMatrixDimension() throws MalformedURLException, IOException {
+    public void testWALLONIENoMatrixDimension() throws IOException {
         Main.setProjection(Projections.getProjectionByCode("EPSG:31370"));
         WMTSTileSource testSource = new WMTSTileSource(getImagery("test/data/wmts/WMTSCapabilities-Wallonie-nomatrixdimension.xml"));
@@ -132,5 +132,5 @@
 
     @Test
-    public void testWIEN() throws MalformedURLException, IOException {
+    public void testWIEN() throws IOException {
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         WMTSTileSource testSource = new WMTSTileSource(testImageryWIEN);