diff --git a/test/data/icc-test.out b/test/data/icc-test.out
index 85c1fef0..f121a03a 100644
--- a/test/data/icc-test.out
+++ b/test/data/icc-test.out
@@ -460,318 +460,6 @@ STRUCTURE OF PNG FILE: ReaganLargePng.png
 50b9125494306a6fc1b7c4f2a1a8d49d
 45ed3c125cc6041b37b44ee4cb881cd8
 45ed3c125cc6041b37b44ee4cb881cd8
-STRUCTURE OF TIFF FILE (II): ReaganLargeTiff.tiff
- address |    tag                           |      type |    count |    offset | value
-      10 | 0x00fe NewSubfileType            |      LONG |        1 |         0 | 0
-      22 | 0x0100 ImageWidth                |     SHORT |        1 |       200 | 200
-      34 | 0x0101 ImageLength               |     SHORT |        1 |       130 | 130
-      46 | 0x0102 BitsPerSample             |     SHORT |        3 |       374 | 8 8 8
-      58 | 0x0103 Compression               |     SHORT |        1 |         5 | 5
-      70 | 0x0106 PhotometricInterpretation |     SHORT |        1 |         2 | 2
-      82 | 0x010d DocumentName              |     ASCII |       59 |       380 | /media/trekstor/exiv2/exiv2-svn/ ...
-      94 | 0x010e ImageDescription          |     ASCII |      403 |       440 | 040621-N-6536T-062.USS Ronald Re ...
-     106 | 0x010f Make                      |     ASCII |       18 |       844 | NIKON CORPORATION
-     118 | 0x0110 Model                     |     ASCII |       10 |       862 | NIKON D1X
-     130 | 0x0111 StripOffsets              |      LONG |        2 |       872 | 1623650 1667534
-     142 | 0x0112 Orientation               |     SHORT |        1 |         1 | 1
-     154 | 0x0115 SamplesPerPixel           |     SHORT |        1 |         3 | 3
-     166 | 0x0116 RowsPerStrip              |     SHORT |        1 |       128 | 128
-     178 | 0x0117 StripByteCounts           |      LONG |        2 |       880 | 43883 931
-     190 | 0x011a XResolution               |  RATIONAL |        1 |       888 | 300/1
-     202 | 0x011b YResolution               |  RATIONAL |        1 |       896 | 300/1
-     214 | 0x011c PlanarConfiguration       |     SHORT |        1 |         1 | 1
-     226 | 0x0128 ResolutionUnit            |     SHORT |        1 |         2 | 2
-     238 | 0x0131 Software                  |     ASCII |       11 |       904 | GIMP 2.9.5
-     250 | 0x0132 DateTime                  |     ASCII |       20 |       916 | 2016:09:13 12:23:27
-     262 | 0x013b Artist                    |     ASCII |       34 |       936 | Photographer..s Mate 3rd Class ( ...
-     274 | 0x013d Predictor                 |     SHORT |        1 |         2 | 2
-     286 | 0x014a SubIFDs                   |      LONG |        1 |   1622480 | 1622480
-     298 | 0x0153 SampleFormat              |     SHORT |        3 |       970 | 1 1 1
-     310 | 0x02bc XMLPacket                 |      BYTE |     7135 |       976 | <?xpacket begin="..." id="W5M0Mp ...
-     322 | 0x83bb IPTCNAA                   |      LONG |      192 |      8112 | 5898524 1193614083 5243420 1869107232 1919381364 ...
-     334 | 0x8769 ExifTag                   |      LONG |        1 |   1622642 | 1622642
-     346 | 0x8773 InterColorProfile         | UNDEFINED |  1613600 |      8880 | ... APPL....prtrRGB Lab ........ ...
-     358 | 0x8825 GPSTag                    |      LONG |        1 |   1623632 | 1623632
-END ReaganLargeTiff.tiff
-Exiv2 exception in modify action for file ReaganLargeTiff.tiff:
-Setting Image comment in TIFF images is not supported
-STRUCTURE OF TIFF FILE (II): ReaganLargeTiff.tiff
- address |    tag                           |      type |    count |    offset | value
-      10 | 0x00fe NewSubfileType            |      LONG |        1 |         0 | 0
-      22 | 0x0100 ImageWidth                |     SHORT |        1 |       200 | 200
-      34 | 0x0101 ImageLength               |     SHORT |        1 |       130 | 130
-      46 | 0x0102 BitsPerSample             |     SHORT |        3 |       374 | 8 8 8
-      58 | 0x0103 Compression               |     SHORT |        1 |         5 | 5
-      70 | 0x0106 PhotometricInterpretation |     SHORT |        1 |         2 | 2
-      82 | 0x010d DocumentName              |     ASCII |       59 |       380 | /media/trekstor/exiv2/exiv2-svn/ ...
-      94 | 0x010e ImageDescription          |     ASCII |      403 |       440 | 040621-N-6536T-062.USS Ronald Re ...
-     106 | 0x010f Make                      |     ASCII |       18 |       844 | NIKON CORPORATION
-     118 | 0x0110 Model                     |     ASCII |       10 |       862 | NIKON D1X
-     130 | 0x0111 StripOffsets              |      LONG |        2 |       872 | 1623650 1667534
-     142 | 0x0112 Orientation               |     SHORT |        1 |         1 | 1
-     154 | 0x0115 SamplesPerPixel           |     SHORT |        1 |         3 | 3
-     166 | 0x0116 RowsPerStrip              |     SHORT |        1 |       128 | 128
-     178 | 0x0117 StripByteCounts           |      LONG |        2 |       880 | 43883 931
-     190 | 0x011a XResolution               |  RATIONAL |        1 |       888 | 300/1
-     202 | 0x011b YResolution               |  RATIONAL |        1 |       896 | 300/1
-     214 | 0x011c PlanarConfiguration       |     SHORT |        1 |         1 | 1
-     226 | 0x0128 ResolutionUnit            |     SHORT |        1 |         2 | 2
-     238 | 0x0131 Software                  |     ASCII |       11 |       904 | GIMP 2.9.5
-     250 | 0x0132 DateTime                  |     ASCII |       20 |       916 | 2016:09:13 12:23:27
-     262 | 0x013b Artist                    |     ASCII |       34 |       936 | Photographer..s Mate 3rd Class ( ...
-     274 | 0x013d Predictor                 |     SHORT |        1 |         2 | 2
-     286 | 0x014a SubIFDs                   |      LONG |        1 |   1622480 | 1622480
-     298 | 0x0153 SampleFormat              |     SHORT |        3 |       970 | 1 1 1
-     310 | 0x02bc XMLPacket                 |      BYTE |     7135 |       976 | <?xpacket begin="..." id="W5M0Mp ...
-     322 | 0x83bb IPTCNAA                   |      LONG |      192 |      8112 | 5898524 1193614083 5243420 1869107232 1919381364 ...
-     334 | 0x8769 ExifTag                   |      LONG |        1 |   1622642 | 1622642
-     346 | 0x8773 InterColorProfile         | UNDEFINED |  1613600 |      8880 | ... APPL....prtrRGB Lab ........ ...
-     358 | 0x8825 GPSTag                    |      LONG |        1 |   1623632 | 1623632
-END ReaganLargeTiff.tiff
-
-STRUCTURE OF TIFF FILE (II): ReaganLargeTiff.tiff
- address |    tag                           |      type |    count |    offset | value
-      10 | 0x00fe NewSubfileType            |      LONG |        1 |         0 | 0
-      22 | 0x0100 ImageWidth                |     SHORT |        1 |       200 | 200
-      34 | 0x0101 ImageLength               |     SHORT |        1 |       130 | 130
-      46 | 0x0102 BitsPerSample             |     SHORT |        3 |       374 | 8 8 8
-      58 | 0x0103 Compression               |     SHORT |        1 |         5 | 5
-      70 | 0x0106 PhotometricInterpretation |     SHORT |        1 |         2 | 2
-      82 | 0x010d DocumentName              |     ASCII |       59 |       380 | /media/trekstor/exiv2/exiv2-svn/ ...
-      94 | 0x010e ImageDescription          |     ASCII |      403 |       440 | 040621-N-6536T-062.USS Ronald Re ...
-     106 | 0x010f Make                      |     ASCII |       18 |       844 | NIKON CORPORATION
-     118 | 0x0110 Model                     |     ASCII |       10 |       862 | NIKON D1X
-     130 | 0x0111 StripOffsets              |      LONG |        2 |       872 | 1623650 1667534
-     142 | 0x0112 Orientation               |     SHORT |        1 |         1 | 1
-     154 | 0x0115 SamplesPerPixel           |     SHORT |        1 |         3 | 3
-     166 | 0x0116 RowsPerStrip              |     SHORT |        1 |       128 | 128
-     178 | 0x0117 StripByteCounts           |      LONG |        2 |       880 | 43883 931
-     190 | 0x011a XResolution               |  RATIONAL |        1 |       888 | 300/1
-     202 | 0x011b YResolution               |  RATIONAL |        1 |       896 | 300/1
-     214 | 0x011c PlanarConfiguration       |     SHORT |        1 |         1 | 1
-     226 | 0x0128 ResolutionUnit            |     SHORT |        1 |         2 | 2
-     238 | 0x0131 Software                  |     ASCII |       11 |       904 | GIMP 2.9.5
-     250 | 0x0132 DateTime                  |     ASCII |       20 |       916 | 2016:09:13 12:23:27
-     262 | 0x013b Artist                    |     ASCII |       34 |       936 | Photographer..s Mate 3rd Class ( ...
-     274 | 0x013d Predictor                 |     SHORT |        1 |         2 | 2
-     286 | 0x014a SubIFDs                   |      LONG |        1 |   1622480 | 1622480
-     298 | 0x0153 SampleFormat              |     SHORT |        3 |       970 | 1 1 1
-     310 | 0x02bc XMLPacket                 |      BYTE |     7135 |       976 | <?xpacket begin="..." id="W5M0Mp ...
-     322 | 0x83bb IPTCNAA                   |      LONG |      192 |      8112 | 5898524 1193614083 5243420 1869107232 1919381364 ...
-     334 | 0x8769 ExifTag                   |      LONG |        1 |   1622642 | 1622642
-     346 | 0x8773 InterColorProfile         | UNDEFINED |  1613600 |      8880 | ... APPL....prtrRGB Lab ........ ...
-     358 | 0x8825 GPSTag                    |      LONG |        1 |   1623632 | 1623632
-END ReaganLargeTiff.tiff
-STRUCTURE OF TIFF FILE (II): ReaganLargeTiff.tiff
- address |    tag                           |      type |    count |    offset | value
-      10 | 0x00fe NewSubfileType            |      LONG |        1 |         0 | 0
-      22 | 0x0100 ImageWidth                |     SHORT |        1 |       200 | 200
-      34 | 0x0101 ImageLength               |     SHORT |        1 |       130 | 130
-      46 | 0x0102 BitsPerSample             |     SHORT |        3 |       374 | 8 8 8
-      58 | 0x0103 Compression               |     SHORT |        1 |         5 | 5
-      70 | 0x0106 PhotometricInterpretation |     SHORT |        1 |         2 | 2
-      82 | 0x010d DocumentName              |     ASCII |       59 |       380 | /media/trekstor/exiv2/exiv2-svn/ ...
-      94 | 0x010e ImageDescription          |     ASCII |      403 |       440 | 040621-N-6536T-062.USS Ronald Re ...
-     106 | 0x010f Make                      |     ASCII |       18 |       844 | NIKON CORPORATION
-     118 | 0x0110 Model                     |     ASCII |       10 |       862 | NIKON D1X
-     130 | 0x0111 StripOffsets              |      LONG |        2 |       872 | 1623650 1667534
-     142 | 0x0112 Orientation               |     SHORT |        1 |         1 | 1
-     154 | 0x0115 SamplesPerPixel           |     SHORT |        1 |         3 | 3
-     166 | 0x0116 RowsPerStrip              |     SHORT |        1 |       128 | 128
-     178 | 0x0117 StripByteCounts           |      LONG |        2 |       880 | 43883 931
-     190 | 0x011a XResolution               |  RATIONAL |        1 |       888 | 300/1
-     202 | 0x011b YResolution               |  RATIONAL |        1 |       896 | 300/1
-     214 | 0x011c PlanarConfiguration       |     SHORT |        1 |         1 | 1
-     226 | 0x0128 ResolutionUnit            |     SHORT |        1 |         2 | 2
-     238 | 0x0131 Software                  |     ASCII |       11 |       904 | GIMP 2.9.5
-     250 | 0x0132 DateTime                  |     ASCII |       20 |       916 | 2016:09:13 12:23:27
-     262 | 0x013b Artist                    |     ASCII |       34 |       936 | Photographer..s Mate 3rd Class ( ...
-     274 | 0x013d Predictor                 |     SHORT |        1 |         2 | 2
-     286 | 0x014a SubIFDs                   |      LONG |        1 |   1622480 | 1622480
-     298 | 0x0153 SampleFormat              |     SHORT |        3 |       970 | 1 1 1
-     310 | 0x02bc XMLPacket                 |      BYTE |     7135 |       976 | <?xpacket begin="..." id="W5M0Mp ...
-     322 | 0x83bb IPTCNAA                   |      LONG |      192 |      8112 | 5898524 1193614083 5243420 1869107232 1919381364 ...
-     334 | 0x8769 ExifTag                   |      LONG |        1 |   1622642 | 1622642
-     346 | 0x8773 InterColorProfile         | UNDEFINED |  1613600 |      8880 | ... APPL....prtrRGB Lab ........ ...
-     358 | 0x8825 GPSTag                    |      LONG |        1 |   1623632 | 1623632
-END ReaganLargeTiff.tiff
-Exiv2 exception in modify action for file ReaganLargeTiff.tiff:
-Setting Image comment in TIFF images is not supported
-STRUCTURE OF TIFF FILE (II): ReaganLargeTiff.tiff
- address |    tag                           |      type |    count |    offset | value
-      10 | 0x00fe NewSubfileType            |      LONG |        1 |         0 | 0
-      22 | 0x0100 ImageWidth                |     SHORT |        1 |       200 | 200
-      34 | 0x0101 ImageLength               |     SHORT |        1 |       130 | 130
-      46 | 0x0102 BitsPerSample             |     SHORT |        3 |       374 | 8 8 8
-      58 | 0x0103 Compression               |     SHORT |        1 |         5 | 5
-      70 | 0x0106 PhotometricInterpretation |     SHORT |        1 |         2 | 2
-      82 | 0x010d DocumentName              |     ASCII |       59 |       380 | /media/trekstor/exiv2/exiv2-svn/ ...
-      94 | 0x010e ImageDescription          |     ASCII |      403 |       440 | 040621-N-6536T-062.USS Ronald Re ...
-     106 | 0x010f Make                      |     ASCII |       18 |       844 | NIKON CORPORATION
-     118 | 0x0110 Model                     |     ASCII |       10 |       862 | NIKON D1X
-     130 | 0x0111 StripOffsets              |      LONG |        2 |       872 | 1623650 1667534
-     142 | 0x0112 Orientation               |     SHORT |        1 |         1 | 1
-     154 | 0x0115 SamplesPerPixel           |     SHORT |        1 |         3 | 3
-     166 | 0x0116 RowsPerStrip              |     SHORT |        1 |       128 | 128
-     178 | 0x0117 StripByteCounts           |      LONG |        2 |       880 | 43883 931
-     190 | 0x011a XResolution               |  RATIONAL |        1 |       888 | 300/1
-     202 | 0x011b YResolution               |  RATIONAL |        1 |       896 | 300/1
-     214 | 0x011c PlanarConfiguration       |     SHORT |        1 |         1 | 1
-     226 | 0x0128 ResolutionUnit            |     SHORT |        1 |         2 | 2
-     238 | 0x0131 Software                  |     ASCII |       11 |       904 | GIMP 2.9.5
-     250 | 0x0132 DateTime                  |     ASCII |       20 |       916 | 2016:09:13 12:23:27
-     262 | 0x013b Artist                    |     ASCII |       34 |       936 | Photographer..s Mate 3rd Class ( ...
-     274 | 0x013d Predictor                 |     SHORT |        1 |         2 | 2
-     286 | 0x014a SubIFDs                   |      LONG |        1 |   1622480 | 1622480
-     298 | 0x0153 SampleFormat              |     SHORT |        3 |       970 | 1 1 1
-     310 | 0x02bc XMLPacket                 |      BYTE |     7135 |       976 | <?xpacket begin="..." id="W5M0Mp ...
-     322 | 0x83bb IPTCNAA                   |      LONG |      192 |      8112 | 5898524 1193614083 5243420 1869107232 1919381364 ...
-     334 | 0x8769 ExifTag                   |      LONG |        1 |   1622642 | 1622642
-     346 | 0x8773 InterColorProfile         | UNDEFINED |  1613600 |      8880 | ... APPL....prtrRGB Lab ........ ...
-     358 | 0x8825 GPSTag                    |      LONG |        1 |   1623632 | 1623632
-END ReaganLargeTiff.tiff
-
-STRUCTURE OF TIFF FILE (II): ReaganLargeTiff.tiff
- address |    tag                           |      type |    count |    offset | value
-      10 | 0x00fe NewSubfileType            |      LONG |        1 |         0 | 0
-      22 | 0x0100 ImageWidth                |     SHORT |        1 |       200 | 200
-      34 | 0x0101 ImageLength               |     SHORT |        1 |       130 | 130
-      46 | 0x0102 BitsPerSample             |     SHORT |        3 |       374 | 8 8 8
-      58 | 0x0103 Compression               |     SHORT |        1 |         5 | 5
-      70 | 0x0106 PhotometricInterpretation |     SHORT |        1 |         2 | 2
-      82 | 0x010d DocumentName              |     ASCII |       59 |       380 | /media/trekstor/exiv2/exiv2-svn/ ...
-      94 | 0x010e ImageDescription          |     ASCII |      403 |       440 | 040621-N-6536T-062.USS Ronald Re ...
-     106 | 0x010f Make                      |     ASCII |       18 |       844 | NIKON CORPORATION
-     118 | 0x0110 Model                     |     ASCII |       10 |       862 | NIKON D1X
-     130 | 0x0111 StripOffsets              |      LONG |        2 |       872 | 1623650 1667534
-     142 | 0x0112 Orientation               |     SHORT |        1 |         1 | 1
-     154 | 0x0115 SamplesPerPixel           |     SHORT |        1 |         3 | 3
-     166 | 0x0116 RowsPerStrip              |     SHORT |        1 |       128 | 128
-     178 | 0x0117 StripByteCounts           |      LONG |        2 |       880 | 43883 931
-     190 | 0x011a XResolution               |  RATIONAL |        1 |       888 | 300/1
-     202 | 0x011b YResolution               |  RATIONAL |        1 |       896 | 300/1
-     214 | 0x011c PlanarConfiguration       |     SHORT |        1 |         1 | 1
-     226 | 0x0128 ResolutionUnit            |     SHORT |        1 |         2 | 2
-     238 | 0x0131 Software                  |     ASCII |       11 |       904 | GIMP 2.9.5
-     250 | 0x0132 DateTime                  |     ASCII |       20 |       916 | 2016:09:13 12:23:27
-     262 | 0x013b Artist                    |     ASCII |       34 |       936 | Photographer..s Mate 3rd Class ( ...
-     274 | 0x013d Predictor                 |     SHORT |        1 |         2 | 2
-     286 | 0x014a SubIFDs                   |      LONG |        1 |   1622480 | 1622480
-     298 | 0x0153 SampleFormat              |     SHORT |        3 |       970 | 1 1 1
-     310 | 0x02bc XMLPacket                 |      BYTE |     7135 |       976 | <?xpacket begin="..." id="W5M0Mp ...
-     322 | 0x83bb IPTCNAA                   |      LONG |      192 |      8112 | 5898524 1193614083 5243420 1869107232 1919381364 ...
-     334 | 0x8769 ExifTag                   |      LONG |        1 |   1622642 | 1622642
-     346 | 0x8773 InterColorProfile         | UNDEFINED |  1613600 |      8880 | ... APPL....prtrRGB Lab ........ ...
-     358 | 0x8825 GPSTag                    |      LONG |        1 |   1623632 | 1623632
-END ReaganLargeTiff.tiff
-STRUCTURE OF TIFF FILE (II): ReaganLargeTiff.tiff
- address |    tag                           |      type |    count |    offset | value
-      10 | 0x00fe NewSubfileType            |      LONG |        1 |         0 | 0
-      22 | 0x0100 ImageWidth                |     SHORT |        1 |       200 | 200
-      34 | 0x0101 ImageLength               |     SHORT |        1 |       130 | 130
-      46 | 0x0102 BitsPerSample             |     SHORT |        3 |       374 | 8 8 8
-      58 | 0x0103 Compression               |     SHORT |        1 |         5 | 5
-      70 | 0x0106 PhotometricInterpretation |     SHORT |        1 |         2 | 2
-      82 | 0x010d DocumentName              |     ASCII |       59 |       380 | /media/trekstor/exiv2/exiv2-svn/ ...
-      94 | 0x010e ImageDescription          |     ASCII |      403 |       440 | 040621-N-6536T-062.USS Ronald Re ...
-     106 | 0x010f Make                      |     ASCII |       18 |       844 | NIKON CORPORATION
-     118 | 0x0110 Model                     |     ASCII |       10 |       862 | NIKON D1X
-     130 | 0x0111 StripOffsets              |      LONG |        2 |       872 | 1623650 1667534
-     142 | 0x0112 Orientation               |     SHORT |        1 |         1 | 1
-     154 | 0x0115 SamplesPerPixel           |     SHORT |        1 |         3 | 3
-     166 | 0x0116 RowsPerStrip              |     SHORT |        1 |       128 | 128
-     178 | 0x0117 StripByteCounts           |      LONG |        2 |       880 | 43883 931
-     190 | 0x011a XResolution               |  RATIONAL |        1 |       888 | 300/1
-     202 | 0x011b YResolution               |  RATIONAL |        1 |       896 | 300/1
-     214 | 0x011c PlanarConfiguration       |     SHORT |        1 |         1 | 1
-     226 | 0x0128 ResolutionUnit            |     SHORT |        1 |         2 | 2
-     238 | 0x0131 Software                  |     ASCII |       11 |       904 | GIMP 2.9.5
-     250 | 0x0132 DateTime                  |     ASCII |       20 |       916 | 2016:09:13 12:23:27
-     262 | 0x013b Artist                    |     ASCII |       34 |       936 | Photographer..s Mate 3rd Class ( ...
-     274 | 0x013d Predictor                 |     SHORT |        1 |         2 | 2
-     286 | 0x014a SubIFDs                   |      LONG |        1 |   1622480 | 1622480
-     298 | 0x0153 SampleFormat              |     SHORT |        3 |       970 | 1 1 1
-     310 | 0x02bc XMLPacket                 |      BYTE |     7135 |       976 | <?xpacket begin="..." id="W5M0Mp ...
-     322 | 0x83bb IPTCNAA                   |      LONG |      192 |      8112 | 5898524 1193614083 5243420 1869107232 1919381364 ...
-     334 | 0x8769 ExifTag                   |      LONG |        1 |   1622642 | 1622642
-     346 | 0x8773 InterColorProfile         | UNDEFINED |      560 |      8880 | ...0ADBE....mntrRGB XYZ ....... ...
-     358 | 0x8825 GPSTag                    |      LONG |        1 |   1623632 | 1623632
-END ReaganLargeTiff.tiff
-Exiv2 exception in modify action for file ReaganLargeTiff.tiff:
-Setting Image comment in TIFF images is not supported
-STRUCTURE OF TIFF FILE (II): ReaganLargeTiff.tiff
- address |    tag                           |      type |    count |    offset | value
-      10 | 0x00fe NewSubfileType            |      LONG |        1 |         0 | 0
-      22 | 0x0100 ImageWidth                |     SHORT |        1 |       200 | 200
-      34 | 0x0101 ImageLength               |     SHORT |        1 |       130 | 130
-      46 | 0x0102 BitsPerSample             |     SHORT |        3 |       374 | 8 8 8
-      58 | 0x0103 Compression               |     SHORT |        1 |         5 | 5
-      70 | 0x0106 PhotometricInterpretation |     SHORT |        1 |         2 | 2
-      82 | 0x010d DocumentName              |     ASCII |       59 |       380 | /media/trekstor/exiv2/exiv2-svn/ ...
-      94 | 0x010e ImageDescription          |     ASCII |      403 |       440 | 040621-N-6536T-062.USS Ronald Re ...
-     106 | 0x010f Make                      |     ASCII |       18 |       844 | NIKON CORPORATION
-     118 | 0x0110 Model                     |     ASCII |       10 |       862 | NIKON D1X
-     130 | 0x0111 StripOffsets              |      LONG |        2 |       872 | 1623650 1667534
-     142 | 0x0112 Orientation               |     SHORT |        1 |         1 | 1
-     154 | 0x0115 SamplesPerPixel           |     SHORT |        1 |         3 | 3
-     166 | 0x0116 RowsPerStrip              |     SHORT |        1 |       128 | 128
-     178 | 0x0117 StripByteCounts           |      LONG |        2 |       880 | 43883 931
-     190 | 0x011a XResolution               |  RATIONAL |        1 |       888 | 300/1
-     202 | 0x011b YResolution               |  RATIONAL |        1 |       896 | 300/1
-     214 | 0x011c PlanarConfiguration       |     SHORT |        1 |         1 | 1
-     226 | 0x0128 ResolutionUnit            |     SHORT |        1 |         2 | 2
-     238 | 0x0131 Software                  |     ASCII |       11 |       904 | GIMP 2.9.5
-     250 | 0x0132 DateTime                  |     ASCII |       20 |       916 | 2016:09:13 12:23:27
-     262 | 0x013b Artist                    |     ASCII |       34 |       936 | Photographer..s Mate 3rd Class ( ...
-     274 | 0x013d Predictor                 |     SHORT |        1 |         2 | 2
-     286 | 0x014a SubIFDs                   |      LONG |        1 |   1622480 | 1622480
-     298 | 0x0153 SampleFormat              |     SHORT |        3 |       970 | 1 1 1
-     310 | 0x02bc XMLPacket                 |      BYTE |     7135 |       976 | <?xpacket begin="..." id="W5M0Mp ...
-     322 | 0x83bb IPTCNAA                   |      LONG |      192 |      8112 | 5898524 1193614083 5243420 1869107232 1919381364 ...
-     334 | 0x8769 ExifTag                   |      LONG |        1 |   1622642 | 1622642
-     346 | 0x8773 InterColorProfile         | UNDEFINED |      560 |      8880 | ...0ADBE....mntrRGB XYZ ....... ...
-     358 | 0x8825 GPSTag                    |      LONG |        1 |   1623632 | 1623632
-END ReaganLargeTiff.tiff
-
-STRUCTURE OF TIFF FILE (II): ReaganLargeTiff.tiff
- address |    tag                           |      type |    count |    offset | value
-      10 | 0x00fe NewSubfileType            |      LONG |        1 |         0 | 0
-      22 | 0x0100 ImageWidth                |     SHORT |        1 |       200 | 200
-      34 | 0x0101 ImageLength               |     SHORT |        1 |       130 | 130
-      46 | 0x0102 BitsPerSample             |     SHORT |        3 |       374 | 8 8 8
-      58 | 0x0103 Compression               |     SHORT |        1 |         5 | 5
-      70 | 0x0106 PhotometricInterpretation |     SHORT |        1 |         2 | 2
-      82 | 0x010d DocumentName              |     ASCII |       59 |       380 | /media/trekstor/exiv2/exiv2-svn/ ...
-      94 | 0x010e ImageDescription          |     ASCII |      403 |       440 | 040621-N-6536T-062.USS Ronald Re ...
-     106 | 0x010f Make                      |     ASCII |       18 |       844 | NIKON CORPORATION
-     118 | 0x0110 Model                     |     ASCII |       10 |       862 | NIKON D1X
-     130 | 0x0111 StripOffsets              |      LONG |        2 |       872 | 1623650 1667534
-     142 | 0x0112 Orientation               |     SHORT |        1 |         1 | 1
-     154 | 0x0115 SamplesPerPixel           |     SHORT |        1 |         3 | 3
-     166 | 0x0116 RowsPerStrip              |     SHORT |        1 |       128 | 128
-     178 | 0x0117 StripByteCounts           |      LONG |        2 |       880 | 43883 931
-     190 | 0x011a XResolution               |  RATIONAL |        1 |       888 | 300/1
-     202 | 0x011b YResolution               |  RATIONAL |        1 |       896 | 300/1
-     214 | 0x011c PlanarConfiguration       |     SHORT |        1 |         1 | 1
-     226 | 0x0128 ResolutionUnit            |     SHORT |        1 |         2 | 2
-     238 | 0x0131 Software                  |     ASCII |       11 |       904 | GIMP 2.9.5
-     250 | 0x0132 DateTime                  |     ASCII |       20 |       916 | 2016:09:13 12:23:27
-     262 | 0x013b Artist                    |     ASCII |       34 |       936 | Photographer..s Mate 3rd Class ( ...
-     274 | 0x013d Predictor                 |     SHORT |        1 |         2 | 2
-     286 | 0x014a SubIFDs                   |      LONG |        1 |   1622480 | 1622480
-     298 | 0x0153 SampleFormat              |     SHORT |        3 |       970 | 1 1 1
-     310 | 0x02bc XMLPacket                 |      BYTE |     7135 |       976 | <?xpacket begin="..." id="W5M0Mp ...
-     322 | 0x83bb IPTCNAA                   |      LONG |      192 |      8112 | 5898524 1193614083 5243420 1869107232 1919381364 ...
-     334 | 0x8769 ExifTag                   |      LONG |        1 |   1622642 | 1622642
-     346 | 0x8773 InterColorProfile         | UNDEFINED |      560 |      8880 | ...0ADBE....mntrRGB XYZ ....... ...
-     358 | 0x8825 GPSTag                    |      LONG |        1 |   1623632 | 1623632
-END ReaganLargeTiff.tiff
-45ed3c125cc6041b37b44ee4cb881cd8
-45ed3c125cc6041b37b44ee4cb881cd8
-50b9125494306a6fc1b7c4f2a1a8d49d
-50b9125494306a6fc1b7c4f2a1a8d49d
-45ed3c125cc6041b37b44ee4cb881cd8
-45ed3c125cc6041b37b44ee4cb881cd8
 STRUCTURE OF JPEG FILE: ReaganLargeJpg.jpg
  address | marker       |  length | data
        0 | 0xffd8 SOI  
diff --git a/test/icc-test.sh b/test/icc-test.sh
index 3327aba9..c4a017da 100755
--- a/test/icc-test.sh
+++ b/test/icc-test.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-# Test driver for webp
+# Test driver for exiv2.exe ICC support (-pS, -pC, -eC, -iC)
 
 source ./functions.source
 
-test2120() # --comment and -dc clobbered by writing ICC/JPG
+test1120() # --comment and -dc clobbered by writing ICC/JPG
 {
     runTest exiv2 --comment abcdefg     $filename
     runTest exiv2 -pS                   $filename
@@ -16,7 +16,7 @@ test2120() # --comment and -dc clobbered by writing ICC/JPG
 
     num=1074                    # ICC Profile Support
     printf "ICC " >&3
-    for filename in Reagan.jpg exiv2-bug1199.webp ReaganLargePng.png ReaganLargeTiff.tiff ReaganLargeJpg.jpg
+    for filename in Reagan.jpg exiv2-bug1199.webp ReaganLargePng.png ReaganLargeJpg.jpg # 1272 ReaganLargeTiff.tiff
     do
         format=$(echo $filename|cut -d. -f 2)
         stub=$(  echo $filename|cut -d. -f 1)
@@ -28,7 +28,7 @@ test2120() # --comment and -dc clobbered by writing ICC/JPG
         runTest exiv2 -pC                   $filename > ${stub}_1.icc
         runTest exiv2 -eC --force           $filename
                 mv                          $iccname_   ${stub}_2.icc
-        test2120
+        test1120
 
         copyTestFile          large.icc     $iccname_
         runTest exiv2 -iC                   $filename
@@ -36,7 +36,7 @@ test2120() # --comment and -dc clobbered by writing ICC/JPG
         runTest exiv2 -pS                   $filename
         runTest exiv2 -eC --force           $filename
                 mv                          $iccname_   ${stub}_large_2.icc
-        test2120
+        test1120
 
         copyTestFile          small.icc     $iccname_
         runTest exiv2 -iC                   $filename
@@ -44,7 +44,7 @@ test2120() # --comment and -dc clobbered by writing ICC/JPG
         runTest exiv2 -pS                   $filename
         runTest exiv2 -eC --force           $filename
                 mv                          $iccname_   ${stub}_small_2.icc
-        test2120
+        test1120
 
         printf " md5 " >&3