Update paths for PWG raster sample files.

diff --git a/test/ipp-everywhere.test b/test/ipp-everywhere.test
index 849c1be8df7d880311c8460e13c758fecaf2ecaa..d7b0c445cedf0206e75e84cf731d9929513dd33f 100644 (file)
--- a/test/ipp-everywhere.test
+++ b/test/ipp-everywhere.test
@@ -176,7 +176,7 @@ INCLUDE "ipp-2.0.test"
 # Test printing all sample documents
 {
        NAME "Print color.jpg-4x6 @ 150dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/color.jpg-4x6-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/color.jpg-4x6-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -188,7 +188,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20150616/black-1/color.jpg-4x6-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/color.jpg-4x6-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -196,7 +196,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/color.jpg-4x6-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/color.jpg-4x6-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -211,7 +211,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/black-1/color.jpg-4x6-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/color.jpg-4x6-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -219,7 +219,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/color.jpg-4x6-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/color.jpg-4x6-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -234,7 +234,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/black-1/color.jpg-4x6-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/color.jpg-4x6-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -242,7 +242,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -254,7 +254,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -262,7 +262,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -277,7 +277,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -285,7 +285,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -300,7 +300,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -308,7 +308,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -320,7 +320,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -328,7 +328,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -343,7 +343,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -351,7 +351,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -366,7 +366,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -374,7 +374,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -386,7 +386,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -394,7 +394,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -409,7 +409,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -417,7 +417,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -432,7 +432,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -440,7 +440,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, srgb-16"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
 
@@ -452,7 +452,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -460,7 +460,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, srgb-16, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -475,7 +475,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -483,7 +483,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, srgb-16, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -498,7 +498,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -506,7 +506,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/color.jpg-4x6-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/color.jpg-4x6-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -518,7 +518,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20150616/black-1/color.jpg-4x6-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/color.jpg-4x6-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -526,7 +526,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/color.jpg-4x6-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/color.jpg-4x6-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -541,7 +541,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/black-1/color.jpg-4x6-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/color.jpg-4x6-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -549,7 +549,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/color.jpg-4x6-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/color.jpg-4x6-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -564,7 +564,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/black-1/color.jpg-4x6-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/color.jpg-4x6-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -572,7 +572,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -584,7 +584,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -592,7 +592,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -607,7 +607,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -615,7 +615,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -630,7 +630,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -638,7 +638,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -650,7 +650,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -658,7 +658,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -673,7 +673,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -681,7 +681,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -696,7 +696,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -704,7 +704,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -716,7 +716,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -724,7 +724,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -739,7 +739,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -747,7 +747,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -762,7 +762,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -770,7 +770,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, srgb-16"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
 
@@ -782,7 +782,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -790,7 +790,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, srgb-16, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -805,7 +805,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -813,7 +813,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, srgb-16, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -828,7 +828,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -836,7 +836,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/color.jpg-4x6-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/color.jpg-4x6-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -848,7 +848,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20150616/black-1/color.jpg-4x6-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/color.jpg-4x6-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -856,7 +856,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/color.jpg-4x6-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/color.jpg-4x6-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -871,7 +871,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/black-1/color.jpg-4x6-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/color.jpg-4x6-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -879,7 +879,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/color.jpg-4x6-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/color.jpg-4x6-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -894,7 +894,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/black-1/color.jpg-4x6-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/color.jpg-4x6-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -902,7 +902,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -914,7 +914,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -922,7 +922,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -937,7 +937,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -945,7 +945,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -960,7 +960,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -968,7 +968,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -980,7 +980,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -988,7 +988,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1003,7 +1003,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1011,7 +1011,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1026,7 +1026,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1034,7 +1034,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -1046,7 +1046,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1054,7 +1054,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1069,7 +1069,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1077,7 +1077,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1092,7 +1092,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1100,7 +1100,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, srgb-16"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
 
@@ -1112,7 +1112,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1120,7 +1120,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, srgb-16, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1135,7 +1135,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1143,7 +1143,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, srgb-16, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1158,7 +1158,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1166,7 +1166,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/color.jpg-4x6-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/color.jpg-4x6-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -1178,7 +1178,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20150616/black-1/color.jpg-4x6-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/color.jpg-4x6-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1186,7 +1186,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/color.jpg-4x6-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/color.jpg-4x6-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1201,7 +1201,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/black-1/color.jpg-4x6-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/color.jpg-4x6-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1209,7 +1209,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/color.jpg-4x6-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/color.jpg-4x6-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1224,7 +1224,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/black-1/color.jpg-4x6-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/color.jpg-4x6-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1232,7 +1232,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -1244,7 +1244,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1252,7 +1252,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1267,7 +1267,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1275,7 +1275,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1290,7 +1290,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1298,7 +1298,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -1310,7 +1310,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1318,7 +1318,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1333,7 +1333,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1341,7 +1341,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1356,7 +1356,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1364,7 +1364,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -1376,7 +1376,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1384,7 +1384,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1399,7 +1399,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1407,7 +1407,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1422,7 +1422,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1430,7 +1430,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, srgb-16"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
 
@@ -1442,7 +1442,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1450,7 +1450,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, srgb-16, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1465,7 +1465,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1473,7 +1473,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, srgb-16, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1488,7 +1488,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1496,7 +1496,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/color.jpg-4x6-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/color.jpg-4x6-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -1508,7 +1508,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20150616/black-1/color.jpg-4x6-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/color.jpg-4x6-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1516,7 +1516,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/color.jpg-4x6-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/color.jpg-4x6-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1531,7 +1531,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/black-1/color.jpg-4x6-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/color.jpg-4x6-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1539,7 +1539,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/color.jpg-4x6-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/color.jpg-4x6-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1554,7 +1554,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/black-1/color.jpg-4x6-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/color.jpg-4x6-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1562,7 +1562,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -1574,7 +1574,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1582,7 +1582,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1597,7 +1597,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1605,7 +1605,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1620,7 +1620,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1628,7 +1628,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -1640,7 +1640,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1648,7 +1648,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1663,7 +1663,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1671,7 +1671,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1686,7 +1686,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1694,7 +1694,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -1706,7 +1706,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1714,7 +1714,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1729,7 +1729,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1737,7 +1737,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1752,7 +1752,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1760,7 +1760,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, srgb-16"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
 
@@ -1772,7 +1772,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1780,7 +1780,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, srgb-16, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1795,7 +1795,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1803,7 +1803,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, srgb-16, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1818,7 +1818,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1826,7 +1826,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/color.jpg-4x6-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/color.jpg-4x6-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -1838,7 +1838,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20150616/black-1/color.jpg-4x6-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/color.jpg-4x6-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1846,7 +1846,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/color.jpg-4x6-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/color.jpg-4x6-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1861,7 +1861,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/black-1/color.jpg-4x6-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/color.jpg-4x6-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1869,7 +1869,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/color.jpg-4x6-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/color.jpg-4x6-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1884,7 +1884,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/black-1/color.jpg-4x6-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/color.jpg-4x6-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1892,7 +1892,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -1904,7 +1904,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1912,7 +1912,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1927,7 +1927,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1935,7 +1935,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1950,7 +1950,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1958,7 +1958,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -1970,7 +1970,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1978,7 +1978,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1993,7 +1993,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2001,7 +2001,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2016,7 +2016,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2024,7 +2024,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -2036,7 +2036,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2044,7 +2044,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2059,7 +2059,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2067,7 +2067,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2082,7 +2082,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2090,7 +2090,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, srgb-16"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
 
@@ -2102,7 +2102,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2110,7 +2110,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, srgb-16, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2125,7 +2125,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2133,7 +2133,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, srgb-16, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2148,7 +2148,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2156,7 +2156,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/document-a4-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/document-a4-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -2168,7 +2168,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-150dpi-20150616/black-1/document-a4-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/document-a4-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2176,7 +2176,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/document-a4-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/document-a4-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2191,7 +2191,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/black-1/document-a4-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/document-a4-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2199,7 +2199,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/document-a4-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/document-a4-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2214,7 +2214,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/black-1/document-a4-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/document-a4-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2222,7 +2222,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/document-a4-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/document-a4-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -2234,7 +2234,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/document-a4-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/document-a4-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2242,7 +2242,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/document-a4-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/document-a4-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2257,7 +2257,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/document-a4-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/document-a4-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2265,7 +2265,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/document-a4-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/document-a4-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2280,7 +2280,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/document-a4-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/document-a4-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2288,7 +2288,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/document-a4-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/document-a4-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -2300,7 +2300,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/document-a4-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/document-a4-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2308,7 +2308,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/document-a4-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/document-a4-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2323,7 +2323,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/document-a4-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/document-a4-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2331,7 +2331,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/document-a4-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/document-a4-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2346,7 +2346,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/document-a4-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/document-a4-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2354,7 +2354,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/document-a4-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/document-a4-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -2366,7 +2366,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/document-a4-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/document-a4-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2374,7 +2374,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/document-a4-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/document-a4-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2389,7 +2389,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/document-a4-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/document-a4-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2397,7 +2397,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/document-a4-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/document-a4-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2412,7 +2412,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/document-a4-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/document-a4-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2420,7 +2420,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/document-a4-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/document-a4-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -2432,7 +2432,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-180dpi-20150616/black-1/document-a4-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/document-a4-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2440,7 +2440,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/document-a4-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/document-a4-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2455,7 +2455,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/black-1/document-a4-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/document-a4-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2463,7 +2463,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/document-a4-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/document-a4-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2478,7 +2478,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/black-1/document-a4-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/document-a4-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2486,7 +2486,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/document-a4-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/document-a4-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -2498,7 +2498,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/document-a4-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/document-a4-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2506,7 +2506,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/document-a4-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/document-a4-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2521,7 +2521,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/document-a4-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/document-a4-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2529,7 +2529,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/document-a4-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/document-a4-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2544,7 +2544,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/document-a4-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/document-a4-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2552,7 +2552,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/document-a4-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/document-a4-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -2564,7 +2564,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/document-a4-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/document-a4-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2572,7 +2572,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/document-a4-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/document-a4-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2587,7 +2587,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/document-a4-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/document-a4-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2595,7 +2595,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/document-a4-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/document-a4-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2610,7 +2610,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/document-a4-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/document-a4-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2618,7 +2618,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/document-a4-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/document-a4-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -2630,7 +2630,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/document-a4-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/document-a4-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2638,7 +2638,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/document-a4-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/document-a4-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2653,7 +2653,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/document-a4-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/document-a4-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2661,7 +2661,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/document-a4-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/document-a4-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2676,7 +2676,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/document-a4-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/document-a4-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2684,7 +2684,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/document-a4-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/document-a4-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -2696,7 +2696,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-300dpi-20150616/black-1/document-a4-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/document-a4-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2704,7 +2704,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/document-a4-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/document-a4-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2719,7 +2719,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/black-1/document-a4-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/document-a4-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2727,7 +2727,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/document-a4-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/document-a4-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2742,7 +2742,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/black-1/document-a4-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/document-a4-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2750,7 +2750,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/document-a4-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/document-a4-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -2762,7 +2762,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/document-a4-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/document-a4-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2770,7 +2770,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/document-a4-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/document-a4-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2785,7 +2785,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/document-a4-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/document-a4-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2793,7 +2793,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/document-a4-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/document-a4-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2808,7 +2808,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/document-a4-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/document-a4-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2816,7 +2816,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/document-a4-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/document-a4-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -2828,7 +2828,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/document-a4-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/document-a4-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2836,7 +2836,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/document-a4-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/document-a4-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2851,7 +2851,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/document-a4-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/document-a4-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2859,7 +2859,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/document-a4-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/document-a4-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2874,7 +2874,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/document-a4-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/document-a4-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2882,7 +2882,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/document-a4-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/document-a4-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -2894,7 +2894,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/document-a4-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/document-a4-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2902,7 +2902,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/document-a4-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/document-a4-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2917,7 +2917,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/document-a4-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/document-a4-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2925,7 +2925,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/document-a4-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/document-a4-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2940,7 +2940,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/document-a4-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/document-a4-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2948,7 +2948,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/document-a4-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/document-a4-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -2960,7 +2960,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-360dpi-20150616/black-1/document-a4-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/document-a4-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2968,7 +2968,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/document-a4-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/document-a4-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2983,7 +2983,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/black-1/document-a4-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/document-a4-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2991,7 +2991,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/document-a4-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/document-a4-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3006,7 +3006,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/black-1/document-a4-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/document-a4-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3014,7 +3014,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/document-a4-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/document-a4-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -3026,7 +3026,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/document-a4-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/document-a4-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3034,7 +3034,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/document-a4-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/document-a4-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3049,7 +3049,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/document-a4-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/document-a4-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3057,7 +3057,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/document-a4-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/document-a4-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3072,7 +3072,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/document-a4-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/document-a4-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3080,7 +3080,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/document-a4-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/document-a4-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -3092,7 +3092,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/document-a4-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/document-a4-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3100,7 +3100,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/document-a4-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/document-a4-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3115,7 +3115,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/document-a4-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/document-a4-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3123,7 +3123,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/document-a4-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/document-a4-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3138,7 +3138,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/document-a4-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/document-a4-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3146,7 +3146,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/document-a4-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/document-a4-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -3158,7 +3158,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/document-a4-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/document-a4-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3166,7 +3166,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/document-a4-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/document-a4-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3181,7 +3181,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/document-a4-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/document-a4-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3189,7 +3189,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/document-a4-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/document-a4-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3204,7 +3204,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/document-a4-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/document-a4-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3212,7 +3212,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/document-a4-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/document-a4-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -3224,7 +3224,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-600dpi-20150616/black-1/document-a4-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/document-a4-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3232,7 +3232,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/document-a4-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/document-a4-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3247,7 +3247,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/black-1/document-a4-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/document-a4-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3255,7 +3255,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/document-a4-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/document-a4-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3270,7 +3270,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/black-1/document-a4-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/document-a4-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3278,7 +3278,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/document-a4-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/document-a4-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -3290,7 +3290,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/document-a4-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/document-a4-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3298,7 +3298,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/document-a4-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/document-a4-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3313,7 +3313,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/document-a4-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/document-a4-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3321,7 +3321,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/document-a4-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/document-a4-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3336,7 +3336,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/document-a4-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/document-a4-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3344,7 +3344,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/document-a4-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/document-a4-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -3356,7 +3356,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/document-a4-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/document-a4-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3364,7 +3364,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/document-a4-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/document-a4-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3379,7 +3379,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/document-a4-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/document-a4-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3387,7 +3387,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/document-a4-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/document-a4-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3402,7 +3402,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/document-a4-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/document-a4-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3410,7 +3410,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/document-a4-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/document-a4-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -3422,7 +3422,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/document-a4-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/document-a4-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3430,7 +3430,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/document-a4-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/document-a4-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3445,7 +3445,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/document-a4-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/document-a4-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3453,7 +3453,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/document-a4-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/document-a4-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3468,7 +3468,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/document-a4-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/document-a4-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3476,7 +3476,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/document-a4-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/document-a4-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -3488,7 +3488,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-720dpi-20150616/black-1/document-a4-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/document-a4-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3496,7 +3496,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/document-a4-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/document-a4-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3511,7 +3511,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/black-1/document-a4-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/document-a4-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3519,7 +3519,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/document-a4-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/document-a4-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3534,7 +3534,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/black-1/document-a4-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/document-a4-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3542,7 +3542,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/document-a4-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/document-a4-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -3554,7 +3554,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/document-a4-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/document-a4-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3562,7 +3562,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/document-a4-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/document-a4-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3577,7 +3577,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/document-a4-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/document-a4-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3585,7 +3585,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/document-a4-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/document-a4-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3600,7 +3600,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/document-a4-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/document-a4-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3608,7 +3608,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/document-a4-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/document-a4-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -3620,7 +3620,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/document-a4-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/document-a4-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3628,7 +3628,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/document-a4-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/document-a4-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3643,7 +3643,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/document-a4-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/document-a4-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3651,7 +3651,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/document-a4-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/document-a4-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3666,7 +3666,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/document-a4-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/document-a4-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3674,7 +3674,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/document-a4-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/document-a4-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -3686,7 +3686,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/document-a4-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/document-a4-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3694,7 +3694,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/document-a4-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/document-a4-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3709,7 +3709,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/document-a4-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/document-a4-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3717,7 +3717,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/document-a4-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/document-a4-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3732,7 +3732,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/document-a4-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/document-a4-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3740,7 +3740,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/document-letter-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/document-letter-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -3752,7 +3752,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-150dpi-20150616/black-1/document-letter-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/document-letter-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3760,7 +3760,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/document-letter-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/document-letter-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3775,7 +3775,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/black-1/document-letter-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/document-letter-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3783,7 +3783,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/document-letter-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/document-letter-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3798,7 +3798,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/black-1/document-letter-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/document-letter-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3806,7 +3806,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/document-letter-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/document-letter-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -3818,7 +3818,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/document-letter-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/document-letter-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3826,7 +3826,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/document-letter-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/document-letter-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3841,7 +3841,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/document-letter-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/document-letter-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3849,7 +3849,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/document-letter-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/document-letter-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3864,7 +3864,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/document-letter-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/document-letter-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3872,7 +3872,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/document-letter-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/document-letter-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -3884,7 +3884,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/document-letter-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/document-letter-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3892,7 +3892,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/document-letter-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/document-letter-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3907,7 +3907,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/document-letter-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/document-letter-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3915,7 +3915,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/document-letter-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/document-letter-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3930,7 +3930,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/document-letter-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/document-letter-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3938,7 +3938,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/document-letter-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/document-letter-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -3950,7 +3950,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/document-letter-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/document-letter-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3958,7 +3958,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/document-letter-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/document-letter-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3973,7 +3973,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/document-letter-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/document-letter-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3981,7 +3981,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/document-letter-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/document-letter-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3996,7 +3996,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/document-letter-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/document-letter-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4004,7 +4004,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/document-letter-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/document-letter-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -4016,7 +4016,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-180dpi-20150616/black-1/document-letter-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/document-letter-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4024,7 +4024,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/document-letter-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/document-letter-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4039,7 +4039,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/black-1/document-letter-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/document-letter-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4047,7 +4047,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/document-letter-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/document-letter-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4062,7 +4062,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/black-1/document-letter-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/document-letter-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4070,7 +4070,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/document-letter-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/document-letter-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -4082,7 +4082,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/document-letter-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/document-letter-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4090,7 +4090,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/document-letter-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/document-letter-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4105,7 +4105,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/document-letter-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/document-letter-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4113,7 +4113,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/document-letter-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/document-letter-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4128,7 +4128,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/document-letter-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/document-letter-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4136,7 +4136,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/document-letter-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/document-letter-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -4148,7 +4148,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/document-letter-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/document-letter-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4156,7 +4156,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/document-letter-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/document-letter-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4171,7 +4171,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/document-letter-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/document-letter-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4179,7 +4179,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/document-letter-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/document-letter-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4194,7 +4194,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/document-letter-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/document-letter-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4202,7 +4202,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/document-letter-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/document-letter-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -4214,7 +4214,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/document-letter-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/document-letter-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4222,7 +4222,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/document-letter-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/document-letter-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4237,7 +4237,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/document-letter-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/document-letter-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4245,7 +4245,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/document-letter-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/document-letter-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4260,7 +4260,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/document-letter-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/document-letter-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4268,7 +4268,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/document-letter-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/document-letter-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -4280,7 +4280,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-300dpi-20150616/black-1/document-letter-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/document-letter-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4288,7 +4288,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/document-letter-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/document-letter-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4303,7 +4303,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/black-1/document-letter-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/document-letter-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4311,7 +4311,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/document-letter-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/document-letter-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4326,7 +4326,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/black-1/document-letter-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/document-letter-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4334,7 +4334,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/document-letter-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/document-letter-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -4346,7 +4346,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/document-letter-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/document-letter-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4354,7 +4354,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/document-letter-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/document-letter-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4369,7 +4369,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/document-letter-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/document-letter-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4377,7 +4377,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/document-letter-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/document-letter-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4392,7 +4392,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/document-letter-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/document-letter-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4400,7 +4400,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/document-letter-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/document-letter-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -4412,7 +4412,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/document-letter-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/document-letter-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4420,7 +4420,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/document-letter-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/document-letter-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4435,7 +4435,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/document-letter-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/document-letter-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4443,7 +4443,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/document-letter-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/document-letter-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4458,7 +4458,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/document-letter-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/document-letter-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4466,7 +4466,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/document-letter-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/document-letter-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -4478,7 +4478,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/document-letter-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/document-letter-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4486,7 +4486,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/document-letter-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/document-letter-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4501,7 +4501,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/document-letter-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/document-letter-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4509,7 +4509,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/document-letter-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/document-letter-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4524,7 +4524,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/document-letter-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/document-letter-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4532,7 +4532,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/document-letter-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/document-letter-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -4544,7 +4544,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-360dpi-20150616/black-1/document-letter-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/document-letter-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4552,7 +4552,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/document-letter-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/document-letter-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4567,7 +4567,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/black-1/document-letter-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/document-letter-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4575,7 +4575,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/document-letter-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/document-letter-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4590,7 +4590,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/black-1/document-letter-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/document-letter-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4598,7 +4598,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/document-letter-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/document-letter-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -4610,7 +4610,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/document-letter-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/document-letter-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4618,7 +4618,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/document-letter-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/document-letter-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4633,7 +4633,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/document-letter-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/document-letter-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4641,7 +4641,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/document-letter-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/document-letter-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4656,7 +4656,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/document-letter-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/document-letter-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4664,7 +4664,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/document-letter-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/document-letter-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -4676,7 +4676,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/document-letter-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/document-letter-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4684,7 +4684,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/document-letter-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/document-letter-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4699,7 +4699,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/document-letter-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/document-letter-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4707,7 +4707,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/document-letter-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/document-letter-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4722,7 +4722,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/document-letter-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/document-letter-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4730,7 +4730,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/document-letter-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/document-letter-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -4742,7 +4742,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/document-letter-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/document-letter-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4750,7 +4750,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/document-letter-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/document-letter-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4765,7 +4765,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/document-letter-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/document-letter-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4773,7 +4773,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/document-letter-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/document-letter-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4788,7 +4788,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/document-letter-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/document-letter-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4796,7 +4796,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/document-letter-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/document-letter-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -4808,7 +4808,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-600dpi-20150616/black-1/document-letter-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/document-letter-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4816,7 +4816,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/document-letter-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/document-letter-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4831,7 +4831,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/black-1/document-letter-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/document-letter-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4839,7 +4839,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/document-letter-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/document-letter-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4854,7 +4854,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/black-1/document-letter-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/document-letter-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4862,7 +4862,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/document-letter-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/document-letter-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -4874,7 +4874,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/document-letter-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/document-letter-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4882,7 +4882,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/document-letter-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/document-letter-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4897,7 +4897,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/document-letter-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/document-letter-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4905,7 +4905,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/document-letter-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/document-letter-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4920,7 +4920,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/document-letter-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/document-letter-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4928,7 +4928,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/document-letter-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/document-letter-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -4940,7 +4940,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/document-letter-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/document-letter-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4948,7 +4948,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/document-letter-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/document-letter-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4963,7 +4963,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/document-letter-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/document-letter-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4971,7 +4971,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/document-letter-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/document-letter-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4986,7 +4986,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/document-letter-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/document-letter-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4994,7 +4994,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/document-letter-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/document-letter-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -5006,7 +5006,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/document-letter-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/document-letter-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5014,7 +5014,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/document-letter-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/document-letter-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5029,7 +5029,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/document-letter-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/document-letter-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5037,7 +5037,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/document-letter-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/document-letter-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5052,7 +5052,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/document-letter-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/document-letter-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5060,7 +5060,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/document-letter-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/document-letter-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -5072,7 +5072,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-720dpi-20150616/black-1/document-letter-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/document-letter-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5080,7 +5080,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/document-letter-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/document-letter-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5095,7 +5095,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/black-1/document-letter-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/document-letter-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5103,7 +5103,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/document-letter-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/document-letter-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5118,7 +5118,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/black-1/document-letter-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/document-letter-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5126,7 +5126,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/document-letter-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/document-letter-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -5138,7 +5138,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/document-letter-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/document-letter-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5146,7 +5146,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/document-letter-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/document-letter-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5161,7 +5161,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/document-letter-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/document-letter-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5169,7 +5169,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/document-letter-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/document-letter-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5184,7 +5184,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/document-letter-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/document-letter-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5192,7 +5192,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/document-letter-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/document-letter-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -5204,7 +5204,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/document-letter-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/document-letter-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5212,7 +5212,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/document-letter-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/document-letter-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5227,7 +5227,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/document-letter-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/document-letter-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5235,7 +5235,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/document-letter-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/document-letter-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5250,7 +5250,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/document-letter-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/document-letter-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5258,7 +5258,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/document-letter-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/document-letter-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -5270,7 +5270,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/document-letter-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/document-letter-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5278,7 +5278,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/document-letter-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/document-letter-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5293,7 +5293,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/document-letter-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/document-letter-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5301,7 +5301,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/document-letter-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/document-letter-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5316,7 +5316,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/document-letter-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/document-letter-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5324,7 +5324,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/gray.jpg-4x6-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/gray.jpg-4x6-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -5336,7 +5336,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20150616/black-1/gray.jpg-4x6-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/gray.jpg-4x6-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5344,7 +5344,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/gray.jpg-4x6-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/gray.jpg-4x6-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5359,7 +5359,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/black-1/gray.jpg-4x6-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/gray.jpg-4x6-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5367,7 +5367,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/gray.jpg-4x6-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/gray.jpg-4x6-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5382,7 +5382,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/black-1/gray.jpg-4x6-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/gray.jpg-4x6-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5390,7 +5390,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -5402,7 +5402,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5410,7 +5410,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5425,7 +5425,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5433,7 +5433,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5448,7 +5448,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5456,7 +5456,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -5468,7 +5468,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5476,7 +5476,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5491,7 +5491,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5499,7 +5499,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5514,7 +5514,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5522,7 +5522,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/gray.jpg-4x6-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/gray.jpg-4x6-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -5534,7 +5534,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20150616/black-1/gray.jpg-4x6-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/gray.jpg-4x6-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5542,7 +5542,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/gray.jpg-4x6-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/gray.jpg-4x6-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5557,7 +5557,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/black-1/gray.jpg-4x6-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/gray.jpg-4x6-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5565,7 +5565,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/gray.jpg-4x6-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/gray.jpg-4x6-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5580,7 +5580,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/black-1/gray.jpg-4x6-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/gray.jpg-4x6-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5588,7 +5588,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -5600,7 +5600,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5608,7 +5608,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5623,7 +5623,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5631,7 +5631,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5646,7 +5646,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5654,7 +5654,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -5666,7 +5666,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5674,7 +5674,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5689,7 +5689,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5697,7 +5697,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5712,7 +5712,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5720,7 +5720,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/gray.jpg-4x6-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/gray.jpg-4x6-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -5732,7 +5732,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20150616/black-1/gray.jpg-4x6-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/gray.jpg-4x6-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5740,7 +5740,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/gray.jpg-4x6-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/gray.jpg-4x6-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5755,7 +5755,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/black-1/gray.jpg-4x6-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/gray.jpg-4x6-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5763,7 +5763,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/gray.jpg-4x6-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/gray.jpg-4x6-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5778,7 +5778,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/black-1/gray.jpg-4x6-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/gray.jpg-4x6-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5786,7 +5786,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -5798,7 +5798,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5806,7 +5806,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5821,7 +5821,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5829,7 +5829,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5844,7 +5844,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5852,7 +5852,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -5864,7 +5864,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5872,7 +5872,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5887,7 +5887,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5895,7 +5895,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5910,7 +5910,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5918,7 +5918,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/gray.jpg-4x6-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/gray.jpg-4x6-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -5930,7 +5930,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20150616/black-1/gray.jpg-4x6-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/gray.jpg-4x6-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5938,7 +5938,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/gray.jpg-4x6-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/gray.jpg-4x6-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5953,7 +5953,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/black-1/gray.jpg-4x6-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/gray.jpg-4x6-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5961,7 +5961,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/gray.jpg-4x6-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/gray.jpg-4x6-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5976,7 +5976,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/black-1/gray.jpg-4x6-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/gray.jpg-4x6-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5984,7 +5984,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -5996,7 +5996,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6004,7 +6004,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6019,7 +6019,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6027,7 +6027,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6042,7 +6042,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6050,7 +6050,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -6062,7 +6062,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6070,7 +6070,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6085,7 +6085,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6093,7 +6093,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6108,7 +6108,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6116,7 +6116,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/gray.jpg-4x6-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/gray.jpg-4x6-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -6128,7 +6128,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20150616/black-1/gray.jpg-4x6-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/gray.jpg-4x6-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6136,7 +6136,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/gray.jpg-4x6-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/gray.jpg-4x6-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6151,7 +6151,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/black-1/gray.jpg-4x6-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/gray.jpg-4x6-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6159,7 +6159,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/gray.jpg-4x6-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/gray.jpg-4x6-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6174,7 +6174,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/black-1/gray.jpg-4x6-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/gray.jpg-4x6-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6182,7 +6182,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -6194,7 +6194,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6202,7 +6202,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6217,7 +6217,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6225,7 +6225,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6240,7 +6240,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6248,7 +6248,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -6260,7 +6260,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6268,7 +6268,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6283,7 +6283,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6291,7 +6291,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6306,7 +6306,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6314,7 +6314,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/gray.jpg-4x6-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/gray.jpg-4x6-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -6326,7 +6326,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20150616/black-1/gray.jpg-4x6-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/gray.jpg-4x6-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6334,7 +6334,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/gray.jpg-4x6-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/gray.jpg-4x6-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6349,7 +6349,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/black-1/gray.jpg-4x6-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/gray.jpg-4x6-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6357,7 +6357,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/gray.jpg-4x6-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/gray.jpg-4x6-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6372,7 +6372,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/black-1/gray.jpg-4x6-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/gray.jpg-4x6-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6380,7 +6380,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -6392,7 +6392,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6400,7 +6400,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6415,7 +6415,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6423,7 +6423,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6438,7 +6438,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6446,7 +6446,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -6458,7 +6458,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6466,7 +6466,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6481,7 +6481,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6489,7 +6489,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6504,7 +6504,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6512,7 +6512,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/onepage-a4-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/onepage-a4-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -6524,7 +6524,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-150dpi-20150616/black-1/onepage-a4-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/onepage-a4-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6532,7 +6532,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/onepage-a4-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/onepage-a4-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6547,7 +6547,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/black-1/onepage-a4-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/onepage-a4-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6555,7 +6555,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/onepage-a4-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/onepage-a4-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6570,7 +6570,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/black-1/onepage-a4-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/onepage-a4-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6578,7 +6578,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -6590,7 +6590,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6598,7 +6598,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6613,7 +6613,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6621,7 +6621,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6636,7 +6636,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6644,7 +6644,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/onepage-a4-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/onepage-a4-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -6656,7 +6656,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/onepage-a4-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/onepage-a4-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6664,7 +6664,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/onepage-a4-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/onepage-a4-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6679,7 +6679,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/onepage-a4-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/onepage-a4-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6687,7 +6687,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/onepage-a4-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/onepage-a4-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6702,7 +6702,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/onepage-a4-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/onepage-a4-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6710,7 +6710,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/onepage-a4-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/onepage-a4-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -6722,7 +6722,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/onepage-a4-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/onepage-a4-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6730,7 +6730,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/onepage-a4-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/onepage-a4-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6745,7 +6745,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/onepage-a4-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/onepage-a4-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6753,7 +6753,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/onepage-a4-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/onepage-a4-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6768,7 +6768,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/onepage-a4-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/onepage-a4-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6776,7 +6776,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/onepage-a4-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/onepage-a4-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -6788,7 +6788,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-180dpi-20150616/black-1/onepage-a4-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/onepage-a4-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6796,7 +6796,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/onepage-a4-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/onepage-a4-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6811,7 +6811,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/black-1/onepage-a4-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/onepage-a4-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6819,7 +6819,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/onepage-a4-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/onepage-a4-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6834,7 +6834,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/black-1/onepage-a4-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/onepage-a4-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6842,7 +6842,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -6854,7 +6854,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6862,7 +6862,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6877,7 +6877,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6885,7 +6885,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6900,7 +6900,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6908,7 +6908,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/onepage-a4-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/onepage-a4-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -6920,7 +6920,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/onepage-a4-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/onepage-a4-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6928,7 +6928,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/onepage-a4-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/onepage-a4-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6943,7 +6943,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/onepage-a4-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/onepage-a4-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6951,7 +6951,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/onepage-a4-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/onepage-a4-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6966,7 +6966,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/onepage-a4-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/onepage-a4-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6974,7 +6974,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/onepage-a4-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/onepage-a4-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -6986,7 +6986,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/onepage-a4-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/onepage-a4-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6994,7 +6994,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/onepage-a4-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/onepage-a4-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7009,7 +7009,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/onepage-a4-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/onepage-a4-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7017,7 +7017,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/onepage-a4-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/onepage-a4-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7032,7 +7032,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/onepage-a4-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/onepage-a4-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7040,7 +7040,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/onepage-a4-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/onepage-a4-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -7052,7 +7052,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-300dpi-20150616/black-1/onepage-a4-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/onepage-a4-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7060,7 +7060,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/onepage-a4-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/onepage-a4-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7075,7 +7075,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/black-1/onepage-a4-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/onepage-a4-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7083,7 +7083,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/onepage-a4-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/onepage-a4-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7098,7 +7098,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/black-1/onepage-a4-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/onepage-a4-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7106,7 +7106,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -7118,7 +7118,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7126,7 +7126,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7141,7 +7141,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7149,7 +7149,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7164,7 +7164,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7172,7 +7172,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/onepage-a4-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/onepage-a4-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -7184,7 +7184,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/onepage-a4-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/onepage-a4-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7192,7 +7192,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/onepage-a4-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/onepage-a4-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7207,7 +7207,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/onepage-a4-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/onepage-a4-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7215,7 +7215,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/onepage-a4-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/onepage-a4-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7230,7 +7230,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/onepage-a4-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/onepage-a4-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7238,7 +7238,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/onepage-a4-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/onepage-a4-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -7250,7 +7250,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/onepage-a4-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/onepage-a4-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7258,7 +7258,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/onepage-a4-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/onepage-a4-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7273,7 +7273,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/onepage-a4-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/onepage-a4-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7281,7 +7281,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/onepage-a4-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/onepage-a4-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7296,7 +7296,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/onepage-a4-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/onepage-a4-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7304,7 +7304,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/onepage-a4-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/onepage-a4-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -7316,7 +7316,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-360dpi-20150616/black-1/onepage-a4-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/onepage-a4-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7324,7 +7324,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/onepage-a4-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/onepage-a4-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7339,7 +7339,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/black-1/onepage-a4-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/onepage-a4-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7347,7 +7347,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/onepage-a4-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/onepage-a4-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7362,7 +7362,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/black-1/onepage-a4-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/onepage-a4-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7370,7 +7370,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -7382,7 +7382,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7390,7 +7390,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7405,7 +7405,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7413,7 +7413,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7428,7 +7428,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7436,7 +7436,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/onepage-a4-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/onepage-a4-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -7448,7 +7448,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/onepage-a4-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/onepage-a4-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7456,7 +7456,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/onepage-a4-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/onepage-a4-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7471,7 +7471,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/onepage-a4-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/onepage-a4-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7479,7 +7479,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/onepage-a4-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/onepage-a4-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7494,7 +7494,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/onepage-a4-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/onepage-a4-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7502,7 +7502,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/onepage-a4-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/onepage-a4-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -7514,7 +7514,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/onepage-a4-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/onepage-a4-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7522,7 +7522,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/onepage-a4-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/onepage-a4-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7537,7 +7537,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/onepage-a4-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/onepage-a4-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7545,7 +7545,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/onepage-a4-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/onepage-a4-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7560,7 +7560,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/onepage-a4-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/onepage-a4-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7568,7 +7568,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/onepage-a4-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/onepage-a4-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -7580,7 +7580,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-600dpi-20150616/black-1/onepage-a4-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/onepage-a4-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7588,7 +7588,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/onepage-a4-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/onepage-a4-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7603,7 +7603,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/black-1/onepage-a4-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/onepage-a4-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7611,7 +7611,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/onepage-a4-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/onepage-a4-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7626,7 +7626,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/black-1/onepage-a4-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/onepage-a4-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7634,7 +7634,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -7646,7 +7646,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7654,7 +7654,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7669,7 +7669,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7677,7 +7677,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7692,7 +7692,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7700,7 +7700,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/onepage-a4-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/onepage-a4-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -7712,7 +7712,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/onepage-a4-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/onepage-a4-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7720,7 +7720,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/onepage-a4-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/onepage-a4-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7735,7 +7735,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/onepage-a4-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/onepage-a4-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7743,7 +7743,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/onepage-a4-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/onepage-a4-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7758,7 +7758,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/onepage-a4-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/onepage-a4-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7766,7 +7766,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/onepage-a4-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/onepage-a4-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -7778,7 +7778,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/onepage-a4-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/onepage-a4-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7786,7 +7786,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/onepage-a4-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/onepage-a4-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7801,7 +7801,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/onepage-a4-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/onepage-a4-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7809,7 +7809,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/onepage-a4-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/onepage-a4-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7824,7 +7824,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/onepage-a4-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/onepage-a4-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7832,7 +7832,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/onepage-a4-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/onepage-a4-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -7844,7 +7844,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-720dpi-20150616/black-1/onepage-a4-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/onepage-a4-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7852,7 +7852,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/onepage-a4-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/onepage-a4-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7867,7 +7867,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/black-1/onepage-a4-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/onepage-a4-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7875,7 +7875,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/onepage-a4-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/onepage-a4-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7890,7 +7890,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/black-1/onepage-a4-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/onepage-a4-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7898,7 +7898,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -7910,7 +7910,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7918,7 +7918,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7933,7 +7933,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7941,7 +7941,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7956,7 +7956,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7964,7 +7964,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/onepage-a4-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/onepage-a4-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -7976,7 +7976,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/onepage-a4-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/onepage-a4-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7984,7 +7984,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/onepage-a4-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/onepage-a4-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7999,7 +7999,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/onepage-a4-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/onepage-a4-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8007,7 +8007,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/onepage-a4-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/onepage-a4-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8022,7 +8022,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/onepage-a4-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/onepage-a4-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8030,7 +8030,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/onepage-a4-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/onepage-a4-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -8042,7 +8042,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/onepage-a4-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/onepage-a4-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8050,7 +8050,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/onepage-a4-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/onepage-a4-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8065,7 +8065,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/onepage-a4-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/onepage-a4-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8073,7 +8073,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/onepage-a4-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/onepage-a4-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8088,7 +8088,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/onepage-a4-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/onepage-a4-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8096,7 +8096,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/onepage-letter-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/onepage-letter-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -8108,7 +8108,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-150dpi-20150616/black-1/onepage-letter-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/onepage-letter-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8116,7 +8116,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/onepage-letter-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/onepage-letter-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8131,7 +8131,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/black-1/onepage-letter-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/onepage-letter-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8139,7 +8139,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/onepage-letter-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/onepage-letter-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8154,7 +8154,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/black-1/onepage-letter-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/onepage-letter-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8162,7 +8162,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -8174,7 +8174,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8182,7 +8182,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8197,7 +8197,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8205,7 +8205,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8220,7 +8220,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8228,7 +8228,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/onepage-letter-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/onepage-letter-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -8240,7 +8240,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/onepage-letter-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/onepage-letter-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8248,7 +8248,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/onepage-letter-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/onepage-letter-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8263,7 +8263,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/onepage-letter-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/onepage-letter-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8271,7 +8271,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/onepage-letter-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/onepage-letter-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8286,7 +8286,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/sgray-8/onepage-letter-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/onepage-letter-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8294,7 +8294,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/onepage-letter-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/onepage-letter-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -8306,7 +8306,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/onepage-letter-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/onepage-letter-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8314,7 +8314,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/onepage-letter-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/onepage-letter-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8329,7 +8329,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/onepage-letter-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/onepage-letter-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8337,7 +8337,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/onepage-letter-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/onepage-letter-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8352,7 +8352,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20150616/srgb-8/onepage-letter-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/onepage-letter-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8360,7 +8360,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/onepage-letter-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/onepage-letter-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -8372,7 +8372,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-180dpi-20150616/black-1/onepage-letter-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/onepage-letter-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8380,7 +8380,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/onepage-letter-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/onepage-letter-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8395,7 +8395,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/black-1/onepage-letter-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/onepage-letter-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8403,7 +8403,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/onepage-letter-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/onepage-letter-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8418,7 +8418,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/black-1/onepage-letter-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/onepage-letter-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8426,7 +8426,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -8438,7 +8438,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8446,7 +8446,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8461,7 +8461,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8469,7 +8469,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8484,7 +8484,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8492,7 +8492,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/onepage-letter-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/onepage-letter-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -8504,7 +8504,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/onepage-letter-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/onepage-letter-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8512,7 +8512,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/onepage-letter-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/onepage-letter-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8527,7 +8527,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/onepage-letter-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/onepage-letter-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8535,7 +8535,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/onepage-letter-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/onepage-letter-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8550,7 +8550,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/sgray-8/onepage-letter-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/onepage-letter-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8558,7 +8558,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/onepage-letter-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/onepage-letter-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -8570,7 +8570,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/onepage-letter-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/onepage-letter-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8578,7 +8578,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/onepage-letter-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/onepage-letter-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8593,7 +8593,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/onepage-letter-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/onepage-letter-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8601,7 +8601,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/onepage-letter-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/onepage-letter-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8616,7 +8616,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20150616/srgb-8/onepage-letter-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/onepage-letter-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8624,7 +8624,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/onepage-letter-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/onepage-letter-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -8636,7 +8636,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-300dpi-20150616/black-1/onepage-letter-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/onepage-letter-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8644,7 +8644,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/onepage-letter-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/onepage-letter-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8659,7 +8659,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/black-1/onepage-letter-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/onepage-letter-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8667,7 +8667,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/onepage-letter-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/onepage-letter-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8682,7 +8682,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/black-1/onepage-letter-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/onepage-letter-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8690,7 +8690,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -8702,7 +8702,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8710,7 +8710,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8725,7 +8725,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8733,7 +8733,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8748,7 +8748,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8756,7 +8756,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/onepage-letter-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/onepage-letter-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -8768,7 +8768,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/onepage-letter-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/onepage-letter-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8776,7 +8776,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/onepage-letter-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/onepage-letter-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8791,7 +8791,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/onepage-letter-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/onepage-letter-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8799,7 +8799,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/onepage-letter-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/onepage-letter-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8814,7 +8814,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/sgray-8/onepage-letter-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/onepage-letter-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8822,7 +8822,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/onepage-letter-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/onepage-letter-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -8834,7 +8834,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/onepage-letter-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/onepage-letter-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8842,7 +8842,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/onepage-letter-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/onepage-letter-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8857,7 +8857,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/onepage-letter-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/onepage-letter-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8865,7 +8865,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/onepage-letter-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/onepage-letter-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8880,7 +8880,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20150616/srgb-8/onepage-letter-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/onepage-letter-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8888,7 +8888,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/onepage-letter-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/onepage-letter-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -8900,7 +8900,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-360dpi-20150616/black-1/onepage-letter-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/onepage-letter-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8908,7 +8908,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/onepage-letter-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/onepage-letter-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8923,7 +8923,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/black-1/onepage-letter-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/onepage-letter-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8931,7 +8931,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/onepage-letter-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/onepage-letter-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8946,7 +8946,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/black-1/onepage-letter-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/onepage-letter-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8954,7 +8954,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -8966,7 +8966,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8974,7 +8974,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8989,7 +8989,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8997,7 +8997,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9012,7 +9012,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9020,7 +9020,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/onepage-letter-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/onepage-letter-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -9032,7 +9032,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/onepage-letter-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/onepage-letter-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9040,7 +9040,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/onepage-letter-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/onepage-letter-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9055,7 +9055,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/onepage-letter-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/onepage-letter-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9063,7 +9063,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/onepage-letter-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/onepage-letter-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9078,7 +9078,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/sgray-8/onepage-letter-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/onepage-letter-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9086,7 +9086,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/onepage-letter-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/onepage-letter-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -9098,7 +9098,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/onepage-letter-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/onepage-letter-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9106,7 +9106,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/onepage-letter-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/onepage-letter-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9121,7 +9121,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/onepage-letter-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/onepage-letter-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9129,7 +9129,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/onepage-letter-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/onepage-letter-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9144,7 +9144,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20150616/srgb-8/onepage-letter-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/onepage-letter-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9152,7 +9152,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/onepage-letter-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/onepage-letter-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -9164,7 +9164,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-600dpi-20150616/black-1/onepage-letter-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/onepage-letter-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9172,7 +9172,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/onepage-letter-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/onepage-letter-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9187,7 +9187,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/black-1/onepage-letter-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/onepage-letter-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9195,7 +9195,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/onepage-letter-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/onepage-letter-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9210,7 +9210,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/black-1/onepage-letter-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/onepage-letter-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9218,7 +9218,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -9230,7 +9230,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9238,7 +9238,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9253,7 +9253,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9261,7 +9261,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9276,7 +9276,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9284,7 +9284,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/onepage-letter-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/onepage-letter-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -9296,7 +9296,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/onepage-letter-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/onepage-letter-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9304,7 +9304,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/onepage-letter-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/onepage-letter-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9319,7 +9319,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/onepage-letter-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/onepage-letter-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9327,7 +9327,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/onepage-letter-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/onepage-letter-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9342,7 +9342,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/sgray-8/onepage-letter-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/onepage-letter-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9350,7 +9350,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/onepage-letter-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/onepage-letter-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -9362,7 +9362,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/onepage-letter-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/onepage-letter-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9370,7 +9370,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/onepage-letter-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/onepage-letter-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9385,7 +9385,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/onepage-letter-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/onepage-letter-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9393,7 +9393,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/onepage-letter-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/onepage-letter-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9408,7 +9408,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20150616/srgb-8/onepage-letter-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/onepage-letter-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9416,7 +9416,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/onepage-letter-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/onepage-letter-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -9428,7 +9428,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-720dpi-20150616/black-1/onepage-letter-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/onepage-letter-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9436,7 +9436,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/onepage-letter-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/onepage-letter-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9451,7 +9451,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/black-1/onepage-letter-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/onepage-letter-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9459,7 +9459,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/onepage-letter-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/onepage-letter-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9474,7 +9474,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/black-1/onepage-letter-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/onepage-letter-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9482,7 +9482,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -9494,7 +9494,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9502,7 +9502,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9517,7 +9517,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9525,7 +9525,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9540,7 +9540,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9548,7 +9548,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/onepage-letter-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/onepage-letter-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -9560,7 +9560,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/onepage-letter-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/onepage-letter-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9568,7 +9568,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/onepage-letter-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/onepage-letter-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9583,7 +9583,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/onepage-letter-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/onepage-letter-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9591,7 +9591,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/onepage-letter-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/onepage-letter-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9606,7 +9606,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/sgray-8/onepage-letter-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/onepage-letter-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9614,7 +9614,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/onepage-letter-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/onepage-letter-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -9626,7 +9626,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/onepage-letter-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/onepage-letter-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9634,7 +9634,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/onepage-letter-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/onepage-letter-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9649,7 +9649,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/onepage-letter-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/onepage-letter-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9657,7 +9657,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/onepage-letter-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/onepage-letter-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9672,7 +9672,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20150616/srgb-8/onepage-letter-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/onepage-letter-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH