diff --git a/extra/images/bitmap/bitmap-tests.factor b/extra/images/bitmap/bitmap-tests.factor
index 2ac2fed4d1..a9d7e42134 100644
--- a/extra/images/bitmap/bitmap-tests.factor
+++ b/extra/images/bitmap/bitmap-tests.factor
@@ -4,8 +4,8 @@ IN: images.bitmap.tests
 ! "vocab:images/testing/bmp/1bit.bmp" decode-test
 ! "vocab:images/testing/bmp/rgb_4bit.bmp" decode-test
 
-"vocab:images/testing/bmp/rgb_8bit.bmp"
-[ decode-test ] [ bmp-image encode-test ] bi
+"vocab:images/testing/bmp/rgb_8bit.bmp" bmp-image
+[ decode-test ] [ encode-test ] 2bi
 
-"vocab:images/testing/bmp/42red_24bit.bmp"
-[ decode-test ] [ bmp-image encode-test ] bi
+"vocab:images/testing/bmp/42red_24bit.bmp" bmp-image
+[ decode-test ] [ encode-test ] 2bi
diff --git a/extra/images/gif/gif-tests.factor b/extra/images/gif/gif-tests.factor
index 8c1add1c51..3dbf60716e 100644
--- a/extra/images/gif/gif-tests.factor
+++ b/extra/images/gif/gif-tests.factor
@@ -5,12 +5,12 @@ io.encodings.binary io.files kernel math math.bitwise
 namespaces sequences tools.test ;
 IN: images.gif.tests
 
-"vocab:images/testing/gif/circle.gif" decode-test
-"vocab:images/testing/gif/checkmark.gif" decode-test
-"vocab:images/testing/gif/monochrome.gif" decode-test
-"vocab:images/testing/gif/alpha.gif" decode-test
-"vocab:images/testing/gif/noise.gif" decode-test
-"vocab:images/testing/gif/astronaut_animation.gif" decode-test
+"vocab:images/testing/gif/circle.gif" gif-image decode-test
+"vocab:images/testing/gif/checkmark.gif" gif-image decode-test
+"vocab:images/testing/gif/monochrome.gif" gif-image decode-test
+"vocab:images/testing/gif/alpha.gif" gif-image decode-test
+"vocab:images/testing/gif/noise.gif" gif-image decode-test
+"vocab:images/testing/gif/astronaut_animation.gif" gif-image decode-test
 
 : path>gif ( path -- gif )
     binary [ input-stream get load-gif ] with-file-reader ;
diff --git a/extra/images/pbm/pbm-tests.factor b/extra/images/pbm/pbm-tests.factor
index 73558cc144..98eac60ea6 100644
--- a/extra/images/pbm/pbm-tests.factor
+++ b/extra/images/pbm/pbm-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Erik Charlebois.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: images.testing ;
+USING: images.pbm images.testing ;
 IN: images.pbm.tests
 
-"vocab:images/testing/pbm/test.binary.pbm" decode-test
-"vocab:images/testing/pbm/test.ascii.pbm" decode-test
+"vocab:images/testing/pbm/test.binary.pbm" pbm-image decode-test
+"vocab:images/testing/pbm/test.ascii.pbm" pbm-image decode-test
diff --git a/extra/images/pgm/pgm-tests.factor b/extra/images/pgm/pgm-tests.factor
index 7bfade4717..3015a291f2 100644
--- a/extra/images/pgm/pgm-tests.factor
+++ b/extra/images/pgm/pgm-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Erik Charlebois.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: images.testing ;
+USING: images.testing images.pgm ;
 IN: images.pgm.tests
 
-"vocab:images/testing/pgm/radial.binary.pgm" decode-test
-"vocab:images/testing/pgm/radial.ascii.pgm" decode-test
+"vocab:images/testing/pgm/radial.binary.pgm" pgm-image decode-test
+"vocab:images/testing/pgm/radial.ascii.pgm" pgm-image decode-test
diff --git a/extra/images/pgm/pgm.factor b/extra/images/pgm/pgm.factor
index d7ea44c886..730fc3ea81 100644
--- a/extra/images/pgm/pgm.factor
+++ b/extra/images/pgm/pgm.factor
@@ -36,12 +36,12 @@ SINGLETON: pgm-image
     read-number        :> max
     width height *     :> npixels
     max 256 >=         :> wide
-    
+
     type {
         { "P2" [ [ 0 npixels read-numbers ] wide [ ushort-array{ } ] [ B{ } ] if make ] }
         { "P5" [ wide [ 2 ] [ 1 ] if npixels * read ] }
     } case :> data
-    
+
     image new
     L                                                  >>component-order
     { width height }                                   >>dim
@@ -53,7 +53,7 @@ M: pgm-image stream>image*
     drop [ [ read-pgm ] throw-on-eof ] with-input-stream ;
 
 M: pgm-image image>stream
-    drop {
+    2drop {
         [ drop "P5\n" ascii encode write ]
         [ dim>> first number>string " " append ascii encode write ]
         [ dim>> second number>string "\n" append ascii encode write ]
diff --git a/extra/images/png/png-tests.factor b/extra/images/png/png-tests.factor
index acccc84e37..80ffecb568 100644
--- a/extra/images/png/png-tests.factor
+++ b/extra/images/png/png-tests.factor
@@ -1,262 +1,262 @@
 ! Copyright (C) 2009 Doug Coleman, Keith Lazuka
 ! See http://factorcode.org/license.txt for BSD license.
-USING: images.testing io.directories ;
+USING: images.testing io.directories images.png ;
 IN: images.png.tests
 
 ! Test files from PngSuite (http://www.libpng.org/pub/png/pngsuite.html)
 
 ! The subset of the suite that should work given the current implementation.
 "vocab:images/testing/png" [
-    "basi0g01.png" decode-test
-    "basi0g02.png" decode-test
-    "basi0g04.png" decode-test
-    "basi0g08.png" decode-test
-    "basi0g16.png" decode-test
-    "basi2c08.png" decode-test
-    "basi3p01.png" decode-test
-    "basi3p02.png" decode-test
-    "basi3p04.png" decode-test
-    "basi3p08.png" decode-test
-    "basn0g01.png" decode-test
-    "basn0g02.png" decode-test
-    "basn0g04.png" decode-test
-    "basn0g08.png" decode-test
-    "basn0g16.png" decode-test
-    "basn2c08.png" decode-test
-    "basn3p01.png" decode-test
-    "basn3p02.png" decode-test
-    "basn3p04.png" decode-test
-    "basn3p08.png" decode-test
-    "basn6a08.png" decode-test
-    "f00n2c08.png" decode-test
-    "f01n2c08.png" decode-test
-    "f02n2c08.png" decode-test
-    "f03n2c08.png" decode-test
-    "f04n2c08.png" decode-test
-    "s01i3p01.png" decode-test
-    "s01n3p01.png" decode-test
-    "s02i3p01.png" decode-test
-    "s02n3p01.png" decode-test
-    "s03i3p01.png" decode-test
-    "s03n3p01.png" decode-test
-    "s04i3p01.png" decode-test
-    "s04n3p01.png" decode-test
-    "s05i3p02.png" decode-test
-    "s05n3p02.png" decode-test
-    "s06i3p02.png" decode-test
-    "s06n3p02.png" decode-test
-    "s07i3p02.png" decode-test
-    "s07n3p02.png" decode-test
-    "s08i3p02.png" decode-test
-    "s08n3p02.png" decode-test
-    "s09i3p02.png" decode-test
-    "s32n3p04.png" decode-test
-    "s32i3p04.png" decode-test
-    "s33n3p04.png" decode-test
-    "s33i3p04.png" decode-test
-    "s34n3p04.png" decode-test
-    "s34i3p04.png" decode-test
-    "s35n3p04.png" decode-test
-    "s35i3p04.png" decode-test
-    "s36n3p04.png" decode-test
-    "s36i3p04.png" decode-test
-    "s37n3p04.png" decode-test
-    "s37i3p04.png" decode-test
-    "s38n3p04.png" decode-test
-    "s38i3p04.png" decode-test
-    "s39n3p04.png" decode-test
-    "s39i3p04.png" decode-test
-    "s40n3p04.png" decode-test
-    "s40i3p04.png" decode-test
-    "s07n3p02.png" decode-test
-    "z00n2c08.png" decode-test
-    "z03n2c08.png" decode-test
-    "z06n2c08.png" decode-test
-    "z09n2c08.png" decode-test
+    "basi0g01.png" png-image decode-test
+    "basi0g02.png" png-image decode-test
+    "basi0g04.png" png-image decode-test
+    "basi0g08.png" png-image decode-test
+    "basi0g16.png" png-image decode-test
+    "basi2c08.png" png-image decode-test
+    "basi3p01.png" png-image decode-test
+    "basi3p02.png" png-image decode-test
+    "basi3p04.png" png-image decode-test
+    "basi3p08.png" png-image decode-test
+    "basn0g01.png" png-image decode-test
+    "basn0g02.png" png-image decode-test
+    "basn0g04.png" png-image decode-test
+    "basn0g08.png" png-image decode-test
+    "basn0g16.png" png-image decode-test
+    "basn2c08.png" png-image decode-test
+    "basn3p01.png" png-image decode-test
+    "basn3p02.png" png-image decode-test
+    "basn3p04.png" png-image decode-test
+    "basn3p08.png" png-image decode-test
+    "basn6a08.png" png-image decode-test
+    "f00n2c08.png" png-image decode-test
+    "f01n2c08.png" png-image decode-test
+    "f02n2c08.png" png-image decode-test
+    "f03n2c08.png" png-image decode-test
+    "f04n2c08.png" png-image decode-test
+    "s01i3p01.png" png-image decode-test
+    "s01n3p01.png" png-image decode-test
+    "s02i3p01.png" png-image decode-test
+    "s02n3p01.png" png-image decode-test
+    "s03i3p01.png" png-image decode-test
+    "s03n3p01.png" png-image decode-test
+    "s04i3p01.png" png-image decode-test
+    "s04n3p01.png" png-image decode-test
+    "s05i3p02.png" png-image decode-test
+    "s05n3p02.png" png-image decode-test
+    "s06i3p02.png" png-image decode-test
+    "s06n3p02.png" png-image decode-test
+    "s07i3p02.png" png-image decode-test
+    "s07n3p02.png" png-image decode-test
+    "s08i3p02.png" png-image decode-test
+    "s08n3p02.png" png-image decode-test
+    "s09i3p02.png" png-image decode-test
+    "s32n3p04.png" png-image decode-test
+    "s32i3p04.png" png-image decode-test
+    "s33n3p04.png" png-image decode-test
+    "s33i3p04.png" png-image decode-test
+    "s34n3p04.png" png-image decode-test
+    "s34i3p04.png" png-image decode-test
+    "s35n3p04.png" png-image decode-test
+    "s35i3p04.png" png-image decode-test
+    "s36n3p04.png" png-image decode-test
+    "s36i3p04.png" png-image decode-test
+    "s37n3p04.png" png-image decode-test
+    "s37i3p04.png" png-image decode-test
+    "s38n3p04.png" png-image decode-test
+    "s38i3p04.png" png-image decode-test
+    "s39n3p04.png" png-image decode-test
+    "s39i3p04.png" png-image decode-test
+    "s40n3p04.png" png-image decode-test
+    "s40i3p04.png" png-image decode-test
+    "s07n3p02.png" png-image decode-test
+    "z00n2c08.png" png-image decode-test
+    "z03n2c08.png" png-image decode-test
+    "z06n2c08.png" png-image decode-test
+    "z09n2c08.png" png-image decode-test
 ] with-directory
 
 ! Test pngsuite
 "vocab:images/testing/png/suite" [
-    "PngSuite.png" decode-test
-    "basi0g01.png" decode-test
-    "basi0g02.png" decode-test
-    "basi0g04.png" decode-test
-    "basi0g08.png" decode-test
-    "basi0g16.png" decode-test
-    "basi2c08.png" decode-test
-    "basi2c16.png" decode-test
-    "basi3p01.png" decode-test
-    "basi3p02.png" decode-test
-    "basi3p04.png" decode-test
-    "basi3p08.png" decode-test
-    "basi4a08.png" decode-test
-    "basi4a16.png" decode-test
-    "basi6a08.png" decode-test
-    "basi6a16.png" decode-test
-    "basn0g01.png" decode-test
-    "basn0g02.png" decode-test
-    "basn0g04.png" decode-test
-    "basn0g08.png" decode-test
-    "basn0g16.png" decode-test
-    "basn2c08.png" decode-test
-    "basn2c16.png" decode-test
-    "basn3p01.png" decode-test
-    "basn3p02.png" decode-test
-    "basn3p04.png" decode-test
-    "basn3p08.png" decode-test
-    "basn4a08.png" decode-test
-    "basn4a16.png" decode-test
-    "basn6a08.png" decode-test
-    "basn6a16.png" decode-test
-    "bgai4a08.png" decode-test
-    "bgai4a16.png" decode-test
-    "bgan6a08.png" decode-test
-    "bgan6a16.png" decode-test
-    "bgbn4a08.png" decode-test
-    "bggn4a16.png" decode-test
-    "bgwn6a08.png" decode-test
-    "bgyn6a16.png" decode-test
-    "ccwn2c08.png" decode-test
-    "ccwn3p08.png" decode-test
-    "cdfn2c08.png" decode-test
-    "cdhn2c08.png" decode-test
-    "cdsn2c08.png" decode-test
-    "cdun2c08.png" decode-test
-    "ch1n3p04.png" decode-test
-    "ch2n3p08.png" decode-test
-    "cm0n0g04.png" decode-test
-    "cm7n0g04.png" decode-test
-    "cm9n0g04.png" decode-test
-    "cs3n2c16.png" decode-test
-    "cs3n3p08.png" decode-test
-    "cs5n2c08.png" decode-test
-    "cs5n3p08.png" decode-test
-    "cs8n2c08.png" decode-test
-    "cs8n3p08.png" decode-test
-    "ct0n0g04.png" decode-test
-    "ct1n0g04.png" decode-test
-    "cten0g04.png" decode-test
-    "ctfn0g04.png" decode-test
-    "ctgn0g04.png" decode-test
-    "cthn0g04.png" decode-test
-    "ctjn0g04.png" decode-test
-    "ctzn0g04.png" decode-test
-    "f00n0g08.png" decode-test
-    "f00n2c08.png" decode-test
-    "f01n0g08.png" decode-test
-    "f01n2c08.png" decode-test
-    "f02n0g08.png" decode-test
-    "f02n2c08.png" decode-test
-    "f03n0g08.png" decode-test
-    "f03n2c08.png" decode-test
-    "f04n0g08.png" decode-test
-    "f04n2c08.png" decode-test
-    "f99n0g04.png" decode-test
-    "g03n0g16.png" decode-test
-    "g03n2c08.png" decode-test
-    "g03n3p04.png" decode-test
-    "g04n0g16.png" decode-test
-    "g04n2c08.png" decode-test
-    "g04n3p04.png" decode-test
-    "g05n0g16.png" decode-test
-    "g05n2c08.png" decode-test
-    "g05n3p04.png" decode-test
-    "g07n0g16.png" decode-test
-    "g07n2c08.png" decode-test
-    "g07n3p04.png" decode-test
-    "g10n0g16.png" decode-test
-    "g10n2c08.png" decode-test
-    "g10n3p04.png" decode-test
-    "g25n0g16.png" decode-test
-    "g25n2c08.png" decode-test
-    "g25n3p04.png" decode-test
-    "oi1n0g16.png" decode-test
-    "oi1n2c16.png" decode-test
-    "oi2n0g16.png" decode-test
-    "oi2n2c16.png" decode-test
-    "oi4n0g16.png" decode-test
-    "oi4n2c16.png" decode-test
-    "oi9n0g16.png" decode-test
-    "oi9n2c16.png" decode-test
-    "pngsuite_logo.png" decode-test
-    "pp0n2c16.png" decode-test
-    "pp0n6a08.png" decode-test
-    "ps1n0g08.png" decode-test
-    "ps1n2c16.png" decode-test
-    "ps2n0g08.png" decode-test
-    "ps2n2c16.png" decode-test
-    "s01i3p01.png" decode-test
-    "s01n3p01.png" decode-test
-    "s02i3p01.png" decode-test
-    "s02n3p01.png" decode-test
-    "s03i3p01.png" decode-test
-    "s03n3p01.png" decode-test
-    "s04i3p01.png" decode-test
-    "s04n3p01.png" decode-test
-    "s05i3p02.png" decode-test
-    "s05n3p02.png" decode-test
-    "s06i3p02.png" decode-test
-    "s06n3p02.png" decode-test
-    "s07i3p02.png" decode-test
-    "s07n3p02.png" decode-test
-    "s08i3p02.png" decode-test
-    "s08n3p02.png" decode-test
-    "s09i3p02.png" decode-test
-    "s09n3p02.png" decode-test
-    "s32i3p04.png" decode-test
-    "s32n3p04.png" decode-test
-    "s33i3p04.png" decode-test
-    "s33n3p04.png" decode-test
-    "s34i3p04.png" decode-test
-    "s34n3p04.png" decode-test
-    "s35i3p04.png" decode-test
-    "s35n3p04.png" decode-test
-    "s36i3p04.png" decode-test
-    "s36n3p04.png" decode-test
-    "s37i3p04.png" decode-test
-    "s37n3p04.png" decode-test
-    "s38i3p04.png" decode-test
-    "s38n3p04.png" decode-test
-    "s39i3p04.png" decode-test
-    "s39n3p04.png" decode-test
-    "s40i3p04.png" decode-test
-    "s40n3p04.png" decode-test
-    "tbbn0g04.png" decode-test
-    "tbbn1g04.png" decode-test
-    "tbbn2c16.png" decode-test
-    "tbbn3p08.png" decode-test
-    "tbgn2c16.png" decode-test
-    "tbgn3p08.png" decode-test
-    "tbrn2c08.png" decode-test
-    "tbwn0g16.png" decode-test
-    "tbwn1g16.png" decode-test
-    "tbwn3p08.png" decode-test
-    "tbyn3p08.png" decode-test
-    "tp0n0g08.png" decode-test
-    "tp0n1g08.png" decode-test
-    "tp0n2c08.png" decode-test
-    "tp0n3p08.png" decode-test
-    "tp1n3p08.png" decode-test
-    "z00n2c08.png" decode-test
-    "z03n2c08.png" decode-test
-    "z06n2c08.png" decode-test
-    "z09n2c08.png" decode-test
+    "PngSuite.png" png-image decode-test
+    "basi0g01.png" png-image decode-test
+    "basi0g02.png" png-image decode-test
+    "basi0g04.png" png-image decode-test
+    "basi0g08.png" png-image decode-test
+    "basi0g16.png" png-image decode-test
+    "basi2c08.png" png-image decode-test
+    "basi2c16.png" png-image decode-test
+    "basi3p01.png" png-image decode-test
+    "basi3p02.png" png-image decode-test
+    "basi3p04.png" png-image decode-test
+    "basi3p08.png" png-image decode-test
+    "basi4a08.png" png-image decode-test
+    "basi4a16.png" png-image decode-test
+    "basi6a08.png" png-image decode-test
+    "basi6a16.png" png-image decode-test
+    "basn0g01.png" png-image decode-test
+    "basn0g02.png" png-image decode-test
+    "basn0g04.png" png-image decode-test
+    "basn0g08.png" png-image decode-test
+    "basn0g16.png" png-image decode-test
+    "basn2c08.png" png-image decode-test
+    "basn2c16.png" png-image decode-test
+    "basn3p01.png" png-image decode-test
+    "basn3p02.png" png-image decode-test
+    "basn3p04.png" png-image decode-test
+    "basn3p08.png" png-image decode-test
+    "basn4a08.png" png-image decode-test
+    "basn4a16.png" png-image decode-test
+    "basn6a08.png" png-image decode-test
+    "basn6a16.png" png-image decode-test
+    "bgai4a08.png" png-image decode-test
+    "bgai4a16.png" png-image decode-test
+    "bgan6a08.png" png-image decode-test
+    "bgan6a16.png" png-image decode-test
+    "bgbn4a08.png" png-image decode-test
+    "bggn4a16.png" png-image decode-test
+    "bgwn6a08.png" png-image decode-test
+    "bgyn6a16.png" png-image decode-test
+    "ccwn2c08.png" png-image decode-test
+    "ccwn3p08.png" png-image decode-test
+    "cdfn2c08.png" png-image decode-test
+    "cdhn2c08.png" png-image decode-test
+    "cdsn2c08.png" png-image decode-test
+    "cdun2c08.png" png-image decode-test
+    "ch1n3p04.png" png-image decode-test
+    "ch2n3p08.png" png-image decode-test
+    "cm0n0g04.png" png-image decode-test
+    "cm7n0g04.png" png-image decode-test
+    "cm9n0g04.png" png-image decode-test
+    "cs3n2c16.png" png-image decode-test
+    "cs3n3p08.png" png-image decode-test
+    "cs5n2c08.png" png-image decode-test
+    "cs5n3p08.png" png-image decode-test
+    "cs8n2c08.png" png-image decode-test
+    "cs8n3p08.png" png-image decode-test
+    "ct0n0g04.png" png-image decode-test
+    "ct1n0g04.png" png-image decode-test
+    "cten0g04.png" png-image decode-test
+    "ctfn0g04.png" png-image decode-test
+    "ctgn0g04.png" png-image decode-test
+    "cthn0g04.png" png-image decode-test
+    "ctjn0g04.png" png-image decode-test
+    "ctzn0g04.png" png-image decode-test
+    "f00n0g08.png" png-image decode-test
+    "f00n2c08.png" png-image decode-test
+    "f01n0g08.png" png-image decode-test
+    "f01n2c08.png" png-image decode-test
+    "f02n0g08.png" png-image decode-test
+    "f02n2c08.png" png-image decode-test
+    "f03n0g08.png" png-image decode-test
+    "f03n2c08.png" png-image decode-test
+    "f04n0g08.png" png-image decode-test
+    "f04n2c08.png" png-image decode-test
+    "f99n0g04.png" png-image decode-test
+    "g03n0g16.png" png-image decode-test
+    "g03n2c08.png" png-image decode-test
+    "g03n3p04.png" png-image decode-test
+    "g04n0g16.png" png-image decode-test
+    "g04n2c08.png" png-image decode-test
+    "g04n3p04.png" png-image decode-test
+    "g05n0g16.png" png-image decode-test
+    "g05n2c08.png" png-image decode-test
+    "g05n3p04.png" png-image decode-test
+    "g07n0g16.png" png-image decode-test
+    "g07n2c08.png" png-image decode-test
+    "g07n3p04.png" png-image decode-test
+    "g10n0g16.png" png-image decode-test
+    "g10n2c08.png" png-image decode-test
+    "g10n3p04.png" png-image decode-test
+    "g25n0g16.png" png-image decode-test
+    "g25n2c08.png" png-image decode-test
+    "g25n3p04.png" png-image decode-test
+    "oi1n0g16.png" png-image decode-test
+    "oi1n2c16.png" png-image decode-test
+    "oi2n0g16.png" png-image decode-test
+    "oi2n2c16.png" png-image decode-test
+    "oi4n0g16.png" png-image decode-test
+    "oi4n2c16.png" png-image decode-test
+    "oi9n0g16.png" png-image decode-test
+    "oi9n2c16.png" png-image decode-test
+    "pngsuite_logo.png" png-image decode-test
+    "pp0n2c16.png" png-image decode-test
+    "pp0n6a08.png" png-image decode-test
+    "ps1n0g08.png" png-image decode-test
+    "ps1n2c16.png" png-image decode-test
+    "ps2n0g08.png" png-image decode-test
+    "ps2n2c16.png" png-image decode-test
+    "s01i3p01.png" png-image decode-test
+    "s01n3p01.png" png-image decode-test
+    "s02i3p01.png" png-image decode-test
+    "s02n3p01.png" png-image decode-test
+    "s03i3p01.png" png-image decode-test
+    "s03n3p01.png" png-image decode-test
+    "s04i3p01.png" png-image decode-test
+    "s04n3p01.png" png-image decode-test
+    "s05i3p02.png" png-image decode-test
+    "s05n3p02.png" png-image decode-test
+    "s06i3p02.png" png-image decode-test
+    "s06n3p02.png" png-image decode-test
+    "s07i3p02.png" png-image decode-test
+    "s07n3p02.png" png-image decode-test
+    "s08i3p02.png" png-image decode-test
+    "s08n3p02.png" png-image decode-test
+    "s09i3p02.png" png-image decode-test
+    "s09n3p02.png" png-image decode-test
+    "s32i3p04.png" png-image decode-test
+    "s32n3p04.png" png-image decode-test
+    "s33i3p04.png" png-image decode-test
+    "s33n3p04.png" png-image decode-test
+    "s34i3p04.png" png-image decode-test
+    "s34n3p04.png" png-image decode-test
+    "s35i3p04.png" png-image decode-test
+    "s35n3p04.png" png-image decode-test
+    "s36i3p04.png" png-image decode-test
+    "s36n3p04.png" png-image decode-test
+    "s37i3p04.png" png-image decode-test
+    "s37n3p04.png" png-image decode-test
+    "s38i3p04.png" png-image decode-test
+    "s38n3p04.png" png-image decode-test
+    "s39i3p04.png" png-image decode-test
+    "s39n3p04.png" png-image decode-test
+    "s40i3p04.png" png-image decode-test
+    "s40n3p04.png" png-image decode-test
+    "tbbn0g04.png" png-image decode-test
+    "tbbn1g04.png" png-image decode-test
+    "tbbn2c16.png" png-image decode-test
+    "tbbn3p08.png" png-image decode-test
+    "tbgn2c16.png" png-image decode-test
+    "tbgn3p08.png" png-image decode-test
+    "tbrn2c08.png" png-image decode-test
+    "tbwn0g16.png" png-image decode-test
+    "tbwn1g16.png" png-image decode-test
+    "tbwn3p08.png" png-image decode-test
+    "tbyn3p08.png" png-image decode-test
+    "tp0n0g08.png" png-image decode-test
+    "tp0n1g08.png" png-image decode-test
+    "tp0n2c08.png" png-image decode-test
+    "tp0n3p08.png" png-image decode-test
+    "tp1n3p08.png" png-image decode-test
+    "z00n2c08.png" png-image decode-test
+    "z03n2c08.png" png-image decode-test
+    "z06n2c08.png" png-image decode-test
+    "z09n2c08.png" png-image decode-test
 ] with-directory
 
 "vocab:images/testing/png/suite/bads" [
-    "x00n0g01.png" image-load-must-fail
-    "xcsn0g01.png" image-load-must-fail
-    "xd0n2c08.png" image-load-must-fail
-    "xd3n2c08.png" image-load-must-fail
-    "xd9n2c08.png" image-load-must-fail
-    "xdtn0g01.png" image-load-must-fail
-    "xcrn0g04.png" image-load-must-fail
-    "xc1n0g08.png" image-load-must-fail
-    "xc9n2c08.png" image-load-must-fail
-    "xlfn0g04.png" image-load-must-fail
-    "xhdn0g08.png" image-load-must-fail
-    "xs1n0g01.png" image-load-must-fail
-    "xs2n0g01.png" image-load-must-fail
-    "xs4n0g01.png" image-load-must-fail
-    "xs7n0g01.png" image-load-must-fail
+    "x00n0g01.png" png-image image-load-must-fail
+    "xcsn0g01.png" png-image image-load-must-fail
+    "xd0n2c08.png" png-image image-load-must-fail
+    "xd3n2c08.png" png-image image-load-must-fail
+    "xd9n2c08.png" png-image image-load-must-fail
+    "xdtn0g01.png" png-image image-load-must-fail
+    "xcrn0g04.png" png-image image-load-must-fail
+    "xc1n0g08.png" png-image image-load-must-fail
+    "xc9n2c08.png" png-image image-load-must-fail
+    "xlfn0g04.png" png-image image-load-must-fail
+    "xhdn0g08.png" png-image image-load-must-fail
+    "xs1n0g01.png" png-image image-load-must-fail
+    "xs2n0g01.png" png-image image-load-must-fail
+    "xs4n0g01.png" png-image image-load-must-fail
+    "xs7n0g01.png" png-image image-load-must-fail
 ] with-directory
diff --git a/extra/images/ppm/ppm-tests.factor b/extra/images/ppm/ppm-tests.factor
index 208af76dd2..73f8c88c41 100644
--- a/extra/images/ppm/ppm-tests.factor
+++ b/extra/images/ppm/ppm-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Erik Charlebois.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: images.testing ;
+USING: images.testing images.ppm ;
 IN: images.ppm.tests
 
-"vocab:images/testing/ppm/binary.ppm" decode-test
-"vocab:images/testing/ppm/ascii.ppm" decode-test
+"vocab:images/testing/ppm/binary.ppm" ppm-image decode-test
+"vocab:images/testing/ppm/ascii.ppm" ppm-image decode-test
diff --git a/extra/images/testing/testing.factor b/extra/images/testing/testing.factor
index c56c60fbf8..94a68a96e0 100644
--- a/extra/images/testing/testing.factor
+++ b/extra/images/testing/testing.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2009 Keith Lazuka.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs fry images images.loader images.normalization
-images.loader.private images.viewer io io.backend io.directories
-io.encodings.binary io.files io.pathnames io.streams.byte-array kernel locals
-namespaces quotations random sequences serialize tools.test ;
+USING: accessors arrays fry images images.loader
+images.normalization images.viewer io io.backend io.directories
+io.encodings.binary io.files io.pathnames io.streams.byte-array
+kernel locals namespaces quotations random sequences serialize
+tools.test ;
 IN: images.testing
 
 <PRIVATE
@@ -40,18 +41,19 @@ PRIVATE>
 
 :: encode-test ( path image-class -- )
     f verbose-tests? [
-        path load-image dup clone normalize-image 1quotation swap
+        path image-class load-image*
+        [ clone normalize-image 1array ] keep
         '[
             binary [
-                _ image-class [ types get value-at ] keep image>stream
+                _ path file-extension image-class image>stream
             ] with-byte-writer image-class load-image* normalize-image
         ] unit-test
     ] with-variable ;
 
-: decode-test ( path -- )
+:: decode-test ( path image-class -- )
     f verbose-tests? [
-        [ load-image 1quotation ]
-        [ '[ _ load-reference-image ] ] bi
+        path image-class load-image* 1array
+        [ path load-reference-image ]
         unit-test
     ] with-variable ;
 
@@ -63,5 +65,5 @@ PRIVATE>
 : randomize-image ( image -- image )
     dup bytes-per-image random-bytes >>bitmap ;
 
-: image-load-must-fail ( path -- )
-    '[ _ load-image ] must-fail ;
+: image-load-must-fail ( path image-class -- )
+    '[ _ _ load-image* ] must-fail ;
diff --git a/extra/images/tiff/tiff-tests.factor b/extra/images/tiff/tiff-tests.factor
index b0a036ae49..348f1eede0 100644
--- a/extra/images/tiff/tiff-tests.factor
+++ b/extra/images/tiff/tiff-tests.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: images.testing ;
+USING: images.testing images.tiff ;
 IN: images.tiff.tests
 
-"vocab:images/testing/tiff/octagon.tiff" decode-test
-! "vocab:images/testing/tiff/elephants.tiff" decode-test
-"vocab:images/testing/tiff/noise.tiff" decode-test
-"vocab:images/testing/tiff/alpha.tiff" decode-test
-"vocab:images/testing/tiff/color_spectrum.tiff" decode-test
-"vocab:images/testing/tiff/rgb.tiff" decode-test
+"vocab:images/testing/tiff/octagon.tiff" tiff-image decode-test
+! "vocab:images/testing/tiff/elephants.tiff" tiff-image decode-test
+"vocab:images/testing/tiff/noise.tiff" tiff-image decode-test
+"vocab:images/testing/tiff/alpha.tiff" tiff-image decode-test
+"vocab:images/testing/tiff/color_spectrum.tiff" tiff-image decode-test
+"vocab:images/testing/tiff/rgb.tiff" tiff-image decode-test