Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java	(revision 32033)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java	(revision 32034)
@@ -1,7 +1,6 @@
 package org.openstreetmap.josm.plugins.mapillary;
 
-import static org.junit.Assert.*;
-
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
@@ -10,6 +9,7 @@
 import javax.imageio.IIOException;
 
+import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
+import org.openstreetmap.josm.plugins.mapillary.utils.ImageUtil;
 
 /**
@@ -25,8 +25,7 @@
    */
   @Test
-  public void importNoTagsTest() {
+  public void importNoTagsTest() throws IOException {
     File image = new File("images/icon16.png");
-    MapillaryImportedImage img = MapillaryUtils.readNoTags(image,
-        new LatLon(0, 0));
+    MapillaryImportedImage img = ImageUtil.readImagesFrom(image, new LatLon(0, 0)).get(0);
     assertEquals(0, img.getCa(), 0.01);
     assertTrue(new LatLon(0, 0).equalsEpsilon(img.getLatLon()));
Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/oauth/UploadTest.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/oauth/UploadTest.java	(revision 32033)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/oauth/UploadTest.java	(revision 32034)
@@ -20,5 +20,5 @@
 import org.openstreetmap.josm.plugins.mapillary.AbstractTest;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryImportedImage;
-import org.openstreetmap.josm.plugins.mapillary.oauth.UploadUtils;
+import org.openstreetmap.josm.plugins.mapillary.utils.ImageUtil;
 import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
 
@@ -35,8 +35,7 @@
    */
   @Test
-  public void updateFileTest() {
+  public void updateFileTest() throws IOException {
     File image = new File("images/icon16.png");
-    MapillaryImportedImage img = MapillaryUtils.readNoTags(image,
-        new LatLon(0, 0));
+    MapillaryImportedImage img = ImageUtil.readImagesFrom(image, new LatLon(0, 0)).get(0);
     File updatedFile = null;
     try {