Remove unneeded/duplicated filesshell_script

231 files changed, 0 insertions, 3699 deletions

diff --git a/test/API/tools/testfiles/expected/h5diff/h5diff_10.txt b/test/API/tools/testfiles/expected/h5diff/h5diff_10.txt
deleted file mode 100644
index b5ff01a..0000000
--- a/test/API/tools/testfiles/expected/h5diff/h5diff_10.txt
+++ /dev/null
@@ -1,164 +0,0 @@
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
-  file1             File name of the first HDF5 file
-  file2             File name of the second HDF5 file
-  [obj1]            Name of an HDF5 object, in absolute path
-  [obj2]            Name of an HDF5 object, in absolute path
-
-  OPTIONS
-   -h, --help
-         Print a usage message and exit.
-   -V, --version
-         Print version number and exit.
-   -r, --report
-         Report mode. Print differences.
-   -v --verbose
-         Verbose mode. Print differences information and list of objects.
-   -vN --verbose=N
-         Verbose mode with level. Print differences and list of objects.
-         Level of detail depends on value of N:
-          0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute status summary.
-          2 : All level 1 information plus extended attribute status report.
-          3 : All level 2 information plus file names.
-   -q, --quiet
-         Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --vol-value-1           Value (ID) of the VOL connector to use for opening the
-                           first HDF5 file specified
-   --vol-name-1            Name of the VOL connector to use for opening the first
-                           HDF5 file specified
-   --vol-info-1            VOL-specific info to pass to the VOL connector used for
-                           opening the first HDF5 file specified
-   --vol-value-2           Value (ID) of the VOL connector to use for opening the
-                           second HDF5 file specified
-   --vol-name-2            Name of the VOL connector to use for opening the second
-                           HDF5 file specified
-   --vol-info-2            VOL-specific info to pass to the VOL connector used for
-                           opening the second HDF5 file specified
-   --follow-symlinks
-         Follow symbolic links (soft links and external links and compare the)
-         links' target objects.
-         If symbolic link(s) with the same name exist in the files being
-         compared, then determine whether the target of each link is an existing
-         object (dataset, group, or named datatype) or the link is a dangling
-         link (a soft or external link pointing to a target object that does
-         not yet exist).
-         - If both symbolic links are dangling links, they are treated as being
-           the same; by default, h5diff returns an exit code of 0.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If only one of the two links is a dangling link,they are treated as
-           being different and h5diff returns an exit code of 1.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If both symbolic links point to existing objects, h5diff compares the
-           two objects.
-         If any symbolic link specified in the call to h5diff does not exist,
-         h5diff treats it as an error and returns an exit code of 2.
-   --no-dangling-links
-         Must be used with --follow-symlinks option; otherwise, h5diff shows
-         error message and returns an exit code of 2.
-         Check for any symbolic links (soft links or external links) that do not
-         resolve to an existing object (dataset, group, or named datatype).
-         If any dangling link is found, this situation is treated as an error
-         and h5diff returns an exit code of 2.
-   -c, --compare
-         List objects that are not comparable
-   -N, --nan
-         Avoid NaNs detection
-   -n C, --count=C
-         Print differences up to C. C must be a positive integer.
-   -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-p' or '--use-system-epsilon'.
-   -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-d' or '--use-system-epsilon'.
-   --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         If the system epsilon is not defined,one of the following predefined
-         values will be used:
-           FLT_EPSILON = 1.19209E-07 for floating-point type
-           DBL_EPSILON = 2.22045E-16 for double precision type
-         Can not use with '-p' or '-d'.
-   --exclude-path "path"
-         Exclude the specified path to an object when comparing files or groups.
-         If a group is excluded, all member objects will also be excluded.
-         The specified path is excluded wherever it occurs.
-         This flexibility enables the same option to exclude either objects that
-         exist only in one file or common objects that are known to differ.
-
-         When comparing files, "path" is the absolute path to the excluded;
-         object; when comparing groups, "path" is similar to the relative
-         path from the group to the excluded object. This "path" can be
-         taken from the first section of the output of the --verbose option.
-         For example, if you are comparing the group /groupA in two files and
-         you want to exclude /groupA/groupB/groupC in both files, the exclude
-         option would read as follows:
-           --exclude-path "/groupB/groupC"
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
-   --exclude-attribute "path/to/object/with/attribute"
-         Exclude attributes on the specified path to an object when comparing files or groups.
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
- Modes of output:
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-
- File comparison:
-  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
-  a comparison of the two files' root groups.  That is, h5diff first compares
-  the names of root group members, generates a report of root group objects
-  that appear in only one file or in both files, and recursively compares
-  common objects.
-
- Object comparison:
-  1) Groups
-      First compares the names of member objects (relative path, from the
-      specified group) and generates a report of objects that appear in only
-      one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
-      Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes
-      The comparison is based on the return value of H5Tequal.
-  4) Symbolic links
-      The paths to the target objects are compared.
-      (The option --follow-symlinks overrides the default behavior when
-       symbolic links are compared.).
-
- Exit code:
-  0 if no differences, 1 if differences found, 2 if error
-
- Examples of use:
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-    Compares all objects in both files
-
- Notes:
-  file1 and file2 can be the same file.
-  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare
-  '/g1/dset1' and '/g1/dset2' in the same file
-
-EXIT CODE: 0
diff --git a/test/API/tools/testfiles/expected/h5diff/h5diff_58_ref.txt b/test/API/tools/testfiles/expected/h5diff/h5diff_58_ref.txt
deleted file mode 100644
index 48a4b33..0000000
--- a/test/API/tools/testfiles/expected/h5diff/h5diff_58_ref.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-
-dataset: </g1/reference2D> and </g1/reference2D>
-size:           [2]           [2]
-position        reference2D     reference2D     difference          
-------------------------------------------------------------
-[ 0 ]          1               0               1              
-[ 1 ]          2               0               2              
-size:           [2]           [2]
-position        reference2D     reference2D     difference          
-------------------------------------------------------------
-[ 0 ]          1               0               1              
-[ 1 ]          2               0               2              
-size:           [2]           [2]
-position        reference2D     reference2D     difference          
-------------------------------------------------------------
-[ 0 ]          1               0               1              
-[ 1 ]          2               0               2              
-size:           [2]           [2]
-position        reference2D     reference2D     difference          
-------------------------------------------------------------
-[ 0 ]          1               0               1              
-[ 1 ]          2               0               2              
-size:           [2]           [2]
-position        reference2D     reference2D     difference          
-------------------------------------------------------------
-[ 0 ]          1               0               1              
-[ 1 ]          2               0               2              
-size:           [2]           [2]
-position        reference2D     reference2D     difference          
-------------------------------------------------------------
-[ 0 ]          1               0               1              
-[ 1 ]          2               0               2              
-12 differences found
-   obj1   obj2
- --------------------------------------
-Attributes status:  0 common, 0 only in obj1, 0 only in obj2
-EXIT CODE: 1
diff --git a/test/API/tools/testfiles/expected/h5diff/h5diff_600.txt b/test/API/tools/testfiles/expected/h5diff/h5diff_600.txt
deleted file mode 100644
index f52d8cc..0000000
--- a/test/API/tools/testfiles/expected/h5diff/h5diff_600.txt
+++ /dev/null
@@ -1,164 +0,0 @@
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
-  file1             File name of the first HDF5 file
-  file2             File name of the second HDF5 file
-  [obj1]            Name of an HDF5 object, in absolute path
-  [obj2]            Name of an HDF5 object, in absolute path
-
-  OPTIONS
-   -h, --help
-         Print a usage message and exit.
-   -V, --version
-         Print version number and exit.
-   -r, --report
-         Report mode. Print differences.
-   -v --verbose
-         Verbose mode. Print differences information and list of objects.
-   -vN --verbose=N
-         Verbose mode with level. Print differences and list of objects.
-         Level of detail depends on value of N:
-          0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute status summary.
-          2 : All level 1 information plus extended attribute status report.
-          3 : All level 2 information plus file names.
-   -q, --quiet
-         Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --vol-value-1           Value (ID) of the VOL connector to use for opening the
-                           first HDF5 file specified
-   --vol-name-1            Name of the VOL connector to use for opening the first
-                           HDF5 file specified
-   --vol-info-1            VOL-specific info to pass to the VOL connector used for
-                           opening the first HDF5 file specified
-   --vol-value-2           Value (ID) of the VOL connector to use for opening the
-                           second HDF5 file specified
-   --vol-name-2            Name of the VOL connector to use for opening the second
-                           HDF5 file specified
-   --vol-info-2            VOL-specific info to pass to the VOL connector used for
-                           opening the second HDF5 file specified
-   --follow-symlinks
-         Follow symbolic links (soft links and external links and compare the)
-         links' target objects.
-         If symbolic link(s) with the same name exist in the files being
-         compared, then determine whether the target of each link is an existing
-         object (dataset, group, or named datatype) or the link is a dangling
-         link (a soft or external link pointing to a target object that does
-         not yet exist).
-         - If both symbolic links are dangling links, they are treated as being
-           the same; by default, h5diff returns an exit code of 0.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If only one of the two links is a dangling link,they are treated as
-           being different and h5diff returns an exit code of 1.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If both symbolic links point to existing objects, h5diff compares the
-           two objects.
-         If any symbolic link specified in the call to h5diff does not exist,
-         h5diff treats it as an error and returns an exit code of 2.
-   --no-dangling-links
-         Must be used with --follow-symlinks option; otherwise, h5diff shows
-         error message and returns an exit code of 2.
-         Check for any symbolic links (soft links or external links) that do not
-         resolve to an existing object (dataset, group, or named datatype).
-         If any dangling link is found, this situation is treated as an error
-         and h5diff returns an exit code of 2.
-   -c, --compare
-         List objects that are not comparable
-   -N, --nan
-         Avoid NaNs detection
-   -n C, --count=C
-         Print differences up to C. C must be a positive integer.
-   -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-p' or '--use-system-epsilon'.
-   -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-d' or '--use-system-epsilon'.
-   --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         If the system epsilon is not defined,one of the following predefined
-         values will be used:
-           FLT_EPSILON = 1.19209E-07 for floating-point type
-           DBL_EPSILON = 2.22045E-16 for double precision type
-         Can not use with '-p' or '-d'.
-   --exclude-path "path"
-         Exclude the specified path to an object when comparing files or groups.
-         If a group is excluded, all member objects will also be excluded.
-         The specified path is excluded wherever it occurs.
-         This flexibility enables the same option to exclude either objects that
-         exist only in one file or common objects that are known to differ.
-
-         When comparing files, "path" is the absolute path to the excluded;
-         object; when comparing groups, "path" is similar to the relative
-         path from the group to the excluded object. This "path" can be
-         taken from the first section of the output of the --verbose option.
-         For example, if you are comparing the group /groupA in two files and
-         you want to exclude /groupA/groupB/groupC in both files, the exclude
-         option would read as follows:
-           --exclude-path "/groupB/groupC"
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
-   --exclude-attribute "path/to/object/with/attribute"
-         Exclude attributes on the specified path to an object when comparing files or groups.
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
- Modes of output:
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-
- File comparison:
-  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
-  a comparison of the two files' root groups.  That is, h5diff first compares
-  the names of root group members, generates a report of root group objects
-  that appear in only one file or in both files, and recursively compares
-  common objects.
-
- Object comparison:
-  1) Groups
-      First compares the names of member objects (relative path, from the
-      specified group) and generates a report of objects that appear in only
-      one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
-      Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes
-      The comparison is based on the return value of H5Tequal.
-  4) Symbolic links
-      The paths to the target objects are compared.
-      (The option --follow-symlinks overrides the default behavior when
-       symbolic links are compared.).
-
- Exit code:
-  0 if no differences, 1 if differences found, 2 if error
-
- Examples of use:
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-    Compares all objects in both files
-
- Notes:
-  file1 and file2 can be the same file.
-  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare
-  '/g1/dset1' and '/g1/dset2' in the same file
-
-EXIT CODE: 1
diff --git a/test/API/tools/testfiles/expected/h5diff/h5diff_603.txt b/test/API/tools/testfiles/expected/h5diff/h5diff_603.txt
deleted file mode 100644
index 84111b3..0000000
--- a/test/API/tools/testfiles/expected/h5diff/h5diff_603.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-<-d -4> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
-  file1             File name of the first HDF5 file
-  file2             File name of the second HDF5 file
-  [obj1]            Name of an HDF5 object, in absolute path
-  [obj2]            Name of an HDF5 object, in absolute path
-
-  OPTIONS
-   -h, --help
-         Print a usage message and exit.
-   -V, --version
-         Print version number and exit.
-   -r, --report
-         Report mode. Print differences.
-   -v --verbose
-         Verbose mode. Print differences information and list of objects.
-   -vN --verbose=N
-         Verbose mode with level. Print differences and list of objects.
-         Level of detail depends on value of N:
-          0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute status summary.
-          2 : All level 1 information plus extended attribute status report.
-          3 : All level 2 information plus file names.
-   -q, --quiet
-         Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --vol-value-1           Value (ID) of the VOL connector to use for opening the
-                           first HDF5 file specified
-   --vol-name-1            Name of the VOL connector to use for opening the first
-                           HDF5 file specified
-   --vol-info-1            VOL-specific info to pass to the VOL connector used for
-                           opening the first HDF5 file specified
-   --vol-value-2           Value (ID) of the VOL connector to use for opening the
-                           second HDF5 file specified
-   --vol-name-2            Name of the VOL connector to use for opening the second
-                           HDF5 file specified
-   --vol-info-2            VOL-specific info to pass to the VOL connector used for
-                           opening the second HDF5 file specified
-   --follow-symlinks
-         Follow symbolic links (soft links and external links and compare the)
-         links' target objects.
-         If symbolic link(s) with the same name exist in the files being
-         compared, then determine whether the target of each link is an existing
-         object (dataset, group, or named datatype) or the link is a dangling
-         link (a soft or external link pointing to a target object that does
-         not yet exist).
-         - If both symbolic links are dangling links, they are treated as being
-           the same; by default, h5diff returns an exit code of 0.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If only one of the two links is a dangling link,they are treated as
-           being different and h5diff returns an exit code of 1.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If both symbolic links point to existing objects, h5diff compares the
-           two objects.
-         If any symbolic link specified in the call to h5diff does not exist,
-         h5diff treats it as an error and returns an exit code of 2.
-   --no-dangling-links
-         Must be used with --follow-symlinks option; otherwise, h5diff shows
-         error message and returns an exit code of 2.
-         Check for any symbolic links (soft links or external links) that do not
-         resolve to an existing object (dataset, group, or named datatype).
-         If any dangling link is found, this situation is treated as an error
-         and h5diff returns an exit code of 2.
-   -c, --compare
-         List objects that are not comparable
-   -N, --nan
-         Avoid NaNs detection
-   -n C, --count=C
-         Print differences up to C. C must be a positive integer.
-   -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-p' or '--use-system-epsilon'.
-   -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-d' or '--use-system-epsilon'.
-   --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         If the system epsilon is not defined,one of the following predefined
-         values will be used:
-           FLT_EPSILON = 1.19209E-07 for floating-point type
-           DBL_EPSILON = 2.22045E-16 for double precision type
-         Can not use with '-p' or '-d'.
-   --exclude-path "path"
-         Exclude the specified path to an object when comparing files or groups.
-         If a group is excluded, all member objects will also be excluded.
-         The specified path is excluded wherever it occurs.
-         This flexibility enables the same option to exclude either objects that
-         exist only in one file or common objects that are known to differ.
-
-         When comparing files, "path" is the absolute path to the excluded;
-         object; when comparing groups, "path" is similar to the relative
-         path from the group to the excluded object. This "path" can be
-         taken from the first section of the output of the --verbose option.
-         For example, if you are comparing the group /groupA in two files and
-         you want to exclude /groupA/groupB/groupC in both files, the exclude
-         option would read as follows:
-           --exclude-path "/groupB/groupC"
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
-   --exclude-attribute "path/to/object/with/attribute"
-         Exclude attributes on the specified path to an object when comparing files or groups.
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
- Modes of output:
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-
- File comparison:
-  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
-  a comparison of the two files' root groups.  That is, h5diff first compares
-  the names of root group members, generates a report of root group objects
-  that appear in only one file or in both files, and recursively compares
-  common objects.
-
- Object comparison:
-  1) Groups
-      First compares the names of member objects (relative path, from the
-      specified group) and generates a report of objects that appear in only
-      one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
-      Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes
-      The comparison is based on the return value of H5Tequal.
-  4) Symbolic links
-      The paths to the target objects are compared.
-      (The option --follow-symlinks overrides the default behavior when
-       symbolic links are compared.).
-
- Exit code:
-  0 if no differences, 1 if differences found, 2 if error
-
- Examples of use:
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-    Compares all objects in both files
-
- Notes:
-  file1 and file2 can be the same file.
-  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare
-  '/g1/dset1' and '/g1/dset2' in the same file
-
-EXIT CODE: 1
diff --git a/test/API/tools/testfiles/expected/h5diff/h5diff_606.txt b/test/API/tools/testfiles/expected/h5diff/h5diff_606.txt
deleted file mode 100644
index d915d36..0000000
--- a/test/API/tools/testfiles/expected/h5diff/h5diff_606.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-<-d 0x1> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
-  file1             File name of the first HDF5 file
-  file2             File name of the second HDF5 file
-  [obj1]            Name of an HDF5 object, in absolute path
-  [obj2]            Name of an HDF5 object, in absolute path
-
-  OPTIONS
-   -h, --help
-         Print a usage message and exit.
-   -V, --version
-         Print version number and exit.
-   -r, --report
-         Report mode. Print differences.
-   -v --verbose
-         Verbose mode. Print differences information and list of objects.
-   -vN --verbose=N
-         Verbose mode with level. Print differences and list of objects.
-         Level of detail depends on value of N:
-          0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute status summary.
-          2 : All level 1 information plus extended attribute status report.
-          3 : All level 2 information plus file names.
-   -q, --quiet
-         Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --vol-value-1           Value (ID) of the VOL connector to use for opening the
-                           first HDF5 file specified
-   --vol-name-1            Name of the VOL connector to use for opening the first
-                           HDF5 file specified
-   --vol-info-1            VOL-specific info to pass to the VOL connector used for
-                           opening the first HDF5 file specified
-   --vol-value-2           Value (ID) of the VOL connector to use for opening the
-                           second HDF5 file specified
-   --vol-name-2            Name of the VOL connector to use for opening the second
-                           HDF5 file specified
-   --vol-info-2            VOL-specific info to pass to the VOL connector used for
-                           opening the second HDF5 file specified
-   --follow-symlinks
-         Follow symbolic links (soft links and external links and compare the)
-         links' target objects.
-         If symbolic link(s) with the same name exist in the files being
-         compared, then determine whether the target of each link is an existing
-         object (dataset, group, or named datatype) or the link is a dangling
-         link (a soft or external link pointing to a target object that does
-         not yet exist).
-         - If both symbolic links are dangling links, they are treated as being
-           the same; by default, h5diff returns an exit code of 0.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If only one of the two links is a dangling link,they are treated as
-           being different and h5diff returns an exit code of 1.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If both symbolic links point to existing objects, h5diff compares the
-           two objects.
-         If any symbolic link specified in the call to h5diff does not exist,
-         h5diff treats it as an error and returns an exit code of 2.
-   --no-dangling-links
-         Must be used with --follow-symlinks option; otherwise, h5diff shows
-         error message and returns an exit code of 2.
-         Check for any symbolic links (soft links or external links) that do not
-         resolve to an existing object (dataset, group, or named datatype).
-         If any dangling link is found, this situation is treated as an error
-         and h5diff returns an exit code of 2.
-   -c, --compare
-         List objects that are not comparable
-   -N, --nan
-         Avoid NaNs detection
-   -n C, --count=C
-         Print differences up to C. C must be a positive integer.
-   -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-p' or '--use-system-epsilon'.
-   -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-d' or '--use-system-epsilon'.
-   --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         If the system epsilon is not defined,one of the following predefined
-         values will be used:
-           FLT_EPSILON = 1.19209E-07 for floating-point type
-           DBL_EPSILON = 2.22045E-16 for double precision type
-         Can not use with '-p' or '-d'.
-   --exclude-path "path"
-         Exclude the specified path to an object when comparing files or groups.
-         If a group is excluded, all member objects will also be excluded.
-         The specified path is excluded wherever it occurs.
-         This flexibility enables the same option to exclude either objects that
-         exist only in one file or common objects that are known to differ.
-
-         When comparing files, "path" is the absolute path to the excluded;
-         object; when comparing groups, "path" is similar to the relative
-         path from the group to the excluded object. This "path" can be
-         taken from the first section of the output of the --verbose option.
-         For example, if you are comparing the group /groupA in two files and
-         you want to exclude /groupA/groupB/groupC in both files, the exclude
-         option would read as follows:
-           --exclude-path "/groupB/groupC"
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
-   --exclude-attribute "path/to/object/with/attribute"
-         Exclude attributes on the specified path to an object when comparing files or groups.
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
- Modes of output:
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-
- File comparison:
-  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
-  a comparison of the two files' root groups.  That is, h5diff first compares
-  the names of root group members, generates a report of root group objects
-  that appear in only one file or in both files, and recursively compares
-  common objects.
-
- Object comparison:
-  1) Groups
-      First compares the names of member objects (relative path, from the
-      specified group) and generates a report of objects that appear in only
-      one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
-      Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes
-      The comparison is based on the return value of H5Tequal.
-  4) Symbolic links
-      The paths to the target objects are compared.
-      (The option --follow-symlinks overrides the default behavior when
-       symbolic links are compared.).
-
- Exit code:
-  0 if no differences, 1 if differences found, 2 if error
-
- Examples of use:
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-    Compares all objects in both files
-
- Notes:
-  file1 and file2 can be the same file.
-  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare
-  '/g1/dset1' and '/g1/dset2' in the same file
-
-EXIT CODE: 1
diff --git a/test/API/tools/testfiles/expected/h5diff/h5diff_612.txt b/test/API/tools/testfiles/expected/h5diff/h5diff_612.txt
deleted file mode 100644
index 1ef8cdf..0000000
--- a/test/API/tools/testfiles/expected/h5diff/h5diff_612.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-<-p -4> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
-  file1             File name of the first HDF5 file
-  file2             File name of the second HDF5 file
-  [obj1]            Name of an HDF5 object, in absolute path
-  [obj2]            Name of an HDF5 object, in absolute path
-
-  OPTIONS
-   -h, --help
-         Print a usage message and exit.
-   -V, --version
-         Print version number and exit.
-   -r, --report
-         Report mode. Print differences.
-   -v --verbose
-         Verbose mode. Print differences information and list of objects.
-   -vN --verbose=N
-         Verbose mode with level. Print differences and list of objects.
-         Level of detail depends on value of N:
-          0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute status summary.
-          2 : All level 1 information plus extended attribute status report.
-          3 : All level 2 information plus file names.
-   -q, --quiet
-         Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --vol-value-1           Value (ID) of the VOL connector to use for opening the
-                           first HDF5 file specified
-   --vol-name-1            Name of the VOL connector to use for opening the first
-                           HDF5 file specified
-   --vol-info-1            VOL-specific info to pass to the VOL connector used for
-                           opening the first HDF5 file specified
-   --vol-value-2           Value (ID) of the VOL connector to use for opening the
-                           second HDF5 file specified
-   --vol-name-2            Name of the VOL connector to use for opening the second
-                           HDF5 file specified
-   --vol-info-2            VOL-specific info to pass to the VOL connector used for
-                           opening the second HDF5 file specified
-   --follow-symlinks
-         Follow symbolic links (soft links and external links and compare the)
-         links' target objects.
-         If symbolic link(s) with the same name exist in the files being
-         compared, then determine whether the target of each link is an existing
-         object (dataset, group, or named datatype) or the link is a dangling
-         link (a soft or external link pointing to a target object that does
-         not yet exist).
-         - If both symbolic links are dangling links, they are treated as being
-           the same; by default, h5diff returns an exit code of 0.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If only one of the two links is a dangling link,they are treated as
-           being different and h5diff returns an exit code of 1.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If both symbolic links point to existing objects, h5diff compares the
-           two objects.
-         If any symbolic link specified in the call to h5diff does not exist,
-         h5diff treats it as an error and returns an exit code of 2.
-   --no-dangling-links
-         Must be used with --follow-symlinks option; otherwise, h5diff shows
-         error message and returns an exit code of 2.
-         Check for any symbolic links (soft links or external links) that do not
-         resolve to an existing object (dataset, group, or named datatype).
-         If any dangling link is found, this situation is treated as an error
-         and h5diff returns an exit code of 2.
-   -c, --compare
-         List objects that are not comparable
-   -N, --nan
-         Avoid NaNs detection
-   -n C, --count=C
-         Print differences up to C. C must be a positive integer.
-   -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-p' or '--use-system-epsilon'.
-   -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-d' or '--use-system-epsilon'.
-   --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         If the system epsilon is not defined,one of the following predefined
-         values will be used:
-           FLT_EPSILON = 1.19209E-07 for floating-point type
-           DBL_EPSILON = 2.22045E-16 for double precision type
-         Can not use with '-p' or '-d'.
-   --exclude-path "path"
-         Exclude the specified path to an object when comparing files or groups.
-         If a group is excluded, all member objects will also be excluded.
-         The specified path is excluded wherever it occurs.
-         This flexibility enables the same option to exclude either objects that
-         exist only in one file or common objects that are known to differ.
-
-         When comparing files, "path" is the absolute path to the excluded;
-         object; when comparing groups, "path" is similar to the relative
-         path from the group to the excluded object. This "path" can be
-         taken from the first section of the output of the --verbose option.
-         For example, if you are comparing the group /groupA in two files and
-         you want to exclude /groupA/groupB/groupC in both files, the exclude
-         option would read as follows:
-           --exclude-path "/groupB/groupC"
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
-   --exclude-attribute "path/to/object/with/attribute"
-         Exclude attributes on the specified path to an object when comparing files or groups.
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
- Modes of output:
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-
- File comparison:
-  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
-  a comparison of the two files' root groups.  That is, h5diff first compares
-  the names of root group members, generates a report of root group objects
-  that appear in only one file or in both files, and recursively compares
-  common objects.
-
- Object comparison:
-  1) Groups
-      First compares the names of member objects (relative path, from the
-      specified group) and generates a report of objects that appear in only
-      one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
-      Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes
-      The comparison is based on the return value of H5Tequal.
-  4) Symbolic links
-      The paths to the target objects are compared.
-      (The option --follow-symlinks overrides the default behavior when
-       symbolic links are compared.).
-
- Exit code:
-  0 if no differences, 1 if differences found, 2 if error
-
- Examples of use:
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-    Compares all objects in both files
-
- Notes:
-  file1 and file2 can be the same file.
-  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare
-  '/g1/dset1' and '/g1/dset2' in the same file
-
-EXIT CODE: 1
diff --git a/test/API/tools/testfiles/expected/h5diff/h5diff_615.txt b/test/API/tools/testfiles/expected/h5diff/h5diff_615.txt
deleted file mode 100644
index 881362e..0000000
--- a/test/API/tools/testfiles/expected/h5diff/h5diff_615.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-<-p 0x1> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
-  file1             File name of the first HDF5 file
-  file2             File name of the second HDF5 file
-  [obj1]            Name of an HDF5 object, in absolute path
-  [obj2]            Name of an HDF5 object, in absolute path
-
-  OPTIONS
-   -h, --help
-         Print a usage message and exit.
-   -V, --version
-         Print version number and exit.
-   -r, --report
-         Report mode. Print differences.
-   -v --verbose
-         Verbose mode. Print differences information and list of objects.
-   -vN --verbose=N
-         Verbose mode with level. Print differences and list of objects.
-         Level of detail depends on value of N:
-          0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute status summary.
-          2 : All level 1 information plus extended attribute status report.
-          3 : All level 2 information plus file names.
-   -q, --quiet
-         Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --vol-value-1           Value (ID) of the VOL connector to use for opening the
-                           first HDF5 file specified
-   --vol-name-1            Name of the VOL connector to use for opening the first
-                           HDF5 file specified
-   --vol-info-1            VOL-specific info to pass to the VOL connector used for
-                           opening the first HDF5 file specified
-   --vol-value-2           Value (ID) of the VOL connector to use for opening the
-                           second HDF5 file specified
-   --vol-name-2            Name of the VOL connector to use for opening the second
-                           HDF5 file specified
-   --vol-info-2            VOL-specific info to pass to the VOL connector used for
-                           opening the second HDF5 file specified
-   --follow-symlinks
-         Follow symbolic links (soft links and external links and compare the)
-         links' target objects.
-         If symbolic link(s) with the same name exist in the files being
-         compared, then determine whether the target of each link is an existing
-         object (dataset, group, or named datatype) or the link is a dangling
-         link (a soft or external link pointing to a target object that does
-         not yet exist).
-         - If both symbolic links are dangling links, they are treated as being
-           the same; by default, h5diff returns an exit code of 0.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If only one of the two links is a dangling link,they are treated as
-           being different and h5diff returns an exit code of 1.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If both symbolic links point to existing objects, h5diff compares the
-           two objects.
-         If any symbolic link specified in the call to h5diff does not exist,
-         h5diff treats it as an error and returns an exit code of 2.
-   --no-dangling-links
-         Must be used with --follow-symlinks option; otherwise, h5diff shows
-         error message and returns an exit code of 2.
-         Check for any symbolic links (soft links or external links) that do not
-         resolve to an existing object (dataset, group, or named datatype).
-         If any dangling link is found, this situation is treated as an error
-         and h5diff returns an exit code of 2.
-   -c, --compare
-         List objects that are not comparable
-   -N, --nan
-         Avoid NaNs detection
-   -n C, --count=C
-         Print differences up to C. C must be a positive integer.
-   -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-p' or '--use-system-epsilon'.
-   -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-d' or '--use-system-epsilon'.
-   --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         If the system epsilon is not defined,one of the following predefined
-         values will be used:
-           FLT_EPSILON = 1.19209E-07 for floating-point type
-           DBL_EPSILON = 2.22045E-16 for double precision type
-         Can not use with '-p' or '-d'.
-   --exclude-path "path"
-         Exclude the specified path to an object when comparing files or groups.
-         If a group is excluded, all member objects will also be excluded.
-         The specified path is excluded wherever it occurs.
-         This flexibility enables the same option to exclude either objects that
-         exist only in one file or common objects that are known to differ.
-
-         When comparing files, "path" is the absolute path to the excluded;
-         object; when comparing groups, "path" is similar to the relative
-         path from the group to the excluded object. This "path" can be
-         taken from the first section of the output of the --verbose option.
-         For example, if you are comparing the group /groupA in two files and
-         you want to exclude /groupA/groupB/groupC in both files, the exclude
-         option would read as follows:
-           --exclude-path "/groupB/groupC"
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
-   --exclude-attribute "path/to/object/with/attribute"
-         Exclude attributes on the specified path to an object when comparing files or groups.
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
- Modes of output:
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-
- File comparison:
-  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
-  a comparison of the two files' root groups.  That is, h5diff first compares
-  the names of root group members, generates a report of root group objects
-  that appear in only one file or in both files, and recursively compares
-  common objects.
-
- Object comparison:
-  1) Groups
-      First compares the names of member objects (relative path, from the
-      specified group) and generates a report of objects that appear in only
-      one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
-      Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes
-      The comparison is based on the return value of H5Tequal.
-  4) Symbolic links
-      The paths to the target objects are compared.
-      (The option --follow-symlinks overrides the default behavior when
-       symbolic links are compared.).
-
- Exit code:
-  0 if no differences, 1 if differences found, 2 if error
-
- Examples of use:
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-    Compares all objects in both files
-
- Notes:
-  file1 and file2 can be the same file.
-  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare
-  '/g1/dset1' and '/g1/dset2' in the same file
-
-EXIT CODE: 1
diff --git a/test/API/tools/testfiles/expected/h5diff/h5diff_621.txt b/test/API/tools/testfiles/expected/h5diff/h5diff_621.txt
deleted file mode 100644
index ba39a99..0000000
--- a/test/API/tools/testfiles/expected/h5diff/h5diff_621.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-<-n -4> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
-  file1             File name of the first HDF5 file
-  file2             File name of the second HDF5 file
-  [obj1]            Name of an HDF5 object, in absolute path
-  [obj2]            Name of an HDF5 object, in absolute path
-
-  OPTIONS
-   -h, --help
-         Print a usage message and exit.
-   -V, --version
-         Print version number and exit.
-   -r, --report
-         Report mode. Print differences.
-   -v --verbose
-         Verbose mode. Print differences information and list of objects.
-   -vN --verbose=N
-         Verbose mode with level. Print differences and list of objects.
-         Level of detail depends on value of N:
-          0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute status summary.
-          2 : All level 1 information plus extended attribute status report.
-          3 : All level 2 information plus file names.
-   -q, --quiet
-         Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --vol-value-1           Value (ID) of the VOL connector to use for opening the
-                           first HDF5 file specified
-   --vol-name-1            Name of the VOL connector to use for opening the first
-                           HDF5 file specified
-   --vol-info-1            VOL-specific info to pass to the VOL connector used for
-                           opening the first HDF5 file specified
-   --vol-value-2           Value (ID) of the VOL connector to use for opening the
-                           second HDF5 file specified
-   --vol-name-2            Name of the VOL connector to use for opening the second
-                           HDF5 file specified
-   --vol-info-2            VOL-specific info to pass to the VOL connector used for
-                           opening the second HDF5 file specified
-   --follow-symlinks
-         Follow symbolic links (soft links and external links and compare the)
-         links' target objects.
-         If symbolic link(s) with the same name exist in the files being
-         compared, then determine whether the target of each link is an existing
-         object (dataset, group, or named datatype) or the link is a dangling
-         link (a soft or external link pointing to a target object that does
-         not yet exist).
-         - If both symbolic links are dangling links, they are treated as being
-           the same; by default, h5diff returns an exit code of 0.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If only one of the two links is a dangling link,they are treated as
-           being different and h5diff returns an exit code of 1.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If both symbolic links point to existing objects, h5diff compares the
-           two objects.
-         If any symbolic link specified in the call to h5diff does not exist,
-         h5diff treats it as an error and returns an exit code of 2.
-   --no-dangling-links
-         Must be used with --follow-symlinks option; otherwise, h5diff shows
-         error message and returns an exit code of 2.
-         Check for any symbolic links (soft links or external links) that do not
-         resolve to an existing object (dataset, group, or named datatype).
-         If any dangling link is found, this situation is treated as an error
-         and h5diff returns an exit code of 2.
-   -c, --compare
-         List objects that are not comparable
-   -N, --nan
-         Avoid NaNs detection
-   -n C, --count=C
-         Print differences up to C. C must be a positive integer.
-   -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-p' or '--use-system-epsilon'.
-   -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-d' or '--use-system-epsilon'.
-   --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         If the system epsilon is not defined,one of the following predefined
-         values will be used:
-           FLT_EPSILON = 1.19209E-07 for floating-point type
-           DBL_EPSILON = 2.22045E-16 for double precision type
-         Can not use with '-p' or '-d'.
-   --exclude-path "path"
-         Exclude the specified path to an object when comparing files or groups.
-         If a group is excluded, all member objects will also be excluded.
-         The specified path is excluded wherever it occurs.
-         This flexibility enables the same option to exclude either objects that
-         exist only in one file or common objects that are known to differ.
-
-         When comparing files, "path" is the absolute path to the excluded;
-         object; when comparing groups, "path" is similar to the relative
-         path from the group to the excluded object. This "path" can be
-         taken from the first section of the output of the --verbose option.
-         For example, if you are comparing the group /groupA in two files and
-         you want to exclude /groupA/groupB/groupC in both files, the exclude
-         option would read as follows:
-           --exclude-path "/groupB/groupC"
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
-   --exclude-attribute "path/to/object/with/attribute"
-         Exclude attributes on the specified path to an object when comparing files or groups.
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
- Modes of output:
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-
- File comparison:
-  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
-  a comparison of the two files' root groups.  That is, h5diff first compares
-  the names of root group members, generates a report of root group objects
-  that appear in only one file or in both files, and recursively compares
-  common objects.
-
- Object comparison:
-  1) Groups
-      First compares the names of member objects (relative path, from the
-      specified group) and generates a report of objects that appear in only
-      one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
-      Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes
-      The comparison is based on the return value of H5Tequal.
-  4) Symbolic links
-      The paths to the target objects are compared.
-      (The option --follow-symlinks overrides the default behavior when
-       symbolic links are compared.).
-
- Exit code:
-  0 if no differences, 1 if differences found, 2 if error
-
- Examples of use:
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-    Compares all objects in both files
-
- Notes:
-  file1 and file2 can be the same file.
-  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare
-  '/g1/dset1' and '/g1/dset2' in the same file
-
-EXIT CODE: 1
diff --git a/test/API/tools/testfiles/expected/h5diff/h5diff_622.txt b/test/API/tools/testfiles/expected/h5diff/h5diff_622.txt
deleted file mode 100644
index 70421fc..0000000
--- a/test/API/tools/testfiles/expected/h5diff/h5diff_622.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-<-n 0> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
-  file1             File name of the first HDF5 file
-  file2             File name of the second HDF5 file
-  [obj1]            Name of an HDF5 object, in absolute path
-  [obj2]            Name of an HDF5 object, in absolute path
-
-  OPTIONS
-   -h, --help
-         Print a usage message and exit.
-   -V, --version
-         Print version number and exit.
-   -r, --report
-         Report mode. Print differences.
-   -v --verbose
-         Verbose mode. Print differences information and list of objects.
-   -vN --verbose=N
-         Verbose mode with level. Print differences and list of objects.
-         Level of detail depends on value of N:
-          0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute status summary.
-          2 : All level 1 information plus extended attribute status report.
-          3 : All level 2 information plus file names.
-   -q, --quiet
-         Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --vol-value-1           Value (ID) of the VOL connector to use for opening the
-                           first HDF5 file specified
-   --vol-name-1            Name of the VOL connector to use for opening the first
-                           HDF5 file specified
-   --vol-info-1            VOL-specific info to pass to the VOL connector used for
-                           opening the first HDF5 file specified
-   --vol-value-2           Value (ID) of the VOL connector to use for opening the
-                           second HDF5 file specified
-   --vol-name-2            Name of the VOL connector to use for opening the second
-                           HDF5 file specified
-   --vol-info-2            VOL-specific info to pass to the VOL connector used for
-                           opening the second HDF5 file specified
-   --follow-symlinks
-         Follow symbolic links (soft links and external links and compare the)
-         links' target objects.
-         If symbolic link(s) with the same name exist in the files being
-         compared, then determine whether the target of each link is an existing
-         object (dataset, group, or named datatype) or the link is a dangling
-         link (a soft or external link pointing to a target object that does
-         not yet exist).
-         - If both symbolic links are dangling links, they are treated as being
-           the same; by default, h5diff returns an exit code of 0.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If only one of the two links is a dangling link,they are treated as
-           being different and h5diff returns an exit code of 1.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If both symbolic links point to existing objects, h5diff compares the
-           two objects.
-         If any symbolic link specified in the call to h5diff does not exist,
-         h5diff treats it as an error and returns an exit code of 2.
-   --no-dangling-links
-         Must be used with --follow-symlinks option; otherwise, h5diff shows
-         error message and returns an exit code of 2.
-         Check for any symbolic links (soft links or external links) that do not
-         resolve to an existing object (dataset, group, or named datatype).
-         If any dangling link is found, this situation is treated as an error
-         and h5diff returns an exit code of 2.
-   -c, --compare
-         List objects that are not comparable
-   -N, --nan
-         Avoid NaNs detection
-   -n C, --count=C
-         Print differences up to C. C must be a positive integer.
-   -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-p' or '--use-system-epsilon'.
-   -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-d' or '--use-system-epsilon'.
-   --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         If the system epsilon is not defined,one of the following predefined
-         values will be used:
-           FLT_EPSILON = 1.19209E-07 for floating-point type
-           DBL_EPSILON = 2.22045E-16 for double precision type
-         Can not use with '-p' or '-d'.
-   --exclude-path "path"
-         Exclude the specified path to an object when comparing files or groups.
-         If a group is excluded, all member objects will also be excluded.
-         The specified path is excluded wherever it occurs.
-         This flexibility enables the same option to exclude either objects that
-         exist only in one file or common objects that are known to differ.
-
-         When comparing files, "path" is the absolute path to the excluded;
-         object; when comparing groups, "path" is similar to the relative
-         path from the group to the excluded object. This "path" can be
-         taken from the first section of the output of the --verbose option.
-         For example, if you are comparing the group /groupA in two files and
-         you want to exclude /groupA/groupB/groupC in both files, the exclude
-         option would read as follows:
-           --exclude-path "/groupB/groupC"
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
-   --exclude-attribute "path/to/object/with/attribute"
-         Exclude attributes on the specified path to an object when comparing files or groups.
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
- Modes of output:
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-
- File comparison:
-  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
-  a comparison of the two files' root groups.  That is, h5diff first compares
-  the names of root group members, generates a report of root group objects
-  that appear in only one file or in both files, and recursively compares
-  common objects.
-
- Object comparison:
-  1) Groups
-      First compares the names of member objects (relative path, from the
-      specified group) and generates a report of objects that appear in only
-      one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
-      Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes
-      The comparison is based on the return value of H5Tequal.
-  4) Symbolic links
-      The paths to the target objects are compared.
-      (The option --follow-symlinks overrides the default behavior when
-       symbolic links are compared.).
-
- Exit code:
-  0 if no differences, 1 if differences found, 2 if error
-
- Examples of use:
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-    Compares all objects in both files
-
- Notes:
-  file1 and file2 can be the same file.
-  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare
-  '/g1/dset1' and '/g1/dset2' in the same file
-
-EXIT CODE: 1
diff --git a/test/API/tools/testfiles/expected/h5diff/h5diff_623.txt b/test/API/tools/testfiles/expected/h5diff/h5diff_623.txt
deleted file mode 100644
index 0d74268..0000000
--- a/test/API/tools/testfiles/expected/h5diff/h5diff_623.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-<-n u> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
-  file1             File name of the first HDF5 file
-  file2             File name of the second HDF5 file
-  [obj1]            Name of an HDF5 object, in absolute path
-  [obj2]            Name of an HDF5 object, in absolute path
-
-  OPTIONS
-   -h, --help
-         Print a usage message and exit.
-   -V, --version
-         Print version number and exit.
-   -r, --report
-         Report mode. Print differences.
-   -v --verbose
-         Verbose mode. Print differences information and list of objects.
-   -vN --verbose=N
-         Verbose mode with level. Print differences and list of objects.
-         Level of detail depends on value of N:
-          0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute status summary.
-          2 : All level 1 information plus extended attribute status report.
-          3 : All level 2 information plus file names.
-   -q, --quiet
-         Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --vol-value-1           Value (ID) of the VOL connector to use for opening the
-                           first HDF5 file specified
-   --vol-name-1            Name of the VOL connector to use for opening the first
-                           HDF5 file specified
-   --vol-info-1            VOL-specific info to pass to the VOL connector used for
-                           opening the first HDF5 file specified
-   --vol-value-2           Value (ID) of the VOL connector to use for opening the
-                           second HDF5 file specified
-   --vol-name-2            Name of the VOL connector to use for opening the second
-                           HDF5 file specified
-   --vol-info-2            VOL-specific info to pass to the VOL connector used for
-                           opening the second HDF5 file specified
-   --follow-symlinks
-         Follow symbolic links (soft links and external links and compare the)
-         links' target objects.
-         If symbolic link(s) with the same name exist in the files being
-         compared, then determine whether the target of each link is an existing
-         object (dataset, group, or named datatype) or the link is a dangling
-         link (a soft or external link pointing to a target object that does
-         not yet exist).
-         - If both symbolic links are dangling links, they are treated as being
-           the same; by default, h5diff returns an exit code of 0.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If only one of the two links is a dangling link,they are treated as
-           being different and h5diff returns an exit code of 1.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If both symbolic links point to existing objects, h5diff compares the
-           two objects.
-         If any symbolic link specified in the call to h5diff does not exist,
-         h5diff treats it as an error and returns an exit code of 2.
-   --no-dangling-links
-         Must be used with --follow-symlinks option; otherwise, h5diff shows
-         error message and returns an exit code of 2.
-         Check for any symbolic links (soft links or external links) that do not
-         resolve to an existing object (dataset, group, or named datatype).
-         If any dangling link is found, this situation is treated as an error
-         and h5diff returns an exit code of 2.
-   -c, --compare
-         List objects that are not comparable
-   -N, --nan
-         Avoid NaNs detection
-   -n C, --count=C
-         Print differences up to C. C must be a positive integer.
-   -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-p' or '--use-system-epsilon'.
-   -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-d' or '--use-system-epsilon'.
-   --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         If the system epsilon is not defined,one of the following predefined
-         values will be used:
-           FLT_EPSILON = 1.19209E-07 for floating-point type
-           DBL_EPSILON = 2.22045E-16 for double precision type
-         Can not use with '-p' or '-d'.
-   --exclude-path "path"
-         Exclude the specified path to an object when comparing files or groups.
-         If a group is excluded, all member objects will also be excluded.
-         The specified path is excluded wherever it occurs.
-         This flexibility enables the same option to exclude either objects that
-         exist only in one file or common objects that are known to differ.
-
-         When comparing files, "path" is the absolute path to the excluded;
-         object; when comparing groups, "path" is similar to the relative
-         path from the group to the excluded object. This "path" can be
-         taken from the first section of the output of the --verbose option.
-         For example, if you are comparing the group /groupA in two files and
-         you want to exclude /groupA/groupB/groupC in both files, the exclude
-         option would read as follows:
-           --exclude-path "/groupB/groupC"
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
-   --exclude-attribute "path/to/object/with/attribute"
-         Exclude attributes on the specified path to an object when comparing files or groups.
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
- Modes of output:
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-
- File comparison:
-  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
-  a comparison of the two files' root groups.  That is, h5diff first compares
-  the names of root group members, generates a report of root group objects
-  that appear in only one file or in both files, and recursively compares
-  common objects.
-
- Object comparison:
-  1) Groups
-      First compares the names of member objects (relative path, from the
-      specified group) and generates a report of objects that appear in only
-      one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
-      Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes
-      The comparison is based on the return value of H5Tequal.
-  4) Symbolic links
-      The paths to the target objects are compared.
-      (The option --follow-symlinks overrides the default behavior when
-       symbolic links are compared.).
-
- Exit code:
-  0 if no differences, 1 if differences found, 2 if error
-
- Examples of use:
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-    Compares all objects in both files
-
- Notes:
-  file1 and file2 can be the same file.
-  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare
-  '/g1/dset1' and '/g1/dset2' in the same file
-
-EXIT CODE: 1
diff --git a/test/API/tools/testfiles/expected/h5diff/h5diff_624.txt b/test/API/tools/testfiles/expected/h5diff/h5diff_624.txt
deleted file mode 100644
index cb8b8b4..0000000
--- a/test/API/tools/testfiles/expected/h5diff/h5diff_624.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-<-n 0x1> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
-  file1             File name of the first HDF5 file
-  file2             File name of the second HDF5 file
-  [obj1]            Name of an HDF5 object, in absolute path
-  [obj2]            Name of an HDF5 object, in absolute path
-
-  OPTIONS
-   -h, --help
-         Print a usage message and exit.
-   -V, --version
-         Print version number and exit.
-   -r, --report
-         Report mode. Print differences.
-   -v --verbose
-         Verbose mode. Print differences information and list of objects.
-   -vN --verbose=N
-         Verbose mode with level. Print differences and list of objects.
-         Level of detail depends on value of N:
-          0 : Identical to '-v' or '--verbose'.
-          1 : All level 0 information plus one-line attribute status summary.
-          2 : All level 1 information plus extended attribute status report.
-          3 : All level 2 information plus file names.
-   -q, --quiet
-         Quiet mode. Do not produce output.
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --vol-value-1           Value (ID) of the VOL connector to use for opening the
-                           first HDF5 file specified
-   --vol-name-1            Name of the VOL connector to use for opening the first
-                           HDF5 file specified
-   --vol-info-1            VOL-specific info to pass to the VOL connector used for
-                           opening the first HDF5 file specified
-   --vol-value-2           Value (ID) of the VOL connector to use for opening the
-                           second HDF5 file specified
-   --vol-name-2            Name of the VOL connector to use for opening the second
-                           HDF5 file specified
-   --vol-info-2            VOL-specific info to pass to the VOL connector used for
-                           opening the second HDF5 file specified
-   --follow-symlinks
-         Follow symbolic links (soft links and external links and compare the)
-         links' target objects.
-         If symbolic link(s) with the same name exist in the files being
-         compared, then determine whether the target of each link is an existing
-         object (dataset, group, or named datatype) or the link is a dangling
-         link (a soft or external link pointing to a target object that does
-         not yet exist).
-         - If both symbolic links are dangling links, they are treated as being
-           the same; by default, h5diff returns an exit code of 0.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If only one of the two links is a dangling link,they are treated as
-           being different and h5diff returns an exit code of 1.
-           If, however, --no-dangling-links is used with --follow-symlinks,
-           this situation is treated as an error and h5diff returns an
-           exit code of 2.
-         - If both symbolic links point to existing objects, h5diff compares the
-           two objects.
-         If any symbolic link specified in the call to h5diff does not exist,
-         h5diff treats it as an error and returns an exit code of 2.
-   --no-dangling-links
-         Must be used with --follow-symlinks option; otherwise, h5diff shows
-         error message and returns an exit code of 2.
-         Check for any symbolic links (soft links or external links) that do not
-         resolve to an existing object (dataset, group, or named datatype).
-         If any dangling link is found, this situation is treated as an error
-         and h5diff returns an exit code of 2.
-   -c, --compare
-         List objects that are not comparable
-   -N, --nan
-         Avoid NaNs detection
-   -n C, --count=C
-         Print differences up to C. C must be a positive integer.
-   -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-p' or '--use-system-epsilon'.
-   -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         Can not use with '-d' or '--use-system-epsilon'.
-   --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
-         is the data point value in file1 and b is the data point value in file2.
-         If the system epsilon is not defined,one of the following predefined
-         values will be used:
-           FLT_EPSILON = 1.19209E-07 for floating-point type
-           DBL_EPSILON = 2.22045E-16 for double precision type
-         Can not use with '-p' or '-d'.
-   --exclude-path "path"
-         Exclude the specified path to an object when comparing files or groups.
-         If a group is excluded, all member objects will also be excluded.
-         The specified path is excluded wherever it occurs.
-         This flexibility enables the same option to exclude either objects that
-         exist only in one file or common objects that are known to differ.
-
-         When comparing files, "path" is the absolute path to the excluded;
-         object; when comparing groups, "path" is similar to the relative
-         path from the group to the excluded object. This "path" can be
-         taken from the first section of the output of the --verbose option.
-         For example, if you are comparing the group /groupA in two files and
-         you want to exclude /groupA/groupB/groupC in both files, the exclude
-         option would read as follows:
-           --exclude-path "/groupB/groupC"
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
-   --exclude-attribute "path/to/object/with/attribute"
-         Exclude attributes on the specified path to an object when comparing files or groups.
-
-         If there are multiple paths to an object, only the specified path(s)
-         will be excluded; the comparison will include any path not explicitly
-         excluded.
-         This option can be used repeatedly to exclude multiple paths.
-
- Modes of output:
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-
- File comparison:
-  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
-  a comparison of the two files' root groups.  That is, h5diff first compares
-  the names of root group members, generates a report of root group objects
-  that appear in only one file or in both files, and recursively compares
-  common objects.
-
- Object comparison:
-  1) Groups
-      First compares the names of member objects (relative path, from the
-      specified group) and generates a report of objects that appear in only
-      one group or in both groups. Common objects are then compared recursively.
-  2) Datasets
-      Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes
-      The comparison is based on the return value of H5Tequal.
-  4) Symbolic links
-      The paths to the target objects are compared.
-      (The option --follow-symlinks overrides the default behavior when
-       symbolic links are compared.).
-
- Exit code:
-  0 if no differences, 1 if differences found, 2 if error
-
- Examples of use:
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-    Compares all objects in both files
-
- Notes:
-  file1 and file2 can be the same file.
-  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare
-  '/g1/dset1' and '/g1/dset2' in the same file
-
-EXIT CODE: 1
diff --git a/test/API/tools/testfiles/expected/h5dump/h5dump-help.txt b/test/API/tools/testfiles/expected/h5dump/h5dump-help.txt
deleted file mode 100644
index 5b11223..0000000
--- a/test/API/tools/testfiles/expected/h5dump/h5dump-help.txt
+++ /dev/null
@@ -1,153 +0,0 @@
-usage: h5dump [OPTIONS] files
-  OPTIONS
-     -h,   --help         Print a usage message and exit
-     -V,   --version      Print version number and exit
---------------- File Options ---------------
-     -n,   --contents     Print a list of the file contents and exit
-                          Optional value 1 also prints attributes.
-     -B,   --superblock   Print the content of the super block
-     -H,   --header       Print the header only; no data is displayed
-     -f D, --filedriver=D Specify which driver to open the file with
-     -o F, --output=F     Output raw data into file F
-     -b B, --binary=B     Binary file output, of form B
-     -O F, --ddl=F        Output ddl text into file F
-                          Use blank(empty) filename F to suppress ddl display
-     --s3-cred=<cred>     Supply S3 authentication information to "ros3" vfd.
-                          <cred> :: "(<aws-region>,<access-id>,<access-key>)"
-                          If absent or <cred> -> "(,,)", no authentication.
-                          Has no effect if filedriver is not "ros3".
-     --hdfs-attrs=<attrs> Supply configuration information for HDFS file access.
-                          For use with "--filedriver=hdfs"
-                          <attrs> :: (<namenode name>,<namenode port>,
-                                      <kerberos cache path>,<username>,
-                                      <buffer size>)
-                          Any absent attribute will use a default value.
-     --vol-value          Value (ID) of the VOL connector to use for opening the
-                          HDF5 file specified
-     --vol-name           Name of the VOL connector to use for opening the
-                          HDF5 file specified
-     --vol-info           VOL-specific info to pass to the VOL connector used for
-                          opening the HDF5 file specified
---------------- Object Options ---------------
-     -a P, --attribute=P  Print the specified attribute
-                          If an attribute name contains a slash (/), escape the
-                          slash with a preceding backslash (\).
-                          (See example section below.)
-     -d P, --dataset=P    Print the specified dataset
-     -g P, --group=P      Print the specified group and all members
-     -l P, --soft-link=P  Print the value(s) of the specified soft link
-     -t P, --datatype=P   Print the specified named datatype
-     -N P, --any_path=P   Print any attribute, dataset, group, datatype, or link that matches P
-                          P can be the absolute path or just a relative path.
-     -A,   --onlyattr     Print the header and value of attributes
-                          Optional value 0 suppresses printing attributes.
-     --vds-view-first-missing Set the VDS bounds to first missing mapped elements.
-     --vds-gap-size=N     Set the missing file gap size, N=non-negative integers
---------------- Object Property Options ---------------
-     -i,   --object-ids   Print the object ids
-     -p,   --properties   Print dataset filters, storage layout and fill value
-     -M L, --packedbits=L Print packed bits as unsigned integers, using mask
-                          format L for an integer dataset specified with
-                          option -d. L is a list of offset,length values,
-                          separated by commas. Offset is the beginning bit in
-                          the data value and length is the number of bits of
-                          the mask.
-     -R,   --region       Print dataset pointed by region references
---------------- Formatting Options ---------------
-     -e,   --escape       Escape non printing characters
-     -r,   --string       Print 1-byte integer datasets as ASCII
-     -y,   --noindex      Do not print array indices with the data
-     -m T, --format=T     Set the floating point output format
-     -q Q, --sort_by=Q    Sort groups and attributes by index Q
-     -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they occur.
-                          Optional value 2 also prints file open errors.
-     --no-compact-subset  Disable compact form of subsetting and allow the use
-                          of "[" in dataset names.
-     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-                          sets the number of columns to the maximum (65535).
-                          Default width is 80 columns.
---------------- XML Options ---------------
-     -x,   --xml          Output in XML using Schema
-     -u,   --use-dtd      Output in XML using DTD
-     -D U, --xml-dtd=U    Use the DTD or schema at U
-     -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
-                          ":": no namespace, default: "hdf5:"
-                          E.g., to dump a file called "-f", use h5dump -- -f
-
---------------- Subsetting Options ---------------
- Subsetting is available by using the following options with a dataset
- option. Subsetting is done by selecting a hyperslab from the data.
- Thus, the options mirror those for performing a hyperslab selection.
- One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting.
- The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
- each dimension. START is optional and will default to 0 in each dimension.
-
-      -s START,  --start=START    Offset of start of subsetting selection
-      -S STRIDE, --stride=STRIDE  Hyperslab stride
-      -c COUNT,  --count=COUNT    Number of blocks to include in selection
-      -k BLOCK,  --block=BLOCK    Size of block in hyperslab
-  START, COUNT, STRIDE, and BLOCK - is a list of integers the number of which are equal to the
-      number of dimensions in the dataspace being queried
-      (Alternate compact form of subsetting is described in the Reference Manual)
-
---------------- Option Argument Conventions ---------------
-  D - is the file driver to use in opening the file. Acceptable values
-      are "sec2", "family", "split", "multi", "direct", and "stream". Without
-      the file driver flag, the file will be opened with each driver in
-      turn and in the order specified above until one driver succeeds
-      in opening the file.
-      See examples below for family, split, and multi driver special file name usage.
-
-  F - is a filename.
-  P - is the full path from the root group to the object.
-  N - is an integer greater than 1.
-  T - is a string containing the floating point format, e.g '%.3f'
-  U - is a URI reference (as defined in [IETF RFC 2396],
-        updated by [IETF RFC 2732])
-  B - is the form of binary output: NATIVE for a memory type, FILE for the
-        file type, LE or BE for pre-existing little or big endian types.
-        Must be used with -o (output file) and it is recommended that
-        -d (dataset) is used. B is an optional argument, defaults to NATIVE
-  Q - is the sort index type. It can be "creation_order" or "name" (default)
-  Z - is the sort order type. It can be "descending" or "ascending" (default)
-
---------------- Examples ---------------
-
-  1) Attribute foo of the group /bar_none in file quux.h5
-
-      h5dump -a /bar_none/foo quux.h5
-
-     Attribute "high/low" of the group /bar_none in the file quux.h5
-
-      h5dump -a "/bar_none/high\/low" quux.h5
-
-  2) Selecting a subset from dataset /foo in file quux.h5
-
-      h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5
-
-  3) Saving dataset 'dset' in file quux.h5 to binary file 'out.bin'
-        using a little-endian type
-
-      h5dump -d /dset -b LE -o out.bin quux.h5
-
-  4) Display two packed bits (bits 0-1 and bits 4-6) in the dataset /dset
-
-      h5dump -d /dset -M 0,1,4,3 quux.h5
-
-  5) Dataset foo in files file1.h5 file2.h5 file3.h5
-
-      h5dump -d /foo file1.h5 file2.h5 file3.h5
-
-  6) Dataset foo in split files splitfile-m.h5 splitfile-r.h5
-
-      h5dump -d /foo -f split splitfile
-
-  7) Dataset foo in multi files mf-s.h5, mf-b.h5, mf-r.h5, mf-g.h5, mf-l.h5 and mf-o.h5
-
-      h5dump -d /foo -f multi mf
-
-  8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5
-
-      h5dump -d /foo -f family fam%05d.h5
-
diff --git a/test/API/tools/testfiles/expected/h5dump/tall-1.err b/test/API/tools/testfiles/expected/h5dump/tall-1.err
deleted file mode 100644
index 84140f2..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tall-1.err
+++ /dev/null
@@ -1,34 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
-    major: Object header
-    minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
-    major: Links
-    minor: Unable to open file
diff --git a/test/API/tools/testfiles/expected/h5dump/tall-2A.err b/test/API/tools/testfiles/expected/h5dump/tall-2A.err
deleted file mode 100644
index 84140f2..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tall-2A.err
+++ /dev/null
@@ -1,34 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
-    major: Object header
-    minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
-    major: Links
-    minor: Unable to open file
diff --git a/test/API/tools/testfiles/expected/h5dump/tall-2A0.err b/test/API/tools/testfiles/expected/h5dump/tall-2A0.err
deleted file mode 100644
index 84140f2..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tall-2A0.err
+++ /dev/null
@@ -1,34 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
-    major: Object header
-    minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
-    major: Links
-    minor: Unable to open file
diff --git a/test/API/tools/testfiles/expected/h5dump/tall-2B.err b/test/API/tools/testfiles/expected/h5dump/tall-2B.err
deleted file mode 100644
index 84140f2..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tall-2B.err
+++ /dev/null
@@ -1,34 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
-    major: Object header
-    minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
-    major: Links
-    minor: Unable to open file
diff --git a/test/API/tools/testfiles/expected/h5dump/tall-4s.ddl b/test/API/tools/testfiles/expected/h5dump/tall-4s.ddl
deleted file mode 100644
index 36cb659..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tall-4s.ddl
+++ /dev/null
@@ -1,33 +0,0 @@
-HDF5 "tall.h5" {
-DATASET "/g1/g1.1/dset1.1.1" {
-   DATATYPE  H5T_STD_I32BE
-   DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
-   SUBSET {
-      START ( 1, 1 );
-      STRIDE ( 2, 3 );
-      COUNT ( 3, 2 );
-      BLOCK ( 1, 1 );
-      DATA {
-      (1,1): 1, 4,
-      (3,1): 3, 12,
-      (5,1): 5, 20
-      }
-   }
-   ATTRIBUTE "attr1" {
-      DATATYPE  H5T_STD_I8BE
-      DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
-      DATA {
-      (0): 49, 115, 116, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 32,
-      (14): 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
-      }
-   }
-   ATTRIBUTE "attr2" {
-      DATATYPE  H5T_STD_I8BE
-      DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
-      DATA {
-      (0): 50, 110, 100, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 32,
-      (14): 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0
-      }
-   }
-}
-}
diff --git a/test/API/tools/testfiles/expected/h5dump/tattr-3.err b/test/API/tools/testfiles/expected/h5dump/tattr-3.err
deleted file mode 100644
index 8481acf..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tattr-3.err
+++ /dev/null
@@ -1,20 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Aopen(): unable to open attribute: 'attr'
-    major: Attribute
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_attr_open(): attribute open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__attr_open(): attribute open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_attr_open(): unable to open attribute: 'attr'
-    major: Attribute
-    minor: Can't open object
-  #004: (file name) line (number) in H5A__open(): unable to load attribute info from object header for attribute: 'attr'
-    major: Attribute
-    minor: Can't open object
-  #005: (file name) line (number) in H5O__attr_open_by_name(): can't locate attribute: 'attr'
-    major: Attribute
-    minor: Object not found
-h5dump error: unable to open attribute "attr"
diff --git a/test/API/tools/testfiles/expected/h5dump/tcomp-3.err b/test/API/tools/testfiles/expected/h5dump/tcomp-3.err
deleted file mode 100644
index fc59b0b..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tcomp-3.err
+++ /dev/null
@@ -1,28 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Topen2(): unable to open named datatype
-    major: Datatype
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_datatype_open(): datatype open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__datatype_open(): datatype open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_datatype_open(): unable to open named datatype
-    major: Datatype
-    minor: Can't open object
-  #004: (file name) line (number) in H5T__open_name(): not found
-    major: Datatype
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #008: (file name) line (number) in H5G__loc_find_cb(): object '#6632' doesn't exist
-    major: Symbol table
-    minor: Object not found
diff --git a/test/API/tools/testfiles/expected/h5dump/tdset-2.err b/test/API/tools/testfiles/expected/h5dump/tdset-2.err
deleted file mode 100644
index 39bbb0e..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tdset-2.err
+++ /dev/null
@@ -1,54 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): unable to open dataset
-    major: Dataset
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__dataset_open(): dataset open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
-    major: Dataset
-    minor: Can't open object
-  #004: (file name) line (number) in H5D__open_name(): not found
-    major: Dataset
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #008: (file name) line (number) in H5G__loc_find_cb(): object 'dset3' doesn't exist
-    major: Symbol table
-    minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Lget_info2(): unable to get link info
-    major: Links
-    minor: Can't get value
-  #001: (file name) line (number) in H5VL_link_get(): link get failed
-    major: Virtual Object Layer
-    minor: Can't get value
-  #002: (file name) line (number) in H5VL__link_get(): link get failed
-    major: Virtual Object Layer
-    minor: Can't get value
-  #003: (file name) line (number) in H5VL__native_link_get(): unable to get link info
-    major: Links
-    minor: Object not found
-  #004: (file name) line (number) in H5L_get_info(): name doesn't exist
-    major: Links
-    minor: Object already exists
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #007: (file name) line (number) in H5L__get_info_cb(): name doesn't exist
-    major: Links
-    minor: Object not found
-h5dump error: unable to get link info from "dset3"
diff --git a/test/API/tools/testfiles/expected/h5dump/textlink.err b/test/API/tools/testfiles/expected/h5dump/textlink.err
deleted file mode 100644
index 3f77f38..0000000
--- a/test/API/tools/testfiles/expected/h5dump/textlink.err
+++ /dev/null
@@ -1,68 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
-    major: Object header
-    minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'filename'
-    major: Links
-    minor: Unable to open file
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
-    major: Object header
-    minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'anotherfile'
-    major: Links
-    minor: Unable to open file
diff --git a/test/API/tools/testfiles/expected/h5dump/textlinkfar.err b/test/API/tools/testfiles/expected/h5dump/textlinkfar.err
deleted file mode 100644
index 8245291..0000000
--- a/test/API/tools/testfiles/expected/h5dump/textlinkfar.err
+++ /dev/null
@@ -1,252 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
-    major: Object header
-    minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #011: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #012: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #013: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #014: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #015: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #016: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
-    major: Symbol table
-    minor: Object not found
-  #017: (file name) line (number) in H5G__traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #018: (file name) line (number) in H5G__traverse_slink_cb(): component not found
-    major: Symbol table
-    minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #001: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #003: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #004: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #005: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #006: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #007: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #008: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #009: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #010: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #011: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #012: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #013: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #014: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #015: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #016: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #017: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #018: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #019: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #020: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #021: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #022: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #023: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #024: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #025: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #026: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #027: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #028: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #029: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #030: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #031: (file name) line (number) in H5G__traverse_special(): too many links
-    major: Links
-    minor: Too many soft links in path
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #001: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #003: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #004: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #005: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #006: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #007: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #008: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #009: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #010: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #011: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #012: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #013: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #014: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #015: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #016: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #017: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #018: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #019: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #020: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #021: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #022: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #023: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #024: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #025: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #026: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #027: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #028: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #029: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #030: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #031: (file name) line (number) in H5G__traverse_special(): too many links
-    major: Links
-    minor: Too many soft links in path
diff --git a/test/API/tools/testfiles/expected/h5dump/textlinksrc.err b/test/API/tools/testfiles/expected/h5dump/textlinksrc.err
deleted file mode 100644
index 8245291..0000000
--- a/test/API/tools/testfiles/expected/h5dump/textlinksrc.err
+++ /dev/null
@@ -1,252 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
-    major: Object header
-    minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #011: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #012: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #013: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #014: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #015: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #016: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
-    major: Symbol table
-    minor: Object not found
-  #017: (file name) line (number) in H5G__traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #018: (file name) line (number) in H5G__traverse_slink_cb(): component not found
-    major: Symbol table
-    minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #001: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #003: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #004: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #005: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #006: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #007: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #008: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #009: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #010: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #011: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #012: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #013: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #014: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #015: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #016: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #017: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #018: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #019: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #020: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #021: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #022: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #023: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #024: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #025: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #026: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #027: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #028: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #029: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #030: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #031: (file name) line (number) in H5G__traverse_special(): too many links
-    major: Links
-    minor: Too many soft links in path
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #001: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #002: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #003: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #004: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #005: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #006: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #007: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #008: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #009: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #010: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #011: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #012: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #013: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #014: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #015: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #016: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #017: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #018: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #019: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #020: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #021: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #022: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #023: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #024: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #025: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #026: (file name) line (number) in H5L__extern_traverse(): unable to open object
-    major: Links
-    minor: Can't open object
-  #027: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #028: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #029: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #030: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #031: (file name) line (number) in H5G__traverse_special(): too many links
-    major: Links
-    minor: Too many soft links in path
diff --git a/test/API/tools/testfiles/expected/h5dump/tgroup-2.ddl b/test/API/tools/testfiles/expected/h5dump/tgroup-2.ddl
deleted file mode 100644
index 2ac8ac6..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tgroup-2.ddl
+++ /dev/null
@@ -1,42 +0,0 @@
-HDF5 "tgroup.h5" {
-GROUP "/g2" {
-   GROUP "g2.1" {
-      GROUP "g2.1.1" {
-      }
-      GROUP "g2.1.2" {
-      }
-      GROUP "g2.1.3" {
-      }
-   }
-}
-GROUP "/" {
-   GROUP "g1" {
-      GROUP "g1.1" {
-      }
-      GROUP "g1.2" {
-      }
-   }
-   GROUP "g2" {
-      GROUP "g2.1" {
-         GROUP "g2.1.1" {
-         }
-         GROUP "g2.1.2" {
-         }
-         GROUP "g2.1.3" {
-         }
-      }
-   }
-   GROUP "g3" {
-      GROUP "g3.1" {
-      }
-      GROUP "g3.2" {
-      }
-      GROUP "g3.3" {
-      }
-      GROUP "g3.4" {
-      }
-   }
-}
-GROUP "/y" {
-   }
-}
diff --git a/test/API/tools/testfiles/expected/h5dump/tgroup-2.err b/test/API/tools/testfiles/expected/h5dump/tgroup-2.err
deleted file mode 100644
index 27557f3..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tgroup-2.err
+++ /dev/null
@@ -1,29 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Gopen2(): unable to open group
-    major: Symbol table
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_group_open(): group open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__group_open(): group open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_group_open(): unable to open group
-    major: Symbol table
-    minor: Can't open object
-  #004: (file name) line (number) in H5G__open_name(): group not found
-    major: Symbol table
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #008: (file name) line (number) in H5G__loc_find_cb(): object 'y' doesn't exist
-    major: Symbol table
-    minor: Object not found
-h5dump error: unable to open group "/y"
diff --git a/test/API/tools/testfiles/expected/h5dump/tgrpnullspace.ddl b/test/API/tools/testfiles/expected/h5dump/tgrpnullspace.ddl
deleted file mode 100644
index 1365c19..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tgrpnullspace.ddl
+++ /dev/null
@@ -1,31 +0,0 @@
-HDF5 "tgrpnullspace.h5" {
-GROUP "/" {
-   GROUP "g1" {
-      ATTRIBUTE "attr" {
-         DATATYPE  H5T_STD_U32LE
-         DATASPACE  NULL
-         DATA {
-         }
-      }
-      DATASET "dset" {
-         DATATYPE  H5T_STD_I32BE
-         DATASPACE  NULL
-         STORAGE_LAYOUT {
-            CONTIGUOUS
-         }
-         FILTERS {
-            NONE
-         }
-         FILLVALUE {
-            FILL_TIME H5D_FILL_TIME_IFSET
-            VALUE  H5D_FILL_VALUE_DEFAULT
-         }
-         ALLOCATION_TIME {
-            H5D_ALLOC_TIME_LATE
-         }
-         DATA {
-         }
-      }
-   }
-}
-}
diff --git a/test/API/tools/testfiles/expected/h5dump/tnbit.ddl b/test/API/tools/testfiles/expected/h5dump/tnbit.ddl
deleted file mode 100644
index fd5d1cf..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tnbit.ddl
+++ /dev/null
@@ -1,20 +0,0 @@
-HDF5 "tfilters.h5" {
-DATASET "nbit" {
-   DATATYPE  32-bit little-endian integer
-   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   STORAGE_LAYOUT {
-      CHUNKED ( 10, 5 )
-      SIZE 76 (10.526:1 COMPRESSION)
-   }
-   FILTERS {
-      COMPRESSION NBIT
-   }
-   FILLVALUE {
-      FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  H5D_FILL_VALUE_DEFAULT
-   }
-   ALLOCATION_TIME {
-      H5D_ALLOC_TIME_INCR
-   }
-}
-}
diff --git a/test/API/tools/testfiles/expected/h5dump/torderlinks1.err b/test/API/tools/testfiles/expected/h5dump/torderlinks1.err
deleted file mode 100644
index caeef27..0000000
--- a/test/API/tools/testfiles/expected/h5dump/torderlinks1.err
+++ /dev/null
@@ -1,34 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
-    major: Object header
-    minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
-    major: Links
-    minor: Unable to open file
diff --git a/test/API/tools/testfiles/expected/h5dump/torderlinks2.err b/test/API/tools/testfiles/expected/h5dump/torderlinks2.err
deleted file mode 100644
index caeef27..0000000
--- a/test/API/tools/testfiles/expected/h5dump/torderlinks2.err
+++ /dev/null
@@ -1,34 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
-    major: Object header
-    minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
-    major: Object header
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
-    major: Symbol table
-    minor: Unable to find atom information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
-    major: Links
-    minor: Unable to open file
diff --git a/test/API/tools/testfiles/expected/h5dump/tperror.err b/test/API/tools/testfiles/expected/h5dump/tperror.err
deleted file mode 100644
index e2f24c1..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tperror.err
+++ /dev/null
@@ -1,54 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): unable to open dataset
-    major: Dataset
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__dataset_open(): dataset open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
-    major: Dataset
-    minor: Can't open object
-  #004: (file name) line (number) in H5D__open_name(): not found
-    major: Dataset
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #008: (file name) line (number) in H5G__loc_find_cb(): object 'bogus' doesn't exist
-    major: Symbol table
-    minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Lget_info2(): unable to get link info
-    major: Links
-    minor: Can't get value
-  #001: (file name) line (number) in H5VL_link_get(): link get failed
-    major: Virtual Object Layer
-    minor: Can't get value
-  #002: (file name) line (number) in H5VL__link_get(): link get failed
-    major: Virtual Object Layer
-    minor: Can't get value
-  #003: (file name) line (number) in H5VL__native_link_get(): unable to get link info
-    major: Links
-    minor: Object not found
-  #004: (file name) line (number) in H5L_get_info(): name doesn't exist
-    major: Links
-    minor: Object already exists
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #007: (file name) line (number) in H5L__get_info_cb(): name doesn't exist
-    major: Links
-    minor: Object not found
-h5dump error: unable to get link info from "bogus"
diff --git a/test/API/tools/testfiles/expected/h5dump/treadintfilter.ddl b/test/API/tools/testfiles/expected/h5dump/treadintfilter.ddl
deleted file mode 100644
index a2269a6b..0000000
--- a/test/API/tools/testfiles/expected/h5dump/treadintfilter.ddl
+++ /dev/null
@@ -1,132 +0,0 @@
-HDF5 "tfilters.h5" {
-DATASET "deflate" {
-   DATATYPE  H5T_STD_I32LE
-   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   DATA {
-   (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-   (1,0): 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-   (2,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-   (3,0): 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-   (4,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
-   (5,0): 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-   (6,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
-   (7,0): 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-   (8,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
-   (9,0): 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
-   (10,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
-   (11,0): 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
-   (12,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
-   (13,0): 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
-   (14,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
-   (15,0): 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-   (16,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
-   (17,0): 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
-   (18,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
-   (19,0): 190, 191, 192, 193, 194, 195, 196, 197, 198, 199
-   }
-}
-DATASET "shuffle" {
-   DATATYPE  H5T_STD_I32LE
-   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   DATA {
-   (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-   (1,0): 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-   (2,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-   (3,0): 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-   (4,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
-   (5,0): 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-   (6,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
-   (7,0): 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-   (8,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
-   (9,0): 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
-   (10,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
-   (11,0): 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
-   (12,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
-   (13,0): 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
-   (14,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
-   (15,0): 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-   (16,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
-   (17,0): 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
-   (18,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
-   (19,0): 190, 191, 192, 193, 194, 195, 196, 197, 198, 199
-   }
-}
-DATASET "fletcher32" {
-   DATATYPE  H5T_STD_I32LE
-   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   DATA {
-   (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-   (1,0): 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-   (2,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-   (3,0): 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-   (4,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
-   (5,0): 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-   (6,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
-   (7,0): 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-   (8,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
-   (9,0): 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
-   (10,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
-   (11,0): 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
-   (12,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
-   (13,0): 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
-   (14,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
-   (15,0): 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-   (16,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
-   (17,0): 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
-   (18,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
-   (19,0): 190, 191, 192, 193, 194, 195, 196, 197, 198, 199
-   }
-}
-DATASET "nbit" {
-   DATATYPE  32-bit little-endian integer
-   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   DATA {
-   (0,0): 0, 1, 2, 3, -4, -3, -2, -1, 0, 1,
-   (1,0): 2, 3, -4, -3, -2, -1, 0, 1, 2, 3,
-   (2,0): -4, -3, -2, -1, 0, 1, 2, 3, -4, -3,
-   (3,0): -2, -1, 0, 1, 2, 3, -4, -3, -2, -1,
-   (4,0): 0, 1, 2, 3, -4, -3, -2, -1, 0, 1,
-   (5,0): 2, 3, -4, -3, -2, -1, 0, 1, 2, 3,
-   (6,0): -4, -3, -2, -1, 0, 1, 2, 3, -4, -3,
-   (7,0): -2, -1, 0, 1, 2, 3, -4, -3, -2, -1,
-   (8,0): 0, 1, 2, 3, -4, -3, -2, -1, 0, 1,
-   (9,0): 2, 3, -4, -3, -2, -1, 0, 1, 2, 3,
-   (10,0): -4, -3, -2, -1, 0, 1, 2, 3, -4, -3,
-   (11,0): -2, -1, 0, 1, 2, 3, -4, -3, -2, -1,
-   (12,0): 0, 1, 2, 3, -4, -3, -2, -1, 0, 1,
-   (13,0): 2, 3, -4, -3, -2, -1, 0, 1, 2, 3,
-   (14,0): -4, -3, -2, -1, 0, 1, 2, 3, -4, -3,
-   (15,0): -2, -1, 0, 1, 2, 3, -4, -3, -2, -1,
-   (16,0): 0, 1, 2, 3, -4, -3, -2, -1, 0, 1,
-   (17,0): 2, 3, -4, -3, -2, -1, 0, 1, 2, 3,
-   (18,0): -4, -3, -2, -1, 0, 1, 2, 3, -4, -3,
-   (19,0): -2, -1, 0, 1, 2, 3, -4, -3, -2, -1
-   }
-}
-DATASET "scaleoffset" {
-   DATATYPE  H5T_STD_I32LE
-   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-   DATA {
-   (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-   (1,0): 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-   (2,0): 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
-   (3,0): 14, 15, 0, 1, 2, 19, 0, 5, 6, 7,
-   (4,0): 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
-   (5,0): 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
-   (6,0): 12, 13, 14, 15, 0, 17, 18, 19, 0, 5,
-   (7,0): 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-   (8,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-   (9,0): 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-   (10,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
-   (11,0): 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
-   (12,0): 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
-   (13,0): 114, 0, 100, 101, 102, 119, 0, 105, 106, 107,
-   (14,0): 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
-   (15,0): 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-   (16,0): 112, 113, 114, 0, 100, 117, 118, 119, 0, 105,
-   (17,0): 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
-   (18,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
-   (19,0): 110, 111, 112, 113, 114, 115, 116, 117, 118, 119
-   }
-}
-}
diff --git a/test/API/tools/testfiles/expected/h5dump/tslink-D.err b/test/API/tools/testfiles/expected/h5dump/tslink-D.err
deleted file mode 100644
index e650a33..0000000
--- a/test/API/tools/testfiles/expected/h5dump/tslink-D.err
+++ /dev/null
@@ -1,37 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): unable to open dataset
-    major: Dataset
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__dataset_open(): dataset open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
-    major: Dataset
-    minor: Can't open object
-  #004: (file name) line (number) in H5D__open_name(): not found
-    major: Dataset
-    minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
-    major: Symbol table
-    minor: Object not found
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
-    major: Links
-    minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
-    major: Symbol table
-    minor: Object not found
-  #010: (file name) line (number) in H5G__traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #011: (file name) line (number) in H5G__traverse_slink_cb(): component not found
-    major: Symbol table
-    minor: Object not found
diff --git a/test/API/tools/testfiles/expected/h5ls/help-1.ls b/test/API/tools/testfiles/expected/h5ls/help-1.ls
deleted file mode 100644
index 0926c4c..0000000
--- a/test/API/tools/testfiles/expected/h5ls/help-1.ls
+++ /dev/null
@@ -1,70 +0,0 @@
-usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
-  OPTIONS
-   -h, -?, --help  Print a usage message and exit
-   -a, --address   Print raw data address.  If dataset is contiguous, address
-                   is offset in file of beginning of raw data. If chunked,
-                   returned list of addresses indicates offset of each chunk.
-                   Must be used with -v, --verbose option.
-                   Provides no information for non-dataset objects.
-   -d, --data      Print the values of datasets
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --follow-symlinks
-                   Follow symbolic links (soft links and external links)
-                   to display target object information.
-                   Without this option, h5ls identifies a symbolic link
-                   as a soft link or external link and prints the value
-                   assigned to the symbolic link; it does not provide any
-                   information regarding the target object or determine
-                   whether the link is a dangling link.
-   --no-dangling-links
-                   Must be used with --follow-symlinks option;
-                   otherwise, h5ls shows error message and returns an exit
-                   code of 1.
-                   Check for any symbolic links (soft links or external links)
-                   that do not resolve to an existing object (dataset, group,
-                   or named datatype).
-                   If any dangling link is found, this situation is treated
-                   as an error and h5ls returns an exit code of 1.
-   -f, --full      Print full path names instead of base names
-   -g, --group     Show information about a group, not its contents
-   -l, --label     Label members of compound datasets
-   -r, --recursive List all groups recursively, avoiding cycles
-   -s, --string    Print 1-byte integer datasets as ASCII
-   -S, --simple    Use a machine-readable output format
-   -wN, --width=N  Set the number of columns of output
-   -v, --verbose   Generate more verbose output
-   -V, --version   Print version number and exit
-   --vfd=DRIVER    Use the specified virtual file driver
-   -x, --hexdump   Show raw data in hexadecimal format
-   --s3-cred=C     Supply S3 authentication information to "ros3" vfd.
-                   Accepts tuple of "(<aws-region>,<access-id>,<access-key>)".
-                   If absent or C->"(,,)", defaults to no-authentication.
-                   Has no effect if vfd flag not set to "ros3".
-   --hdfs-attrs=A  Supply configuration information to Hadoop VFD.
-                   Accepts tuple of (<namenode name>,<namenode port>,
-                   ...<kerberos cache path>,<username>,<buffer size>)
-                   If absent or A == '(,,,,)', all default values are used.
-                   Has no effect if vfd flag is not 'hdfs'.
-   --vol-value     Value (ID) of the VOL connector to use for opening the
-                   HDF5 file specified
-   --vol-name      Name of the VOL connector to use for opening the
-                   HDF5 file specified
-   --vol-info      VOL-specific info to pass to the VOL connector used for
-                   opening the HDF5 file specified
-
-  file/OBJECT
-    Each object consists of an HDF5 file name optionally followed by a
-    slash and an object name within the file (if no object is specified
-    within the file then the contents of the root group are displayed).
-    The file name may include a printf(3C) integer format such as
-    "%05d" to open a file family.
-
-  Deprecated Options
-    The following options have been removed in HDF5 1.12. Use the indicated
-    replacement option in all work.
-
-   -E or --external   Follow external links.
-                      Replaced by --follow-symlinks.
-   -e, --errors       Show all HDF5 error reporting
-                      Replaced by --enable-error-stack.
diff --git a/test/API/tools/testfiles/expected/h5ls/help-2.ls b/test/API/tools/testfiles/expected/h5ls/help-2.ls
deleted file mode 100644
index 0926c4c..0000000
--- a/test/API/tools/testfiles/expected/h5ls/help-2.ls
+++ /dev/null
@@ -1,70 +0,0 @@
-usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
-  OPTIONS
-   -h, -?, --help  Print a usage message and exit
-   -a, --address   Print raw data address.  If dataset is contiguous, address
-                   is offset in file of beginning of raw data. If chunked,
-                   returned list of addresses indicates offset of each chunk.
-                   Must be used with -v, --verbose option.
-                   Provides no information for non-dataset objects.
-   -d, --data      Print the values of datasets
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --follow-symlinks
-                   Follow symbolic links (soft links and external links)
-                   to display target object information.
-                   Without this option, h5ls identifies a symbolic link
-                   as a soft link or external link and prints the value
-                   assigned to the symbolic link; it does not provide any
-                   information regarding the target object or determine
-                   whether the link is a dangling link.
-   --no-dangling-links
-                   Must be used with --follow-symlinks option;
-                   otherwise, h5ls shows error message and returns an exit
-                   code of 1.
-                   Check for any symbolic links (soft links or external links)
-                   that do not resolve to an existing object (dataset, group,
-                   or named datatype).
-                   If any dangling link is found, this situation is treated
-                   as an error and h5ls returns an exit code of 1.
-   -f, --full      Print full path names instead of base names
-   -g, --group     Show information about a group, not its contents
-   -l, --label     Label members of compound datasets
-   -r, --recursive List all groups recursively, avoiding cycles
-   -s, --string    Print 1-byte integer datasets as ASCII
-   -S, --simple    Use a machine-readable output format
-   -wN, --width=N  Set the number of columns of output
-   -v, --verbose   Generate more verbose output
-   -V, --version   Print version number and exit
-   --vfd=DRIVER    Use the specified virtual file driver
-   -x, --hexdump   Show raw data in hexadecimal format
-   --s3-cred=C     Supply S3 authentication information to "ros3" vfd.
-                   Accepts tuple of "(<aws-region>,<access-id>,<access-key>)".
-                   If absent or C->"(,,)", defaults to no-authentication.
-                   Has no effect if vfd flag not set to "ros3".
-   --hdfs-attrs=A  Supply configuration information to Hadoop VFD.
-                   Accepts tuple of (<namenode name>,<namenode port>,
-                   ...<kerberos cache path>,<username>,<buffer size>)
-                   If absent or A == '(,,,,)', all default values are used.
-                   Has no effect if vfd flag is not 'hdfs'.
-   --vol-value     Value (ID) of the VOL connector to use for opening the
-                   HDF5 file specified
-   --vol-name      Name of the VOL connector to use for opening the
-                   HDF5 file specified
-   --vol-info      VOL-specific info to pass to the VOL connector used for
-                   opening the HDF5 file specified
-
-  file/OBJECT
-    Each object consists of an HDF5 file name optionally followed by a
-    slash and an object name within the file (if no object is specified
-    within the file then the contents of the root group are displayed).
-    The file name may include a printf(3C) integer format such as
-    "%05d" to open a file family.
-
-  Deprecated Options
-    The following options have been removed in HDF5 1.12. Use the indicated
-    replacement option in all work.
-
-   -E or --external   Follow external links.
-                      Replaced by --follow-symlinks.
-   -e, --errors       Show all HDF5 error reporting
-                      Replaced by --enable-error-stack.
diff --git a/test/API/tools/testfiles/expected/h5ls/help-3.ls b/test/API/tools/testfiles/expected/h5ls/help-3.ls
deleted file mode 100644
index 0926c4c..0000000
--- a/test/API/tools/testfiles/expected/h5ls/help-3.ls
+++ /dev/null
@@ -1,70 +0,0 @@
-usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
-  OPTIONS
-   -h, -?, --help  Print a usage message and exit
-   -a, --address   Print raw data address.  If dataset is contiguous, address
-                   is offset in file of beginning of raw data. If chunked,
-                   returned list of addresses indicates offset of each chunk.
-                   Must be used with -v, --verbose option.
-                   Provides no information for non-dataset objects.
-   -d, --data      Print the values of datasets
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --follow-symlinks
-                   Follow symbolic links (soft links and external links)
-                   to display target object information.
-                   Without this option, h5ls identifies a symbolic link
-                   as a soft link or external link and prints the value
-                   assigned to the symbolic link; it does not provide any
-                   information regarding the target object or determine
-                   whether the link is a dangling link.
-   --no-dangling-links
-                   Must be used with --follow-symlinks option;
-                   otherwise, h5ls shows error message and returns an exit
-                   code of 1.
-                   Check for any symbolic links (soft links or external links)
-                   that do not resolve to an existing object (dataset, group,
-                   or named datatype).
-                   If any dangling link is found, this situation is treated
-                   as an error and h5ls returns an exit code of 1.
-   -f, --full      Print full path names instead of base names
-   -g, --group     Show information about a group, not its contents
-   -l, --label     Label members of compound datasets
-   -r, --recursive List all groups recursively, avoiding cycles
-   -s, --string    Print 1-byte integer datasets as ASCII
-   -S, --simple    Use a machine-readable output format
-   -wN, --width=N  Set the number of columns of output
-   -v, --verbose   Generate more verbose output
-   -V, --version   Print version number and exit
-   --vfd=DRIVER    Use the specified virtual file driver
-   -x, --hexdump   Show raw data in hexadecimal format
-   --s3-cred=C     Supply S3 authentication information to "ros3" vfd.
-                   Accepts tuple of "(<aws-region>,<access-id>,<access-key>)".
-                   If absent or C->"(,,)", defaults to no-authentication.
-                   Has no effect if vfd flag not set to "ros3".
-   --hdfs-attrs=A  Supply configuration information to Hadoop VFD.
-                   Accepts tuple of (<namenode name>,<namenode port>,
-                   ...<kerberos cache path>,<username>,<buffer size>)
-                   If absent or A == '(,,,,)', all default values are used.
-                   Has no effect if vfd flag is not 'hdfs'.
-   --vol-value     Value (ID) of the VOL connector to use for opening the
-                   HDF5 file specified
-   --vol-name      Name of the VOL connector to use for opening the
-                   HDF5 file specified
-   --vol-info      VOL-specific info to pass to the VOL connector used for
-                   opening the HDF5 file specified
-
-  file/OBJECT
-    Each object consists of an HDF5 file name optionally followed by a
-    slash and an object name within the file (if no object is specified
-    within the file then the contents of the root group are displayed).
-    The file name may include a printf(3C) integer format such as
-    "%05d" to open a file family.
-
-  Deprecated Options
-    The following options have been removed in HDF5 1.12. Use the indicated
-    replacement option in all work.
-
-   -E or --external   Follow external links.
-                      Replaced by --follow-symlinks.
-   -e, --errors       Show all HDF5 error reporting
-                      Replaced by --enable-error-stack.
diff --git a/test/API/tools/testfiles/expected/h5ls/textlinksrc-nodangle-1.ls b/test/API/tools/testfiles/expected/h5ls/textlinksrc-nodangle-1.ls
deleted file mode 100644
index 0926c4c..0000000
--- a/test/API/tools/testfiles/expected/h5ls/textlinksrc-nodangle-1.ls
+++ /dev/null
@@ -1,70 +0,0 @@
-usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
-  OPTIONS
-   -h, -?, --help  Print a usage message and exit
-   -a, --address   Print raw data address.  If dataset is contiguous, address
-                   is offset in file of beginning of raw data. If chunked,
-                   returned list of addresses indicates offset of each chunk.
-                   Must be used with -v, --verbose option.
-                   Provides no information for non-dataset objects.
-   -d, --data      Print the values of datasets
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --follow-symlinks
-                   Follow symbolic links (soft links and external links)
-                   to display target object information.
-                   Without this option, h5ls identifies a symbolic link
-                   as a soft link or external link and prints the value
-                   assigned to the symbolic link; it does not provide any
-                   information regarding the target object or determine
-                   whether the link is a dangling link.
-   --no-dangling-links
-                   Must be used with --follow-symlinks option;
-                   otherwise, h5ls shows error message and returns an exit
-                   code of 1.
-                   Check for any symbolic links (soft links or external links)
-                   that do not resolve to an existing object (dataset, group,
-                   or named datatype).
-                   If any dangling link is found, this situation is treated
-                   as an error and h5ls returns an exit code of 1.
-   -f, --full      Print full path names instead of base names
-   -g, --group     Show information about a group, not its contents
-   -l, --label     Label members of compound datasets
-   -r, --recursive List all groups recursively, avoiding cycles
-   -s, --string    Print 1-byte integer datasets as ASCII
-   -S, --simple    Use a machine-readable output format
-   -wN, --width=N  Set the number of columns of output
-   -v, --verbose   Generate more verbose output
-   -V, --version   Print version number and exit
-   --vfd=DRIVER    Use the specified virtual file driver
-   -x, --hexdump   Show raw data in hexadecimal format
-   --s3-cred=C     Supply S3 authentication information to "ros3" vfd.
-                   Accepts tuple of "(<aws-region>,<access-id>,<access-key>)".
-                   If absent or C->"(,,)", defaults to no-authentication.
-                   Has no effect if vfd flag not set to "ros3".
-   --hdfs-attrs=A  Supply configuration information to Hadoop VFD.
-                   Accepts tuple of (<namenode name>,<namenode port>,
-                   ...<kerberos cache path>,<username>,<buffer size>)
-                   If absent or A == '(,,,,)', all default values are used.
-                   Has no effect if vfd flag is not 'hdfs'.
-   --vol-value     Value (ID) of the VOL connector to use for opening the
-                   HDF5 file specified
-   --vol-name      Name of the VOL connector to use for opening the
-                   HDF5 file specified
-   --vol-info      VOL-specific info to pass to the VOL connector used for
-                   opening the HDF5 file specified
-
-  file/OBJECT
-    Each object consists of an HDF5 file name optionally followed by a
-    slash and an object name within the file (if no object is specified
-    within the file then the contents of the root group are displayed).
-    The file name may include a printf(3C) integer format such as
-    "%05d" to open a file family.
-
-  Deprecated Options
-    The following options have been removed in HDF5 1.12. Use the indicated
-    replacement option in all work.
-
-   -E or --external   Follow external links.
-                      Replaced by --follow-symlinks.
-   -e, --errors       Show all HDF5 error reporting
-                      Replaced by --enable-error-stack.
diff --git a/test/API/tools/testfiles/expected/h5ls/tgroup-1.ls b/test/API/tools/testfiles/expected/h5ls/tgroup-1.ls
deleted file mode 100644
index 0926c4c..0000000
--- a/test/API/tools/testfiles/expected/h5ls/tgroup-1.ls
+++ /dev/null
@@ -1,70 +0,0 @@
-usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
-  OPTIONS
-   -h, -?, --help  Print a usage message and exit
-   -a, --address   Print raw data address.  If dataset is contiguous, address
-                   is offset in file of beginning of raw data. If chunked,
-                   returned list of addresses indicates offset of each chunk.
-                   Must be used with -v, --verbose option.
-                   Provides no information for non-dataset objects.
-   -d, --data      Print the values of datasets
-   --enable-error-stack
-                   Prints messages from the HDF5 error stack as they occur.
-   --follow-symlinks
-                   Follow symbolic links (soft links and external links)
-                   to display target object information.
-                   Without this option, h5ls identifies a symbolic link
-                   as a soft link or external link and prints the value
-                   assigned to the symbolic link; it does not provide any
-                   information regarding the target object or determine
-                   whether the link is a dangling link.
-   --no-dangling-links
-                   Must be used with --follow-symlinks option;
-                   otherwise, h5ls shows error message and returns an exit
-                   code of 1.
-                   Check for any symbolic links (soft links or external links)
-                   that do not resolve to an existing object (dataset, group,
-                   or named datatype).
-                   If any dangling link is found, this situation is treated
-                   as an error and h5ls returns an exit code of 1.
-   -f, --full      Print full path names instead of base names
-   -g, --group     Show information about a group, not its contents
-   -l, --label     Label members of compound datasets
-   -r, --recursive List all groups recursively, avoiding cycles
-   -s, --string    Print 1-byte integer datasets as ASCII
-   -S, --simple    Use a machine-readable output format
-   -wN, --width=N  Set the number of columns of output
-   -v, --verbose   Generate more verbose output
-   -V, --version   Print version number and exit
-   --vfd=DRIVER    Use the specified virtual file driver
-   -x, --hexdump   Show raw data in hexadecimal format
-   --s3-cred=C     Supply S3 authentication information to "ros3" vfd.
-                   Accepts tuple of "(<aws-region>,<access-id>,<access-key>)".
-                   If absent or C->"(,,)", defaults to no-authentication.
-                   Has no effect if vfd flag not set to "ros3".
-   --hdfs-attrs=A  Supply configuration information to Hadoop VFD.
-                   Accepts tuple of (<namenode name>,<namenode port>,
-                   ...<kerberos cache path>,<username>,<buffer size>)
-                   If absent or A == '(,,,,)', all default values are used.
-                   Has no effect if vfd flag is not 'hdfs'.
-   --vol-value     Value (ID) of the VOL connector to use for opening the
-                   HDF5 file specified
-   --vol-name      Name of the VOL connector to use for opening the
-                   HDF5 file specified
-   --vol-info      VOL-specific info to pass to the VOL connector used for
-                   opening the HDF5 file specified
-
-  file/OBJECT
-    Each object consists of an HDF5 file name optionally followed by a
-    slash and an object name within the file (if no object is specified
-    within the file then the contents of the root group are displayed).
-    The file name may include a printf(3C) integer format such as
-    "%05d" to open a file family.
-
-  Deprecated Options
-    The following options have been removed in HDF5 1.12. Use the indicated
-    replacement option in all work.
-
-   -E or --external   Follow external links.
-                      Replaced by --follow-symlinks.
-   -e, --errors       Show all HDF5 error reporting
-                      Replaced by --enable-error-stack.
diff --git a/test/API/tools/testfiles/expected/h5mkgrp/h5mkgrp_help.txt b/test/API/tools/testfiles/expected/h5mkgrp/h5mkgrp_help.txt
deleted file mode 100644
index 9525230..0000000
--- a/test/API/tools/testfiles/expected/h5mkgrp/h5mkgrp_help.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-usage: h5mkgrp [OPTIONS] FILE GROUP...
-   OPTIONS
-      -h, --help         Print a usage message and exit
-      -l, --latest       Use latest version of file format to create groups
-      -p, --parents      No error if existing, make parent groups as needed
-      -v, --verbose      Print information about OBJECTS and OPTIONS
-      -V, --version      Print version number and exit
-      --vol-value        Value (ID) of the VOL connector to use for opening the
-                         HDF5 file specified
-      --vol-name         Name of the VOL connector to use for opening the
-                         HDF5 file specified
-      --vol-info         VOL-specific info to pass to the VOL connector used for
-                         opening the HDF5 file specified
-
diff --git a/test/API/tools/testfiles/expected/h5repack/README b/test/API/tools/testfiles/expected/h5repack/README
deleted file mode 100644
index 4096dee..0000000
--- a/test/API/tools/testfiles/expected/h5repack/README
+++ /dev/null
@@ -1,5 +0,0 @@
-h5repack_nested_8bit_enum_deflated.h5:
-h5repack_nested_8bit_enum.h5:
-    enuberated 8bit type nested in compount type.  Original file provided
-    by a user (HDFFV-8667) as a test file. Used h5copy to extract only the
-    Compound type dataset. The non-deflated version is produced by h5repack.
diff --git a/test/API/tools/testfiles/expected/h5repack/h5repack-help.txt b/test/API/tools/testfiles/expected/h5repack/h5repack-help.txt
deleted file mode 100644
index e12838d..0000000
--- a/test/API/tools/testfiles/expected/h5repack/h5repack-help.txt
+++ /dev/null
@@ -1,189 +0,0 @@
-usage: h5repack [OPTIONS] file1 file2
-  file1                    Input HDF5 File
-  file2                    Output HDF5 File
-  OPTIONS
-   -h, --help              Print a usage message and exit
-   -v, --verbose           Verbose mode, print object information
-   -V, --version           Print version number and exit
-   -n, --native            Use a native HDF5 type when repacking
-   --enable-error-stack    Prints messages from the HDF5 error stack as they
-                           occur
-   --src-vol-value         Value (ID) of the VOL connector to use for opening the
-                           input HDF5 file specified
-   --src-vol-name          Name of the VOL connector to use for opening the input
-                           HDF5 file specified
-   --src-vol-info          VOL-specific info to pass to the VOL connector used for
-                           opening the input HDF5 file specified
-   --dst-vol-value         Value (ID) of the VOL connector to use for opening the
-                           output HDF5 file specified
-   --dst-vol-name          Name of the VOL connector to use for opening the output
-                           HDF5 file specified
-   --dst-vol-info          VOL-specific info to pass to the VOL connector used for
-                           opening the output HDF5 file specified
-   -L, --latest            Use latest version of file format
-                           This option will take precedence over the options
-                           --low and --high
-   --low=BOUND             The low bound for library release versions to use
-                           when creating objects in the file
-                           (default is H5F_LIBVER_EARLIEST)
-   --high=BOUND            The high bound for library release versions to use
-                           when creating objects in the file
-                           (default is H5F_LIBVER_LATEST)
-   --merge                 Follow external soft link recursively and merge data
-   --prune                 Do not follow external soft links and remove link
-   --merge --prune         Follow external link, merge data and remove dangling link
-   -c L1, --compact=L1     Maximum number of links in header messages
-   -d L2, --indexed=L2     Minimum number of links in the indexed format
-   -s S[:F], --ssize=S[:F] Shared object header message minimum size
-   -m M, --minimum=M       Do not apply the filter to datasets smaller than M
-   -e E, --file=E          Name of file E with the -f and -l options
-   -u U, --ublock=U        Name of file U with user block data to be added
-   -b B, --block=B         Size of user block to be added
-   -M A, --metadata_block_size=A  Metadata block size for H5Pset_meta_block_size
-   -t T, --threshold=T     Threshold value for H5Pset_alignment
-   -a A, --alignment=A     Alignment value for H5Pset_alignment
-   -q Q, --sort_by=Q       Sort groups and attributes by index Q
-   -z Z, --sort_order=Z    Sort groups and attributes by order Z
-   -f FILT, --filter=FILT  Filter type
-   -l LAYT, --layout=LAYT  Layout type
-   -S FS_STRATEGY, --fs_strategy=FS_STRATEGY  File space management strategy for
-                           H5Pset_file_space_strategy
-   -P FS_PERSIST, --fs_persist=FS_PERSIST  Persisting or not persisting free-
-                           space for H5Pset_file_space_strategy
-   -T FS_THRESHOLD, --fs_threshold=FS_THRESHOLD   Free-space section threshold
-                           for H5Pset_file_space_strategy
-   -G FS_PAGESIZE, --fs_pagesize=FS_PAGESIZE   File space page size for
-                           H5Pset_file_space_page_size
-
-    M - is an integer greater than 1, size of dataset in bytes (default is 0)
-    E - is a filename.
-    S - is an integer
-    U - is a filename.
-    T - is an integer
-    A - is an integer greater than zero
-    Q - is the sort index type for the input file. It can be "name" or
-        "creation_order" (default)
-    Z - is the sort order type for the input file. It can be "descending" or
-        "ascending" (default)
-    B - is the user block size, any value that is 512 or greater and is
-        a power of 2 (1024 default)
-    F - is the shared object header message type, any of <dspace|dtype|fill|
-        pline|attr>. If F is not specified, S applies to all messages
-
-    BOUND is an integer indicating the library release versions to use when
-          creating objects in the file (see H5Pset_libver_bounds()):
-        0: This is H5F_LIBVER_EARLIEST in H5F_libver_t struct
-        1: This is H5F_LIBVER_V18 in H5F_libver_t struct
-        2: This is H5F_LIBVER_V110 in H5F_libver_t struct
-        3: This is H5F_LIBVER_V112 in H5F_libver_t struct
-        4: This is H5F_LIBVER_V114 in H5F_libver_t struct
-           (H5F_LIBVER_LATEST is aliased to H5F_LIBVER_V114 for this release
-
-    FS_STRATEGY is a string indicating the file space strategy used:
-        FSM_AGGR:
-               The mechanisms used in managing file space are free-space
-               managers, aggregators and virtual file driver.
-        PAGE:
-               The mechanisms used in managing file space are free-space
-               managers with embedded paged aggregation and virtual file driver.
-        AGGR:
-               The mechanisms used in managing file space are aggregators and
-               virtual file driver.
-        NONE:
-               The mechanisms used in managing file space are virtual file
-               driver.
-        The default strategy when not set is FSM_AGGR without persisting free-
-        space.
-
-    FS_PERSIST is 1 to persisting free-space or 0 to not persisting free-space.
-      The default when not set is not persisting free-space.
-      The value is ignored for AGGR and NONE strategies.
-
-    FS_THRESHOLD is the minimum size (in bytes) of free-space sections to be
-        tracked by the library.
-      The default when not set is 1.
-      The value is ignored for AGGR and NONE strategies.
-
-    FS_PAGESIZE is the size (in bytes) >=512 that is used by the library when
-        the file space strategy PAGE is used.
-      The default when not set is 4096.
-
-    FILT - is a string with the format:
-
-      <list of objects>:<name of filter>=<filter parameters>
-
-      <list of objects> is a comma separated list of object names, meaning apply
-        compression only to those objects. If no names are specified, the filter
-        is applied to all objects
-      <name of filter> can be:
-        GZIP, to apply the HDF5 GZIP filter (GZIP compression)
-        SZIP, to apply the HDF5 SZIP filter (SZIP compression)
-        SHUF, to apply the HDF5 shuffle filter
-        FLET, to apply the HDF5 checksum filter
-        NBIT, to apply the HDF5 NBIT filter (NBIT compression)
-        SOFF, to apply the HDF5 Scale/Offset filter
-        UD,   to apply a user defined filter
-        NONE, to remove all filters
-      <filter parameters> is optional filter parameter information
-        GZIP=<deflation level> from 1-9
-        SZIP=<pixels per block,coding> pixels per block is a even number in
-            2-32 and coding method is either EC or NN
-        SHUF (no parameter)
-        FLET (no parameter)
-        NBIT (no parameter)
-        SOFF=<scale_factor,scale_type> scale_factor is an integer and scale_type
-            is either IN or DS
-        UD=<filter_number,filter_flag,cd_value_count,value1[,value2,...,valueN]>
-            Required values: filter_number, filter_flag, cd_value_count, value1
-            Optional values: value2 to valueN
-        NONE (no parameter)
-
-    LAYT - is a string with the format:
-
-      <list of objects>:<layout type>=<layout parameters>
-
-      <list of objects> is a comma separated list of object names, meaning that
-        layout information is supplied for those objects. If no names are
-        specified, the layout type is applied to all objects
-      <layout type> can be:
-        CHUNK, to apply chunking layout
-        COMPA, to apply compact layout
-        CONTI, to apply contiguous layout
-      <layout parameters> is optional layout information
-        CHUNK=DIM[xDIM...xDIM], the chunk size of each dimension
-        COMPA (no parameter)
-        CONTI (no parameter)
-
-Examples of use:
-
-1) h5repack -v -f GZIP=1 file1 file2
-
-   GZIP compression with level 1 to all objects
-
-2) h5repack -v -f dset1:SZIP=8,NN file1 file2
-
-   SZIP compression with 8 pixels per block and NN coding method to object dset1
-
-3) h5repack -v -l dset1,dset2:CHUNK=20x10 -f dset3,dset4,dset5:NONE file1 file2
-
-   Chunked layout, with a layout size of 20x10, to objects dset1 and dset2
-   and remove filters to objects dset3, dset4, dset5
-
-4) h5repack -L -c 10 -s 20:dtype file1 file2
-
-   Using latest file format with maximum compact group size of 10 and
-   minimum shared datatype size of 20
-
-5) h5repack -f SHUF -f GZIP=1 file1 file2
-
-   Add both filters SHUF and GZIP in this order to all datasets
-
-6) h5repack -f UD=307,0,1,9 file1 file2
-
-   Add bzip2 filter to all datasets
-
-7) h5repack --low=0 --high=1 file1 file2
-
-   Set low=H5F_LIBVER_EARLIEST and high=H5F_LIBVER_V18 via
-   H5Pset_libver_bounds() when creating the repacked file, file2
-
diff --git a/test/API/tools/testfiles/expected/h5repack/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/test/API/tools/testfiles/expected/h5repack/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
deleted file mode 100644
index 9e83ff8..0000000
--- a/test/API/tools/testfiles/expected/h5repack/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+++ /dev/null
@@ -1,47 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dcreate2(): unable to create dataset
-    major: Dataset
-    minor: Unable to initialize object
-  #001: (file name) line (number) in H5VL_dataset_create(): dataset create failed
-    major: Virtual Object Layer
-    minor: Unable to create file
-  #002: (file name) line (number) in H5VL__dataset_create(): dataset create failed
-    major: Virtual Object Layer
-    minor: Unable to create file
-  #003: (file name) line (number) in H5VL__native_dataset_create(): unable to create dataset
-    major: Dataset
-    minor: Unable to initialize object
-  #004: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
-    major: Dataset
-    minor: Unable to initialize object
-  #005: (file name) line (number) in H5L_link_object(): unable to create new link to object
-    major: Links
-    minor: Unable to initialize object
-  #006: (file name) line (number) in H5L__create_real(): can't insert link
-    major: Links
-    minor: Unable to insert object
-  #007: (file name) line (number) in H5G_traverse(): internal path traversal failed
-    major: Symbol table
-    minor: Object not found
-  #008: (file name) line (number) in H5G__traverse_real(): traversal operator failed
-    major: Symbol table
-    minor: Callback failed
-  #009: (file name) line (number) in H5L__link_cb(): unable to create object
-    major: Links
-    minor: Unable to initialize object
-  #010: (file name) line (number) in H5O_obj_create(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #011: (file name) line (number) in H5O__dset_create(): unable to create dataset
-    major: Dataset
-    minor: Unable to initialize object
-  #012: (file name) line (number) in H5D__create(): unable to construct layout information
-    major: Dataset
-    minor: Unable to initialize object
-  #013: (file name) line (number) in H5D__chunk_construct(): dimensionality of chunks doesn't match the dataspace
-    major: Dataset
-    minor: Bad value
-H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in do_copy_objects(): H5Dcreate2 failed
-    major: Failure in tools library
-    minor: function info
diff --git a/test/API/tools/testfiles/hdf5/bounds_latest_latest.h5 b/test/API/tools/testfiles/hdf5/bounds_latest_latest.h5
deleted file mode 100644
index 6e8bcad..0000000
--- a/test/API/tools/testfiles/hdf5/bounds_latest_latest.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/charsets.h5 b/test/API/tools/testfiles/hdf5/charsets.h5
deleted file mode 100644
index 2b9e735..0000000
--- a/test/API/tools/testfiles/hdf5/charsets.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/compounds_array_vlen1.h5 b/test/API/tools/testfiles/hdf5/compounds_array_vlen1.h5
deleted file mode 100644
index 398026c..0000000
--- a/test/API/tools/testfiles/hdf5/compounds_array_vlen1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/compounds_array_vlen2.h5 b/test/API/tools/testfiles/hdf5/compounds_array_vlen2.h5
deleted file mode 100644
index f6f0868..0000000
--- a/test/API/tools/testfiles/hdf5/compounds_array_vlen2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/diff_strings1.h5 b/test/API/tools/testfiles/hdf5/diff_strings1.h5
deleted file mode 100644
index 0f8b380..0000000
--- a/test/API/tools/testfiles/hdf5/diff_strings1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/diff_strings2.h5 b/test/API/tools/testfiles/hdf5/diff_strings2.h5
deleted file mode 100644
index e8520ae..0000000
--- a/test/API/tools/testfiles/hdf5/diff_strings2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/err_attr_dspace.h5 b/test/API/tools/testfiles/hdf5/err_attr_dspace.h5
deleted file mode 100644
index 969c328..0000000
--- a/test/API/tools/testfiles/hdf5/err_attr_dspace.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/file_space.h5 b/test/API/tools/testfiles/hdf5/file_space.h5
deleted file mode 100644
index d9e2890..0000000
--- a/test/API/tools/testfiles/hdf5/file_space.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/filter_fail.h5 b/test/API/tools/testfiles/hdf5/filter_fail.h5
deleted file mode 100644
index c140a69..0000000
--- a/test/API/tools/testfiles/hdf5/filter_fail.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5copytst.h5 b/test/API/tools/testfiles/hdf5/h5copytst.h5
deleted file mode 100644
index 474c3da..0000000
--- a/test/API/tools/testfiles/hdf5/h5copytst.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_attr1.h5 b/test/API/tools/testfiles/hdf5/h5diff_attr1.h5
deleted file mode 100644
index 4cea743..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_attr1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_attr2.h5 b/test/API/tools/testfiles/hdf5/h5diff_attr2.h5
deleted file mode 100644
index 3ea3302..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_attr2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_attr3.h5 b/test/API/tools/testfiles/hdf5/h5diff_attr3.h5
deleted file mode 100644
index 631845d..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_attr3.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_attr_v_level1.h5 b/test/API/tools/testfiles/hdf5/h5diff_attr_v_level1.h5
deleted file mode 100644
index 2b1d8a1..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_attr_v_level1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_attr_v_level2.h5 b/test/API/tools/testfiles/hdf5/h5diff_attr_v_level2.h5
deleted file mode 100644
index 4588fca..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_attr_v_level2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_basic1.h5 b/test/API/tools/testfiles/hdf5/h5diff_basic1.h5
deleted file mode 100644
index e1396be..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_basic1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_basic2.h5 b/test/API/tools/testfiles/hdf5/h5diff_basic2.h5
deleted file mode 100644
index c0795b6..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_basic2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_comp_vl_strs.h5 b/test/API/tools/testfiles/hdf5/h5diff_comp_vl_strs.h5
deleted file mode 100644
index 4ad6f19..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_comp_vl_strs.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_danglelinks1.h5 b/test/API/tools/testfiles/hdf5/h5diff_danglelinks1.h5
deleted file mode 100644
index b8be9bc..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_danglelinks1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_danglelinks2.h5 b/test/API/tools/testfiles/hdf5/h5diff_danglelinks2.h5
deleted file mode 100644
index 3c3907c..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_danglelinks2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_dset1.h5 b/test/API/tools/testfiles/hdf5/h5diff_dset1.h5
deleted file mode 100644
index fefd86a..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_dset1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_dset2.h5 b/test/API/tools/testfiles/hdf5/h5diff_dset2.h5
deleted file mode 100644
index 598e481..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_dset2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_dset3.h5 b/test/API/tools/testfiles/hdf5/h5diff_dset3.h5
deleted file mode 100644
index 893c135..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_dset3.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_dset_zero_dim_size1.h5 b/test/API/tools/testfiles/hdf5/h5diff_dset_zero_dim_size1.h5
deleted file mode 100644
index cdc7644..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_dset_zero_dim_size1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_dset_zero_dim_size2.h5 b/test/API/tools/testfiles/hdf5/h5diff_dset_zero_dim_size2.h5
deleted file mode 100644
index 4752ed1..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_dset_zero_dim_size2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_dtypes.h5 b/test/API/tools/testfiles/hdf5/h5diff_dtypes.h5
deleted file mode 100644
index ffa5264..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_dtypes.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_empty.h5 b/test/API/tools/testfiles/hdf5/h5diff_empty.h5
deleted file mode 100644
index 3f0d1df..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_empty.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_enum_invalid_values.h5 b/test/API/tools/testfiles/hdf5/h5diff_enum_invalid_values.h5
deleted file mode 100644
index dd02db9..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_enum_invalid_values.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_exclude1-1.h5 b/test/API/tools/testfiles/hdf5/h5diff_exclude1-1.h5
deleted file mode 100644
index 8b675ea..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_exclude1-1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_exclude1-2.h5 b/test/API/tools/testfiles/hdf5/h5diff_exclude1-2.h5
deleted file mode 100644
index 78854cd..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_exclude1-2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_exclude2-1.h5 b/test/API/tools/testfiles/hdf5/h5diff_exclude2-1.h5
deleted file mode 100644
index 8923111..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_exclude2-1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_exclude2-2.h5 b/test/API/tools/testfiles/hdf5/h5diff_exclude2-2.h5
deleted file mode 100644
index 9e42007..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_exclude2-2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_exclude3-1.h5 b/test/API/tools/testfiles/hdf5/h5diff_exclude3-1.h5
deleted file mode 100644
index f9cc83d..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_exclude3-1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_exclude3-2.h5 b/test/API/tools/testfiles/hdf5/h5diff_exclude3-2.h5
deleted file mode 100644
index f811905..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_exclude3-2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_ext2softlink_src.h5 b/test/API/tools/testfiles/hdf5/h5diff_ext2softlink_src.h5
deleted file mode 100644
index 50b7d2b..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_ext2softlink_src.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_ext2softlink_trg.h5 b/test/API/tools/testfiles/hdf5/h5diff_ext2softlink_trg.h5
deleted file mode 100644
index 610e890..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_ext2softlink_trg.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_extlink_src.h5 b/test/API/tools/testfiles/hdf5/h5diff_extlink_src.h5
deleted file mode 100644
index cfc1066..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_extlink_src.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_extlink_trg.h5 b/test/API/tools/testfiles/hdf5/h5diff_extlink_trg.h5
deleted file mode 100644
index 3a322c9..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_extlink_trg.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_grp_recurse1.h5 b/test/API/tools/testfiles/hdf5/h5diff_grp_recurse1.h5
deleted file mode 100644
index cfd4e62..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_grp_recurse1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_grp_recurse2.h5 b/test/API/tools/testfiles/hdf5/h5diff_grp_recurse2.h5
deleted file mode 100644
index 54bcdec..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_grp_recurse2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_grp_recurse_ext1.h5 b/test/API/tools/testfiles/hdf5/h5diff_grp_recurse_ext1.h5
deleted file mode 100644
index 12a534a..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_grp_recurse_ext1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_grp_recurse_ext2-1.h5 b/test/API/tools/testfiles/hdf5/h5diff_grp_recurse_ext2-1.h5
deleted file mode 100644
index 5bb02df..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_grp_recurse_ext2-1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_grp_recurse_ext2-2.h5 b/test/API/tools/testfiles/hdf5/h5diff_grp_recurse_ext2-2.h5
deleted file mode 100644
index 312543e..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_grp_recurse_ext2-2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_grp_recurse_ext2-3.h5 b/test/API/tools/testfiles/hdf5/h5diff_grp_recurse_ext2-3.h5
deleted file mode 100644
index 43ad156..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_grp_recurse_ext2-3.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_hyper1.h5 b/test/API/tools/testfiles/hdf5/h5diff_hyper1.h5
deleted file mode 100644
index ceeff80..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_hyper1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_hyper2.h5 b/test/API/tools/testfiles/hdf5/h5diff_hyper2.h5
deleted file mode 100644
index 05a2eb1..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_hyper2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_linked_softlink.h5 b/test/API/tools/testfiles/hdf5/h5diff_linked_softlink.h5
deleted file mode 100644
index 03c5dee..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_linked_softlink.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_links.h5 b/test/API/tools/testfiles/hdf5/h5diff_links.h5
deleted file mode 100644
index 8af66a6..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_links.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_softlinks.h5 b/test/API/tools/testfiles/hdf5/h5diff_softlinks.h5
deleted file mode 100644
index 67a843d..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_softlinks.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5diff_types.h5 b/test/API/tools/testfiles/hdf5/h5diff_types.h5
deleted file mode 100644
index c835069..0000000
--- a/test/API/tools/testfiles/hdf5/h5diff_types.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_aggr.h5 b/test/API/tools/testfiles/hdf5/h5repack_aggr.h5
deleted file mode 100644
index 8da0751..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_aggr.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_attr.h5 b/test/API/tools/testfiles/hdf5/h5repack_attr.h5
deleted file mode 100644
index 80df0be..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_attr.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_attr_refs.h5 b/test/API/tools/testfiles/hdf5/h5repack_attr_refs.h5
deleted file mode 100644
index 1b0ca34..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_attr_refs.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_deflate.h5 b/test/API/tools/testfiles/hdf5/h5repack_deflate.h5
deleted file mode 100644
index 4988491..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_deflate.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_early.h5 b/test/API/tools/testfiles/hdf5/h5repack_early.h5
deleted file mode 100644
index d9a7ece..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_early.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_ext.h5 b/test/API/tools/testfiles/hdf5/h5repack_ext.h5
deleted file mode 100644
index 8518b5b..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_ext.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_f32le.h5 b/test/API/tools/testfiles/hdf5/h5repack_f32le.h5
deleted file mode 100644
index 03a9b57..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_f32le.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_f32le_ex.h5 b/test/API/tools/testfiles/hdf5/h5repack_f32le_ex.h5
deleted file mode 100644
index ca6c49d..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_f32le_ex.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_fill.h5 b/test/API/tools/testfiles/hdf5/h5repack_fill.h5
deleted file mode 100644
index ac40089..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_fill.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_filters.h5 b/test/API/tools/testfiles/hdf5/h5repack_filters.h5
deleted file mode 100644
index eabade8..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_filters.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_fletcher.h5 b/test/API/tools/testfiles/hdf5/h5repack_fletcher.h5
deleted file mode 100644
index 16ca4ef..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_fletcher.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_fsm_aggr_nopersist.h5 b/test/API/tools/testfiles/hdf5/h5repack_fsm_aggr_nopersist.h5
deleted file mode 100644
index 1cd5f3f..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_fsm_aggr_nopersist.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_fsm_aggr_persist.h5 b/test/API/tools/testfiles/hdf5/h5repack_fsm_aggr_persist.h5
deleted file mode 100644
index 469dbce..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_fsm_aggr_persist.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_hlink.h5 b/test/API/tools/testfiles/hdf5/h5repack_hlink.h5
deleted file mode 100644
index 80c0fcc..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_hlink.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_int32le_1d.h5 b/test/API/tools/testfiles/hdf5/h5repack_int32le_1d.h5
deleted file mode 100644
index 7d60566..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_int32le_1d.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_int32le_1d_ex.h5 b/test/API/tools/testfiles/hdf5/h5repack_int32le_1d_ex.h5
deleted file mode 100644
index ba4b534..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_int32le_1d_ex.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_int32le_2d.h5 b/test/API/tools/testfiles/hdf5/h5repack_int32le_2d.h5
deleted file mode 100644
index 2f32bd1..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_int32le_2d.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_int32le_2d_ex.h5 b/test/API/tools/testfiles/hdf5/h5repack_int32le_2d_ex.h5
deleted file mode 100644
index f6cce59..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_int32le_2d_ex.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_int32le_3d.h5 b/test/API/tools/testfiles/hdf5/h5repack_int32le_3d.h5
deleted file mode 100644
index 7a61ef5..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_int32le_3d.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_int32le_3d_ex.h5 b/test/API/tools/testfiles/hdf5/h5repack_int32le_3d_ex.h5
deleted file mode 100644
index 7c4b750..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_int32le_3d_ex.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_layout.UD.h5 b/test/API/tools/testfiles/hdf5/h5repack_layout.UD.h5
deleted file mode 100644
index caf2024..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_layout.UD.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_layout.h5 b/test/API/tools/testfiles/hdf5/h5repack_layout.h5
deleted file mode 100644
index 4e53766..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_layout.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_layout2.h5 b/test/API/tools/testfiles/hdf5/h5repack_layout2.h5
deleted file mode 100644
index f6821e5..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_layout2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_layout3.h5 b/test/API/tools/testfiles/hdf5/h5repack_layout3.h5
deleted file mode 100644
index 6d2de41..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_layout3.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_layouto.h5 b/test/API/tools/testfiles/hdf5/h5repack_layouto.h5
deleted file mode 100644
index a038e68..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_layouto.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_named_dtypes.h5 b/test/API/tools/testfiles/hdf5/h5repack_named_dtypes.h5
deleted file mode 100644
index 85c1352..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_named_dtypes.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_nbit.h5 b/test/API/tools/testfiles/hdf5/h5repack_nbit.h5
deleted file mode 100644
index ac71bee..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_nbit.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_nested_8bit_enum.h5 b/test/API/tools/testfiles/hdf5/h5repack_nested_8bit_enum.h5
deleted file mode 100644
index f1bd8e9..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_nested_8bit_enum.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_nested_8bit_enum_deflated.h5 b/test/API/tools/testfiles/hdf5/h5repack_nested_8bit_enum_deflated.h5
deleted file mode 100644
index 2e66da2..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_nested_8bit_enum_deflated.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_none.h5 b/test/API/tools/testfiles/hdf5/h5repack_none.h5
deleted file mode 100644
index 2e4d789..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_none.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_objs.h5 b/test/API/tools/testfiles/hdf5/h5repack_objs.h5
deleted file mode 100644
index 284b0ac..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_objs.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_paged_nopersist.h5 b/test/API/tools/testfiles/hdf5/h5repack_paged_nopersist.h5
deleted file mode 100644
index 352e586..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_paged_nopersist.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_paged_persist.h5 b/test/API/tools/testfiles/hdf5/h5repack_paged_persist.h5
deleted file mode 100644
index 64c3b23..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_paged_persist.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_refs.h5 b/test/API/tools/testfiles/hdf5/h5repack_refs.h5
deleted file mode 100644
index 2a1ec9b..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_refs.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_shuffle.h5 b/test/API/tools/testfiles/hdf5/h5repack_shuffle.h5
deleted file mode 100644
index c14e2cb..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_shuffle.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_soffset.h5 b/test/API/tools/testfiles/hdf5/h5repack_soffset.h5
deleted file mode 100644
index 2acd867..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_soffset.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_szip.h5 b/test/API/tools/testfiles/hdf5/h5repack_szip.h5
deleted file mode 100644
index b16d169..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_szip.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_uint8be.h5 b/test/API/tools/testfiles/hdf5/h5repack_uint8be.h5
deleted file mode 100644
index 0e25211..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_uint8be.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/h5repack_uint8be_ex.h5 b/test/API/tools/testfiles/hdf5/h5repack_uint8be_ex.h5
deleted file mode 100644
index 8787188..0000000
--- a/test/API/tools/testfiles/hdf5/h5repack_uint8be_ex.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/non_comparables1.h5 b/test/API/tools/testfiles/hdf5/non_comparables1.h5
deleted file mode 100644
index 7dbb45d..0000000
--- a/test/API/tools/testfiles/hdf5/non_comparables1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/non_comparables2.h5 b/test/API/tools/testfiles/hdf5/non_comparables2.h5
deleted file mode 100644
index a5e7014..0000000
--- a/test/API/tools/testfiles/hdf5/non_comparables2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/packedbits.h5 b/test/API/tools/testfiles/hdf5/packedbits.h5
deleted file mode 100644
index cbb73ab..0000000
--- a/test/API/tools/testfiles/hdf5/packedbits.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/t128bit_float.h5 b/test/API/tools/testfiles/hdf5/t128bit_float.h5
deleted file mode 100644
index 134d510..0000000
--- a/test/API/tools/testfiles/hdf5/t128bit_float.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/taindices.h5 b/test/API/tools/testfiles/hdf5/taindices.h5
deleted file mode 100644
index b482a21..0000000
--- a/test/API/tools/testfiles/hdf5/taindices.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tall.h5 b/test/API/tools/testfiles/hdf5/tall.h5
deleted file mode 100644
index 918aeee..0000000
--- a/test/API/tools/testfiles/hdf5/tall.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tarray1.h5 b/test/API/tools/testfiles/hdf5/tarray1.h5
deleted file mode 100644
index 90371f2..0000000
--- a/test/API/tools/testfiles/hdf5/tarray1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tarray1_big.h5 b/test/API/tools/testfiles/hdf5/tarray1_big.h5
deleted file mode 100644
index 6862dd5..0000000
--- a/test/API/tools/testfiles/hdf5/tarray1_big.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tarray2.h5 b/test/API/tools/testfiles/hdf5/tarray2.h5
deleted file mode 100644
index e2e53e8..0000000
--- a/test/API/tools/testfiles/hdf5/tarray2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tarray3.h5 b/test/API/tools/testfiles/hdf5/tarray3.h5
deleted file mode 100644
index 580d846..0000000
--- a/test/API/tools/testfiles/hdf5/tarray3.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tarray4.h5 b/test/API/tools/testfiles/hdf5/tarray4.h5
deleted file mode 100644
index b34efb8..0000000
--- a/test/API/tools/testfiles/hdf5/tarray4.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tarray5.h5 b/test/API/tools/testfiles/hdf5/tarray5.h5
deleted file mode 100644
index 55ebf46..0000000
--- a/test/API/tools/testfiles/hdf5/tarray5.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tarray6.h5 b/test/API/tools/testfiles/hdf5/tarray6.h5
deleted file mode 100644
index 7eb078c..0000000
--- a/test/API/tools/testfiles/hdf5/tarray6.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tarray7.h5 b/test/API/tools/testfiles/hdf5/tarray7.h5
deleted file mode 100644
index 74089ea..0000000
--- a/test/API/tools/testfiles/hdf5/tarray7.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tarray8.h5 b/test/API/tools/testfiles/hdf5/tarray8.h5
deleted file mode 100644
index 88022c3..0000000
--- a/test/API/tools/testfiles/hdf5/tarray8.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tattr.h5 b/test/API/tools/testfiles/hdf5/tattr.h5
deleted file mode 100644
index d61def5..0000000
--- a/test/API/tools/testfiles/hdf5/tattr.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tattr2.h5 b/test/API/tools/testfiles/hdf5/tattr2.h5
deleted file mode 100644
index c40f3f7..0000000
--- a/test/API/tools/testfiles/hdf5/tattr2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tattr4_be.h5 b/test/API/tools/testfiles/hdf5/tattr4_be.h5
deleted file mode 100644
index a464ac6..0000000
--- a/test/API/tools/testfiles/hdf5/tattr4_be.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tattrintsize.h5 b/test/API/tools/testfiles/hdf5/tattrintsize.h5
deleted file mode 100644
index 04d6f4c..0000000
--- a/test/API/tools/testfiles/hdf5/tattrintsize.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tattrreg.h5 b/test/API/tools/testfiles/hdf5/tattrreg.h5
deleted file mode 100644
index 193b3e1..0000000
--- a/test/API/tools/testfiles/hdf5/tattrreg.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tbigdims.h5 b/test/API/tools/testfiles/hdf5/tbigdims.h5
deleted file mode 100644
index c54c2c3..0000000
--- a/test/API/tools/testfiles/hdf5/tbigdims.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tbinary.h5 b/test/API/tools/testfiles/hdf5/tbinary.h5
deleted file mode 100644
index c85aa51..0000000
--- a/test/API/tools/testfiles/hdf5/tbinary.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tbitnopaque.h5 b/test/API/tools/testfiles/hdf5/tbitnopaque.h5
deleted file mode 100644
index 089a86d..0000000
--- a/test/API/tools/testfiles/hdf5/tbitnopaque.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tchar.h5 b/test/API/tools/testfiles/hdf5/tchar.h5
deleted file mode 100644
index 4d23ea9..0000000
--- a/test/API/tools/testfiles/hdf5/tchar.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tcmpdattrintsize.h5 b/test/API/tools/testfiles/hdf5/tcmpdattrintsize.h5
deleted file mode 100644
index 40d4887..0000000
--- a/test/API/tools/testfiles/hdf5/tcmpdattrintsize.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tcmpdintsize.h5 b/test/API/tools/testfiles/hdf5/tcmpdintsize.h5
deleted file mode 100644
index 0e7bef5..0000000
--- a/test/API/tools/testfiles/hdf5/tcmpdintsize.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tcompound.h5 b/test/API/tools/testfiles/hdf5/tcompound.h5
deleted file mode 100644
index d1ec650..0000000
--- a/test/API/tools/testfiles/hdf5/tcompound.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tcompound_complex.h5 b/test/API/tools/testfiles/hdf5/tcompound_complex.h5
deleted file mode 100644
index 5c6274f..0000000
--- a/test/API/tools/testfiles/hdf5/tcompound_complex.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tcompound_complex2.h5 b/test/API/tools/testfiles/hdf5/tcompound_complex2.h5
deleted file mode 100644
index eee6073..0000000
--- a/test/API/tools/testfiles/hdf5/tcompound_complex2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tdatareg.h5 b/test/API/tools/testfiles/hdf5/tdatareg.h5
deleted file mode 100644
index 62a889f..0000000
--- a/test/API/tools/testfiles/hdf5/tdatareg.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tdset.h5 b/test/API/tools/testfiles/hdf5/tdset.h5
deleted file mode 100644
index 71dcb91..0000000
--- a/test/API/tools/testfiles/hdf5/tdset.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tdset_idx.h5 b/test/API/tools/testfiles/hdf5/tdset_idx.h5
deleted file mode 100644
index b31d5c3..0000000
--- a/test/API/tools/testfiles/hdf5/tdset_idx.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tempty.h5 b/test/API/tools/testfiles/hdf5/tempty.h5
deleted file mode 100644
index d7d903f..0000000
--- a/test/API/tools/testfiles/hdf5/tempty.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/textlink.h5 b/test/API/tools/testfiles/hdf5/textlink.h5
deleted file mode 100644
index a5ec3e6..0000000
--- a/test/API/tools/testfiles/hdf5/textlink.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/textlinkfar.h5 b/test/API/tools/testfiles/hdf5/textlinkfar.h5
deleted file mode 100644
index 6fb3130..0000000
--- a/test/API/tools/testfiles/hdf5/textlinkfar.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/textlinksrc.h5 b/test/API/tools/testfiles/hdf5/textlinksrc.h5
deleted file mode 100644
index 4db1cc4..0000000
--- a/test/API/tools/testfiles/hdf5/textlinksrc.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/textlinktar.h5 b/test/API/tools/testfiles/hdf5/textlinktar.h5
deleted file mode 100644
index fe33e10..0000000
--- a/test/API/tools/testfiles/hdf5/textlinktar.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfamily00000.h5 b/test/API/tools/testfiles/hdf5/tfamily00000.h5
deleted file mode 100644
index a130bfd..0000000
--- a/test/API/tools/testfiles/hdf5/tfamily00000.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfamily00001.h5 b/test/API/tools/testfiles/hdf5/tfamily00001.h5
deleted file mode 100644
index 83119d8..0000000
--- a/test/API/tools/testfiles/hdf5/tfamily00001.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfamily00002.h5 b/test/API/tools/testfiles/hdf5/tfamily00002.h5
deleted file mode 100644
index 65f57c2..0000000
--- a/test/API/tools/testfiles/hdf5/tfamily00002.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfamily00003.h5 b/test/API/tools/testfiles/hdf5/tfamily00003.h5
deleted file mode 100644
index 2917a8a..0000000
--- a/test/API/tools/testfiles/hdf5/tfamily00003.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfamily00004.h5 b/test/API/tools/testfiles/hdf5/tfamily00004.h5
deleted file mode 100644
index a583474..0000000
--- a/test/API/tools/testfiles/hdf5/tfamily00004.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfamily00005.h5 b/test/API/tools/testfiles/hdf5/tfamily00005.h5
deleted file mode 100644
index 65f57c2..0000000
--- a/test/API/tools/testfiles/hdf5/tfamily00005.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfamily00006.h5 b/test/API/tools/testfiles/hdf5/tfamily00006.h5
deleted file mode 100644
index 65f57c2..0000000
--- a/test/API/tools/testfiles/hdf5/tfamily00006.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfamily00007.h5 b/test/API/tools/testfiles/hdf5/tfamily00007.h5
deleted file mode 100644
index 65f57c2..0000000
--- a/test/API/tools/testfiles/hdf5/tfamily00007.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfamily00008.h5 b/test/API/tools/testfiles/hdf5/tfamily00008.h5
deleted file mode 100644
index fb35a9c..0000000
--- a/test/API/tools/testfiles/hdf5/tfamily00008.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfamily00009.h5 b/test/API/tools/testfiles/hdf5/tfamily00009.h5
deleted file mode 100644
index fd2920a..0000000
--- a/test/API/tools/testfiles/hdf5/tfamily00009.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfamily00010.h5 b/test/API/tools/testfiles/hdf5/tfamily00010.h5
deleted file mode 100644
index 3bf308f..0000000
--- a/test/API/tools/testfiles/hdf5/tfamily00010.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfcontents1.h5 b/test/API/tools/testfiles/hdf5/tfcontents1.h5
deleted file mode 100644
index c16ee4d..0000000
--- a/test/API/tools/testfiles/hdf5/tfcontents1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfcontents2.h5 b/test/API/tools/testfiles/hdf5/tfcontents2.h5
deleted file mode 100644
index 1df0779..0000000
--- a/test/API/tools/testfiles/hdf5/tfcontents2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfilters.h5 b/test/API/tools/testfiles/hdf5/tfilters.h5
deleted file mode 100644
index 7c33e55..0000000
--- a/test/API/tools/testfiles/hdf5/tfilters.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfpformat.h5 b/test/API/tools/testfiles/hdf5/tfpformat.h5
deleted file mode 100644
index 5f78930..0000000
--- a/test/API/tools/testfiles/hdf5/tfpformat.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tfvalues.h5 b/test/API/tools/testfiles/hdf5/tfvalues.h5
deleted file mode 100644
index a6af958..0000000
--- a/test/API/tools/testfiles/hdf5/tfvalues.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tgroup.h5 b/test/API/tools/testfiles/hdf5/tgroup.h5
deleted file mode 100644
index 565fb67..0000000
--- a/test/API/tools/testfiles/hdf5/tgroup.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tgrp_comments.h5 b/test/API/tools/testfiles/hdf5/tgrp_comments.h5
deleted file mode 100644
index ddd2eec..0000000
--- a/test/API/tools/testfiles/hdf5/tgrp_comments.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tgrpnullspace.h5 b/test/API/tools/testfiles/hdf5/tgrpnullspace.h5
deleted file mode 100644
index 82a405e..0000000
--- a/test/API/tools/testfiles/hdf5/tgrpnullspace.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/thlink.h5 b/test/API/tools/testfiles/hdf5/thlink.h5
deleted file mode 100644
index 6e0e7e1..0000000
--- a/test/API/tools/testfiles/hdf5/thlink.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/thyperslab.h5 b/test/API/tools/testfiles/hdf5/thyperslab.h5
deleted file mode 100644
index a730aa3..0000000
--- a/test/API/tools/testfiles/hdf5/thyperslab.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tints4dims.h5 b/test/API/tools/testfiles/hdf5/tints4dims.h5
deleted file mode 100644
index 2fe8321..0000000
--- a/test/API/tools/testfiles/hdf5/tints4dims.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tintsattrs.h5 b/test/API/tools/testfiles/hdf5/tintsattrs.h5
deleted file mode 100644
index ca8c573..0000000
--- a/test/API/tools/testfiles/hdf5/tintsattrs.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tlarge_objname.h5 b/test/API/tools/testfiles/hdf5/tlarge_objname.h5
deleted file mode 100644
index 707d7b6..0000000
--- a/test/API/tools/testfiles/hdf5/tlarge_objname.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tldouble.h5 b/test/API/tools/testfiles/hdf5/tldouble.h5
deleted file mode 100644
index eb031e7..0000000
--- a/test/API/tools/testfiles/hdf5/tldouble.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tlonglinks.h5 b/test/API/tools/testfiles/hdf5/tlonglinks.h5
deleted file mode 100644
index f54e5f5..0000000
--- a/test/API/tools/testfiles/hdf5/tlonglinks.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tloop.h5 b/test/API/tools/testfiles/hdf5/tloop.h5
deleted file mode 100644
index d7a2f47..0000000
--- a/test/API/tools/testfiles/hdf5/tloop.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tmulti-b.h5 b/test/API/tools/testfiles/hdf5/tmulti-b.h5
deleted file mode 100644
index 3f5d51f..0000000
--- a/test/API/tools/testfiles/hdf5/tmulti-b.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tmulti-g.h5 b/test/API/tools/testfiles/hdf5/tmulti-g.h5
deleted file mode 100644
index e69de29..0000000
--- a/test/API/tools/testfiles/hdf5/tmulti-g.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tmulti-l.h5 b/test/API/tools/testfiles/hdf5/tmulti-l.h5
deleted file mode 100644
index 42fe396..0000000
--- a/test/API/tools/testfiles/hdf5/tmulti-l.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tmulti-o.h5 b/test/API/tools/testfiles/hdf5/tmulti-o.h5
deleted file mode 100644
index b433ee8..0000000
--- a/test/API/tools/testfiles/hdf5/tmulti-o.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tmulti-r.h5 b/test/API/tools/testfiles/hdf5/tmulti-r.h5
deleted file mode 100644
index 928d4d5..0000000
--- a/test/API/tools/testfiles/hdf5/tmulti-r.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tmulti-s.h5 b/test/API/tools/testfiles/hdf5/tmulti-s.h5
deleted file mode 100644
index 3feae49..0000000
--- a/test/API/tools/testfiles/hdf5/tmulti-s.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tnamed_dtype_attr.h5 b/test/API/tools/testfiles/hdf5/tnamed_dtype_attr.h5
deleted file mode 100644
index e7bf23d..0000000
--- a/test/API/tools/testfiles/hdf5/tnamed_dtype_attr.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tnestedcmpddt.h5 b/test/API/tools/testfiles/hdf5/tnestedcmpddt.h5
deleted file mode 100644
index f2af756..0000000
--- a/test/API/tools/testfiles/hdf5/tnestedcmpddt.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tnestedcomp.h5 b/test/API/tools/testfiles/hdf5/tnestedcomp.h5
deleted file mode 100644
index b777ee3..0000000
--- a/test/API/tools/testfiles/hdf5/tnestedcomp.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tno-subset.h5 b/test/API/tools/testfiles/hdf5/tno-subset.h5
deleted file mode 100644
index e6b6f57..0000000
--- a/test/API/tools/testfiles/hdf5/tno-subset.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tnullspace.h5 b/test/API/tools/testfiles/hdf5/tnullspace.h5
deleted file mode 100644
index b5dac5d..0000000
--- a/test/API/tools/testfiles/hdf5/tnullspace.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/torderattr.h5 b/test/API/tools/testfiles/hdf5/torderattr.h5
deleted file mode 100644
index bafa846..0000000
--- a/test/API/tools/testfiles/hdf5/torderattr.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tordergr.h5 b/test/API/tools/testfiles/hdf5/tordergr.h5
deleted file mode 100644
index 9ccd238..0000000
--- a/test/API/tools/testfiles/hdf5/tordergr.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tsaf.h5 b/test/API/tools/testfiles/hdf5/tsaf.h5
deleted file mode 100644
index c84c5b6..0000000
--- a/test/API/tools/testfiles/hdf5/tsaf.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tscalarattrintsize.h5 b/test/API/tools/testfiles/hdf5/tscalarattrintsize.h5
deleted file mode 100644
index df91f54..0000000
--- a/test/API/tools/testfiles/hdf5/tscalarattrintsize.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tscalarintattrsize.h5 b/test/API/tools/testfiles/hdf5/tscalarintattrsize.h5
deleted file mode 100644
index 61f5fb3..0000000
--- a/test/API/tools/testfiles/hdf5/tscalarintattrsize.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tscalarintsize.h5 b/test/API/tools/testfiles/hdf5/tscalarintsize.h5
deleted file mode 100644
index 5a82378..0000000
--- a/test/API/tools/testfiles/hdf5/tscalarintsize.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tscalarstring.h5 b/test/API/tools/testfiles/hdf5/tscalarstring.h5
deleted file mode 100644
index b0993ef..0000000
--- a/test/API/tools/testfiles/hdf5/tscalarstring.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tslink.h5 b/test/API/tools/testfiles/hdf5/tslink.h5
deleted file mode 100644
index 753b62d..0000000
--- a/test/API/tools/testfiles/hdf5/tslink.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tsoftlinks.h5 b/test/API/tools/testfiles/hdf5/tsoftlinks.h5
deleted file mode 100644
index 01ea922..0000000
--- a/test/API/tools/testfiles/hdf5/tsoftlinks.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tsplit_file-m.h5 b/test/API/tools/testfiles/hdf5/tsplit_file-m.h5
deleted file mode 100644
index a6eef73..0000000
--- a/test/API/tools/testfiles/hdf5/tsplit_file-m.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tsplit_file-r.h5 b/test/API/tools/testfiles/hdf5/tsplit_file-r.h5
deleted file mode 100644
index 928d4d5..0000000
--- a/test/API/tools/testfiles/hdf5/tsplit_file-r.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tstr.h5 b/test/API/tools/testfiles/hdf5/tstr.h5
deleted file mode 100644
index af5384f..0000000
--- a/test/API/tools/testfiles/hdf5/tstr.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tstr2.h5 b/test/API/tools/testfiles/hdf5/tstr2.h5
deleted file mode 100644
index d3b1588..0000000
--- a/test/API/tools/testfiles/hdf5/tstr2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tstr3.h5 b/test/API/tools/testfiles/hdf5/tstr3.h5
deleted file mode 100644
index 9f9112f..0000000
--- a/test/API/tools/testfiles/hdf5/tstr3.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tudfilter.h5 b/test/API/tools/testfiles/hdf5/tudfilter.h5
deleted file mode 100644
index 081b000..0000000
--- a/test/API/tools/testfiles/hdf5/tudfilter.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tudfilter2.h5 b/test/API/tools/testfiles/hdf5/tudfilter2.h5
deleted file mode 100644
index 081b000..0000000
--- a/test/API/tools/testfiles/hdf5/tudfilter2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tudlink.h5 b/test/API/tools/testfiles/hdf5/tudlink.h5
deleted file mode 100644
index 5dc0c707..0000000
--- a/test/API/tools/testfiles/hdf5/tudlink.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tvldtypes1.h5 b/test/API/tools/testfiles/hdf5/tvldtypes1.h5
deleted file mode 100644
index b5b2bd7..0000000
--- a/test/API/tools/testfiles/hdf5/tvldtypes1.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tvldtypes2.h5 b/test/API/tools/testfiles/hdf5/tvldtypes2.h5
deleted file mode 100644
index 65bf63f..0000000
--- a/test/API/tools/testfiles/hdf5/tvldtypes2.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tvldtypes3.h5 b/test/API/tools/testfiles/hdf5/tvldtypes3.h5
deleted file mode 100644
index dd4aca7..0000000
--- a/test/API/tools/testfiles/hdf5/tvldtypes3.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tvldtypes4.h5 b/test/API/tools/testfiles/hdf5/tvldtypes4.h5
deleted file mode 100644
index 70dc73e..0000000
--- a/test/API/tools/testfiles/hdf5/tvldtypes4.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tvldtypes5.h5 b/test/API/tools/testfiles/hdf5/tvldtypes5.h5
deleted file mode 100644
index 776c020..0000000
--- a/test/API/tools/testfiles/hdf5/tvldtypes5.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tvlenstr_array.h5 b/test/API/tools/testfiles/hdf5/tvlenstr_array.h5
deleted file mode 100644
index 4277f20..0000000
--- a/test/API/tools/testfiles/hdf5/tvlenstr_array.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tvlstr.h5 b/test/API/tools/testfiles/hdf5/tvlstr.h5
deleted file mode 100644
index acd8a1f..0000000
--- a/test/API/tools/testfiles/hdf5/tvlstr.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/tvms.h5 b/test/API/tools/testfiles/hdf5/tvms.h5
deleted file mode 100644
index 9c243ff..0000000
--- a/test/API/tools/testfiles/hdf5/tvms.h5
+++ /dev/null
diff --git a/test/API/tools/testfiles/hdf5/zerodim.h5 b/test/API/tools/testfiles/hdf5/zerodim.h5
deleted file mode 100644
index 6939353..0000000
--- a/test/API/tools/testfiles/hdf5/zerodim.h5
+++ /dev/null