Index: applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/gui/SophoxServerPreferenceTest.java
===================================================================
--- applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/gui/SophoxServerPreferenceTest.java	(revision 33808)
+++ applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/gui/SophoxServerPreferenceTest.java	(revision 33808)
@@ -0,0 +1,41 @@
+// License: GPL. For details, see LICENSE file.
+package org.wikipedia.gui;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
+import org.openstreetmap.josm.gui.preferences.server.ServerAccessPreference;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link SophoxServerPreference} class.
+ */
+public class SophoxServerPreferenceTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().platform();
+
+    /**
+     * Unit test of {@link SophoxServerPreference}.
+     */
+    @Test
+    public void testSophoxServerPreference() {
+        assertNotNull(new SophoxServerPreference.Factory().createPreferenceSetting());
+    }
+
+    /**
+     * Unit test of {@link SophoxServerPreference#addGui}.
+     */
+    @Test
+    public void testAddGui() {
+        PreferencesTestUtils.doTestPreferenceSettingAddGui(new SophoxServerPreference.Factory(), ServerAccessPreference.class);
+    }
+}
Index: applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/gui/WikosmServerPreferenceTest.java
===================================================================
--- applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/gui/WikosmServerPreferenceTest.java	(revision 33631)
+++ 	(revision )
@@ -1,41 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.wikipedia.gui;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
-import org.openstreetmap.josm.gui.preferences.server.ServerAccessPreference;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-/**
- * Unit tests of {@link WikosmServerPreference} class.
- */
-public class WikosmServerPreferenceTest {
-
-    /**
-     * Setup tests
-     */
-    @Rule
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().platform();
-
-    /**
-     * Unit test of {@link WikosmServerPreference}.
-     */
-    @Test
-    public void testWikosmServerPreference() {
-        assertNotNull(new WikosmServerPreference.Factory().createPreferenceSetting());
-    }
-
-    /**
-     * Unit test of {@link WikosmServerPreference#addGui}.
-     */
-    @Test
-    public void testAddGui() {
-        PreferencesTestUtils.doTestPreferenceSettingAddGui(new WikosmServerPreference.Factory(), ServerAccessPreference.class);
-    }
-}
Index: applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/io/SophoxDownloadReaderTest.java
===================================================================
--- applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/io/SophoxDownloadReaderTest.java	(revision 33808)
+++ applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/io/SophoxDownloadReaderTest.java	(revision 33808)
@@ -0,0 +1,70 @@
+// License: GPL. For details, see LICENSE file.
+package org.wikipedia.io;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Unit tests of {@link SophoxDownloadReader} class.
+ */
+public class SophoxDownloadReaderTest {
+
+    /**
+     * Base test environment is enough
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    /**
+     * Tests point generation
+     */
+    @Test
+    public void testPoint() throws UnsupportedEncodingException {
+        assertThat(SophoxDownloadReader.point(9.5, 47.16),
+                is("\"Point(9.5 47.16)\"^^geo:wktLiteral"));
+        assertThat(SophoxDownloadReader.boxParams(1.1, 2.2, 3.3, 4.4),
+                is("\nbd:serviceParam wikibase:cornerWest \"Point(1.1 2.2)\"^^geo:wktLiteral." +
+                        "\nbd:serviceParam wikibase:cornerEast \"Point(3.3 4.4)\"^^geo:wktLiteral.\n"));
+    }
+
+    /**
+     * Tests server response parsing
+     */
+    @Test
+    public void testIdParsing() throws UnsupportedEncodingException {
+        String json = String.join("\n",
+                "{\"results\":{\"bindings\":[",
+                "{\"a\":{\"type\": \"uri\", \"value\": \"https://www.openstreetmap.org/node/12345\"}},",
+                "{\"a\":{\"type\": \"uri\", \"value\": \"https://www.openstreetmap.org/way/1234512345\"}},",
+                "{\"a\":{\"type\": \"uri\", \"value\": \"https://www.openstreetmap.org/relation/98765\"}}",
+                "]}}"
+        );
+
+        InputStream stream = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8.name()));
+        List<PrimitiveId> actual = SophoxDownloadReader.getPrimitiveIds(stream);
+
+        List<PrimitiveId> expected = Arrays.asList(new PrimitiveId[]{
+                new SimplePrimitiveId(12345, OsmPrimitiveType.NODE),
+                new SimplePrimitiveId(1234512345, OsmPrimitiveType.WAY),
+                new SimplePrimitiveId(98765, OsmPrimitiveType.RELATION),
+        });
+
+        assertThat(actual, is(expected));
+    }
+}
Index: applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/io/WikosmDownloadReaderTest.java
===================================================================
--- applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/io/WikosmDownloadReaderTest.java	(revision 33631)
+++ 	(revision )
@@ -1,70 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.wikipedia.io;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-/**
- * Unit tests of {@link WikosmDownloadReader} class.
- */
-public class WikosmDownloadReaderTest {
-
-    /**
-     * Base test environment is enough
-     */
-    @Rule
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
-
-    /**
-     * Tests point generation
-     */
-    @Test
-    public void testPoint() throws UnsupportedEncodingException {
-        assertThat(WikosmDownloadReader.point(9.5, 47.16),
-                is("\"Point(9.5 47.16)\"^^geo:wktLiteral"));
-        assertThat(WikosmDownloadReader.boxParams(1.1, 2.2, 3.3, 4.4),
-                is("\nbd:serviceParam wikibase:cornerWest \"Point(1.1 2.2)\"^^geo:wktLiteral." +
-                        "\nbd:serviceParam wikibase:cornerEast \"Point(3.3 4.4)\"^^geo:wktLiteral.\n"));
-    }
-
-    /**
-     * Tests server response parsing
-     */
-    @Test
-    public void testIdParsing() throws UnsupportedEncodingException {
-        String json = String.join("\n",
-                "{\"results\":{\"bindings\":[",
-                "{\"a\":{\"type\": \"uri\", \"value\": \"https://www.openstreetmap.org/node/12345\"}},",
-                "{\"a\":{\"type\": \"uri\", \"value\": \"https://www.openstreetmap.org/way/1234512345\"}},",
-                "{\"a\":{\"type\": \"uri\", \"value\": \"https://www.openstreetmap.org/relation/98765\"}}",
-                "]}}"
-        );
-
-        InputStream stream = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8.name()));
-        List<PrimitiveId> actual = WikosmDownloadReader.getPrimitiveIds(stream);
-
-        List<PrimitiveId> expected = Arrays.asList(new PrimitiveId[]{
-                new SimplePrimitiveId(12345, OsmPrimitiveType.NODE),
-                new SimplePrimitiveId(1234512345, OsmPrimitiveType.WAY),
-                new SimplePrimitiveId(98765, OsmPrimitiveType.RELATION),
-        });
-
-        assertThat(actual, is(expected));
-    }
-}