[svn-r1958] updated the ddls for the changes that were made to the dumper

6 files changed, 387 insertions, 499 deletions

diff --git a/tools/testfiles/tall-1.ddl b/tools/testfiles/tall-1.ddl
index 1c935cd..82582c8 100644
--- a/tools/testfiles/tall-1.ddl
+++ b/tools/testfiles/tall-1.ddl
@@ -1,7 +1,7 @@
 #############################
 Expected output for 'h5dump tall.h5'
 #############################
-HDF5 "tall.h5" {
+HDF5 "testfiles\tall.h5" {
 GROUP "/" {
    ATTRIBUTE "attr1" {
       DATATYPE { H5T_STD_I8BE }
@@ -39,7 +39,7 @@ GROUP "/" {
                DATATYPE { H5T_STD_I8BE }
                DATASPACE { SIMPLE ( 27 ) / ( 27 ) }
                DATA {
-                  49, 115, 116, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 
+                  49, 115, 116, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101,
                   32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
                }
             }
@@ -47,7 +47,7 @@ GROUP "/" {
                DATATYPE { H5T_STD_I8BE }
                DATASPACE { SIMPLE ( 27 ) / ( 27 ) }
                DATA {
-                  50, 110, 100, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 
+                  50, 110, 100, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101,
                   32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
                }
             }
@@ -56,8 +56,8 @@ GROUP "/" {
             DATATYPE { H5T_STD_I32BE }
             DATASPACE { SIMPLE ( 20 ) / ( 20 ) }
             DATA {
-               0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-               19
+               0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+               18, 19
             }
          }
       }
diff --git a/tools/testfiles/tattr-1.ddl b/tools/testfiles/tattr-1.ddl
index 857b0f7..146597c 100644
--- a/tools/testfiles/tattr-1.ddl
+++ b/tools/testfiles/tattr-1.ddl
@@ -1,13 +1,13 @@
 #############################
 Expected output for 'h5dump tattr.h5'
 #############################
-HDF5 "tattr.h5" {
+HDF5 "testfiles\tattr.h5" {
 GROUP "/" {
    ATTRIBUTE "attr1" {
       DATATYPE { H5T_STD_I8BE }
       DATASPACE { SIMPLE ( 24 ) / ( 24 ) }
       DATA {
-         97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 114, 111, 
+         97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 114, 111,
          111, 116, 32, 103, 114, 111, 117, 112, 0
       }
    }
diff --git a/tools/testfiles/tattr-2.ddl b/tools/testfiles/tattr-2.ddl
index c7978dc..a83e046 100644
--- a/tools/testfiles/tattr-2.ddl
+++ b/tools/testfiles/tattr-2.ddl
@@ -1,12 +1,12 @@
 #############################
 Expected output for 'h5dump -a attr1 attr4 attr5 tattr.h5'
 #############################
-HDF5 "tattr.h5" {
+HDF5 "testfiles\tattr.h5" {
 ATTRIBUTE "attr1" {
    DATATYPE { H5T_STD_I8BE }
    DATASPACE { SIMPLE ( 24 ) / ( 24 ) }
    DATA {
-      97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 114, 111, 
+      97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 114, 111,
       111, 116, 32, 103, 114, 111, 117, 112, 0
    }
 }
diff --git a/tools/testfiles/tcomp-1.ddl b/tools/testfiles/tcomp-1.ddl
index 21fe28d..ff8e77e 100644
--- a/tools/testfiles/tcomp-1.ddl
+++ b/tools/testfiles/tcomp-1.ddl
@@ -1,7 +1,7 @@
 #############################
 Expected output for 'h5dump tcompound.h5'
 #############################
-HDF5 "tcompound.h5" {
+HDF5 "testfiles\tcompound.h5" {
 GROUP "/" {
    DATATYPE "#5992:0" {
       H5T_STD_I32BE "int";
@@ -79,147 +79,147 @@ GROUP "/" {
          DATA {
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             },
             {
                [ 0, 1, 2, 3 ],
-               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
-                 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
-                 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
-                 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+               [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 
+               0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
+               0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 
+               0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 
+               0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
             }
          }
       }
diff --git a/tools/testfiles/tdset-1.ddl b/tools/testfiles/tdset-1.ddl
index 520489d..c2f8476 100644
--- a/tools/testfiles/tdset-1.ddl
+++ b/tools/testfiles/tdset-1.ddl
@@ -1,7 +1,7 @@
 #############################
 Expected output for 'h5dump tdset.h5'
 #############################
-HDF5 "tdset.h5" {
+HDF5 "testfiles\tdset.h5" {
 GROUP "/" {
    DATASET "dset1" {
       DATATYPE { H5T_STD_I32BE }
@@ -9,20 +9,21 @@ GROUP "/" {
       DATA {
          0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
          1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-         2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
-         3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 
+         2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+         21,
+         3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
          22,
-         4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 
+         4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
          23,
-         5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 
+         5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
          24,
-         6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
-         25,
-         7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 
+         6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+         24, 25,
+         7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
          25, 26,
-         8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 
+         8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
          26, 27,
-         9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 
+         9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
          27, 28
       }
    }
@@ -30,95 +31,95 @@ GROUP "/" {
       DATATYPE { H5T_IEEE_F64BE }
       DATASPACE { SIMPLE ( 30, 20 ) / ( 30, 20 ) }
       DATA {
-         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 
-         0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008,
+         0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017,
          0.0018, 0.0019,
-         1, 1.0001, 1.0002, 1.0003, 1.0004, 1.0005, 1.0006, 1.0007, 1.0008, 
-         1.0009, 1.001, 1.0011, 1.0012, 1.0013, 1.0014, 1.0015, 1.0016, 1.0017, 
+         1, 1.0001, 1.0002, 1.0003, 1.0004, 1.0005, 1.0006, 1.0007, 1.0008,
+         1.0009, 1.001, 1.0011, 1.0012, 1.0013, 1.0014, 1.0015, 1.0016, 1.0017,
          1.0018, 1.0019,
-         2, 2.0001, 2.0002, 2.0003, 2.0004, 2.0005, 2.0006, 2.0007, 2.0008, 
-         2.0009, 2.001, 2.0011, 2.0012, 2.0013, 2.0014, 2.0015, 2.0016, 2.0017, 
+         2, 2.0001, 2.0002, 2.0003, 2.0004, 2.0005, 2.0006, 2.0007, 2.0008,
+         2.0009, 2.001, 2.0011, 2.0012, 2.0013, 2.0014, 2.0015, 2.0016, 2.0017,
          2.0018, 2.0019,
-         3, 3.0001, 3.0002, 3.0003, 3.0004, 3.0005, 3.0006, 3.0007, 3.0008, 
-         3.0009, 3.001, 3.0011, 3.0012, 3.0013, 3.0014, 3.0015, 3.0016, 3.0017, 
+         3, 3.0001, 3.0002, 3.0003, 3.0004, 3.0005, 3.0006, 3.0007, 3.0008,
+         3.0009, 3.001, 3.0011, 3.0012, 3.0013, 3.0014, 3.0015, 3.0016, 3.0017,
          3.0018, 3.0019,
-         4, 4.0001, 4.0002, 4.0003, 4.0004, 4.0005, 4.0006, 4.0007, 4.0008, 
-         4.0009, 4.001, 4.0011, 4.0012, 4.0013, 4.0014, 4.0015, 4.0016, 4.0017, 
+         4, 4.0001, 4.0002, 4.0003, 4.0004, 4.0005, 4.0006, 4.0007, 4.0008,
+         4.0009, 4.001, 4.0011, 4.0012, 4.0013, 4.0014, 4.0015, 4.0016, 4.0017,
          4.0018, 4.0019,
-         5, 5.0001, 5.0002, 5.0003, 5.0004, 5.0005, 5.0006, 5.0007, 5.0008, 
-         5.0009, 5.001, 5.0011, 5.0012, 5.0013, 5.0014, 5.0015, 5.0016, 5.0017, 
+         5, 5.0001, 5.0002, 5.0003, 5.0004, 5.0005, 5.0006, 5.0007, 5.0008,
+         5.0009, 5.001, 5.0011, 5.0012, 5.0013, 5.0014, 5.0015, 5.0016, 5.0017,
          5.0018, 5.0019,
-         6, 6.0001, 6.0002, 6.0003, 6.0004, 6.0005, 6.0006, 6.0007, 6.0008, 
-         6.0009, 6.001, 6.0011, 6.0012, 6.0013, 6.0014, 6.0015, 6.0016, 6.0017, 
+         6, 6.0001, 6.0002, 6.0003, 6.0004, 6.0005, 6.0006, 6.0007, 6.0008,
+         6.0009, 6.001, 6.0011, 6.0012, 6.0013, 6.0014, 6.0015, 6.0016, 6.0017,
          6.0018, 6.0019,
-         7, 7.0001, 7.0002, 7.0003, 7.0004, 7.0005, 7.0006, 7.0007, 7.0008, 
-         7.0009, 7.001, 7.0011, 7.0012, 7.0013, 7.0014, 7.0015, 7.0016, 7.0017, 
+         7, 7.0001, 7.0002, 7.0003, 7.0004, 7.0005, 7.0006, 7.0007, 7.0008,
+         7.0009, 7.001, 7.0011, 7.0012, 7.0013, 7.0014, 7.0015, 7.0016, 7.0017,
          7.0018, 7.0019,
-         8, 8.0001, 8.0002, 8.0003, 8.0004, 8.0005, 8.0006, 8.0007, 8.0008, 
-         8.0009, 8.001, 8.0011, 8.0012, 8.0013, 8.0014, 8.0015, 8.0016, 8.0017, 
+         8, 8.0001, 8.0002, 8.0003, 8.0004, 8.0005, 8.0006, 8.0007, 8.0008,
+         8.0009, 8.001, 8.0011, 8.0012, 8.0013, 8.0014, 8.0015, 8.0016, 8.0017,
          8.0018, 8.0019,
-         9, 9.0001, 9.0002, 9.0003, 9.0004, 9.0005, 9.0006, 9.0007, 9.0008, 
-         9.0009, 9.001, 9.0011, 9.0012, 9.0013, 9.0014, 9.0015, 9.0016, 9.0017, 
+         9, 9.0001, 9.0002, 9.0003, 9.0004, 9.0005, 9.0006, 9.0007, 9.0008,
+         9.0009, 9.001, 9.0011, 9.0012, 9.0013, 9.0014, 9.0015, 9.0016, 9.0017,
          9.0018, 9.0019,
-         10, 10.0001, 10.0002, 10.0003, 10.0004, 10.0005, 10.0006, 10.0007, 
-         10.0008, 10.0009, 10.001, 10.0011, 10.0012, 10.0013, 10.0014, 10.0015, 
+         10, 10.0001, 10.0002, 10.0003, 10.0004, 10.0005, 10.0006, 10.0007,
+         10.0008, 10.0009, 10.001, 10.0011, 10.0012, 10.0013, 10.0014, 10.0015,
          10.0016, 10.0017, 10.0018, 10.0019,
-         11, 11.0001, 11.0002, 11.0003, 11.0004, 11.0005, 11.0006, 11.0007, 
-         11.0008, 11.0009, 11.001, 11.0011, 11.0012, 11.0013, 11.0014, 11.0015, 
+         11, 11.0001, 11.0002, 11.0003, 11.0004, 11.0005, 11.0006, 11.0007,
+         11.0008, 11.0009, 11.001, 11.0011, 11.0012, 11.0013, 11.0014, 11.0015,
          11.0016, 11.0017, 11.0018, 11.0019,
-         12, 12.0001, 12.0002, 12.0003, 12.0004, 12.0005, 12.0006, 12.0007, 
-         12.0008, 12.0009, 12.001, 12.0011, 12.0012, 12.0013, 12.0014, 12.0015, 
+         12, 12.0001, 12.0002, 12.0003, 12.0004, 12.0005, 12.0006, 12.0007,
+         12.0008, 12.0009, 12.001, 12.0011, 12.0012, 12.0013, 12.0014, 12.0015,
          12.0016, 12.0017, 12.0018, 12.0019,
-         13, 13.0001, 13.0002, 13.0003, 13.0004, 13.0005, 13.0006, 13.0007, 
-         13.0008, 13.0009, 13.001, 13.0011, 13.0012, 13.0013, 13.0014, 13.0015, 
+         13, 13.0001, 13.0002, 13.0003, 13.0004, 13.0005, 13.0006, 13.0007,
+         13.0008, 13.0009, 13.001, 13.0011, 13.0012, 13.0013, 13.0014, 13.0015,
          13.0016, 13.0017, 13.0018, 13.0019,
-         14, 14.0001, 14.0002, 14.0003, 14.0004, 14.0005, 14.0006, 14.0007, 
-         14.0008, 14.0009, 14.001, 14.0011, 14.0012, 14.0013, 14.0014, 14.0015, 
+         14, 14.0001, 14.0002, 14.0003, 14.0004, 14.0005, 14.0006, 14.0007,
+         14.0008, 14.0009, 14.001, 14.0011, 14.0012, 14.0013, 14.0014, 14.0015,
          14.0016, 14.0017, 14.0018, 14.0019,
-         15, 15.0001, 15.0002, 15.0003, 15.0004, 15.0005, 15.0006, 15.0007, 
-         15.0008, 15.0009, 15.001, 15.0011, 15.0012, 15.0013, 15.0014, 15.0015, 
+         15, 15.0001, 15.0002, 15.0003, 15.0004, 15.0005, 15.0006, 15.0007,
+         15.0008, 15.0009, 15.001, 15.0011, 15.0012, 15.0013, 15.0014, 15.0015,
          15.0016, 15.0017, 15.0018, 15.0019,
-         16, 16.0001, 16.0002, 16.0003, 16.0004, 16.0005, 16.0006, 16.0007, 
-         16.0008, 16.0009, 16.001, 16.0011, 16.0012, 16.0013, 16.0014, 16.0015, 
+         16, 16.0001, 16.0002, 16.0003, 16.0004, 16.0005, 16.0006, 16.0007,
+         16.0008, 16.0009, 16.001, 16.0011, 16.0012, 16.0013, 16.0014, 16.0015,
          16.0016, 16.0017, 16.0018, 16.0019,
-         17, 17.0001, 17.0002, 17.0003, 17.0004, 17.0005, 17.0006, 17.0007, 
-         17.0008, 17.0009, 17.001, 17.0011, 17.0012, 17.0013, 17.0014, 17.0015, 
+         17, 17.0001, 17.0002, 17.0003, 17.0004, 17.0005, 17.0006, 17.0007,
+         17.0008, 17.0009, 17.001, 17.0011, 17.0012, 17.0013, 17.0014, 17.0015,
          17.0016, 17.0017, 17.0018, 17.0019,
-         18, 18.0001, 18.0002, 18.0003, 18.0004, 18.0005, 18.0006, 18.0007, 
-         18.0008, 18.0009, 18.001, 18.0011, 18.0012, 18.0013, 18.0014, 18.0015, 
+         18, 18.0001, 18.0002, 18.0003, 18.0004, 18.0005, 18.0006, 18.0007,
+         18.0008, 18.0009, 18.001, 18.0011, 18.0012, 18.0013, 18.0014, 18.0015,
          18.0016, 18.0017, 18.0018, 18.0019,
-         19, 19.0001, 19.0002, 19.0003, 19.0004, 19.0005, 19.0006, 19.0007, 
-         19.0008, 19.0009, 19.001, 19.0011, 19.0012, 19.0013, 19.0014, 19.0015, 
+         19, 19.0001, 19.0002, 19.0003, 19.0004, 19.0005, 19.0006, 19.0007,
+         19.0008, 19.0009, 19.001, 19.0011, 19.0012, 19.0013, 19.0014, 19.0015,
          19.0016, 19.0017, 19.0018, 19.0019,
-         20, 20.0001, 20.0002, 20.0003, 20.0004, 20.0005, 20.0006, 20.0007, 
-         20.0008, 20.0009, 20.001, 20.0011, 20.0012, 20.0013, 20.0014, 20.0015, 
+         20, 20.0001, 20.0002, 20.0003, 20.0004, 20.0005, 20.0006, 20.0007,
+         20.0008, 20.0009, 20.001, 20.0011, 20.0012, 20.0013, 20.0014, 20.0015,
          20.0016, 20.0017, 20.0018, 20.0019,
-         21, 21.0001, 21.0002, 21.0003, 21.0004, 21.0005, 21.0006, 21.0007, 
-         21.0008, 21.0009, 21.001, 21.0011, 21.0012, 21.0013, 21.0014, 21.0015, 
+         21, 21.0001, 21.0002, 21.0003, 21.0004, 21.0005, 21.0006, 21.0007,
+         21.0008, 21.0009, 21.001, 21.0011, 21.0012, 21.0013, 21.0014, 21.0015,
          21.0016, 21.0017, 21.0018, 21.0019,
-         22, 22.0001, 22.0002, 22.0003, 22.0004, 22.0005, 22.0006, 22.0007, 
-         22.0008, 22.0009, 22.001, 22.0011, 22.0012, 22.0013, 22.0014, 22.0015, 
+         22, 22.0001, 22.0002, 22.0003, 22.0004, 22.0005, 22.0006, 22.0007,
+         22.0008, 22.0009, 22.001, 22.0011, 22.0012, 22.0013, 22.0014, 22.0015,
          22.0016, 22.0017, 22.0018, 22.0019,
-         23, 23.0001, 23.0002, 23.0003, 23.0004, 23.0005, 23.0006, 23.0007, 
-         23.0008, 23.0009, 23.001, 23.0011, 23.0012, 23.0013, 23.0014, 23.0015, 
+         23, 23.0001, 23.0002, 23.0003, 23.0004, 23.0005, 23.0006, 23.0007,
+         23.0008, 23.0009, 23.001, 23.0011, 23.0012, 23.0013, 23.0014, 23.0015,
          23.0016, 23.0017, 23.0018, 23.0019,
-         24, 24.0001, 24.0002, 24.0003, 24.0004, 24.0005, 24.0006, 24.0007, 
-         24.0008, 24.0009, 24.001, 24.0011, 24.0012, 24.0013, 24.0014, 24.0015, 
+         24, 24.0001, 24.0002, 24.0003, 24.0004, 24.0005, 24.0006, 24.0007,
+         24.0008, 24.0009, 24.001, 24.0011, 24.0012, 24.0013, 24.0014, 24.0015,
          24.0016, 24.0017, 24.0018, 24.0019,
-         25, 25.0001, 25.0002, 25.0003, 25.0004, 25.0005, 25.0006, 25.0007, 
-         25.0008, 25.0009, 25.001, 25.0011, 25.0012, 25.0013, 25.0014, 25.0015, 
+         25, 25.0001, 25.0002, 25.0003, 25.0004, 25.0005, 25.0006, 25.0007,
+         25.0008, 25.0009, 25.001, 25.0011, 25.0012, 25.0013, 25.0014, 25.0015,
          25.0016, 25.0017, 25.0018, 25.0019,
-         26, 26.0001, 26.0002, 26.0003, 26.0004, 26.0005, 26.0006, 26.0007, 
-         26.0008, 26.0009, 26.001, 26.0011, 26.0012, 26.0013, 26.0014, 26.0015, 
+         26, 26.0001, 26.0002, 26.0003, 26.0004, 26.0005, 26.0006, 26.0007,
+         26.0008, 26.0009, 26.001, 26.0011, 26.0012, 26.0013, 26.0014, 26.0015,
          26.0016, 26.0017, 26.0018, 26.0019,
-         27, 27.0001, 27.0002, 27.0003, 27.0004, 27.0005, 27.0006, 27.0007, 
-         27.0008, 27.0009, 27.001, 27.0011, 27.0012, 27.0013, 27.0014, 27.0015, 
+         27, 27.0001, 27.0002, 27.0003, 27.0004, 27.0005, 27.0006, 27.0007,
+         27.0008, 27.0009, 27.001, 27.0011, 27.0012, 27.0013, 27.0014, 27.0015,
          27.0016, 27.0017, 27.0018, 27.0019,
-         28, 28.0001, 28.0002, 28.0003, 28.0004, 28.0005, 28.0006, 28.0007, 
-         28.0008, 28.0009, 28.001, 28.0011, 28.0012, 28.0013, 28.0014, 28.0015, 
+         28, 28.0001, 28.0002, 28.0003, 28.0004, 28.0005, 28.0006, 28.0007,
+         28.0008, 28.0009, 28.001, 28.0011, 28.0012, 28.0013, 28.0014, 28.0015,
          28.0016, 28.0017, 28.0018, 28.0019,
-         29, 29.0001, 29.0002, 29.0003, 29.0004, 29.0005, 29.0006, 29.0007, 
-         29.0008, 29.0009, 29.001, 29.0011, 29.0012, 29.0013, 29.0014, 29.0015, 
+         29, 29.0001, 29.0002, 29.0003, 29.0004, 29.0005, 29.0006, 29.0007,
+         29.0008, 29.0009, 29.001, 29.0011, 29.0012, 29.0013, 29.0014, 29.0015,
          29.0016, 29.0017, 29.0018, 29.0019
       }
    }
diff --git a/tools/testfiles/tstr-1.ddl b/tools/testfiles/tstr-1.ddl
index 53fe0fa..00e0bf1 100644
--- a/tools/testfiles/tstr-1.ddl
+++ b/tools/testfiles/tstr-1.ddl
@@ -1,7 +1,7 @@
 #############################
 Expected output for 'h5dump tstr.h5'
 #############################
-HDF5 "tstr.h5" {
+HDF5 "testfiles\tstr.h5" {
 GROUP "/" {
    DATASET "comp1" {
       DATATYPE {
@@ -15,346 +15,238 @@ GROUP "/" {
       DATASPACE { SIMPLE ( 3, 6 ) / ( 3, 6 ) }
       DATA {
          {
-            [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
-              1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-              4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-              9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-              16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 
+            1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 
+            4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 
+            9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 
+            16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-              4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-              9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-              16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 
+            4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 
+            9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 
+            16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-              9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-              16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-              81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 
+            9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 
+            16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 
+            81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-              16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-              81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-              100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 
+            16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 
+            81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 
+            100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-              81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-              100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-              121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 
+            81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 
+            100, 121, 144, 169, 196, 225, 256, 289, 324, 361, 
+            121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-              81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-              100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-              121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
-              144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 
+            81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 
+            100, 121, 144, 169, 196, 225, 256, 289, 324, 361, 
+            121, 144, 169, 196, 225, 256, 289, 324, 361, 400, 
+            144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
-              1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-              4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-              9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-              16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 
+            1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 
+            4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 
+            9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 
+            16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-              4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-              9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-              16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 
+            4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 
+            9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 
+            16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-              9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-              16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-              81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 
+            9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 
+            16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 
+            81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-              16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-              81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-              100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 
+            16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 
+            81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 
+            100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-              81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-              100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-              121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 
+            81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 
+            100, 121, 144, 169, 196, 225, 256, 289, 324, 361, 
+            121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-              81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-              100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-              121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
-              144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 
+            81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 
+            100, 121, 144, 169, 196, 225, 256, 289, 324, 361, 
+            121, 144, 169, 196, 225, 256, 289, 324, 361, 400, 
+            144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
-              1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-              4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-              9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-              16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 
+            1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 
+            4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 
+            9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 
+            16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-              4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-              9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-              16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 
+            4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 
+            9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 
+            16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-              9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-              16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-              81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 
+            9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 
+            16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 
+            81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-              16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-              81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-              100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 
+            16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 
+            81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 
+            100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-              25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-              81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-              100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-              121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 
+            25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 
+            81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 
+            100, 121, 144, 169, 196, 225, 256, 289, 324, 361, 
+            121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
          {
-            [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-              36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-              49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-              64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-              81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-              100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-              121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
-              144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
-            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+            [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 
+            36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 
+            49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 
+            64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 
+            81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 
+            100, 121, 144, 169, 196, 225, 256, 289, 324, 361, 
+            121, 144, 169, 196, 225, 256, 289, 324, 361, 400, 
+            144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", 
+            "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          }
       }
    }
@@ -383,11 +275,11 @@ GROUP "/" {
       }
       DATASPACE { SIMPLE ( 20 ) / ( 20 ) }
       DATA {
-         "ab cd ef1  ", "ab cd ef2  ", "ab cd ef3  ", "ab cd ef4  ", "ab cd " //
-         "ef5  ", "ab cd ef6  ", "ab cd ef7  ", "ab cd ef8  ", "ab cd ef9  ", 
-         "ab cd ef0  ", "ab cd ef1  ", "ab cd ef2  ", "ab cd ef3  ", "ab cd " //
-         "ef4  ", "ab cd ef5  ", "ab cd ef6  ", "ab cd ef7  ", "ab cd ef8  ", 
-         "ab cd ef9  ", "ab cd ef0  "
+         "ab cd ef1  ", "ab cd ef2  ", "ab cd ef3  ", "ab cd ef4  ",
+         "ab cd ef5  ", "ab cd ef6  ", "ab cd ef7  ", "ab cd ef8  ",
+         "ab cd ef9  ", "ab cd ef0  ", "ab cd ef1  ", "ab cd ef2  ",
+         "ab cd ef3  ", "ab cd ef4  ", "ab cd ef5  ", "ab cd ef6  ",
+         "ab cd ef7  ", "ab cd ef8  ", "ab cd ef9  ", "ab cd ef0  "
       }
    }
    DATASET "string3" {
@@ -400,15 +292,15 @@ GROUP "/" {
       }
       DATASPACE { SIMPLE ( 27 ) / ( 27 ) }
       DATA {
-         "abcd0\000\000\000", "abcd1\000\000\000", "abcd2\000\000\000", "abc" //
-         "d3\000\000\000", "abcd4\000\000\000", "abcd5\000\000\000", "abcd6" //
-         "\000\000\000", "abcd7\000\000\000", "abcd8\000\000\000", "abcd9" //
-         "\000\000\000", "abcd0\000\000\000", "abcd1\000\000\000", "abcd2" //
-         "\000\000\000", "abcd3\000\000\000", "abcd4\000\000\000", "abcd5" //
-         "\000\000\000", "abcd6\000\000\000", "abcd7\000\000\000", "abcd8" //
-         "\000\000\000", "abcd9\000\000\000", "abcd0\000\000\000", "abcd1" //
-         "\000\000\000", "abcd2\000\000\000", "abcd3\000\000\000", "abcd4" //
-         "\000\000\000", "abcd5\000\000\000", "abcd6\000\000\000"
+         "abcd0\000\000\000", "abcd1\000\000\000", "abcd2\000\000\000",
+         "abcd3\000\000\000", "abcd4\000\000\000", "abcd5\000\000\000",
+         "abcd6\000\000\000", "abcd7\000\000\000", "abcd8\000\000\000",
+         "abcd9\000\000\000", "abcd0\000\000\000", "abcd1\000\000\000",
+         "abcd2\000\000\000", "abcd3\000\000\000", "abcd4\000\000\000",
+         "abcd5\000\000\000", "abcd6\000\000\000", "abcd7\000\000\000",
+         "abcd8\000\000\000", "abcd9\000\000\000", "abcd0\000\000\000",
+         "abcd1\000\000\000", "abcd2\000\000\000", "abcd3\000\000\000",
+         "abcd4\000\000\000", "abcd5\000\000\000", "abcd6\000\000\000"
       }
    }
    DATASET "string4" {
@@ -421,14 +313,9 @@ GROUP "/" {
       }
       DATASPACE { SIMPLE ( 3 ) / ( 3 ) }
       DATA {
-         "s1234567890123456789                                              " //
-         "                                                                  " //
-         "                                    ", "s1234567890123456789      " //
-         "                                                                  " //
-         "                                                                  " //
-         "          ", "s1234567890123456789                                " //
-         "                                                                  " //
-         "                                                  "
+         "s1234567890123456789                                                                                                                                                    ",
+         "s1234567890123456789                                                                                                                                                    ",
+         "s1234567890123456789                                                                                                                                                    "
       }
    }
 }