Update paths for PWG raster sample files.

diff --git a/test/ipp-everywhere.test b/test/ipp-everywhere.test
index ee1ac0daf35d2f4435da111afaf2efa98999edf4..071d9ea51f15ea45245bb787ede2e85db0ce1696 100644 (file)
--- a/test/ipp-everywhere.test
+++ b/test/ipp-everywhere.test
@@ -179,7 +179,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
 
@@ -191,7 +191,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
@@ -199,7 +199,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
@@ -214,7 +214,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
@@ -222,7 +222,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
@@ -237,7 +237,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
@@ -245,7 +245,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
 
@@ -257,7 +257,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
@@ -265,7 +265,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
@@ -280,7 +280,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
@@ -288,7 +288,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
@@ -303,7 +303,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
@@ -311,7 +311,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
 
@@ -323,7 +323,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
@@ -331,7 +331,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
@@ -346,7 +346,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
@@ -354,7 +354,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
@@ -369,7 +369,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
@@ -377,7 +377,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
 
@@ -389,7 +389,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
@@ -397,7 +397,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
@@ -412,7 +412,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
@@ -420,7 +420,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
@@ -435,7 +435,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
@@ -443,7 +443,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
 
@@ -455,7 +455,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
@@ -463,7 +463,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
@@ -478,7 +478,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
@@ -486,7 +486,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
@@ -501,7 +501,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
@@ -509,7 +509,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
 
@@ -521,7 +521,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
@@ -529,7 +529,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
@@ -544,7 +544,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
@@ -552,7 +552,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
@@ -567,7 +567,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
@@ -575,7 +575,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
 
@@ -587,7 +587,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
@@ -595,7 +595,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
@@ -610,7 +610,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
@@ -618,7 +618,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
@@ -633,7 +633,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
@@ -641,7 +641,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
 
@@ -653,7 +653,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
@@ -661,7 +661,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
@@ -676,7 +676,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
@@ -684,7 +684,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
@@ -699,7 +699,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
@@ -707,7 +707,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
 
@@ -719,7 +719,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
@@ -727,7 +727,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
@@ -742,7 +742,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
@@ -750,7 +750,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
@@ -765,7 +765,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
@@ -773,7 +773,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
 
@@ -785,7 +785,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
@@ -793,7 +793,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
@@ -808,7 +808,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
@@ -816,7 +816,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
@@ -831,7 +831,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
@@ -839,7 +839,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
 
@@ -851,7 +851,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
@@ -859,7 +859,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
@@ -874,7 +874,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
@@ -882,7 +882,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
@@ -897,7 +897,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
@@ -905,7 +905,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
 
@@ -917,7 +917,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
@@ -925,7 +925,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
@@ -940,7 +940,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
@@ -948,7 +948,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
@@ -963,7 +963,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
@@ -971,7 +971,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
 
@@ -983,7 +983,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
@@ -991,7 +991,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
@@ -1006,7 +1006,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
@@ -1014,7 +1014,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
@@ -1029,7 +1029,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
@@ -1037,7 +1037,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
 
@@ -1049,7 +1049,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
@@ -1057,7 +1057,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
@@ -1072,7 +1072,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
@@ -1080,7 +1080,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
@@ -1095,7 +1095,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
@@ -1103,7 +1103,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
 
@@ -1115,7 +1115,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
@@ -1123,7 +1123,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
@@ -1138,7 +1138,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
@@ -1146,7 +1146,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
@@ -1161,7 +1161,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
@@ -1169,7 +1169,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
 
@@ -1181,7 +1181,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
@@ -1189,7 +1189,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
@@ -1204,7 +1204,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
@@ -1212,7 +1212,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
@@ -1227,7 +1227,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
@@ -1235,7 +1235,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
 
@@ -1247,7 +1247,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
@@ -1255,7 +1255,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
@@ -1270,7 +1270,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
@@ -1278,7 +1278,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
@@ -1293,7 +1293,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
@@ -1301,7 +1301,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
 
@@ -1313,7 +1313,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
@@ -1321,7 +1321,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
@@ -1336,7 +1336,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
@@ -1344,7 +1344,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
@@ -1359,7 +1359,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
@@ -1367,7 +1367,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
 
@@ -1379,7 +1379,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
@@ -1387,7 +1387,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
@@ -1402,7 +1402,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
@@ -1410,7 +1410,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
@@ -1425,7 +1425,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
@@ -1433,7 +1433,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
 
@@ -1445,7 +1445,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
@@ -1453,7 +1453,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
@@ -1468,7 +1468,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
@@ -1476,7 +1476,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
@@ -1491,7 +1491,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
@@ -1499,7 +1499,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
 
@@ -1511,7 +1511,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
@@ -1519,7 +1519,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
@@ -1534,7 +1534,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
@@ -1542,7 +1542,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
@@ -1557,7 +1557,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
@@ -1565,7 +1565,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
 
@@ -1577,7 +1577,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
@@ -1585,7 +1585,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
@@ -1600,7 +1600,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
@@ -1608,7 +1608,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
@@ -1623,7 +1623,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
@@ -1631,7 +1631,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
 
@@ -1643,7 +1643,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
@@ -1651,7 +1651,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
@@ -1666,7 +1666,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
@@ -1674,7 +1674,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
@@ -1689,7 +1689,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
@@ -1697,7 +1697,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
 
@@ -1709,7 +1709,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
@@ -1717,7 +1717,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
@@ -1732,7 +1732,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
@@ -1740,7 +1740,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
@@ -1755,7 +1755,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
@@ -1763,7 +1763,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
 
@@ -1775,7 +1775,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
@@ -1783,7 +1783,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
@@ -1798,7 +1798,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
@@ -1806,7 +1806,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
@@ -1821,7 +1821,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
@@ -1829,7 +1829,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
 
@@ -1841,7 +1841,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
@@ -1849,7 +1849,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
@@ -1864,7 +1864,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
@@ -1872,7 +1872,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
@@ -1887,7 +1887,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
@@ -1895,7 +1895,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
 
@@ -1907,7 +1907,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
@@ -1915,7 +1915,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
@@ -1930,7 +1930,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
@@ -1938,7 +1938,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
@@ -1953,7 +1953,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
@@ -1961,7 +1961,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
 
@@ -1973,7 +1973,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
@@ -1981,7 +1981,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
@@ -1996,7 +1996,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
@@ -2004,7 +2004,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
@@ -2019,7 +2019,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
@@ -2027,7 +2027,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
 
@@ -2039,7 +2039,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
@@ -2047,7 +2047,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
@@ -2062,7 +2062,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
@@ -2070,7 +2070,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
@@ -2085,7 +2085,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
@@ -2093,7 +2093,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
 
@@ -2105,7 +2105,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
@@ -2113,7 +2113,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
@@ -2128,7 +2128,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
@@ -2136,7 +2136,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
@@ -2151,7 +2151,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
@@ -2159,7 +2159,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
 
@@ -2171,7 +2171,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
@@ -2179,7 +2179,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
@@ -2194,7 +2194,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
@@ -2202,7 +2202,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
@@ -2217,7 +2217,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
@@ -2225,7 +2225,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
 
@@ -2237,7 +2237,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
@@ -2245,7 +2245,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
@@ -2260,7 +2260,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
@@ -2268,7 +2268,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
@@ -2283,7 +2283,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
@@ -2291,7 +2291,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
 
@@ -2303,7 +2303,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
@@ -2311,7 +2311,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
@@ -2326,7 +2326,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
@@ -2334,7 +2334,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
@@ -2349,7 +2349,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
@@ -2357,7 +2357,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
 
@@ -2369,7 +2369,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
@@ -2377,7 +2377,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
@@ -2392,7 +2392,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
@@ -2400,7 +2400,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
@@ -2415,7 +2415,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
@@ -2423,7 +2423,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
 
@@ -2435,7 +2435,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
@@ -2443,7 +2443,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
@@ -2458,7 +2458,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
@@ -2466,7 +2466,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
@@ -2481,7 +2481,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
@@ -2489,7 +2489,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
 
@@ -2501,7 +2501,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
@@ -2509,7 +2509,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
@@ -2524,7 +2524,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
@@ -2532,7 +2532,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
@@ -2547,7 +2547,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
@@ -2555,7 +2555,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
 
@@ -2567,7 +2567,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
@@ -2575,7 +2575,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
@@ -2590,7 +2590,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
@@ -2598,7 +2598,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
@@ -2613,7 +2613,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
@@ -2621,7 +2621,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
 
@@ -2633,7 +2633,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
@@ -2641,7 +2641,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
@@ -2656,7 +2656,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
@@ -2664,7 +2664,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
@@ -2679,7 +2679,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
@@ -2687,7 +2687,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
 
@@ -2699,7 +2699,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
@@ -2707,7 +2707,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
@@ -2722,7 +2722,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
@@ -2730,7 +2730,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
@@ -2745,7 +2745,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
@@ -2753,7 +2753,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
 
@@ -2765,7 +2765,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
@@ -2773,7 +2773,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
@@ -2788,7 +2788,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
@@ -2796,7 +2796,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
@@ -2811,7 +2811,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
@@ -2819,7 +2819,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
 
@@ -2831,7 +2831,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
@@ -2839,7 +2839,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
@@ -2854,7 +2854,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
@@ -2862,7 +2862,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
@@ -2877,7 +2877,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
@@ -2885,7 +2885,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
 
@@ -2897,7 +2897,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
@@ -2905,7 +2905,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
@@ -2920,7 +2920,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
@@ -2928,7 +2928,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
@@ -2943,7 +2943,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
@@ -2951,7 +2951,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
 
@@ -2963,7 +2963,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
@@ -2971,7 +2971,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
@@ -2986,7 +2986,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
@@ -2994,7 +2994,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
@@ -3009,7 +3009,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
@@ -3017,7 +3017,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
 
@@ -3029,7 +3029,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
@@ -3037,7 +3037,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
@@ -3052,7 +3052,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
@@ -3060,7 +3060,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
@@ -3075,7 +3075,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
@@ -3083,7 +3083,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
 
@@ -3095,7 +3095,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
@@ -3103,7 +3103,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
@@ -3118,7 +3118,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
@@ -3126,7 +3126,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
@@ -3141,7 +3141,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
@@ -3149,7 +3149,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
 
@@ -3161,7 +3161,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
@@ -3169,7 +3169,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
@@ -3184,7 +3184,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
@@ -3192,7 +3192,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
@@ -3207,7 +3207,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
@@ -3215,7 +3215,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
 
@@ -3227,7 +3227,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
@@ -3235,7 +3235,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
@@ -3250,7 +3250,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
@@ -3258,7 +3258,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
@@ -3273,7 +3273,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
@@ -3281,7 +3281,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
 
@@ -3293,7 +3293,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
@@ -3301,7 +3301,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
@@ -3316,7 +3316,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
@@ -3324,7 +3324,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
@@ -3339,7 +3339,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
@@ -3347,7 +3347,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
 
@@ -3359,7 +3359,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
@@ -3367,7 +3367,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
@@ -3382,7 +3382,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
@@ -3390,7 +3390,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
@@ -3405,7 +3405,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
@@ -3413,7 +3413,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
 
@@ -3425,7 +3425,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
@@ -3433,7 +3433,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
@@ -3448,7 +3448,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
@@ -3456,7 +3456,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
@@ -3471,7 +3471,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
@@ -3479,7 +3479,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
 
@@ -3491,7 +3491,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
@@ -3499,7 +3499,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
@@ -3514,7 +3514,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
@@ -3522,7 +3522,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
@@ -3537,7 +3537,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
@@ -3545,7 +3545,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
 
@@ -3557,7 +3557,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
@@ -3565,7 +3565,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
@@ -3580,7 +3580,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
@@ -3588,7 +3588,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
@@ -3603,7 +3603,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
@@ -3611,7 +3611,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
 
@@ -3623,7 +3623,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
@@ -3631,7 +3631,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
@@ -3646,7 +3646,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
@@ -3654,7 +3654,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
@@ -3669,7 +3669,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
@@ -3677,7 +3677,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
 
@@ -3689,7 +3689,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
@@ -3697,7 +3697,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
@@ -3712,7 +3712,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
@@ -3720,7 +3720,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
@@ -3735,7 +3735,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
@@ -3743,7 +3743,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
 
@@ -3755,7 +3755,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
@@ -3763,7 +3763,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
@@ -3778,7 +3778,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
@@ -3786,7 +3786,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
@@ -3801,7 +3801,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
@@ -3809,7 +3809,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
 
@@ -3821,7 +3821,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
@@ -3829,7 +3829,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
@@ -3844,7 +3844,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
@@ -3852,7 +3852,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
@@ -3867,7 +3867,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
@@ -3875,7 +3875,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
 
@@ -3887,7 +3887,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
@@ -3895,7 +3895,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
@@ -3910,7 +3910,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
@@ -3918,7 +3918,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
@@ -3933,7 +3933,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
@@ -3941,7 +3941,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
 
@@ -3953,7 +3953,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
@@ -3961,7 +3961,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
@@ -3976,7 +3976,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
@@ -3984,7 +3984,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
@@ -3999,7 +3999,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
@@ -4007,7 +4007,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
 
@@ -4019,7 +4019,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
@@ -4027,7 +4027,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
@@ -4042,7 +4042,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
@@ -4050,7 +4050,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
@@ -4065,7 +4065,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
@@ -4073,7 +4073,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
 
@@ -4085,7 +4085,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
@@ -4093,7 +4093,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
@@ -4108,7 +4108,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
@@ -4116,7 +4116,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
@@ -4131,7 +4131,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
@@ -4139,7 +4139,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
 
@@ -4151,7 +4151,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
@@ -4159,7 +4159,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
@@ -4174,7 +4174,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
@@ -4182,7 +4182,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
@@ -4197,7 +4197,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
@@ -4205,7 +4205,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
 
@@ -4217,7 +4217,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
@@ -4225,7 +4225,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
@@ -4240,7 +4240,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
@@ -4248,7 +4248,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
@@ -4263,7 +4263,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
@@ -4271,7 +4271,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
 
@@ -4283,7 +4283,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
@@ -4291,7 +4291,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
@@ -4306,7 +4306,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
@@ -4314,7 +4314,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
@@ -4329,7 +4329,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
@@ -4337,7 +4337,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
 
@@ -4349,7 +4349,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
@@ -4357,7 +4357,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
@@ -4372,7 +4372,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
@@ -4380,7 +4380,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
@@ -4395,7 +4395,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
@@ -4403,7 +4403,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
 
@@ -4415,7 +4415,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
@@ -4423,7 +4423,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
@@ -4438,7 +4438,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
@@ -4446,7 +4446,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
@@ -4461,7 +4461,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
@@ -4469,7 +4469,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
 
@@ -4481,7 +4481,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
@@ -4489,7 +4489,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
@@ -4504,7 +4504,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
@@ -4512,7 +4512,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
@@ -4527,7 +4527,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
@@ -4535,7 +4535,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
 
@@ -4547,7 +4547,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
@@ -4555,7 +4555,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
@@ -4570,7 +4570,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
@@ -4578,7 +4578,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
@@ -4593,7 +4593,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
@@ -4601,7 +4601,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
 
@@ -4613,7 +4613,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
@@ -4621,7 +4621,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
@@ -4636,7 +4636,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
@@ -4644,7 +4644,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
@@ -4659,7 +4659,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
@@ -4667,7 +4667,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
 
@@ -4679,7 +4679,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
@@ -4687,7 +4687,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
@@ -4702,7 +4702,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
@@ -4710,7 +4710,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
@@ -4725,7 +4725,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
@@ -4733,7 +4733,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
 
@@ -4745,7 +4745,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
@@ -4753,7 +4753,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
@@ -4768,7 +4768,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
@@ -4776,7 +4776,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
@@ -4791,7 +4791,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
@@ -4799,7 +4799,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
 
@@ -4811,7 +4811,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
@@ -4819,7 +4819,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
@@ -4834,7 +4834,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
@@ -4842,7 +4842,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
@@ -4857,7 +4857,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
@@ -4865,7 +4865,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
 
@@ -4877,7 +4877,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
@@ -4885,7 +4885,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
@@ -4900,7 +4900,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
@@ -4908,7 +4908,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
@@ -4923,7 +4923,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
@@ -4931,7 +4931,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
 
@@ -4943,7 +4943,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
@@ -4951,7 +4951,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
@@ -4966,7 +4966,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
@@ -4974,7 +4974,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
@@ -4989,7 +4989,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
@@ -4997,7 +4997,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
 
@@ -5009,7 +5009,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
@@ -5017,7 +5017,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
@@ -5032,7 +5032,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
@@ -5040,7 +5040,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
@@ -5055,7 +5055,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
@@ -5063,7 +5063,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
 
@@ -5075,7 +5075,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
@@ -5083,7 +5083,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
@@ -5098,7 +5098,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
@@ -5106,7 +5106,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
@@ -5121,7 +5121,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
@@ -5129,7 +5129,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
 
@@ -5141,7 +5141,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
@@ -5149,7 +5149,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
@@ -5164,7 +5164,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
@@ -5172,7 +5172,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
@@ -5187,7 +5187,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
@@ -5195,7 +5195,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
 
@@ -5207,7 +5207,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
@@ -5215,7 +5215,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
@@ -5230,7 +5230,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
@@ -5238,7 +5238,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
@@ -5253,7 +5253,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
@@ -5261,7 +5261,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
 
@@ -5273,7 +5273,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
@@ -5281,7 +5281,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
@@ -5296,7 +5296,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
@@ -5304,7 +5304,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
@@ -5319,7 +5319,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
@@ -5327,7 +5327,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
 
@@ -5339,7 +5339,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
@@ -5347,7 +5347,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
@@ -5362,7 +5362,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
@@ -5370,7 +5370,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
@@ -5385,7 +5385,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
@@ -5393,7 +5393,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
 
@@ -5405,7 +5405,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
@@ -5413,7 +5413,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
@@ -5428,7 +5428,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
@@ -5436,7 +5436,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
@@ -5451,7 +5451,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
@@ -5459,7 +5459,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
 
@@ -5471,7 +5471,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
@@ -5479,7 +5479,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
@@ -5494,7 +5494,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
@@ -5502,7 +5502,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
@@ -5517,7 +5517,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
@@ -5525,7 +5525,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
 
@@ -5537,7 +5537,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
@@ -5545,7 +5545,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
@@ -5560,7 +5560,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
@@ -5568,7 +5568,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
@@ -5583,7 +5583,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
@@ -5591,7 +5591,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
 
@@ -5603,7 +5603,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
@@ -5611,7 +5611,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
@@ -5626,7 +5626,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
@@ -5634,7 +5634,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
@@ -5649,7 +5649,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
@@ -5657,7 +5657,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
 
@@ -5669,7 +5669,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
@@ -5677,7 +5677,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
@@ -5692,7 +5692,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
@@ -5700,7 +5700,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
@@ -5715,7 +5715,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
@@ -5723,7 +5723,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
 
@@ -5735,7 +5735,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
@@ -5743,7 +5743,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
@@ -5758,7 +5758,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
@@ -5766,7 +5766,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
@@ -5781,7 +5781,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
@@ -5789,7 +5789,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
 
@@ -5801,7 +5801,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
@@ -5809,7 +5809,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
@@ -5824,7 +5824,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
@@ -5832,7 +5832,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
@@ -5847,7 +5847,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
@@ -5855,7 +5855,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
 
@@ -5867,7 +5867,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
@@ -5875,7 +5875,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
@@ -5890,7 +5890,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
@@ -5898,7 +5898,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
@@ -5913,7 +5913,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
@@ -5921,7 +5921,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
 
@@ -5933,7 +5933,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
@@ -5941,7 +5941,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
@@ -5956,7 +5956,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
@@ -5964,7 +5964,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
@@ -5979,7 +5979,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
@@ -5987,7 +5987,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
 
@@ -5999,7 +5999,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
@@ -6007,7 +6007,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
@@ -6022,7 +6022,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
@@ -6030,7 +6030,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
@@ -6045,7 +6045,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
@@ -6053,7 +6053,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
 
@@ -6065,7 +6065,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
@@ -6073,7 +6073,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
@@ -6088,7 +6088,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
@@ -6096,7 +6096,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
@@ -6111,7 +6111,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
@@ -6119,7 +6119,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
 
@@ -6131,7 +6131,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
@@ -6139,7 +6139,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
@@ -6154,7 +6154,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
@@ -6162,7 +6162,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
@@ -6177,7 +6177,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
@@ -6185,7 +6185,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
 
@@ -6197,7 +6197,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
@@ -6205,7 +6205,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
@@ -6220,7 +6220,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
@@ -6228,7 +6228,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
@@ -6243,7 +6243,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
@@ -6251,7 +6251,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
 
@@ -6263,7 +6263,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
@@ -6271,7 +6271,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
@@ -6286,7 +6286,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
@@ -6294,7 +6294,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
@@ -6309,7 +6309,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
@@ -6317,7 +6317,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
 
@@ -6329,7 +6329,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
@@ -6337,7 +6337,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
@@ -6352,7 +6352,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
@@ -6360,7 +6360,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
@@ -6375,7 +6375,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
@@ -6383,7 +6383,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
 
@@ -6395,7 +6395,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
@@ -6403,7 +6403,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
@@ -6418,7 +6418,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
@@ -6426,7 +6426,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
@@ -6441,7 +6441,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
@@ -6449,7 +6449,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
 
@@ -6461,7 +6461,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
@@ -6469,7 +6469,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
@@ -6484,7 +6484,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
@@ -6492,7 +6492,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
@@ -6507,7 +6507,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
@@ -6515,7 +6515,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
 
@@ -6527,7 +6527,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
@@ -6535,7 +6535,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
@@ -6550,7 +6550,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
@@ -6558,7 +6558,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
@@ -6573,7 +6573,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
@@ -6581,7 +6581,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
 
@@ -6593,7 +6593,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
@@ -6601,7 +6601,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
@@ -6616,7 +6616,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
@@ -6624,7 +6624,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
@@ -6639,7 +6639,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
@@ -6647,7 +6647,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
 
@@ -6659,7 +6659,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
@@ -6667,7 +6667,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
@@ -6682,7 +6682,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
@@ -6690,7 +6690,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
@@ -6705,7 +6705,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
@@ -6713,7 +6713,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
 
@@ -6725,7 +6725,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
@@ -6733,7 +6733,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
@@ -6748,7 +6748,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
@@ -6756,7 +6756,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
@@ -6771,7 +6771,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
@@ -6779,7 +6779,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
 
@@ -6791,7 +6791,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
@@ -6799,7 +6799,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
@@ -6814,7 +6814,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
@@ -6822,7 +6822,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
@@ -6837,7 +6837,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
@@ -6845,7 +6845,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
 
@@ -6857,7 +6857,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
@@ -6865,7 +6865,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
@@ -6880,7 +6880,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
@@ -6888,7 +6888,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
@@ -6903,7 +6903,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
@@ -6911,7 +6911,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
 
@@ -6923,7 +6923,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
@@ -6931,7 +6931,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
@@ -6946,7 +6946,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
@@ -6954,7 +6954,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
@@ -6969,7 +6969,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
@@ -6977,7 +6977,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
 
@@ -6989,7 +6989,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
@@ -6997,7 +6997,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
@@ -7012,7 +7012,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
@@ -7020,7 +7020,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
@@ -7035,7 +7035,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
@@ -7043,7 +7043,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
 
@@ -7055,7 +7055,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
@@ -7063,7 +7063,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
@@ -7078,7 +7078,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
@@ -7086,7 +7086,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
@@ -7101,7 +7101,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
@@ -7109,7 +7109,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
 
@@ -7121,7 +7121,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
@@ -7129,7 +7129,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
@@ -7144,7 +7144,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
@@ -7152,7 +7152,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
@@ -7167,7 +7167,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
@@ -7175,7 +7175,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
 
@@ -7187,7 +7187,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
@@ -7195,7 +7195,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
@@ -7210,7 +7210,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
@@ -7218,7 +7218,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
@@ -7233,7 +7233,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
@@ -7241,7 +7241,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
 
@@ -7253,7 +7253,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
@@ -7261,7 +7261,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
@@ -7276,7 +7276,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
@@ -7284,7 +7284,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
@@ -7299,7 +7299,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
@@ -7307,7 +7307,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
 
@@ -7319,7 +7319,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
@@ -7327,7 +7327,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
@@ -7342,7 +7342,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
@@ -7350,7 +7350,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
@@ -7365,7 +7365,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
@@ -7373,7 +7373,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
 
@@ -7385,7 +7385,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
@@ -7393,7 +7393,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
@@ -7408,7 +7408,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
@@ -7416,7 +7416,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
@@ -7431,7 +7431,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
@@ -7439,7 +7439,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
 
@@ -7451,7 +7451,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
@@ -7459,7 +7459,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
@@ -7474,7 +7474,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
@@ -7482,7 +7482,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
@@ -7497,7 +7497,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
@@ -7505,7 +7505,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
 
@@ -7517,7 +7517,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
@@ -7525,7 +7525,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
@@ -7540,7 +7540,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
@@ -7548,7 +7548,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
@@ -7563,7 +7563,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
@@ -7571,7 +7571,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
 
@@ -7583,7 +7583,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
@@ -7591,7 +7591,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
@@ -7606,7 +7606,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
@@ -7614,7 +7614,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
@@ -7629,7 +7629,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
@@ -7637,7 +7637,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
 
@@ -7649,7 +7649,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
@@ -7657,7 +7657,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
@@ -7672,7 +7672,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
@@ -7680,7 +7680,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
@@ -7695,7 +7695,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
@@ -7703,7 +7703,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
 
@@ -7715,7 +7715,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
@@ -7723,7 +7723,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
@@ -7738,7 +7738,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
@@ -7746,7 +7746,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
@@ -7761,7 +7761,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
@@ -7769,7 +7769,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
 
@@ -7781,7 +7781,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
@@ -7789,7 +7789,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
@@ -7804,7 +7804,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
@@ -7812,7 +7812,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
@@ -7827,7 +7827,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
@@ -7835,7 +7835,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
 
@@ -7847,7 +7847,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
@@ -7855,7 +7855,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
@@ -7870,7 +7870,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
@@ -7878,7 +7878,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
@@ -7893,7 +7893,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
@@ -7901,7 +7901,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
 
@@ -7913,7 +7913,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
@@ -7921,7 +7921,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
@@ -7936,7 +7936,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
@@ -7944,7 +7944,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
@@ -7959,7 +7959,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
@@ -7967,7 +7967,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
 
@@ -7979,7 +7979,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
@@ -7987,7 +7987,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
@@ -8002,7 +8002,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
@@ -8010,7 +8010,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
@@ -8025,7 +8025,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
@@ -8033,7 +8033,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
 
@@ -8045,7 +8045,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
@@ -8053,7 +8053,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
@@ -8068,7 +8068,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
@@ -8076,7 +8076,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
@@ -8091,7 +8091,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
@@ -8099,7 +8099,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
 
@@ -8111,7 +8111,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
@@ -8119,7 +8119,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
@@ -8134,7 +8134,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
@@ -8142,7 +8142,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
@@ -8157,7 +8157,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
@@ -8165,7 +8165,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
 
@@ -8177,7 +8177,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
@@ -8185,7 +8185,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
@@ -8200,7 +8200,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
@@ -8208,7 +8208,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
@@ -8223,7 +8223,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
@@ -8231,7 +8231,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
 
@@ -8243,7 +8243,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
@@ -8251,7 +8251,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
@@ -8266,7 +8266,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
@@ -8274,7 +8274,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
@@ -8289,7 +8289,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
@@ -8297,7 +8297,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
 
@@ -8309,7 +8309,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
@@ -8317,7 +8317,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
@@ -8332,7 +8332,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
@@ -8340,7 +8340,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
@@ -8355,7 +8355,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
@@ -8363,7 +8363,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
 
@@ -8375,7 +8375,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
@@ -8383,7 +8383,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
@@ -8398,7 +8398,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
@@ -8406,7 +8406,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
@@ -8421,7 +8421,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
@@ -8429,7 +8429,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
 
@@ -8441,7 +8441,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
@@ -8449,7 +8449,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
@@ -8464,7 +8464,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
@@ -8472,7 +8472,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
@@ -8487,7 +8487,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
@@ -8495,7 +8495,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
 
@@ -8507,7 +8507,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
@@ -8515,7 +8515,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
@@ -8530,7 +8530,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
@@ -8538,7 +8538,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
@@ -8553,7 +8553,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
@@ -8561,7 +8561,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
 
@@ -8573,7 +8573,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
@@ -8581,7 +8581,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
@@ -8596,7 +8596,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
@@ -8604,7 +8604,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
@@ -8619,7 +8619,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
@@ -8627,7 +8627,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
 
@@ -8639,7 +8639,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
@@ -8647,7 +8647,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
@@ -8662,7 +8662,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
@@ -8670,7 +8670,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
@@ -8685,7 +8685,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
@@ -8693,7 +8693,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
 
@@ -8705,7 +8705,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
@@ -8713,7 +8713,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
@@ -8728,7 +8728,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
@@ -8736,7 +8736,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
@@ -8751,7 +8751,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
@@ -8759,7 +8759,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
 
@@ -8771,7 +8771,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
@@ -8779,7 +8779,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
@@ -8794,7 +8794,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
@@ -8802,7 +8802,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
@@ -8817,7 +8817,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
@@ -8825,7 +8825,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
 
@@ -8837,7 +8837,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
@@ -8845,7 +8845,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
@@ -8860,7 +8860,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
@@ -8868,7 +8868,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
@@ -8883,7 +8883,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
@@ -8891,7 +8891,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
 
@@ -8903,7 +8903,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
@@ -8911,7 +8911,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
@@ -8926,7 +8926,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
@@ -8934,7 +8934,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
@@ -8949,7 +8949,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
@@ -8957,7 +8957,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
 
@@ -8969,7 +8969,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
@@ -8977,7 +8977,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
@@ -8992,7 +8992,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
@@ -9000,7 +9000,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
@@ -9015,7 +9015,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
@@ -9023,7 +9023,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
 
@@ -9035,7 +9035,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
@@ -9043,7 +9043,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
@@ -9058,7 +9058,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
@@ -9066,7 +9066,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
@@ -9081,7 +9081,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
@@ -9089,7 +9089,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
 
@@ -9101,7 +9101,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
@@ -9109,7 +9109,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
@@ -9124,7 +9124,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
@@ -9132,7 +9132,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
@@ -9147,7 +9147,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
@@ -9155,7 +9155,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
 
@@ -9167,7 +9167,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
@@ -9175,7 +9175,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
@@ -9190,7 +9190,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
@@ -9198,7 +9198,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
@@ -9213,7 +9213,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
@@ -9221,7 +9221,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
 
@@ -9233,7 +9233,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
@@ -9241,7 +9241,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
@@ -9256,7 +9256,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
@@ -9264,7 +9264,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
@@ -9279,7 +9279,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
@@ -9287,7 +9287,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
 
@@ -9299,7 +9299,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
@@ -9307,7 +9307,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
@@ -9322,7 +9322,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
@@ -9330,7 +9330,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
@@ -9345,7 +9345,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
@@ -9353,7 +9353,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
 
@@ -9365,7 +9365,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
@@ -9373,7 +9373,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
@@ -9388,7 +9388,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
@@ -9396,7 +9396,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
@@ -9411,7 +9411,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
@@ -9419,7 +9419,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
 
@@ -9431,7 +9431,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
@@ -9439,7 +9439,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
@@ -9454,7 +9454,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
@@ -9462,7 +9462,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
@@ -9477,7 +9477,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
@@ -9485,7 +9485,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
 
@@ -9497,7 +9497,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
@@ -9505,7 +9505,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
@@ -9520,7 +9520,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
@@ -9528,7 +9528,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
@@ -9543,7 +9543,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
@@ -9551,7 +9551,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
 
@@ -9563,7 +9563,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
@@ -9571,7 +9571,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
@@ -9586,7 +9586,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
@@ -9594,7 +9594,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
@@ -9609,7 +9609,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
@@ -9617,7 +9617,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
 
@@ -9629,7 +9629,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
@@ -9637,7 +9637,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
@@ -9652,7 +9652,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
@@ -9660,7 +9660,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
@@ -9675,7 +9675,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