diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index e18e6135..47f09a34 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -214,9 +214,9 @@ Print --------------------------------------------------------------------
 File  1/15: exiv2-empty.jpg
 exiv2-empty.jpg      File name       : exiv2-empty.jpg
 exiv2-empty.jpg      File size       : 4745 Bytes
-exiv2-empty.jpg: No Exif data found in the file
 exiv2-empty.jpg      MIME type       : image/jpeg
 exiv2-empty.jpg      Image size      : 150 x 91
+exiv2-empty.jpg: No Exif data found in the file
 File  2/15: 20031214_000043.jpg
 20031214_000043.jpg  File name       : 20031214_000043.jpg
 20031214_000043.jpg  File size       : 12425 Bytes
@@ -5272,93 +5272,93 @@ Erasing Exif data from the file
 File  1/15: exiv2-empty.jpg
 exiv2-empty.jpg      File name       : exiv2-empty.jpg
 exiv2-empty.jpg      File size       : 4745 Bytes
-exiv2-empty.jpg: No Exif data found in the file
 exiv2-empty.jpg      MIME type       : image/jpeg
 exiv2-empty.jpg      Image size      : 150 x 91
+exiv2-empty.jpg: No Exif data found in the file
 File  2/15: 20031214_000043.jpg
 20031214_000043.jpg  File name       : 20031214_000043.jpg
 20031214_000043.jpg  File size       : 4745 Bytes
-20031214_000043.jpg: No Exif data found in the file
 20031214_000043.jpg  MIME type       : image/jpeg
 20031214_000043.jpg  Image size      : 150 x 91
+20031214_000043.jpg: No Exif data found in the file
 File  3/15: 20000506_020544.jpg
 20000506_020544.jpg  File name       : 20000506_020544.jpg
 20000506_020544.jpg  File size       : 4745 Bytes
-20000506_020544.jpg: No Exif data found in the file
 20000506_020544.jpg  MIME type       : image/jpeg
 20000506_020544.jpg  Image size      : 150 x 91
+20000506_020544.jpg: No Exif data found in the file
 File  4/15: 20040329_224245.jpg
 20040329_224245.jpg  File name       : 20040329_224245.jpg
 20040329_224245.jpg  File size       : 4745 Bytes
-20040329_224245.jpg: No Exif data found in the file
 20040329_224245.jpg  MIME type       : image/jpeg
 20040329_224245.jpg  Image size      : 150 x 91
+20040329_224245.jpg: No Exif data found in the file
 File  5/15: 20010405_235039.jpg
 20010405_235039.jpg  File name       : 20010405_235039.jpg
 20010405_235039.jpg  File size       : 4745 Bytes
-20010405_235039.jpg: No Exif data found in the file
 20010405_235039.jpg  MIME type       : image/jpeg
 20010405_235039.jpg  Image size      : 150 x 91
+20010405_235039.jpg: No Exif data found in the file
 File  6/15: 20030925_201850.jpg
 20030925_201850.jpg  File name       : 20030925_201850.jpg
 20030925_201850.jpg  File size       : 4745 Bytes
-20030925_201850.jpg: No Exif data found in the file
 20030925_201850.jpg  MIME type       : image/jpeg
 20030925_201850.jpg  Image size      : 150 x 91
+20030925_201850.jpg: No Exif data found in the file
 File  7/15: 20001026_044550.jpg
 20001026_044550.jpg  File name       : 20001026_044550.jpg
 20001026_044550.jpg  File size       : 4745 Bytes
-20001026_044550.jpg: No Exif data found in the file
 20001026_044550.jpg  MIME type       : image/jpeg
 20001026_044550.jpg  Image size      : 150 x 91
+20001026_044550.jpg: No Exif data found in the file
 File  8/15: 20030926_111535.jpg
 20030926_111535.jpg  File name       : 20030926_111535.jpg
 20030926_111535.jpg  File size       : 4745 Bytes
-20030926_111535.jpg: No Exif data found in the file
 20030926_111535.jpg  MIME type       : image/jpeg
 20030926_111535.jpg  Image size      : 150 x 91
+20030926_111535.jpg: No Exif data found in the file
 File  9/15: 20040316_075137.jpg
 20040316_075137.jpg  File name       : 20040316_075137.jpg
 20040316_075137.jpg  File size       : 4745 Bytes
-20040316_075137.jpg: No Exif data found in the file
 20040316_075137.jpg  MIME type       : image/jpeg
 20040316_075137.jpg  Image size      : 150 x 91
+20040316_075137.jpg: No Exif data found in the file
 File 10/15: 20040208_093744.jpg
 20040208_093744.jpg  File name       : 20040208_093744.jpg
 20040208_093744.jpg  File size       : 4745 Bytes
-20040208_093744.jpg: No Exif data found in the file
 20040208_093744.jpg  MIME type       : image/jpeg
 20040208_093744.jpg  Image size      : 150 x 91
+20040208_093744.jpg: No Exif data found in the file
 File 11/15: 20050218_212016.jpg
 20050218_212016.jpg  File name       : 20050218_212016.jpg
 20050218_212016.jpg  File size       : 4745 Bytes
-20050218_212016.jpg: No Exif data found in the file
 20050218_212016.jpg  MIME type       : image/jpeg
 20050218_212016.jpg  Image size      : 150 x 91
+20050218_212016.jpg: No Exif data found in the file
 File 12/15: 20050527_051833.jpg
 20050527_051833.jpg  File name       : 20050527_051833.jpg
 20050527_051833.jpg  File size       : 4745 Bytes
-20050527_051833.jpg: No Exif data found in the file
 20050527_051833.jpg  MIME type       : image/jpeg
 20050527_051833.jpg  Image size      : 150 x 91
+20050527_051833.jpg: No Exif data found in the file
 File 13/15: 20060802_095200.jpg
 20060802_095200.jpg  File name       : 20060802_095200.jpg
 20060802_095200.jpg  File size       : 4745 Bytes
-20060802_095200.jpg: No Exif data found in the file
 20060802_095200.jpg  MIME type       : image/jpeg
 20060802_095200.jpg  Image size      : 150 x 91
+20060802_095200.jpg: No Exif data found in the file
 File 14/15: 20001004_015404.jpg
 20001004_015404.jpg  File name       : 20001004_015404.jpg
 20001004_015404.jpg  File size       : 4745 Bytes
-20001004_015404.jpg: No Exif data found in the file
 20001004_015404.jpg  MIME type       : image/jpeg
 20001004_015404.jpg  Image size      : 150 x 91
+20001004_015404.jpg: No Exif data found in the file
 File 15/15: 20060127_225027.jpg
 20060127_225027.jpg  File name       : 20060127_225027.jpg
 20060127_225027.jpg  File size       : 4745 Bytes
-20060127_225027.jpg: No Exif data found in the file
 20060127_225027.jpg  MIME type       : image/jpeg
 20060127_225027.jpg  Image size      : 150 x 91
+20060127_225027.jpg: No Exif data found in the file
 
 Insert Exif data ---------------------------------------------------------
 File  1/15: exiv2-empty.jpg