Index: trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java	(revision 12745)
+++ trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java	(revision 12746)
@@ -193,25 +193,4 @@
         assertEquals(90d*90d, LatLon.ZERO.distanceSq(LatLon.NORTH_POLE), 0);
         assertEquals(180d*180d, LatLon.SOUTH_POLE.distanceSq(LatLon.NORTH_POLE), 0);
-    }
-
-    /**
-     * Tests the methods {@link LatLon#latToString}, {@link LatLon#lonToString}, {@link LatLon#toStringCSV}.
-     */
-    @Test
-    public void testFormatting() {
-        LatLon c = new LatLon(47.000000, 19.000000);
-        assertEquals("47.0", c.latToString(CoordinateFormat.DECIMAL_DEGREES));
-        assertEquals("19.0", c.lonToString(CoordinateFormat.DECIMAL_DEGREES));
-        assertEquals("47°00'00.0\"N", c.latToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
-        assertEquals("19°00'00.0\"E", c.lonToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
-        assertEquals("47°00.000'N", c.latToString(CoordinateFormat.NAUTICAL));
-        assertEquals("19°00.000'E", c.lonToString(CoordinateFormat.NAUTICAL));
-        assertEquals("5942074.0724311", c.latToString(CoordinateFormat.EAST_NORTH));
-        assertEquals("2115070.3250722", c.lonToString(CoordinateFormat.EAST_NORTH));
-        c = new LatLon(-47.000000, -19.000000);
-        assertEquals("47°00'00.0\"S", c.latToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
-        assertEquals("19°00'00.0\"W", c.lonToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
-        assertEquals("47°00.000'S", c.latToString(CoordinateFormat.NAUTICAL));
-        assertEquals("19°00.000'W", c.lonToString(CoordinateFormat.NAUTICAL));
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/data/coor/conversion/ICoordinateFormatTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/coor/conversion/ICoordinateFormatTest.java	(revision 12746)
+++ trunk/test/unit/org/openstreetmap/josm/data/coor/conversion/ICoordinateFormatTest.java	(revision 12746)
@@ -0,0 +1,47 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.coor.conversion;
+
+import static org.junit.Assert.assertEquals;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+/**
+ * Test for {@link ICoordinateFormat} implementations.
+ */
+public class ICoordinateFormatTest {
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().projection();
+
+    /**
+     * Tests {@link ICoordinateFormat#latToString(org.openstreetmap.josm.data.coor.ILatLon)}
+     * and {@link ICoordinateFormat#lonToString(org.openstreetmap.josm.data.coor.ILatLon)}
+     * for various implementations.
+     */
+    @Test
+    public void testFormatting() {
+        LatLon c = new LatLon(47.000000, 19.000000);
+        assertEquals("47.0", DecimalDegreesCoordinateFormat.INSTANCE.latToString(c));
+        assertEquals("19.0", DecimalDegreesCoordinateFormat.INSTANCE.lonToString(c));
+        assertEquals("47°00'00.0\"N", DMSCoordinateFormat.INSTANCE.latToString(c));
+        assertEquals("19°00'00.0\"E", DMSCoordinateFormat.INSTANCE.lonToString(c));
+        assertEquals("47°00.000'N", NauticalCoordinateFormat.INSTANCE.latToString(c));
+        assertEquals("19°00.000'E", NauticalCoordinateFormat.INSTANCE.lonToString(c));
+        assertEquals("5942074.0724311", ProjectedCoordinateFormat.INSTANCE.latToString(c));
+        assertEquals("2115070.3250722", ProjectedCoordinateFormat.INSTANCE.lonToString(c));
+        c = new LatLon(-47.000000, -19.000000);
+        assertEquals("47°00'00.0\"S", DMSCoordinateFormat.INSTANCE.latToString(c));
+        assertEquals("19°00'00.0\"W", DMSCoordinateFormat.INSTANCE.lonToString(c));
+        assertEquals("47°00.000'S", NauticalCoordinateFormat.INSTANCE.latToString(c));
+        assertEquals("19°00.000'W", NauticalCoordinateFormat.INSTANCE.lonToString(c));
+    }
+
+}
Index: trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java	(revision 12745)
+++ trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java	(revision 12746)
@@ -24,4 +24,5 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.data.coor.conversion.DMSCoordinateFormat;
 
 /**
@@ -104,6 +105,6 @@
         assertNotNull(latlon);
         DecimalFormat f = new DecimalFormat("00.0");
-        assertEquals("51°46'"+f.format(43.0)+"\"", LatLon.degreesMinutesSeconds(latlon.lat()));
-        assertEquals("8°21'"+f.format(56.3)+"\"", LatLon.degreesMinutesSeconds(latlon.lon()));
+        assertEquals("51°46'"+f.format(43.0)+"\"", DMSCoordinateFormat.degreesMinutesSeconds(latlon.lat()));
+        assertEquals("8°21'"+f.format(56.3)+"\"", DMSCoordinateFormat.degreesMinutesSeconds(latlon.lon()));
     }