Index: /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java	(revision 32889)
+++ /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java	(revision 32890)
@@ -51,66 +51,4 @@
 
     @Test
-    public void testParseFromUrl1() {
-        final WikipediaLangArticle actual = WikipediaLangArticle.parseFromUrl("https://de.wikipedia.org/wiki/Österreich");
-        assertThat(actual.article, is("Österreich"));
-        assertThat(actual.lang, is("de"));
-    }
-
-    @Test
-    public void testParseFromUrl2() {
-        final WikipediaLangArticle actual = WikipediaLangArticle.parseFromUrl("http://de.wikipedia.org/wiki/%C3%96sterreich");
-        assertThat(actual.article, is("Österreich"));
-        assertThat(actual.lang, is("de"));
-    }
-
-    @Test
-    public void testParseFromUrl3() {
-        final WikipediaLangArticle actual = WikipediaLangArticle.parseFromUrl("http://de.wikipedia.org/wiki/Sternheim_%26_Emanuel");
-        assertThat(actual.article, is("Sternheim_&_Emanuel"));
-        assertThat(actual.lang, is("de"));
-    }
-
-    @Test
-    public void testParseFromUrl4() {
-        final WikipediaLangArticle actual = WikipediaLangArticle.parseFromUrl("//de.wikipedia.org/wiki/Reichstagsgeb%C3%A4ude");
-        assertThat(actual.article, is("Reichstagsgebäude"));
-        assertThat(actual.lang, is("de"));
-    }
-
-    @Test
-    public void testParseFromTag0() {
-        final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia", "Österreich");
-        assertThat(actual, nullValue());
-    }
-
-    @Test
-    public void testParseFromTag1() {
-        final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia", "de:Österreich");
-        assertThat(actual.article, is("Österreich"));
-        assertThat(actual.lang, is("de"));
-    }
-
-    @Test
-    public void testParseFromTag2() {
-        final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia:de", "Österreich");
-        assertThat(actual.article, is("Österreich"));
-        assertThat(actual.lang, is("de"));
-    }
-
-    @Test
-    public void testParseFromTag3() {
-        final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia:de", "de:Österreich");
-        assertThat(actual.article, is("Österreich"));
-        assertThat(actual.lang, is("de"));
-    }
-
-    @Test
-    public void testParseFromTag4() {
-        final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia", "https://de.wikipedia.org/wiki/Österreich");
-        assertThat(actual.article, is("Österreich"));
-        assertThat(actual.lang, is("de"));
-    }
-
-    @Test
     public void testGetInterwikiArticles1() {
         final Collection<WikipediaLangArticle> iw = WikipediaApp.getInterwikiArticles("de", "Österreich");
@@ -131,10 +69,4 @@
         assertThat(WikipediaApp.getCoordinateForArticle("en", "Austria"), is(new LatLon(47.33333333, 13.33333333)));
         assertThat(WikipediaApp.getCoordinateForArticle("en", "Foobar2000"), nullValue());
-    }
-
-    @Test
-    public void testGetBrowserUrl() {
-        final WikipediaEntry entry = new WikipediaEntry("de", "Sternheim & Emanuel");
-        assertThat(entry.getBrowserUrl(), is("https://de.wikipedia.org/wiki/Sternheim_%26_Emanuel"));
     }
 
Index: /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/data/WikipediaEntryTest.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/data/WikipediaEntryTest.java	(revision 32890)
+++ /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/data/WikipediaEntryTest.java	(revision 32890)
@@ -0,0 +1,17 @@
+// License: GPL. For details, see LICENSE file.
+package org.wikipedia.data;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
+
+public class WikipediaEntryTest {
+
+    @Test
+    public void testGetBrowserUrl() {
+        final WikipediaEntry entry = new WikipediaEntry("de", "Sternheim & Emanuel");
+        assertThat(entry.getBrowserUrl(), is("https://de.wikipedia.org/wiki/Sternheim_%26_Emanuel"));
+    }
+
+}
Index: /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/data/WikipediaLangArticleTest.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/data/WikipediaLangArticleTest.java	(revision 32890)
+++ /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/data/WikipediaLangArticleTest.java	(revision 32890)
@@ -0,0 +1,74 @@
+// License: GPL. For details, see LICENSE file.
+package org.wikipedia.data;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.*;
+
+public class WikipediaLangArticleTest {
+
+    @Test
+    public void testParseFromUrl1() {
+        final WikipediaLangArticle actual = WikipediaLangArticle.parseFromUrl("https://de.wikipedia.org/wiki/Österreich");
+        assertThat(actual.article, is("Österreich"));
+        assertThat(actual.lang, is("de"));
+    }
+
+    @Test
+    public void testParseFromUrl2() {
+        final WikipediaLangArticle actual = WikipediaLangArticle.parseFromUrl("http://de.wikipedia.org/wiki/%C3%96sterreich");
+        assertThat(actual.article, is("Österreich"));
+        assertThat(actual.lang, is("de"));
+    }
+
+    @Test
+    public void testParseFromUrl3() {
+        final WikipediaLangArticle actual = WikipediaLangArticle.parseFromUrl("http://de.wikipedia.org/wiki/Sternheim_%26_Emanuel");
+        assertThat(actual.article, is("Sternheim_&_Emanuel"));
+        assertThat(actual.lang, is("de"));
+    }
+
+    @Test
+    public void testParseFromUrl4() {
+        final WikipediaLangArticle actual = WikipediaLangArticle.parseFromUrl("//de.wikipedia.org/wiki/Reichstagsgeb%C3%A4ude");
+        assertThat(actual.article, is("Reichstagsgebäude"));
+        assertThat(actual.lang, is("de"));
+    }
+
+    @Test
+    public void testParseFromTag0() {
+        final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia", "Österreich");
+        assertThat(actual, nullValue());
+    }
+
+    @Test
+    public void testParseFromTag1() {
+        final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia", "de:Österreich");
+        assertThat(actual.article, is("Österreich"));
+        assertThat(actual.lang, is("de"));
+    }
+
+    @Test
+    public void testParseFromTag2() {
+        final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia:de", "Österreich");
+        assertThat(actual.article, is("Österreich"));
+        assertThat(actual.lang, is("de"));
+    }
+
+    @Test
+    public void testParseFromTag3() {
+        final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia:de", "de:Österreich");
+        assertThat(actual.article, is("Österreich"));
+        assertThat(actual.lang, is("de"));
+    }
+
+    @Test
+    public void testParseFromTag4() {
+        final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia", "https://de.wikipedia.org/wiki/Österreich");
+        assertThat(actual.article, is("Österreich"));
+        assertThat(actual.lang, is("de"));
+    }
+
+}