diff --git a/basis/images/png/png-tests.factor b/basis/images/png/png-tests.factor
index 7edb8d753e..6e02c3311d 100644
--- a/basis/images/png/png-tests.factor
+++ b/basis/images/png/png-tests.factor
@@ -13,18 +13,62 @@ IN: images.png.tests
     "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
diff --git a/basis/images/png/png.factor b/basis/images/png/png.factor
index 2a77d13068..0b18b01a45 100644
--- a/basis/images/png/png.factor
+++ b/basis/images/png/png.factor
@@ -170,22 +170,35 @@ ERROR: bad-filter n ;
     byte-array bs:<msb0-bit-reader> :> bs
     loading-png width>> :> width
     loading-png height>> :> height
-
     bs loading-png width height read-scanlines ;
 
-: adam7-subimage-height ( png-height pass -- subimage-height )
-    [ starting-row nth + ] keep
-    row-increment nth /i ;
+:: adam7-subimage-height ( png-height pass -- subimage-height )
+    pass starting-row nth png-height >= [
+        0
+    ] [
+        png-height 1 -
+        pass block-height nth +
+        pass row-increment nth /i
+    ] if ;
 
-: adam7-subimage-width ( png-width pass -- subimage-width )
-    [ starting-col nth + ] keep
-    col-increment nth /i ;
+:: adam7-subimage-width ( png-width pass -- subimage-width )
+    pass starting-col nth png-width >= [
+        0
+    ] [
+        png-width 1 -
+        pass block-width nth +
+        pass col-increment nth /i
+    ] if ;
 
 :: read-adam7-subimage ( bit-reader loading-png pass -- lines )
     loading-png height>> pass adam7-subimage-height :> height
     loading-png width>> pass adam7-subimage-width :> width
 
-    bit-reader loading-png width height read-scanlines ;
+    height width * zero? [
+        B{ } clone
+    ] [
+        bit-reader loading-png width height read-scanlines
+    ] if ;
 
 :: reverse-interlace-adam7 ( byte-array loading-png -- byte-array )
     byte-array bs:<msb0-bit-reader> :> bs
diff --git a/extra/images/testing/png/basi3p01.fig b/extra/images/testing/png/basi3p01.fig
new file mode 100644
index 0000000000..7437629ad1
Binary files /dev/null and b/extra/images/testing/png/basi3p01.fig differ
diff --git a/extra/images/testing/png/basi3p01.png b/extra/images/testing/png/basi3p01.png
new file mode 100644
index 0000000000..00a7cea6c2
Binary files /dev/null and b/extra/images/testing/png/basi3p01.png differ
diff --git a/extra/images/testing/png/basi3p02.fig b/extra/images/testing/png/basi3p02.fig
new file mode 100644
index 0000000000..c373d6159c
Binary files /dev/null and b/extra/images/testing/png/basi3p02.fig differ
diff --git a/extra/images/testing/png/basi3p02.png b/extra/images/testing/png/basi3p02.png
new file mode 100644
index 0000000000..bb16b44b30
Binary files /dev/null and b/extra/images/testing/png/basi3p02.png differ
diff --git a/extra/images/testing/png/basi3p04.fig b/extra/images/testing/png/basi3p04.fig
new file mode 100644
index 0000000000..28523ff6f1
Binary files /dev/null and b/extra/images/testing/png/basi3p04.fig differ
diff --git a/extra/images/testing/png/basi3p04.png b/extra/images/testing/png/basi3p04.png
new file mode 100644
index 0000000000..b4e888e247
Binary files /dev/null and b/extra/images/testing/png/basi3p04.png differ
diff --git a/extra/images/testing/png/basi3p08.fig b/extra/images/testing/png/basi3p08.fig
new file mode 100644
index 0000000000..5c1b5d7096
Binary files /dev/null and b/extra/images/testing/png/basi3p08.fig differ
diff --git a/extra/images/testing/png/basi3p08.png b/extra/images/testing/png/basi3p08.png
new file mode 100644
index 0000000000..50a6d1cac7
Binary files /dev/null and b/extra/images/testing/png/basi3p08.png differ
diff --git a/extra/images/testing/png/basn3p01.fig b/extra/images/testing/png/basn3p01.fig
new file mode 100644
index 0000000000..7437629ad1
Binary files /dev/null and b/extra/images/testing/png/basn3p01.fig differ
diff --git a/extra/images/testing/png/basn3p01.png b/extra/images/testing/png/basn3p01.png
new file mode 100644
index 0000000000..b145c2b8ef
Binary files /dev/null and b/extra/images/testing/png/basn3p01.png differ
diff --git a/extra/images/testing/png/basn3p02.fig b/extra/images/testing/png/basn3p02.fig
new file mode 100644
index 0000000000..c373d6159c
Binary files /dev/null and b/extra/images/testing/png/basn3p02.fig differ
diff --git a/extra/images/testing/png/basn3p02.png b/extra/images/testing/png/basn3p02.png
new file mode 100644
index 0000000000..8985b3d818
Binary files /dev/null and b/extra/images/testing/png/basn3p02.png differ
diff --git a/extra/images/testing/png/basn3p04.fig b/extra/images/testing/png/basn3p04.fig
new file mode 100644
index 0000000000..28523ff6f1
Binary files /dev/null and b/extra/images/testing/png/basn3p04.fig differ
diff --git a/extra/images/testing/png/basn3p04.png b/extra/images/testing/png/basn3p04.png
new file mode 100644
index 0000000000..0fbf9e827b
Binary files /dev/null and b/extra/images/testing/png/basn3p04.png differ
diff --git a/extra/images/testing/png/basn3p08.fig b/extra/images/testing/png/basn3p08.fig
new file mode 100644
index 0000000000..5c1b5d7096
Binary files /dev/null and b/extra/images/testing/png/basn3p08.fig differ
diff --git a/extra/images/testing/png/basn3p08.png b/extra/images/testing/png/basn3p08.png
new file mode 100644
index 0000000000..0ddad07e5f
Binary files /dev/null and b/extra/images/testing/png/basn3p08.png differ
diff --git a/extra/images/testing/png/s01i3p01.fig b/extra/images/testing/png/s01i3p01.fig
new file mode 100644
index 0000000000..87093122f8
Binary files /dev/null and b/extra/images/testing/png/s01i3p01.fig differ
diff --git a/extra/images/testing/png/s01i3p01.png b/extra/images/testing/png/s01i3p01.png
new file mode 100644
index 0000000000..6c0fad1fc9
Binary files /dev/null and b/extra/images/testing/png/s01i3p01.png differ
diff --git a/extra/images/testing/png/s01n3p01.fig b/extra/images/testing/png/s01n3p01.fig
new file mode 100644
index 0000000000..87093122f8
Binary files /dev/null and b/extra/images/testing/png/s01n3p01.fig differ
diff --git a/extra/images/testing/png/s01n3p01.png b/extra/images/testing/png/s01n3p01.png
new file mode 100644
index 0000000000..cb2c8c7826
Binary files /dev/null and b/extra/images/testing/png/s01n3p01.png differ
diff --git a/extra/images/testing/png/s02i3p01.fig b/extra/images/testing/png/s02i3p01.fig
new file mode 100644
index 0000000000..b0ab738fa9
Binary files /dev/null and b/extra/images/testing/png/s02i3p01.fig differ
diff --git a/extra/images/testing/png/s02i3p01.png b/extra/images/testing/png/s02i3p01.png
new file mode 100644
index 0000000000..2defaed911
Binary files /dev/null and b/extra/images/testing/png/s02i3p01.png differ
diff --git a/extra/images/testing/png/s02n3p01.fig b/extra/images/testing/png/s02n3p01.fig
new file mode 100644
index 0000000000..b0ab738fa9
Binary files /dev/null and b/extra/images/testing/png/s02n3p01.fig differ
diff --git a/extra/images/testing/png/s02n3p01.png b/extra/images/testing/png/s02n3p01.png
new file mode 100644
index 0000000000..2b1b669643
Binary files /dev/null and b/extra/images/testing/png/s02n3p01.png differ
diff --git a/extra/images/testing/png/s03i3p01.fig b/extra/images/testing/png/s03i3p01.fig
new file mode 100644
index 0000000000..3c603e5a8c
Binary files /dev/null and b/extra/images/testing/png/s03i3p01.fig differ
diff --git a/extra/images/testing/png/s03i3p01.png b/extra/images/testing/png/s03i3p01.png
new file mode 100644
index 0000000000..c23fdc4631
Binary files /dev/null and b/extra/images/testing/png/s03i3p01.png differ
diff --git a/extra/images/testing/png/s03n3p01.fig b/extra/images/testing/png/s03n3p01.fig
new file mode 100644
index 0000000000..3c603e5a8c
Binary files /dev/null and b/extra/images/testing/png/s03n3p01.fig differ
diff --git a/extra/images/testing/png/s03n3p01.png b/extra/images/testing/png/s03n3p01.png
new file mode 100644
index 0000000000..6d96ee4f87
Binary files /dev/null and b/extra/images/testing/png/s03n3p01.png differ
diff --git a/extra/images/testing/png/s04i3p01.fig b/extra/images/testing/png/s04i3p01.fig
new file mode 100644
index 0000000000..1b60721cdf
Binary files /dev/null and b/extra/images/testing/png/s04i3p01.fig differ
diff --git a/extra/images/testing/png/s04i3p01.png b/extra/images/testing/png/s04i3p01.png
new file mode 100644
index 0000000000..0e710c2c39
Binary files /dev/null and b/extra/images/testing/png/s04i3p01.png differ
diff --git a/extra/images/testing/png/s04n3p01.fig b/extra/images/testing/png/s04n3p01.fig
new file mode 100644
index 0000000000..1b60721cdf
Binary files /dev/null and b/extra/images/testing/png/s04n3p01.fig differ
diff --git a/extra/images/testing/png/s04n3p01.png b/extra/images/testing/png/s04n3p01.png
new file mode 100644
index 0000000000..956396c45b
Binary files /dev/null and b/extra/images/testing/png/s04n3p01.png differ
diff --git a/extra/images/testing/png/s05i3p02.fig b/extra/images/testing/png/s05i3p02.fig
new file mode 100644
index 0000000000..846b376500
Binary files /dev/null and b/extra/images/testing/png/s05i3p02.fig differ
diff --git a/extra/images/testing/png/s05i3p02.png b/extra/images/testing/png/s05i3p02.png
new file mode 100644
index 0000000000..d14cbd351a
Binary files /dev/null and b/extra/images/testing/png/s05i3p02.png differ
diff --git a/extra/images/testing/png/s05n3p02.fig b/extra/images/testing/png/s05n3p02.fig
new file mode 100644
index 0000000000..846b376500
Binary files /dev/null and b/extra/images/testing/png/s05n3p02.fig differ
diff --git a/extra/images/testing/png/s05n3p02.png b/extra/images/testing/png/s05n3p02.png
new file mode 100644
index 0000000000..bf940f0576
Binary files /dev/null and b/extra/images/testing/png/s05n3p02.png differ
diff --git a/extra/images/testing/png/s06i3p02.fig b/extra/images/testing/png/s06i3p02.fig
new file mode 100644
index 0000000000..7d85b7a3b0
Binary files /dev/null and b/extra/images/testing/png/s06i3p02.fig differ
diff --git a/extra/images/testing/png/s06i3p02.png b/extra/images/testing/png/s06i3p02.png
new file mode 100644
index 0000000000..456ada3200
Binary files /dev/null and b/extra/images/testing/png/s06i3p02.png differ
diff --git a/extra/images/testing/png/s06n3p02.fig b/extra/images/testing/png/s06n3p02.fig
new file mode 100644
index 0000000000..7d85b7a3b0
Binary files /dev/null and b/extra/images/testing/png/s06n3p02.fig differ
diff --git a/extra/images/testing/png/s06n3p02.png b/extra/images/testing/png/s06n3p02.png
new file mode 100644
index 0000000000..501064dc25
Binary files /dev/null and b/extra/images/testing/png/s06n3p02.png differ
diff --git a/extra/images/testing/png/s07i3p02.fig b/extra/images/testing/png/s07i3p02.fig
new file mode 100644
index 0000000000..1fe13195fc
Binary files /dev/null and b/extra/images/testing/png/s07i3p02.fig differ
diff --git a/extra/images/testing/png/s07i3p02.png b/extra/images/testing/png/s07i3p02.png
new file mode 100644
index 0000000000..44b66bab9e
Binary files /dev/null and b/extra/images/testing/png/s07i3p02.png differ
diff --git a/extra/images/testing/png/s07n3p02.fig b/extra/images/testing/png/s07n3p02.fig
new file mode 100644
index 0000000000..1fe13195fc
Binary files /dev/null and b/extra/images/testing/png/s07n3p02.fig differ
diff --git a/extra/images/testing/png/s07n3p02.png b/extra/images/testing/png/s07n3p02.png
new file mode 100644
index 0000000000..6a582593d6
Binary files /dev/null and b/extra/images/testing/png/s07n3p02.png differ
diff --git a/extra/images/testing/png/s08i3p02.fig b/extra/images/testing/png/s08i3p02.fig
new file mode 100644
index 0000000000..029bfafad7
Binary files /dev/null and b/extra/images/testing/png/s08i3p02.fig differ
diff --git a/extra/images/testing/png/s08i3p02.png b/extra/images/testing/png/s08i3p02.png
new file mode 100644
index 0000000000..acf74f3fc4
Binary files /dev/null and b/extra/images/testing/png/s08i3p02.png differ
diff --git a/extra/images/testing/png/s08n3p02.fig b/extra/images/testing/png/s08n3p02.fig
new file mode 100644
index 0000000000..029bfafad7
Binary files /dev/null and b/extra/images/testing/png/s08n3p02.fig differ
diff --git a/extra/images/testing/png/s08n3p02.png b/extra/images/testing/png/s08n3p02.png
new file mode 100644
index 0000000000..b7094e1b4f
Binary files /dev/null and b/extra/images/testing/png/s08n3p02.png differ
diff --git a/extra/images/testing/png/s09i3p02.fig b/extra/images/testing/png/s09i3p02.fig
new file mode 100644
index 0000000000..b869491c6c
Binary files /dev/null and b/extra/images/testing/png/s09i3p02.fig differ
diff --git a/extra/images/testing/png/s09i3p02.png b/extra/images/testing/png/s09i3p02.png
new file mode 100644
index 0000000000..0bfae8e456
Binary files /dev/null and b/extra/images/testing/png/s09i3p02.png differ
diff --git a/extra/images/testing/png/s09n3p02.fig b/extra/images/testing/png/s09n3p02.fig
new file mode 100644
index 0000000000..b869491c6c
Binary files /dev/null and b/extra/images/testing/png/s09n3p02.fig differ
diff --git a/extra/images/testing/png/s09n3p02.png b/extra/images/testing/png/s09n3p02.png
new file mode 100644
index 0000000000..711ab82451
Binary files /dev/null and b/extra/images/testing/png/s09n3p02.png differ
diff --git a/extra/images/testing/png/s32i3p04.fig b/extra/images/testing/png/s32i3p04.fig
new file mode 100644
index 0000000000..dc2e114752
Binary files /dev/null and b/extra/images/testing/png/s32i3p04.fig differ
diff --git a/extra/images/testing/png/s32i3p04.png b/extra/images/testing/png/s32i3p04.png
new file mode 100644
index 0000000000..0841910b72
Binary files /dev/null and b/extra/images/testing/png/s32i3p04.png differ
diff --git a/extra/images/testing/png/s32n3p04.fig b/extra/images/testing/png/s32n3p04.fig
new file mode 100644
index 0000000000..dc2e114752
Binary files /dev/null and b/extra/images/testing/png/s32n3p04.fig differ
diff --git a/extra/images/testing/png/s32n3p04.png b/extra/images/testing/png/s32n3p04.png
new file mode 100644
index 0000000000..fa58e3e3f6
Binary files /dev/null and b/extra/images/testing/png/s32n3p04.png differ
diff --git a/extra/images/testing/png/s33i3p04.fig b/extra/images/testing/png/s33i3p04.fig
new file mode 100644
index 0000000000..4bed1c2205
Binary files /dev/null and b/extra/images/testing/png/s33i3p04.fig differ
diff --git a/extra/images/testing/png/s33i3p04.png b/extra/images/testing/png/s33i3p04.png
new file mode 100644
index 0000000000..ab0dc14aba
Binary files /dev/null and b/extra/images/testing/png/s33i3p04.png differ
diff --git a/extra/images/testing/png/s33n3p04.fig b/extra/images/testing/png/s33n3p04.fig
new file mode 100644
index 0000000000..4bed1c2205
Binary files /dev/null and b/extra/images/testing/png/s33n3p04.fig differ
diff --git a/extra/images/testing/png/s33n3p04.png b/extra/images/testing/png/s33n3p04.png
new file mode 100644
index 0000000000..764f1a3dc7
Binary files /dev/null and b/extra/images/testing/png/s33n3p04.png differ
diff --git a/extra/images/testing/png/s34i3p04.fig b/extra/images/testing/png/s34i3p04.fig
new file mode 100644
index 0000000000..cd5d18dc96
Binary files /dev/null and b/extra/images/testing/png/s34i3p04.fig differ
diff --git a/extra/images/testing/png/s34i3p04.png b/extra/images/testing/png/s34i3p04.png
new file mode 100644
index 0000000000..bd99039be4
Binary files /dev/null and b/extra/images/testing/png/s34i3p04.png differ
diff --git a/extra/images/testing/png/s34n3p04.fig b/extra/images/testing/png/s34n3p04.fig
new file mode 100644
index 0000000000..cd5d18dc96
Binary files /dev/null and b/extra/images/testing/png/s34n3p04.fig differ
diff --git a/extra/images/testing/png/s34n3p04.png b/extra/images/testing/png/s34n3p04.png
new file mode 100644
index 0000000000..9cbc68b3b9
Binary files /dev/null and b/extra/images/testing/png/s34n3p04.png differ
diff --git a/extra/images/testing/png/s35i3p04.fig b/extra/images/testing/png/s35i3p04.fig
new file mode 100644
index 0000000000..da5c550045
Binary files /dev/null and b/extra/images/testing/png/s35i3p04.fig differ
diff --git a/extra/images/testing/png/s35i3p04.png b/extra/images/testing/png/s35i3p04.png
new file mode 100644
index 0000000000..e2a5e0a659
Binary files /dev/null and b/extra/images/testing/png/s35i3p04.png differ
diff --git a/extra/images/testing/png/s35n3p04.fig b/extra/images/testing/png/s35n3p04.fig
new file mode 100644
index 0000000000..da5c550045
Binary files /dev/null and b/extra/images/testing/png/s35n3p04.fig differ
diff --git a/extra/images/testing/png/s35n3p04.png b/extra/images/testing/png/s35n3p04.png
new file mode 100644
index 0000000000..90b892ebaf
Binary files /dev/null and b/extra/images/testing/png/s35n3p04.png differ
diff --git a/extra/images/testing/png/s36i3p04.fig b/extra/images/testing/png/s36i3p04.fig
new file mode 100644
index 0000000000..c2844f1c6f
Binary files /dev/null and b/extra/images/testing/png/s36i3p04.fig differ
diff --git a/extra/images/testing/png/s36i3p04.png b/extra/images/testing/png/s36i3p04.png
new file mode 100644
index 0000000000..eb61b6f9a3
Binary files /dev/null and b/extra/images/testing/png/s36i3p04.png differ
diff --git a/extra/images/testing/png/s36n3p04.fig b/extra/images/testing/png/s36n3p04.fig
new file mode 100644
index 0000000000..c2844f1c6f
Binary files /dev/null and b/extra/images/testing/png/s36n3p04.fig differ
diff --git a/extra/images/testing/png/s36n3p04.png b/extra/images/testing/png/s36n3p04.png
new file mode 100644
index 0000000000..b38d179774
Binary files /dev/null and b/extra/images/testing/png/s36n3p04.png differ
diff --git a/extra/images/testing/png/s37i3p04.fig b/extra/images/testing/png/s37i3p04.fig
new file mode 100644
index 0000000000..da638306c8
Binary files /dev/null and b/extra/images/testing/png/s37i3p04.fig differ
diff --git a/extra/images/testing/png/s37i3p04.png b/extra/images/testing/png/s37i3p04.png
new file mode 100644
index 0000000000..6e2b1e9b79
Binary files /dev/null and b/extra/images/testing/png/s37i3p04.png differ
diff --git a/extra/images/testing/png/s37n3p04.fig b/extra/images/testing/png/s37n3p04.fig
new file mode 100644
index 0000000000..da638306c8
Binary files /dev/null and b/extra/images/testing/png/s37n3p04.fig differ
diff --git a/extra/images/testing/png/s37n3p04.png b/extra/images/testing/png/s37n3p04.png
new file mode 100644
index 0000000000..4d3054da51
Binary files /dev/null and b/extra/images/testing/png/s37n3p04.png differ
diff --git a/extra/images/testing/png/s38i3p04.fig b/extra/images/testing/png/s38i3p04.fig
new file mode 100644
index 0000000000..d0f4e934ef
Binary files /dev/null and b/extra/images/testing/png/s38i3p04.fig differ
diff --git a/extra/images/testing/png/s38i3p04.png b/extra/images/testing/png/s38i3p04.png
new file mode 100644
index 0000000000..a0a8a140ad
Binary files /dev/null and b/extra/images/testing/png/s38i3p04.png differ
diff --git a/extra/images/testing/png/s38n3p04.fig b/extra/images/testing/png/s38n3p04.fig
new file mode 100644
index 0000000000..d0f4e934ef
Binary files /dev/null and b/extra/images/testing/png/s38n3p04.fig differ
diff --git a/extra/images/testing/png/s38n3p04.png b/extra/images/testing/png/s38n3p04.png
new file mode 100644
index 0000000000..1233ed048e
Binary files /dev/null and b/extra/images/testing/png/s38n3p04.png differ
diff --git a/extra/images/testing/png/s39i3p04.fig b/extra/images/testing/png/s39i3p04.fig
new file mode 100644
index 0000000000..a801805796
Binary files /dev/null and b/extra/images/testing/png/s39i3p04.fig differ
diff --git a/extra/images/testing/png/s39i3p04.png b/extra/images/testing/png/s39i3p04.png
new file mode 100644
index 0000000000..04fee93eae
Binary files /dev/null and b/extra/images/testing/png/s39i3p04.png differ
diff --git a/extra/images/testing/png/s39n3p04.fig b/extra/images/testing/png/s39n3p04.fig
new file mode 100644
index 0000000000..a801805796
Binary files /dev/null and b/extra/images/testing/png/s39n3p04.fig differ
diff --git a/extra/images/testing/png/s39n3p04.png b/extra/images/testing/png/s39n3p04.png
new file mode 100644
index 0000000000..c750100d55
Binary files /dev/null and b/extra/images/testing/png/s39n3p04.png differ
diff --git a/extra/images/testing/png/s40i3p04.fig b/extra/images/testing/png/s40i3p04.fig
new file mode 100644
index 0000000000..5b0959580c
Binary files /dev/null and b/extra/images/testing/png/s40i3p04.fig differ
diff --git a/extra/images/testing/png/s40i3p04.png b/extra/images/testing/png/s40i3p04.png
new file mode 100644
index 0000000000..68f358b822
Binary files /dev/null and b/extra/images/testing/png/s40i3p04.png differ
diff --git a/extra/images/testing/png/s40n3p04.fig b/extra/images/testing/png/s40n3p04.fig
new file mode 100644
index 0000000000..5b0959580c
Binary files /dev/null and b/extra/images/testing/png/s40n3p04.fig differ
diff --git a/extra/images/testing/png/s40n3p04.png b/extra/images/testing/png/s40n3p04.png
new file mode 100644
index 0000000000..864b6b9673
Binary files /dev/null and b/extra/images/testing/png/s40n3p04.png differ