1330 files changed, 2749 insertions, 2822 deletions

diff --git a/.github/workflows/linux-nvhpc.yml b/.github/workflows/linux-nvhpc.yml
index 7a24b07..06fd40a 100644
--- a/.github/workflows/linux-nvhpc.yml
+++ b/.github/workflows/linux-nvhpc.yml
@@ -50,7 +50,7 @@ jobs:
           export OMPI_FC=/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/compilers/bin/nvfortran
           export LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/cuda/12.2/lib64:/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/compilers/lib
           export PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/comm_libs/openmpi4/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/compilers/bin:$PATH        
-          cmake -B build  -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF -DHDF5_ENABLE_PARALLEL:BOOL=ON -DHDF5_BUILD_FORTRAN:BOOL=ON 
+          cmake -B build  -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF -DHDF5_ENABLE_PARALLEL:BOOL=ON -DHDF5_BUILD_FORTRAN:BOOL=ON
           cat build/CMakeCache.txt
           cmake --build build
           ctest --test-dir build --output-on-failure        
diff --git a/.github/workflows/main-auto-par.yml b/.github/workflows/main-auto-par.yml
index 5f92836..790b20a 100644
--- a/.github/workflows/main-auto-par.yml
+++ b/.github/workflows/main-auto-par.yml
@@ -54,6 +54,7 @@ jobs:
             --with-default-api-version=v114 \
             --enable-shared \
             --enable-parallel \
+            --enable-subfiling-vfd \
             --disable-cxx \
             --disable-fortran \
             --disable-java \
@@ -111,6 +112,7 @@ jobs:
             --with-default-api-version=v114 \
             --enable-shared \
             --enable-parallel \
+            --enable-subfiling-vfd \
             --disable-cxx \
             --disable-fortran \
             --disable-java \
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index 070f26f..d42142a 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -335,7 +335,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
       set (CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
       set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
     endif ()
-    # set the install/unistall icon used for the installer itself
+    # set the install/uninstall icon used for the installer itself
     # There is a bug in NSI that does not handle full unix paths properly.
     set (CPACK_NSIS_MUI_ICON "${HDF_RESOURCES_DIR}\\\\hdf.ico")
     set (CPACK_NSIS_MUI_UNIICON "${HDF_RESOURCES_DIR}\\\\hdf.ico")
@@ -394,7 +394,11 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
     set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "${HDF5_PACKAGE_URL}")
     set(CPACK_WIX_PROPERTY_ARPHELPLINK "${HDF5_PACKAGE_BUGREPORT}")
     if (BUILD_SHARED_LIBS)
-      set (WIX_CMP_NAME "${HDF5_LIB_NAME}${CMAKE_DEBUG_POSTFIX}")
+      if (${HDF_CFG_NAME} MATCHES "Debug" OR ${HDF_CFG_NAME} MATCHES "Developer")
+        set (WIX_CMP_NAME "${HDF5_LIB_NAME}${CMAKE_DEBUG_POSTFIX}")
+      else ()
+        set (WIX_CMP_NAME "${HDF5_LIB_NAME}")
+      endif ()
       configure_file (${HDF_RESOURCES_DIR}/patch.xml.in ${HDF5_BINARY_DIR}/patch.xml @ONLY)
       set(CPACK_WIX_PATCH_FILE "${HDF5_BINARY_DIR}/patch.xml")
     endif ()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 788ca57..da6a4d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,6 +222,7 @@ set (HDF5_HL_CPP_SRC_DIR       ${HDF5_SOURCE_DIR}/hl/c++)
 set (HDF5_HL_TOOLS_DIR         ${HDF5_SOURCE_DIR}/hl/tools)
 set (HDF5_TOOLS_DIR            ${HDF5_SOURCE_DIR}/tools)
 set (HDF5_TOOLS_SRC_DIR        ${HDF5_SOURCE_DIR}/tools/src)
+set (HDF5_TOOLS_TST_DIR        ${HDF5_SOURCE_DIR}/tools/test)
 set (HDF5_PERFORM_SRC_DIR      ${HDF5_SOURCE_DIR}/tools/src/perform)
 set (HDF5_UTILS_DIR            ${HDF5_SOURCE_DIR}/utils)
 set (HDF5_F90_SRC_DIR          ${HDF5_SOURCE_DIR}/fortran)
diff --git a/README.md b/README.md
index b51006b..f513af2 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@ HDF5 version 1.15.0 currently under development
 ![HDF5 Logo](doxygen/img/HDF5.png)
 
 [![develop build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/main.yml?branch=develop&label=develop)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Adevelop)
-[![oneAPI CMake build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/linux-icx.yml?branch=develop&label=oneAPI-C)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Adevelop)
-[![oneAPI Autotools build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/linux-icx-auto.yml?branch=develop&label=oneAPI-A)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Adevelop)
+[![oneAPI CMake build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/intel-cmake.yml?branch=develop&label=oneAPI-C)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Adevelop)
+[![oneAPI Autotools build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/intel-auto.yml?branch=develop&label=oneAPI-A)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Adevelop)
 [![HDF-EOS5 build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/hdfeos5.yml?branch=develop&label=HDF-EOS5)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Adevelop)
 [![netCDF build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/netcdf.yml?branch=develop&label=netCDF)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Adevelop)
 [![h5py build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/h5py.yml?branch=develop&label=h5py)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Adevelop)
@@ -14,6 +14,8 @@ HDF5 version 1.15.0 currently under development
 [![1.10 build status](https://img.shields.io/github/actions/workflow/status/HDFGroup/hdf5/main.yml?branch=hdf5_1_10&label=1.10)](https://github.com/HDFGroup/hdf5/actions?query=branch%3Ahdf5_1_10)
 [![BSD](https://img.shields.io/badge/License-BSD-blue.svg)](https://github.com/HDFGroup/hdf5/blob/develop/COPYING)
 
+[HPC configure/build/test results](https://my.cdash.org/index.php?project=HDF5)
+
 *Please refer to the release_docs/INSTALL file for installation instructions.*
 
 This repository contains a high-performance library's source code and a file format
diff --git a/bin/h5vers b/bin/h5vers
index 1133451..7a07f68 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -199,7 +199,7 @@ my $TESTH5_JAVA = $file;
 $TESTH5_JAVA =~ s/[^\/]*$/..\/java\/test\/TestH5.java/;
 die "unable to read file: $TESTH5_JAVA\n" unless -r $file;
 my $REPACK_LAYOUT_PLUGIN_VERSION = $file;
-$REPACK_LAYOUT_PLUGIN_VERSION =~ s/[^\/]*$/..\/tools\/test\/h5repack\/testfiles\/h5repack_layout.h5-plugin_version_test.ddl/;
+$REPACK_LAYOUT_PLUGIN_VERSION =~ s/[^\/]*$/..\/tools\/test\/h5repack\/expected\/h5repack_layout.h5-plugin_version_test.ddl/;
 die "unable to read file: $REPACK_LAYOUT_PLUGIN_VERSION\n" unless -r $file;
 
 # Get the current version number.
@@ -398,7 +398,7 @@ if ($TESTH5_JAVA) {
   write_file($TESTH5_JAVA, $data);
 }
 
-# Update the tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl file
+# Update the tools/test/h5repack/expected/h5repack_layout.h5-plugin_version_test.ddl file
 if ($REPACK_LAYOUT_PLUGIN_VERSION) {
   my $data = read_file($REPACK_LAYOUT_PLUGIN_VERSION);
   my $version_string = sprintf("%d %d %d", @newver[0,1,2]);
diff --git a/bin/release b/bin/release
index 1226d33..26a756c 100755
--- a/bin/release
+++ b/bin/release
@@ -42,36 +42,36 @@ for compressing the resulting tar archive (if none are given then
                    using CMake on unix machines.
     cmake-zip   -- convert all text files to DOS style and create a zip file including cmake
                    scripts and .bat files to build HDF5 source using CMake on Windows.
-    hpc-cmake-tgz
-                -- create a tar file using the gzip default level with a build-unix.sh
-                   command file and all other CMake files needed to build HDF5 source
-                   using CMake on unix machines, with HDF5options.cmake files for serial
-                   and parallel builds on machines requiring batch jobs to run tests.
-                   The default is for parallel build, with serial only build by changing
-                   the HDF5options.cmake symlink to ser-HDF5options.cmake.  More
-                   information is available in the README_HPC file.
     doc         -- produce the latest doc tree in addition to the archive.
 
-A sha256 checksum is produced for each archive created and stored in the sha256 file.
+A sha256 checksum is produced for each archive created and stored in a corresponding sha256 file.
 
 Examples:
 
     $ bin/release -d /tmp
     /tmp/hdf5-1.8.13-RELEASE.txt
-    /tmp/hdf5-1.8.13.sha256
     /tmp/hdf5-1.8.13.tar
+    /tmp/hdf5-1.8.13.tar.sha256
 
     $ bin/release -d /tmp gzip
     /tmp/hdf5-1.8.13-RELEASE.txt
-    /tmp/hdf5-1.8.13.sha256
+    /tmp/hdf5-1.8.13.tar
+    /tmp/hdf5-1.8.13.tar.sha256
     /tmp/hdf5-1.8.13.tar.gz
+    /tmp/hdf5-1.8.13.tar.gz.sha256
 
     $ bin/release -d /tmp tar gzip zip
     /tmp/hdf5-1.8.13-RELEASE.txt
-    /tmp/hdf5-1.8.13.sha256
     /tmp/hdf5-1.8.13.tar
+    /tmp/hdf5-1.8.13.tar.sha256
     /tmp/hdf5-1.8.13.tar.gz
-    /tmp/hdf5-1.8.13.tar.zip
+    /tmp/hdf5-1.8.13.tar.gz.sha256
+    /tmp/hdf5-1.8.13.zip
+    /tmp/hdf5-1.8.13.zip.sha256
+
+The integrity of a downloaded file can be verified on Linux platforms by running 
+"sha256sum --check <filename>.sha256, which will display 'OK' if the calculated
+checksum of <filename> matches the checksum in <filename>.sha256.
 
 EOF
 
@@ -205,7 +205,7 @@ tar2cmakezip()
     # step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
     cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmziptmpsubdir
     cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmziptmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.3-Source.zip $cmziptmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/hdf5-examples-master.zip $cmziptmpsubdir
     cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.zip $cmziptmpsubdir
     cp $cmziptmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmziptmpsubdir
     cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmziptmpsubdir
@@ -297,7 +297,7 @@ tar2cmaketgz()
     # step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
     cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmgztmpsubdir
     cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.3-Source.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/hdf5-examples-master.tar.gz $cmgztmpsubdir
     cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.tar.gz $cmgztmpsubdir
     cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
     cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
@@ -308,88 +308,6 @@ tar2cmaketgz()
     rm -rf $cmgztmpdir
 }
 
-# Function name: tar2hpccmaketgz
-# Convert the release tarball to a gzipped tarfile with files to run CMake build
-# and HDF5options.cmake files for parallel or serial only builds where build
-# tests are run on compute nodes using batch scripts.
-#
-# Steps:
-# 1. untar the tarball in a temporary directory;
-#    Note: do this in a temporary directory to avoid changing
-#    the original source directory which may be around.
-# 2. add build-unix.sh script.
-# 3. add LIBAEC.tar.gz, ZLib.tar.gz and cmake files to top level directory.
-# 4. create gzipped tar file with these contents:
-#        build-unix.sh          script
-#        hdf5-<version>         source code directory extracted from tar file
-#        CTestScript.cmake      cmake file copied from <hdf5 source code>/config/cmake/scripts
-#        HDF5config.cmake       cmake file copied from <hdf5 source code>/config/cmake/scripts
-#        HDF5options.cmake      cmake file copied from <hdf5 source code>/config/cmake/scripts
-#        LIBAEC.tar.gz          copied from /mnt/scr1/pre-release/hdf5/CMake
-#        ZLib.tar.gz            copied from /mnt/scr1/pre-release/hdf5/CMake
-#
-# 5. For HPC-CMake tgz file the following are also needed in the top-level directory:
-#        README_HPC                 copied from release_docs
-#        ser-HDF5options.cmake      copied from <hdf5 source code>/config/cmake/scripts/HPC
-#        par-HDF5options.cmake      copied from <hdf5 source code>/config/cmake/scripts/HPC
-#        HDF5options.cmake          symlink to par-HDF5options.cmake
-#
-
-# Parameters:
-# $1 version
-# $2 release tarball
-# $3 output zipball file name
-#
-# Returns 0 if successful; 1 otherwise
-#
- # need function to create another temporary directory, extract the
-            # $tmpdir/$HDF5_VERS.tar into it, create build-unix.sh,
-            # add CTestScript.cmake, HDF5config.cmake, LIBAEC.tar.gz
-            # ZLib.tar.gz, HDF5 examples, and then tar.gz it.
-tar2hpccmaketgz()
-{
-    if [ $# -ne 3 ]; then
-        echo "usage: tar2hpccmaketgz <tarfilename> <tgzfilename>"
-        return 1
-    fi
-    cmgztmpdir=/tmp/cmgztmpdir$$
-    cmgztmpsubdir=$cmgztmpdir/HPC-CMake-$HDF5_VERS
-    mkdir -p $cmgztmpsubdir
-    version=$1
-    tarfile=$2
-    tgzfile=$3
-
-    # step 1: untar tarball in cmgztmpdir
-    (cd $cmgztmpsubdir; tar xf -) < $tarfile
-    # sanity check
-    if [ ! -d $cmgztmpsubdir/$version ]; then
-        echo "untar did not create $cmgztmpsubdir/$version source dir"
-        # cleanup
-        rm -rf $cmgztmpdir
-        return 1
-    fi
-
-
-    # step 2: add build-unix.sh script
-    (cd $cmgztmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -V -O hdf5.log" > build-unix.sh; chmod 755 build-unix.sh)
-
-    # step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
-    cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmgztmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.3-Source.tar.gz $cmgztmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.tar.gz $cmgztmpsubdir
-    cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
-    cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
-
-    cp $cmgztmpsubdir/$version/release_docs/README_HPC $cmgztmpsubdir
-    cp $cmgztmpsubdir/$version/config/cmake/scripts/HPC/ser-HDF5options.cmake $cmgztmpsubdir
-    cp $cmgztmpsubdir/$version/config/cmake/scripts/HPC/par-HDF5options.cmake $cmgztmpsubdir
-    (cd $cmgztmpsubdir; ln -s par-HDF5options.cmake HDF5options.cmake)
-    tar czf $DEST/HPC-CMake-$HDF5_VERS.tar.gz -C $cmgztmpdir . || exit 1
-
-    # cleanup
-    rm -rf $cmgztmpdir
-}
 
 # This command must be run at the top level of the hdf5 source directory.
 # Verify this requirement.
@@ -551,43 +469,38 @@ test "$verbose" && echo "   Running tar..." 1>&2
 (cd "$tmpdir" && exec tar -ch --exclude-vcs -f "$HDF5_VERS.tar" "./$HDF5_IN_VERS" || exit 1 )
 
 # Compress
-SHA256=$HDF5_VERS.sha256
+#SHA256=$HDF5_VERS.sha256
 cp /dev/null $DEST/$SHA256
 for comp in $methods; do
     case $comp in
         tar)
             cp -p $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.tar
-            (cd $DEST; sha256sum $HDF5_VERS.tar >> $SHA256)
+            (cd $DEST; sha256sum $HDF5_VERS.tar > $HDF5_VERS.tar.sha256)
             ;;
         gzip)
             test "$verbose" && echo "   Running gzip..." 1>&2
             gzip -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.gz
-            (cd $DEST; sha256sum $HDF5_VERS.tar.gz >> $SHA256)
+            (cd $DEST; sha256sum $HDF5_VERS.tar.gz > $HDF5_VERS.tar.gz.sha256)
             ;;
         cmake-tgz)
             test "$verbose" && echo "   Creating CMake tar.gz file..." 1>&2
             tar2cmaketgz $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/CMake-$HDF5_VERS.tar.gz 1>&2
-            (cd $DEST; sha256sum CMake-$HDF5_VERS.tar.gz >> $SHA256)
-            ;;
-        hpc-cmake-tgz)
-            test "$verbose" && echo "   Creating HPC-CMake tar.gz file..." 1>&2
-            tar2hpccmaketgz $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/HPC-CMake-$HDF5_VERS.tar.gz 1>&2
-            (cd $DEST; sha256sum HPC-CMake-$HDF5_VERS.tar.gz >> $SHA256)
+            (cd $DEST; sha256sum CMake-$HDF5_VERS.tar.gz > CMake-$HDF5_VERS.tar.gz.sha256)
             ;;
         bzip2)
             test "$verbose" && echo "   Running bzip2..." 1>&2
             bzip2 -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.bz2
-            (cd $DEST; sha256sum $HDF5_VERS.tar.bz2 >> $SHA256)
+            (cd $DEST; sha256sum $HDF5_VERS.tar.bz2 > $HDF5_VERS.tar.bz2.sha256)
             ;;
         zip)
             test "$verbose" && echo "   Creating zip ball..." 1>&2
             tar2zip $HDF5_IN_VERS $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.zip 1>&2
-            (cd $DEST; sha256sum $HDF5_VERS.zip >> $SHA256)
+            (cd $DEST; sha256sum $HDF5_VERS.zip > $HDF5_VERS.zip.sha256)
             ;;
         cmake-zip)
             test "$verbose" && echo "   Creating CMake-zip ball..." 1>&2
             tar2cmakezip $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/CMake-$HDF5_VERS.zip 1>&2
-            (cd $DEST; sha256sum CMake-$HDF5_VERS.zip >> $SHA256)
+            (cd $DEST; sha256sum CMake-$HDF5_VERS.zip > CMake-$HDF5_VERS.zip.sha256)
             ;;
         doc)
             if [ "${DOCVERSION}" = "" ]; then
diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp
index 3d0193d..8b199a8 100644
--- a/c++/src/H5DcreatProp.cpp
+++ b/c++/src/H5DcreatProp.cpp
@@ -368,7 +368,7 @@ DSetCreatPropList::setFilter(H5Z_filter_t filter_id, unsigned int flags, size_t
 ///\exception   H5::PropListIException
 ///\par Description
 ///             Deletes a filter from the dataset creation property list;
-///             deletes all filters if \a filter_id is \c H5Z_FILTER_NONE.
+///             deletes all filters if \a filter_id is \c H5Z_FILTER_ALL.
 //--------------------------------------------------------------------------
 void
 DSetCreatPropList::removeFilter(H5Z_filter_t filter_id) const
diff --git a/config/cmake/UseJava.cmake b/config/cmake/UseJava.cmake
index 1de08db..2783cb6 100644
--- a/config/cmake/UseJava.cmake
+++ b/config/cmake/UseJava.cmake
@@ -1474,7 +1474,7 @@ function (create_javah)
       "CLASSES;CLASSPATH;DEPENDS"
       ${ARGN})
 
-    # ckeck parameters
+    # check parameters
     if (NOT _create_javah_TARGET AND NOT _create_javah_GENERATED_FILES)
       message (FATAL_ERROR "create_javah: TARGET or GENERATED_FILES must be specified.")
     endif()
diff --git a/config/cmake/fileCompareTest.cmake b/config/cmake/fileCompareTest.cmake
index 18a29d9..5cd56ee 100644
--- a/config/cmake/fileCompareTest.cmake
+++ b/config/cmake/fileCompareTest.cmake
@@ -66,7 +66,7 @@ else ()
     endif ()
   elseif (TEST_FUNCTION MATCHES "LTEQ")
     if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
-      message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
     else ()
       message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
     endif ()
diff --git a/configure.ac b/configure.ac
index fadd1c1..37252d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1074,14 +1074,6 @@ H5_FORTRAN_SHARED="no"
 if test "X${HDF_FORTRAN}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
   AC_MSG_CHECKING([if shared Fortran libraries are supported])
   H5_FORTRAN_SHARED="yes"
-  ## tell libtool to do the right thing with COMMON symbols, this fixes
-  ## corrupt values with COMMON and EQUIVALENCE when building shared
-  ## Fortran libraries on OSX with gnu and Intel compilers (HDFFV-2772).
-  case "`uname`" in
-    Darwin*)
-    H5_LDFLAGS="$H5_LDFLAGS -Wl,-commons,use_dylibs"
-    ;;
-  esac
 
   ## Report results of check(s)
 
@@ -4206,6 +4198,11 @@ AC_CONFIG_FILES([Makefile
                  hl/fortran/examples/run-hlfortran-ex.sh])
 
 AC_CONFIG_FILES([utils/subfiling_vfd/h5fuse.sh], [chmod +x utils/subfiling_vfd/h5fuse.sh])
+if test -n "$TESTPARALLEL"; then
+  if test "X$SUBFILING_VFD" = "Xyes"; then
+    AC_CONFIG_LINKS([testpar/h5fuse.sh:utils/subfiling_vfd/h5fuse.sh])
+  fi
+fi
 
 AC_CONFIG_COMMANDS([.classes], [], [$MKDIR_P java/src/.classes;
                 $MKDIR_P java/test/.classes;
diff --git a/doc/getting-started-with-hdf5-development.md b/doc/getting-started-with-hdf5-development.md
index 3754df7..b6771dc 100644
--- a/doc/getting-started-with-hdf5-development.md
+++ b/doc/getting-started-with-hdf5-development.md
@@ -496,7 +496,7 @@ files at configure time by the `bin/make_err` script. The original intent was fo
 codes to be strongly associated. i.e., a given minor code would *only* be used
 with its associated major code. Unfortunately, this has not been the case in
 practice, and the emitted text can appear nonsensical in error
-stack dumps. Even worse, the major and minor error codes are used inconsitently
+stack dumps. Even worse, the major and minor error codes are used inconsistently
 throughout the library, making interpreting them almost impossible for
 external users. We hope to address this deficiency in the near future.
 
@@ -556,7 +556,7 @@ configure/CMake options, but it's normally easier to use external tools like
 valgrind or the compiler's memory debugging options.
 
 `H5FL` provides memory pools (*Free Lists*) that create a set of fixed-size allocations
-of a certain type that the library will re-use as needed. They use `H5MM` calls
+of a certain type that the library will reuse as needed. They use `H5MM` calls
 under the hood and can be useful when the library creates and frees a lot of
 objects of that type. It's difficult to give a good guideline as to when to use
 the `H5FL` calls and when to use the `H5MM` calls, but it's probably best to
diff --git a/doxygen/Doxyfile.in b/doxygen/Doxyfile.in
index cddf17c..b24b9f9 100644
--- a/doxygen/Doxyfile.in
+++ b/doxygen/Doxyfile.in
@@ -913,35 +913,6 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = NO
 
-# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-# If clang assisted parsing is enabled you can provide the clang parser with the
-# path to the compilation database (see:
-# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) used when the files
-# were built. This is equivalent to specifying the "-p" option to a clang tool,
-# such as clang-check. These options will then be passed to the parser.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-
-CLANG_DATABASE_PATH    =
-
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1080,15 +1051,6 @@ HTML_COLORSTYLE_SAT    = 100
 
 HTML_COLORSTYLE_GAMMA  = 80
 
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
 # are dynamically created via JavaScript. If disabled, the navigation index will
diff --git a/doxygen/dox/ExamplesAPI.dox b/doxygen/dox/ExamplesAPI.dox
index 8f88c4e..a6fbab1 100644
--- a/doxygen/dox/ExamplesAPI.dox
+++ b/doxygen/dox/ExamplesAPI.dox
@@ -7,7 +7,7 @@ Navigate back: \ref index "Main" / \ref GettingStarted
 The C, FORTRAN and Java examples below point to the examples in the hdf5-examples github repository. Examples for older versions of HDF5
 are handled by setting the appropriate USE_API_xxx definition. HDF5-1.6 examples are in a "16"-named subdirectory.
 
-The Java examples are in the HDF5-1.10 source code, and the Java Object package examples are in the HDFView source.
+The Java examples are in the develop source code, and the Java Object package examples are in the HDFView source.
 <em>Please note that you must comment out the "package" statement at the top when downloading a Java Object example individually.</em>
 
 The MATLAB and Python examples were generously provided by a user and are not tested.
diff --git a/doxygen/examples/H5.format.1.0.html b/doxygen/examples/H5.format.1.0.html
index 26d0421..5002695 100644
--- a/doxygen/examples/H5.format.1.0.html
+++ b/doxygen/examples/H5.format.1.0.html
@@ -2020,7 +2020,7 @@ Elena>               "Free-space object"
 	<dl>
 	  <dt>Mesh Type: (unsigned 32-bit integer)
 	  <dd>This value indicates whether the grid is
-	    polar/spherical/cartesion,
+	    polar/spherical/cartesian,
 	    structured/unstructured and regular/irregular. <br>
 	    The mesh type value is broken up as follows: <br>
 
diff --git a/doxygen/examples/H5.format.1.1.html b/doxygen/examples/H5.format.1.1.html
index 3af50d6..f5e4c4e 100644
--- a/doxygen/examples/H5.format.1.1.html
+++ b/doxygen/examples/H5.format.1.1.html
@@ -2596,7 +2596,7 @@ TABLE.list TD { border:none; }
 	<dl>
 	  <dt>Mesh Type: (unsigned 32-bit integer)
 	  <dd>This value indicates whether the grid is
-	    polar/spherical/cartesion,
+	    polar/spherical/cartesian,
 	    structured/unstructured and regular/irregular. <br>
 	    The mesh type value is broken up as follows: <br>
 
diff --git a/doxygen/examples/H5.format.2.0.html b/doxygen/examples/H5.format.2.0.html
index d2979e1..bde030f 100644
--- a/doxygen/examples/H5.format.2.0.html
+++ b/doxygen/examples/H5.format.2.0.html
@@ -8458,7 +8458,7 @@ The range of values represented by child[
     <dl>
       <dt>Mesh Type: (unsigned 32-bit integer)
       <dd>This value indicates whether the grid is
-        polar/spherical/cartesion,
+        polar/spherical/cartesian,
         structured/unstructured and regular/irregular. <br />
         The mesh type value is broken up as follows: <br />
 
diff --git a/doxygen/examples/H5.format.html b/doxygen/examples/H5.format.html
index c52e8ea..832e3fc 100644
--- a/doxygen/examples/H5.format.html
+++ b/doxygen/examples/H5.format.html
@@ -9123,7 +9123,7 @@ is located within.
 	  <dl>
 	    <dt>Mesh Type: (unsigned 32-bit integer)
 	      <dd>This value indicates whether the grid is
-	        polar/spherical/cartesion,
+	        polar/spherical/cartesian,
 	        structured/unstructured and regular/irregular. <br />
 	        The mesh type value is broken up as follows: <br />
 
diff --git a/examples/h5_interm_group.c b/examples/h5_interm_group.c
index 679238f..315e782 100644
--- a/examples/h5_interm_group.c
+++ b/examples/h5_interm_group.c
@@ -18,8 +18,6 @@
 #include "hdf5.h"
 
 #define H5FILE_NAME "interm_group.h5"
-#define TRUE        1
-#define FALSE       0
 
 int
 main(void)
diff --git a/fortran/src/H5Aff.F90 b/fortran/src/H5Aff.F90
index 3cb1191..a55773a 100644
--- a/fortran/src/H5Aff.F90
+++ b/fortran/src/H5Aff.F90
@@ -1131,6 +1131,9 @@ CONTAINS
     attr_id = INT(H5Aopen_by_idx(loc_id, c_obj_name, INT(idx_type, C_INT), INT(order, C_INT), n, &
          aapl_id_default, lapl_id_default), HID_T)
 
+    hdferr = 0
+    IF(attr_id.LT.0) hdferr = -1
+    
   END SUBROUTINE h5aopen_by_idx_f
 
 !>
diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90
index 7bd2e26..68b3dd8 100644
--- a/fortran/src/H5_ff.F90
+++ b/fortran/src/H5_ff.F90
@@ -12,8 +12,6 @@
 ! PURPOSE
 !  This module is used to pass C stubs for H5 Fortran APIs. The C stubs are
 !  packed into arrays in H5_f.c and these arrays are then passed to Fortran.
-!  This module then uses EQUIVALENCE to assign elements of the arrays to
-!  Fortran equivalent C stubs.
 !
 ! NOTES
 !  The size of the C arrays in H5_f.c has to match the values of the variables
diff --git a/fortran/testpar/CMakeTests.cmake b/fortran/testpar/CMakeTests.cmake
index 1d893d5..8c15724 100644
--- a/fortran/testpar/CMakeTests.cmake
+++ b/fortran/testpar/CMakeTests.cmake
@@ -16,4 +16,4 @@
 ##############################################################################
 ##############################################################################
 add_test (NAME MPI_TEST_FORT_parallel_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:parallel_test> ${MPIEXEC_POSTFLAGS})
-add_test (NAME MPI_TEST_FORT_subfiling_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:subfiling_test> ${MPIEXEC_POSTFLAGS})
\ No newline at end of file
+add_test (NAME MPI_TEST_FORT_subfiling_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:subfiling_test> ${MPIEXEC_POSTFLAGS})
diff --git a/hl/fortran/src/H5IMff.F90 b/hl/fortran/src/H5IMff.F90
index a1be745..5354dd0 100644
--- a/hl/fortran/src/H5IMff.F90
+++ b/hl/fortran/src/H5IMff.F90
@@ -380,7 +380,7 @@ CONTAINS
 !>
 !! \ingroup FH5IM
 !!
-!! \brief This function dettaches a palette to an existing image dataset.
+!! \brief This function detaches a palette to an existing image dataset.
 !!
 !! \param loc_id     Location identifier. The identifier may be that of a file or group.
 !! \param image_name The name of the image dataset.
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index 42a5feb..b5476c6 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -600,7 +600,7 @@ out:
 /*-------------------------------------------------------------------------
  * Function: H5IMunlink_palette
  *
- * Purpose: This function dettaches a palette from an existing image dataset
+ * Purpose: This function detaches a palette from an existing image dataset
  *
  * Return: Success: 0, Failure: -1
  *
diff --git a/hl/src/H5IMpublic.h b/hl/src/H5IMpublic.h
index 81dbb62..0ba9d64 100644
--- a/hl/src/H5IMpublic.h
+++ b/hl/src/H5IMpublic.h
@@ -66,7 +66,7 @@ extern "C" {
  * - \ref H5IMread_image
  *   \n Reads image data from disk.
  * - \ref H5IMunlink_palette
- *   \n Dettaches a palette from an image.
+ *   \n Detaches a palette from an image.
  *
  */
 
@@ -229,7 +229,7 @@ H5_HLDLL herr_t H5IMlink_palette(hid_t loc_id, const char *image_name, const cha
  * --------------------------------------------------------------------------
  * \ingroup H5IM
  *
- * \brief Dettaches a palette from an image.
+ * \brief Detaches a palette from an image.
  *
  * \fg_loc_id
  * \param[in] image_name    The name of the image dataset
@@ -237,7 +237,7 @@ H5_HLDLL herr_t H5IMlink_palette(hid_t loc_id, const char *image_name, const cha
  *
  * \return \herr_t
  *
- * \details H5IMunlink_palette() dettaches a palette from an image
+ * \details H5IMunlink_palette() detaches a palette from an image
  *          specified by \p image_name.
  *
  */
diff --git a/hl/test/CMakeTests.cmake b/hl/test/CMakeTests.cmake
index 9d3ff0c..781ed14 100644
--- a/hl/test/CMakeTests.cmake
+++ b/hl/test/CMakeTests.cmake
@@ -41,7 +41,7 @@ set (HL_REFERENCE_TEST_FILES
 #-- Copy the necessary files.
 # --------------------------------------------------------------------
 foreach (h5_file ${HL_REFERENCE_TEST_FILES})
-  HDFTEST_COPY_FILE("${HDF5_HL_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_HL_TEST_BINARY_DIR}/${h5_file}" "hl_test_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${HDF5_HL_TEST_BINARY_DIR}/testfiles/${h5_file}" "hl_test_files")
 endforeach ()
 add_custom_target(hl_test_files ALL COMMENT "Copying files needed by hl_test tests" DEPENDS ${hl_test_files_list})
 
diff --git a/hl/test/dsdata.txt b/hl/test/testfiles/dsdata.txt
index ce5d7e6..ce5d7e6 100644
--- a/hl/test/dsdata.txt
+++ b/hl/test/testfiles/dsdata.txt
diff --git a/hl/test/dslat.txt b/hl/test/testfiles/dslat.txt
index 9bdcbde..9bdcbde 100644
--- a/hl/test/dslat.txt
+++ b/hl/test/testfiles/dslat.txt
diff --git a/hl/test/dslon.txt b/hl/test/testfiles/dslon.txt
index 4430ccc..4430ccc 100644
--- a/hl/test/dslon.txt
+++ b/hl/test/testfiles/dslon.txt
diff --git a/hl/test/dtype_file.txt b/hl/test/testfiles/dtype_file.txt
index 0ccae94..0ccae94 100644
--- a/hl/test/dtype_file.txt
+++ b/hl/test/testfiles/dtype_file.txt
diff --git a/hl/test/dtype_file_readable.txt b/hl/test/testfiles/dtype_file_readable.txt
index 9b7a5a0..9b7a5a0 100644
--- a/hl/test/dtype_file_readable.txt
+++ b/hl/test/testfiles/dtype_file_readable.txt
diff --git a/hl/test/earth.pal b/hl/test/testfiles/earth.pal
index 2c31cb3..2c31cb3 100644
--- a/hl/test/earth.pal
+++ b/hl/test/testfiles/earth.pal
diff --git a/hl/test/image24pixel.txt b/hl/test/testfiles/image24pixel.txt
index 8af73f2..8af73f2 100644
--- a/hl/test/image24pixel.txt
+++ b/hl/test/testfiles/image24pixel.txt
diff --git a/hl/test/image24plane.txt b/hl/test/testfiles/image24plane.txt
index d6bf9be..d6bf9be 100644
--- a/hl/test/image24plane.txt
+++ b/hl/test/testfiles/image24plane.txt
diff --git a/hl/test/image8.txt b/hl/test/testfiles/image8.txt
index 4ba5980..4ba5980 100644
--- a/hl/test/image8.txt
+++ b/hl/test/testfiles/image8.txt
diff --git a/hl/test/sepia.pal b/hl/test/testfiles/sepia.pal
index f294b08..f294b08 100644
--- a/hl/test/sepia.pal
+++ b/hl/test/testfiles/sepia.pal
diff --git a/hl/test/test_ds_be.h5 b/hl/test/testfiles/test_ds_be.h5
index 3da54f9..3da54f9 100644
--- a/hl/test/test_ds_be.h5
+++ b/hl/test/testfiles/test_ds_be.h5
diff --git a/hl/test/test_ds_be_new_ref-32bit.h5 b/hl/test/testfiles/test_ds_be_new_ref-32bit.h5
index ee327e9..ee327e9 100644
--- a/hl/test/test_ds_be_new_ref-32bit.h5
+++ b/hl/test/testfiles/test_ds_be_new_ref-32bit.h5
diff --git a/hl/test/test_ds_be_new_ref.h5 b/hl/test/testfiles/test_ds_be_new_ref.h5
index eddfa02..eddfa02 100644
--- a/hl/test/test_ds_be_new_ref.h5
+++ b/hl/test/testfiles/test_ds_be_new_ref.h5
diff --git a/hl/test/test_ds_le.h5 b/hl/test/testfiles/test_ds_le.h5
index 1fcbe99..1fcbe99 100644
--- a/hl/test/test_ds_le.h5
+++ b/hl/test/testfiles/test_ds_le.h5
diff --git a/hl/test/test_ds_le_new_ref.h5 b/hl/test/testfiles/test_ds_le_new_ref.h5
index 8625d77..8625d77 100644
--- a/hl/test/test_ds_le_new_ref.h5
+++ b/hl/test/testfiles/test_ds_le_new_ref.h5
diff --git a/hl/test/test_ld.h5 b/hl/test/testfiles/test_ld.h5
index bd5730c..bd5730c 100644
--- a/hl/test/test_ld.h5
+++ b/hl/test/testfiles/test_ld.h5
diff --git a/hl/test/test_table_be.h5 b/hl/test/testfiles/test_table_be.h5
index 3639695..3639695 100644
--- a/hl/test/test_table_be.h5
+++ b/hl/test/testfiles/test_table_be.h5
diff --git a/hl/test/test_table_cray.h5 b/hl/test/testfiles/test_table_cray.h5
index d22dce3..d22dce3 100644
--- a/hl/test/test_table_cray.h5
+++ b/hl/test/testfiles/test_table_cray.h5
diff --git a/hl/test/test_table_le.h5 b/hl/test/testfiles/test_table_le.h5
index 6c330fd..6c330fd 100644
--- a/hl/test/test_table_le.h5
+++ b/hl/test/testfiles/test_table_le.h5
diff --git a/hl/test/usa.wri b/hl/test/testfiles/usa.wri
index afc47fb..afc47fb 100644
--- a/hl/test/usa.wri
+++ b/hl/test/testfiles/usa.wri
diff --git a/hl/tools/gif2h5/CMakeTests.cmake b/hl/tools/gif2h5/CMakeTests.cmake
index b2a8e27..dd0ccc4 100644
--- a/hl/tools/gif2h5/CMakeTests.cmake
+++ b/hl/tools/gif2h5/CMakeTests.cmake
@@ -22,9 +22,9 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 #
 # copy test files from source to build dir
 #
-HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/image1.gif" "${PROJECT_BINARY_DIR}/testfiles/image1.gif" "gif2h5_files")
-HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/h52giftst.h5" "${PROJECT_BINARY_DIR}/testfiles/h52giftst.h5" "gif2h5_files")
-HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/ex_image2.h5" "${PROJECT_BINARY_DIR}/testfiles/ex_image2.h5" "gif2h5_files")
+HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/image1.gif" "${PROJECT_BINARY_DIR}/testfiles/image1.gif" "gif2h5_files")
+HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/h52giftst.h5" "${PROJECT_BINARY_DIR}/testfiles/h52giftst.h5" "gif2h5_files")
+HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/ex_image2.h5" "${PROJECT_BINARY_DIR}/testfiles/ex_image2.h5" "gif2h5_files")
 add_custom_target(gif2h5_files ALL COMMENT "Copying files needed by gif2h5 tests" DEPENDS ${gif2h5_files_list})
 
 # Remove any output file left over from previous test run
diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake
index a7828b3..7c1a7f5 100644
--- a/hl/tools/h5watch/CMakeTests.cmake
+++ b/hl/tools/h5watch/CMakeTests.cmake
@@ -58,7 +58,7 @@ set (H5WATCH_TEST_FILES
 file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 
 foreach (h5watch_file ${H5WATCH_TEST_FILES})
-  HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_DIR}/testfiles/${h5watch_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}" "H5WATCH_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5watch_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}" "H5WATCH_files")
 endforeach ()
 add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tests" DEPENDS ${H5WATCH_files_list})
 
diff --git a/hl/tools/testfiles/w-err-cmpd1.err b/hl/tools/h5watch/testfiles/w-err-cmpd1.err
index 9c165fb..9c165fb 100644
--- a/hl/tools/testfiles/w-err-cmpd1.err
+++ b/hl/tools/h5watch/testfiles/w-err-cmpd1.err
diff --git a/hl/tools/testfiles/w-err-cmpd2.err b/hl/tools/h5watch/testfiles/w-err-cmpd2.err
index 9c165fb..9c165fb 100644
--- a/hl/tools/testfiles/w-err-cmpd2.err
+++ b/hl/tools/h5watch/testfiles/w-err-cmpd2.err
diff --git a/hl/tools/testfiles/w-err-cmpd3.err b/hl/tools/h5watch/testfiles/w-err-cmpd3.err
index 9c165fb..9c165fb 100644
--- a/hl/tools/testfiles/w-err-cmpd3.err
+++ b/hl/tools/h5watch/testfiles/w-err-cmpd3.err
diff --git a/hl/tools/testfiles/w-err-cmpd4.err b/hl/tools/h5watch/testfiles/w-err-cmpd4.err
index 9c165fb..9c165fb 100644
--- a/hl/tools/testfiles/w-err-cmpd4.err
+++ b/hl/tools/h5watch/testfiles/w-err-cmpd4.err
diff --git a/hl/tools/testfiles/w-err-cmpd5.err b/hl/tools/h5watch/testfiles/w-err-cmpd5.err
index 9c165fb..9c165fb 100644
--- a/hl/tools/testfiles/w-err-cmpd5.err
+++ b/hl/tools/h5watch/testfiles/w-err-cmpd5.err
diff --git a/hl/tools/testfiles/w-err-dset-nomax.err b/hl/tools/h5watch/testfiles/w-err-dset-nomax.err
index fd5ca7e..fd5ca7e 100644
--- a/hl/tools/testfiles/w-err-dset-nomax.err
+++ b/hl/tools/h5watch/testfiles/w-err-dset-nomax.err
diff --git a/hl/tools/testfiles/w-err-dset-none.err b/hl/tools/h5watch/testfiles/w-err-dset-none.err
index db781c3..db781c3 100644
--- a/hl/tools/testfiles/w-err-dset-none.err
+++ b/hl/tools/h5watch/testfiles/w-err-dset-none.err
diff --git a/hl/tools/testfiles/w-err-dset1.err b/hl/tools/h5watch/testfiles/w-err-dset1.err
index d6b2a6e..d6b2a6e 100644
--- a/hl/tools/testfiles/w-err-dset1.err
+++ b/hl/tools/h5watch/testfiles/w-err-dset1.err
diff --git a/hl/tools/testfiles/w-err-dset2.err b/hl/tools/h5watch/testfiles/w-err-dset2.err
index 3f77ec8..3f77ec8 100644
--- a/hl/tools/testfiles/w-err-dset2.err
+++ b/hl/tools/h5watch/testfiles/w-err-dset2.err
diff --git a/hl/tools/testfiles/w-err-file.err b/hl/tools/h5watch/testfiles/w-err-file.err
index 015661f..015661f 100644
--- a/hl/tools/testfiles/w-err-file.err
+++ b/hl/tools/h5watch/testfiles/w-err-file.err
diff --git a/hl/tools/testfiles/w-err-poll.ddl b/hl/tools/h5watch/testfiles/w-err-poll.ddl
index e6510f2..e6510f2 100644
--- a/hl/tools/testfiles/w-err-poll.ddl
+++ b/hl/tools/h5watch/testfiles/w-err-poll.ddl
diff --git a/hl/tools/testfiles/w-err-poll0.ddl b/hl/tools/h5watch/testfiles/w-err-poll0.ddl
index e6510f2..e6510f2 100644
--- a/hl/tools/testfiles/w-err-poll0.ddl
+++ b/hl/tools/h5watch/testfiles/w-err-poll0.ddl
diff --git a/hl/tools/testfiles/w-err-std.ddl b/hl/tools/h5watch/testfiles/w-err-std.ddl
index 775d6a0..775d6a0 100644
--- a/hl/tools/testfiles/w-err-std.ddl
+++ b/hl/tools/h5watch/testfiles/w-err-std.ddl
diff --git a/hl/tools/testfiles/w-err-width.ddl b/hl/tools/h5watch/testfiles/w-err-width.ddl
index e6510f2..e6510f2 100644
--- a/hl/tools/testfiles/w-err-width.ddl
+++ b/hl/tools/h5watch/testfiles/w-err-width.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl
index 09255cc..09255cc 100644
--- a/hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl
index 00ed390..00ed390 100644
--- a/hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl
index 9b9a971..9b9a971 100644
--- a/hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc.ddl
index 9b9a971..9b9a971 100644
--- a/hl/tools/testfiles/w-ext-cmpd-esc.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl
index 029e4db..029e4db 100644
--- a/hl/tools/testfiles/w-ext-cmpd-f1.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-f2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl
index 362cc94..362cc94 100644
--- a/hl/tools/testfiles/w-ext-cmpd-f2.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-ff3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-ff3.ddl
index 6a54b97..6a54b97 100644
--- a/hl/tools/testfiles/w-ext-cmpd-ff3.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-ff3.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-label.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-label.ddl
index 394d5a6..394d5a6 100644
--- a/hl/tools/testfiles/w-ext-cmpd-label.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-label.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f1.ddl
index 9b4c235..9b4c235 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two-f1.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f1.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f3.ddl
index 94b5c99..94b5c99 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two-f3.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f3.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-ff2.ddl
index 482da31..482da31 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-ff2.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-two.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two.ddl
index 57ffc2c..57ffc2c 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-two.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd.ddl
index aac5be3..aac5be3 100644
--- a/hl/tools/testfiles/w-ext-cmpd.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd.ddl
diff --git a/hl/tools/testfiles/w-ext-early.ddl b/hl/tools/h5watch/testfiles/w-ext-early.ddl
index bb72104..bb72104 100644
--- a/hl/tools/testfiles/w-ext-early.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-early.ddl
diff --git a/hl/tools/testfiles/w-ext-late.ddl b/hl/tools/h5watch/testfiles/w-ext-late.ddl
index a6f8265..a6f8265 100644
--- a/hl/tools/testfiles/w-ext-late.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-late.ddl
diff --git a/hl/tools/testfiles/w-ext-one-d.ddl b/hl/tools/h5watch/testfiles/w-ext-one-d.ddl
index 673370a..673370a 100644
--- a/hl/tools/testfiles/w-ext-one-d.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-one-d.ddl
diff --git a/hl/tools/testfiles/w-ext-one-simple.ddl b/hl/tools/h5watch/testfiles/w-ext-one-simple.ddl
index 5df9dff..5df9dff 100644
--- a/hl/tools/testfiles/w-ext-one-simple.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-one-simple.ddl
diff --git a/hl/tools/testfiles/w-ext-one.ddl b/hl/tools/h5watch/testfiles/w-ext-one.ddl
index 9604020..9604020 100644
--- a/hl/tools/testfiles/w-ext-one.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-one.ddl
diff --git a/hl/tools/testfiles/w-ext-two-d.ddl b/hl/tools/h5watch/testfiles/w-ext-two-d.ddl
index 5c7af0a..5c7af0a 100644
--- a/hl/tools/testfiles/w-ext-two-d.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-two-d.ddl
diff --git a/hl/tools/testfiles/w-ext-two-width.ddl b/hl/tools/h5watch/testfiles/w-ext-two-width.ddl
index 9f09fde..9f09fde 100644
--- a/hl/tools/testfiles/w-ext-two-width.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-two-width.ddl
diff --git a/hl/tools/testfiles/w-ext-two.ddl b/hl/tools/h5watch/testfiles/w-ext-two.ddl
index 28ff075..28ff075 100644
--- a/hl/tools/testfiles/w-ext-two.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-two.ddl
diff --git a/hl/tools/testfiles/w-help1.ddl b/hl/tools/h5watch/testfiles/w-help1.ddl
index e6510f2..e6510f2 100644
--- a/hl/tools/testfiles/w-help1.ddl
+++ b/hl/tools/h5watch/testfiles/w-help1.ddl
diff --git a/hl/tools/h5watch/testh5watch.sh.in b/hl/tools/h5watch/testh5watch.sh.in
index fb047cd..a1daeec 100644
--- a/hl/tools/h5watch/testh5watch.sh.in
+++ b/hl/tools/h5watch/testh5watch.sh.in
@@ -66,7 +66,7 @@ fi
 nerrors=0
 verbose=yes
 
-test -d ../testfiles || mkdir ../testfiles
+test -d ./testfiles || mkdir ./testfiles
 
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Testing".
@@ -97,9 +97,9 @@ TESTING() {
 # $2 -- expected return code
 # $3 and on -- arguments for h5watch
 TOOLTEST() {
-    expect="$srcdir/../testfiles/$1"
-    actual="../testfiles/`basename $1 .ddl`.out"
-    actual_err="../testfiles/`basename $1 .ddl`.err"
+    expect="$srcdir/testfiles/$1"
+    actual="testfiles/`basename $1 .ddl`.out"
+    actual_err="testfiles/`basename $1 .ddl`.err"
     shift
     retvalexpect=$1
     shift
@@ -146,10 +146,10 @@ TOOLTEST() {
 # $2 -- expected return code
 # $3 and on -- arguments for h5watch
 TOOLTEST_ERR() {
-    expect="$srcdir/../testfiles/$1"
-    expect_err="$srcdir/../testfiles/`basename $1 .ddl`.err"
-    actual="../testfiles/`basename $1 .ddl`.out"
-    actual_err="../testfiles/`basename $1 .ddl`.out.err"
+    expect="$srcdir/testfiles/$1"
+    expect_err="$srcdir/testfiles/`basename $1 .ddl`.err"
+    actual="testfiles/`basename $1 .ddl`.out"
+    actual_err="testfiles/`basename $1 .ddl`.out.err"
     shift
     retvalexpect=$1
     shift
@@ -201,8 +201,8 @@ try=0
 while [ $try -lt $TRY_MAX ] ;
 do
     cp $WATCHFILE $TESTFILE                             # Copy the file being watched/extended to a temporary file
-    actual="../testfiles/`basename $3 .ddl`.out"        # The actual output
-    expect="$srcdir/../testfiles/$3"                    # The expected output
+    actual="testfiles/`basename $3 .ddl`.out"        # The actual output
+    expect="$srcdir/testfiles/$3"                    # The expected output
     #
     # Set up options and object to h5watch
     if test -z "$2"; then
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index ea51512..388ba18 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -8607,7 +8607,7 @@ public class H5 implements java.io.Serializable {
      * @ingroup JH5P
      *
      * H5Premove_filter deletes a filter from the dataset creation property list;
-     *                  deletes all filters if filter is H5Z_FILTER_NONE
+     *                  deletes all filters if filter is H5Z_FILTER_ALL
      *
      * @param obj_id
      *            IN: Property list identifier.
@@ -9434,10 +9434,10 @@ public class H5 implements java.io.Serializable {
     /**
      * @ingroup JH5P
      *
-     * H5Pset_sieve_buf_size Sets the maximum size of the data seive buffer used for file
+     * H5Pset_sieve_buf_size Sets the maximum size of the data sieve buffer used for file
      *      drivers which are capable of using data sieving.  The data sieve
      *      buffer is used when performing I/O on datasets in the file.  Using a
-     *      buffer which is large anough to hold several pieces of the dataset
+     *      buffer which is large enough to hold several pieces of the dataset
      *      being read in for hyperslab selections boosts performance by quite a
      *      bit.
      * <p>
@@ -9448,7 +9448,7 @@ public class H5 implements java.io.Serializable {
      * @param fapl_id
      *            IN: Identifier of property list to modify.
      * @param size
-     *            IN: maximum size of the data seive buffer.
+     *            IN: maximum size of the data sieve buffer.
      *
      * @exception HDF5LibraryException
      *            Error from the HDF5 Library.
diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt
index 9f148e2..967795b 100644
--- a/java/test/CMakeLists.txt
+++ b/java/test/CMakeLists.txt
@@ -104,12 +104,12 @@ HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_
 HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateL2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
 HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateO1.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
 HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/h5ex_g_iterateO2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
 
 add_custom_target(${HDF5_JAVA_TEST_LIB_TARGET}_files ALL COMMENT "Copying files needed by ${HDF5_JAVA_TEST_LIB_TARGET} tests" DEPENDS ${${HDF5_JAVA_TEST_LIB_TARGET}_files_list})
 
@@ -248,12 +248,12 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL)
         HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/${voltest}/h5ex_g_iterateL2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
         HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/${voltest}/h5ex_g_iterateO1.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
         HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_DIR}/${voltest}/h5ex_g_iterateO2.hdf" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_reg.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_reg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
 
         add_custom_target(${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files ALL COMMENT "Copying files needed by ${HDF5_JAVA_TEST_LIB_TARGET} tests" DEPENDS ${${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files_list})
 
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
index 0690081..981d945 100644
--- a/java/test/junit.sh.in
+++ b/java/test/junit.sh.in
@@ -46,7 +46,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
 BLDDIR="."
 BLDLIBDIR="$BLDDIR/testlibs"
 HDFTEST_HOME="$top_srcdir/java/test"
-TOOLS_TESTFILES="$top_srcdir/tools/testfiles"
+DUMP_TESTFILES="$top_srcdir/tools/test/h5dump/testfiles"
 
 JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
 TESTJARFILE=jar@PACKAGE_TARNAME@test.jar
@@ -258,12 +258,12 @@ COPY_DATAFILES_TO_BLDDIR()
     $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterateL2.hdf
     $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterateO1.hdf
     $CP -f $HDFTEST_HOME/h5ex_g_iterate.orig $BLDDIR/h5ex_g_iterateO2.hdf
-    $CP -f $TOOLS_TESTFILES/trefer_reg.h5 $BLDDIR/trefer_reg.h5
-    $CP -f $TOOLS_TESTFILES/trefer_attr.h5 $BLDDIR/trefer_attr.h5
-    $CP -f $TOOLS_TESTFILES/tdatareg.h5 $BLDDIR/tdatareg.h5
-    $CP -f $TOOLS_TESTFILES/tattrreg.h5 $BLDDIR/tattrreg.h5
-    $CP -f $TOOLS_TESTFILES/tintsattrs.h5 $BLDDIR/tintsattrs.h5
-    $CP -f $TOOLS_TESTFILES/tfloatsattrs.h5 $BLDDIR/tfloatsattrs.h5
+    $CP -f $DUMP_TESTFILES/trefer_reg.h5 $BLDDIR/trefer_reg.h5
+    $CP -f $DUMP_TESTFILES/trefer_attr.h5 $BLDDIR/trefer_attr.h5
+    $CP -f $DUMP_TESTFILES/tdatareg.h5 $BLDDIR/tdatareg.h5
+    $CP -f $DUMP_TESTFILES/tattrreg.h5 $BLDDIR/tattrreg.h5
+    $CP -f $DUMP_TESTFILES/tintsattrs.h5 $BLDDIR/tintsattrs.h5
+    $CP -f $DUMP_TESTFILES/tfloatsattrs.h5 $BLDDIR/tfloatsattrs.h5
 }
 
 CLEAN_DATAFILES_AND_BLDDIR()
diff --git a/release_docs/HISTORY-1_0-1_8_0.txt b/release_docs/HISTORY-1_0-1_8_0.txt
index 6d9148d..afe200b 100644
--- a/release_docs/HISTORY-1_0-1_8_0.txt
+++ b/release_docs/HISTORY-1_0-1_8_0.txt
@@ -1443,7 +1443,7 @@ Known Problems
   filter script.
 
 * H5Ocopy() does not copy reg_ref attributes correctly when shared-message
-  is turn on. The value of the reference in the destination attriubte is
+  is turn on. The value of the reference in the destination attribute is
   wrong. This H5Ocopy problem will affect h5copy tool
 
 %%%%1.6.7%%%%   Release Information for hdf5-1.6.7 (31/January/08)
diff --git a/release_docs/HISTORY-1_10_0-1_12_0.txt b/release_docs/HISTORY-1_10_0-1_12_0.txt
index a83e58d..4649a31 100644
--- a/release_docs/HISTORY-1_10_0-1_12_0.txt
+++ b/release_docs/HISTORY-1_10_0-1_12_0.txt
@@ -409,7 +409,7 @@ Bug Fixes since HDF5-1.10.3 release
     - Fixed a bug caused by bad tag value when condensing object header
       messages
 
-      There was an assertion failure when moving meessages from running a
+      There was an assertion failure when moving messages from running a
       user test program with library release hdf5.1.10.4. It was because
       the tag value (object header's address) was not set up when entering
       the library routine H5O__chunk_update_idx(), which will eventually
diff --git a/release_docs/HISTORY-1_12_0-1_14_0.txt b/release_docs/HISTORY-1_12_0-1_14_0.txt
index 11ca947..c48517c 100644
--- a/release_docs/HISTORY-1_12_0-1_14_0.txt
+++ b/release_docs/HISTORY-1_12_0-1_14_0.txt
@@ -3163,7 +3163,7 @@ New Features
 
       Some of the tools accepted shortened versions of the long options
       (ex: --datas instead of --dataset). These were implemented inconsistently,
-      are difficult to maintian, and occasionally block useful long option
+      are difficult to maintain, and occasionally block useful long option
       names. These partial long options have been removed from all the tools.
 
       (DER - 2021/08/03)
diff --git a/release_docs/HISTORY-1_8_0-1_10_0.txt b/release_docs/HISTORY-1_8_0-1_10_0.txt
index cc42d3b..255ccca 100644
--- a/release_docs/HISTORY-1_8_0-1_10_0.txt
+++ b/release_docs/HISTORY-1_8_0-1_10_0.txt
@@ -837,7 +837,7 @@ Bug Fixes since HDF5-1.8.0 release
     - Support for TFLOPS, config/intel-osf1, is removed since the TFLOPS
       machine has long retired. AKC - 2009/10/06.
     - Added $(EXEEXT) extension to H5detect when it's executed in the
-      src/Makfile to generate H5Tinit.c so it works correctly on platforms
+      src/Makefile to generate H5Tinit.c so it works correctly on platforms
       that require the full extension when running executables.
       MAM - 2009/10/01 - BZ #1613
     - Configure will now set FC and CXX to "no" when fortran and c++
@@ -1734,6 +1734,6 @@ Known Problems
   filter script.
 
 * H5Ocopy() does not copy reg_ref attributes correctly when shared-message
-  is turn on. The value of the reference in the destination attriubte is
+  is turn on. The value of the reference in the destination attribute is
   wrong. This H5Ocopy problem will affect h5copy tool
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 985cbf5..0e1dbe4 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -240,6 +240,10 @@ New Features
 
     Fortran Library:
     ----------------
+
+    - Fixed an uninitialized error return value for hdferr
+      to return the error state of the h5aopen_by_idx_f API.
+
     - Added h5pget_vol_cap_flags_f and related Fortran VOL
       capability definitions.
 
@@ -257,6 +261,11 @@ New Features
       h5pget_file_space_page_size_f, h5pset_file_space_page_size_f,
       h5pget_file_space_strategy_f, h5pset_file_space_strategy_f
 
+    - Removed "-commons" linking option on Darwin, as COMMON and EQUIVALENCE
+      are no longer used in the Fortran source.
+
+      Fixes GitHub issue #3571
+
     C++ Library:
     ------------
     -
diff --git a/src/H5.c b/src/H5.c
index c0ebb14..a59c013 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -275,7 +275,7 @@ H5_init_library(void)
 
     /* Debugging? */
     H5__debug_mask("-all");
-    H5__debug_mask(HDgetenv("HDF5_DEBUG"));
+    H5__debug_mask(getenv("HDF5_DEBUG"));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -887,7 +887,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
         const char *s; /* Environment string for disabling version check */
 
         /* Allow different versions of the header files and library? */
-        s = HDgetenv("HDF5_DISABLE_VERSION_CHECK");
+        s = getenv("HDF5_DISABLE_VERSION_CHECK");
 
         if (s && isdigit(*s))
             disable_version_check = (unsigned int)strtol(s, NULL, 0);
diff --git a/src/H5A.c b/src/H5A.c
index 2a22bc2..c183c85 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -104,7 +104,7 @@ static herr_t H5A__exists_by_name_api_common(hid_t obj_id, const char *obj_name,
  *
  * Purpose:     This is the common function for creating HDF5 datasets.
  *
- * Return:      Success:    A attribute ID
+ * Return:      Success:    An attribute ID
  *              Failure:    H5I_INVALID_HID
  *
  *-------------------------------------------------------------------------
@@ -146,7 +146,7 @@ done:
  *
  * Purpose:     This is the common function for creating HDF5 attributes
  *
- * Return:      Success:    A attribute ID
+ * Return:      Success:    An attribute ID
  *              Failure:    H5I_INVALID_HID
  *
  *-------------------------------------------------------------------------
@@ -197,11 +197,11 @@ done:
  *              hid_t H5Acreate2(loc_id, attr_name, type_id, space_id, acpl_id,
  *                  aapl_id)
  *
- * Description: This function creates an attribute which is attached to the
+ * Description: This function creates an attribute that is attached to the
  *              object specified with 'loc_id'. The name specified with
  *              'attr_name' for each attribute for an object must be unique
  *              for that object. The 'type_id' and 'space_id' are created
- *              with the H5T and H5S interfaces respectively. The 'aapl_id'
+ *              with the H5T and H5S interfaces, respectively. The 'aapl_id'
  *              property list is currently unused, but will be used in the
  *              future for optional attribute access properties. The
  *              attribute ID returned from this function must be released
@@ -212,8 +212,8 @@ done:
  *              const char *attr_name;  IN: Name of attribute to locate and open
  *              hid_t type_id;          IN: ID of datatype for attribute
  *              hid_t space_id;         IN: ID of dataspace for attribute
- *              hid_t acpl_id;          IN: ID of creation property list (currently not used)
- *              hid_t aapl_id;          IN: Attribute access property list
+ *              hid_t acpl_id;          IN: ID of creation property list
+ *              hid_t aapl_id;          IN: ID of Attribute access property list (currently not used)
  *
  * Return:      Success:    An ID for the created attribute
  *
@@ -243,7 +243,7 @@ done:
  *
  * Purpose:     Asynchronous version of H5Acreate
  *
- * Return:      Success:    A attribute ID
+ * Return:      Success:    An attribute ID
  *              Failure:    H5I_INVALID_HID
  *
  *-------------------------------------------------------------------------
@@ -291,7 +291,7 @@ done:
  *
  * Purpose:     This is the common function for creating HDF5 attributes by name
  *
- * Return:      Success:    A attribute ID
+ * Return:      Success:    An attribute ID
  *              Failure:    H5I_INVALID_HID
  *
  *-------------------------------------------------------------------------
@@ -352,14 +352,14 @@ done:
         const char *attr_name;  IN: Name of attribute to locate and open
         hid_t type_id;          IN: ID of datatype for attribute
         hid_t space_id;         IN: ID of dataspace for attribute
-        hid_t acpl_id;          IN: ID of creation property list (currently not used)
-        hid_t aapl_id;          IN: Attribute access property list
+        hid_t acpl_id;          IN: ID of creation property list
+        hid_t aapl_id;          IN: ID of Attribute access property list (currently not used)
         hid_t lapl_id;          IN: Link access property list
  RETURNS
     Non-negative on success/H5I_INVALID_HID on failure
 
  DESCRIPTION
-        This function creates an attribute which is attached to the object
+        This function creates an attribute that is attached to the object
     specified with 'loc_id/obj_name'.  The name specified with 'attr_name' for
     each attribute for an object must be unique for that object.  The 'type_id'
     and 'space_id' are created with the H5T and H5S interfaces respectively.
@@ -392,7 +392,7 @@ done:
  *
  * Purpose:     Asynchronous version of H5Acreate_by_name
  *
- * Return:      Success:    A attribute ID
+ * Return:      Success:    An attribute ID
  *              Failure:    H5I_INVALID_HID
  *
  *-------------------------------------------------------------------------
@@ -652,7 +652,7 @@ done:
  USAGE
     hid_t H5Aopen_by_name(loc_id, obj_name, attr_name, aapl_id, lapl_id)
         hid_t loc_id;           IN: Object that attribute is attached to
-        const char *obj_name;   IN: Name of object relative to location
+        const char *obj_name;   IN: Name of the object relative to location
         const char *attr_name;  IN: Name of attribute to locate and open
         hid_t aapl_id;          IN: Attribute access property list
         hid_t lapl_id;          IN: Link access property list
@@ -788,7 +788,7 @@ done:
  USAGE
     hid_t H5Aopen_by_idx(loc_id, obj_ame, idx_type, order, n, aapl_id, lapl_id)
         hid_t loc_id;           IN: Object that attribute is attached to
-        const char *obj_name;   IN: Name of object relative to location
+        const char *obj_name;   IN: Name of the object relative to location
         H5_index_t idx_type;    IN: Type of index to use
         H5_iter_order_t order;  IN: Order to iterate over index
         hsize_t n;              IN: Index (0-based) attribute to open
@@ -1183,7 +1183,7 @@ done:
     Gets a copy of the creation property list for an attribute
  USAGE
     hssize_t H5Aget_create_plist (attr_id, buf_size, buf)
-        hid_t attr_id;      IN: Attribute to get name of
+        hid_t attr_id;      IN: Attribute to get the name of
  RETURNS
     This function returns the ID of a copy of the attribute's creation
     property list, or H5I_INVALID_HID on failure.
@@ -1234,7 +1234,7 @@ done:
     Gets a copy of the name for an attribute
  USAGE
     hssize_t H5Aget_name (attr_id, buf_size, buf)
-        hid_t attr_id;      IN: Attribute to get name of
+        hid_t attr_id;      IN: Attribute to get the name of
         size_t buf_size;    IN: The size of the buffer to store the string in.
         char *buf;          IN: Buffer to store name in
  RETURNS
@@ -1287,7 +1287,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5Aget_name_by_idx
  *
- * Purpose:	Retrieve name of an attribute, according to the
+ * Purpose:	Retrieve the name of an attribute, according to the
  *		order within an index.
  *
  *              Same pattern of behavior as H5Iget_name.
@@ -1855,7 +1855,7 @@ done:
         The operation receives the ID for the group or dataset being iterated
     over ('loc_id'), the name of the current attribute about the object
     ('attr_name'), the attribute's "info" struct ('ainfo') and the pointer to
-    the operator data passed in to H5Aiterate2 ('op_data').  The return values
+    the operator data passed into H5Aiterate2 ('op_data').  The return values
     from an operator are:
         A. Zero causes the iterator to continue, returning zero when all
             attributes have been processed.
@@ -1943,7 +1943,7 @@ done:
         The operation receives the ID for the group or dataset being iterated
     over ('loc_id'), the name of the current attribute about the object
     ('attr_name'), the attribute's "info" struct ('ainfo') and the pointer to
-    the operator data passed in to H5Aiterate_by_name ('op_data').  The return values
+    the operator data passed into H5Aiterate_by_name ('op_data').  The return values
     from an operator are:
         A. Zero causes the iterator to continue, returning zero when all
             attributes have been processed.
diff --git a/src/H5AC.c b/src/H5AC.c
index 1ce0a96..802ccdd 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -143,7 +143,7 @@ H5AC_init(void)
     {
         const char *s; /* String for environment variables */
 
-        s = HDgetenv("H5_COLL_API_SANITY_CHECK");
+        s = getenv("H5_COLL_API_SANITY_CHECK");
         if (s && isdigit(*s)) {
             long env_val               = strtol(s, NULL, 0);
             H5_coll_api_sanity_check_g = (0 == env_val) ? false : true;
diff --git a/src/H5ACmpio.c b/src/H5ACmpio.c
index 77c7fdb..cdebe80 100644
--- a/src/H5ACmpio.c
+++ b/src/H5ACmpio.c
@@ -971,7 +971,7 @@ done:
  *		dirty bytes count.
  *
  *		The rank 0 process then removes any references to the
- *		entry under its old address from the cleands and dirtied
+ *		entry under its old address from the clean and dirtied
  *		lists, and inserts an entry in the dirtied list under the
  *		new address.
  *
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 010fdc7..5e23036 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -25,7 +25,7 @@
 
 #include "H5ACpublic.h" /*public prototypes            */
 
-/* Pivate headers needed by this header */
+/* Private headers needed by this header */
 #include "H5private.h"   /* Generic Functions            */
 #include "H5Cprivate.h"  /* Cache                */
 #include "H5Fprivate.h"  /* File access                */
diff --git a/src/H5Apublic.h b/src/H5Apublic.h
index 3bef700..232ae0a 100644
--- a/src/H5Apublic.h
+++ b/src/H5Apublic.h
@@ -40,7 +40,7 @@ typedef struct {
  *            or named datatype being iterated over
  * \param[in] attr_name The name of the current object attribute
  * \param[in] ainfo The attribute's info struct
- * \param[in,out] op_data A pointer to the operator data passed in to
+ * \param[in,out] op_data A pointer to the operator data passed into
  *                H5Aiterate2() or H5Aiterate_by_name()
  * \returns The return values from an operator are:
  *          \li Zero causes the iterator to continue, returning zero when
@@ -122,10 +122,10 @@ H5_DLL herr_t H5Aclose_async(hid_t attr_id, hid_t es_id);
  *          The attribute is created with the specified datatype and dataspace,
  *          \p type_id and \p space_id.
  *
- *          \plist_unused{acpl}
+ *          \plist_unused{aapl_id}
  *
  *          The attribute identifier returned by this function must be released
- *          with H5Aclose() resource leaks will develop.
+ *          with H5Aclose() or resource leaks will develop.
  *
  * \note If \p loc_id is a file identifier, the attribute will be attached to
  *       that file's root group.
@@ -183,7 +183,7 @@ H5_DLL hid_t  H5Acreate_async(hid_t loc_id, const char *attr_name, hid_t type_id
  *          The attribute is created with the specified datatype and
  *          dataspace, \p type_id and \p space_id.
  *
- *          \plist_unused{aapl}
+ *          \plist_unused{aapl_id}
  *
  *          The link access property list, \p lapl_id, may provide
  *          information regarding the properties of links required to access
@@ -252,7 +252,7 @@ H5_DLL herr_t H5Adelete(hid_t loc_id, const char *attr_name);
  *
  * \return \herr_t
  *
- * \details H5Adelete_by_idx() removes an attribute, specified by its
+ * \details H5Adelete_by_idx() removes an attribute specified by its
  *          location in an index, from an object.
  *
  *          The object from which the attribute is to be removed is
@@ -638,7 +638,7 @@ H5_DLL hid_t H5Aget_type(hid_t attr_id);
  * \details H5Aiterate2() iterates over the attributes attached to a
  *          dataset, named datatype, or group, as specified by \p loc_id.
  *          For each attribute, user-provided data, \p op_data, with
- *          additional information as defined below, is passed to a
+ *          additional information, as defined below, is passed to a
  *          user-defined function, \p op, which operates on that
  *          attribute.
  *
@@ -697,7 +697,7 @@ H5_DLL herr_t H5Aiterate2(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t ord
  * \details H5Aiterate_by_name() iterates over the attributes attached
  *          to the dataset or group specified with \p loc_id and \p obj_name.
  *          For each attribute, user-provided data, \p op_data, with
- *          additional information as defined below, is passed to a
+ *          additional information, as defined below, is passed to a
  *          user-defined function, \p op, which operates on that attribute.
  *
  *          The order of the iteration and the attributes iterated over
@@ -747,7 +747,7 @@ H5_DLL herr_t H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t
  * \return \hid_tv{attribute}
  *
  * \details H5Aopen() opens an existing attribute, \p attr_name, that is
- *          attached to object specified by an object identifier, \p obj_id.
+ *          attached to the object specified by an object identifier, \p obj_id.
  *
  *          \plist_unused{aapl_id}
  *
@@ -1096,7 +1096,7 @@ H5_DLL herr_t H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *
  * \param[in] location_id The identifier for the group, dataset
  *            or named datatype being iterated over
  * \param[in] attr_name The name of the current object attribute
- * \param[in,out] operator_data A pointer to the operator data passed in to
+ * \param[in,out] operator_data A pointer to the operator data passed into
  *                H5Aiterate1()
  * \returns The return values from an operator are:
  *          \li Zero causes the iterator to continue, returning zero when
@@ -1177,7 +1177,7 @@ H5_DLL int H5Aget_num_attrs(hid_t loc_id);
  * \loc_id
  * \param[in,out] idx     Starting (in) and ending (out) attribute index
  * \param[in]     op      User's function to pass each attribute to
- * \param[in,out] op_data User's data to pass through to iterator operator
+ * \param[in,out] op_data User's data to pass through to the iterator operator
  *                        function
  *
  * \return \herr_t
@@ -1220,7 +1220,7 @@ H5_DLL herr_t H5Aiterate1(hid_t loc_id, unsigned *idx, H5A_operator1_t op, void
  *          object specified with \p loc_id. The location object may be
  *          either a group, dataset, or named datatype, all of which may
  *          have any sort of attribute. The attribute specified by the index,
- *          \p idx , indicates the attribute to access. The value of \p idx
+ *          \p idx, indicates the attribute to access. The value of \p idx
  *          is a 0-based, non-negative integer. The attribute identifier
  *          returned from this function must be released with H5Aclose()
  *          or resource leaks will develop.
diff --git a/src/H5CS.c b/src/H5CS.c
index 3e5b6b8..3728273 100644
--- a/src/H5CS.c
+++ b/src/H5CS.c
@@ -228,10 +228,9 @@ H5CS_pop(void)
 H5CS_t *
 H5CS_copy_stack(void)
 {
-    H5CS_t  *old_stack = H5CS_get_my_stack(); /* Existing function stack for library */
-    H5CS_t  *new_stack;                       /* New function stack, for copy */
-    unsigned u;                               /* Local index variable */
-    H5CS_t  *ret_value = NULL;                /* Return value */
+    H5CS_t *old_stack = H5CS_get_my_stack(); /* Existing function stack for library */
+    H5CS_t *new_stack;                       /* New function stack, for copy */
+    H5CS_t *ret_value = NULL;                /* Return value */
 
     /* Don't push this function on the function stack... :-) */
     FUNC_ENTER_NOAPI_NOFS
@@ -270,8 +269,6 @@ done:
 herr_t
 H5CS_close_stack(H5CS_t *stack)
 {
-    unsigned u; /* Local index variable */
-
     /* Don't push this function on the function stack... :-) */
     FUNC_ENTER_NOAPI_NOERR_NOFS
 
diff --git a/src/H5Centry.c b/src/H5Centry.c
index 353cc1f..2bbf9ac 100644
--- a/src/H5Centry.c
+++ b/src/H5Centry.c
@@ -1737,7 +1737,7 @@ done:
  *              deserialized entry after it is inserted in the cache.
  *
  *              Since deserializing a prefetched entry is semantically
- *              equivalent to a load, issue an entry loaded nofification
+ *              equivalent to a load, issue an entry loaded notification
  *              if the notify callback is defined.
  *
  * Return:      SUCCEED on success, and FAIL on failure.
diff --git a/src/H5Cimage.c b/src/H5Cimage.c
index f461365..b969054 100644
--- a/src/H5Cimage.c
+++ b/src/H5Cimage.c
@@ -1096,8 +1096,6 @@ H5C_set_cache_image_config(const H5F_t *f, H5C_t *cache_ptr, H5C_cache_image_ctl
 
     /* Sanity checks */
     assert(f);
-    assert(f->shared);
-    assert(f->shared->cache == f->shared->cache);
 
     /* Check arguments */
     if (cache_ptr == NULL)
@@ -1117,7 +1115,7 @@ H5C_set_cache_image_config(const H5F_t *f, H5C_t *cache_ptr, H5C_cache_image_ctl
 
         cache_ptr->image_ctl = default_image_ctl;
         assert(!(cache_ptr->image_ctl.generate_image));
-    } /* end if */
+    }
     else {
 #endif /* H5_HAVE_PARALLEL */
         /* A cache image can only be generated if the file is opened read / write
@@ -1139,9 +1137,9 @@ H5C_set_cache_image_config(const H5F_t *f, H5C_t *cache_ptr, H5C_cache_image_ctl
 
             cache_ptr->image_ctl = default_image_ctl;
             assert(!(cache_ptr->image_ctl.generate_image));
-        } /* end else */
+        }
 #ifdef H5_HAVE_PARALLEL
-    }  /* end else */
+    }
 #endif /* H5_HAVE_PARALLEL */
 
 done:
diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c
index e5f65cf..d7bf5b1 100644
--- a/src/H5Cmpio.c
+++ b/src/H5Cmpio.c
@@ -83,7 +83,7 @@ static herr_t H5C__flush_candidates_in_ring(H5F_t *f, H5C_ring_t ring, unsigned
  *              system by increasing the number of processes writing to
  *              adjacent locations in the HDF5 file.
  *
- *              To attempt to minimize this, we now arange matters such
+ *              To attempt to minimize this, we now arrange matters such
  *              that each process writes n adjacent entries in the
  *              candidate list, and marks all others clean.  We must do
  *              this in such a fashion as to guarantee that each entry
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index 5aadd9e..3477e75 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -537,7 +537,7 @@ typedef struct H5C_t H5C_t;
  *    ensure that the entry is ready to be flushed -- in particular,
  *    if the entry contains references to other entries that are in
  *    temporary file space, the pre-serialize callback must move those
- *    entries into real file space so that the serialzed entry will
+ *    entries into real file space so that the serialized entry will
  *    contain no invalid data.
  *
  *    One would think that the base address and length of
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 3f4ff72..b37d35c 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -191,8 +191,8 @@ H5D_init(void)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve pipeline filter");
 
     /* Retrieve the prefixes of VDS and external file from the environment variable */
-    H5D_prefix_vds_env = HDgetenv("HDF5_VDS_PREFIX");
-    H5D_prefix_ext_env = HDgetenv("HDF5_EXTFILE_PREFIX");
+    H5D_prefix_vds_env = getenv("HDF5_VDS_PREFIX");
+    H5D_prefix_ext_env = getenv("HDF5_EXTFILE_PREFIX");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index 94f2c39..3bab6be 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -544,7 +544,7 @@ H5D__mpio_debug_init(void)
     memset(H5D_mpio_debug_flags_s, 0, sizeof(H5D_mpio_debug_flags_s));
 
     /* Retrieve and parse the H5Dmpio debug string */
-    debug_str = HDgetenv("H5D_mpio_Debug");
+    debug_str = getenv("H5D_mpio_Debug");
     if (debug_str)
         H5D__mpio_parse_debug_str(debug_str);
 
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c
index cd2027b..f0a0b9d 100644
--- a/src/H5Dscatgath.c
+++ b/src/H5Dscatgath.c
@@ -1335,7 +1335,7 @@ done:
         write_mem_spaces = NULL;
     }
 
-    /* Free bakcground buffer parameter arrays */
+    /* Free background buffer parameter arrays */
     H5MM_free(bkg_mem_spaces);
     bkg_mem_spaces = NULL;
     H5MM_free(bkg_file_spaces);
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index 5cc17fe..08b714d 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -362,7 +362,7 @@ H5FD__core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t size)
 
 #ifndef H5_HAVE_PREADWRITE
     /* Seek to the correct location (if we don't have pwrite) */
-    if ((HDoff_t)addr != HDlseek(file->fd, (off_t)addr, SEEK_SET))
+    if ((HDoff_t)addr != HDlseek(file->fd, (HDoff_t)addr, SEEK_SET))
         HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "error seeking in backing store");
 #endif /* H5_HAVE_PREADWRITE */
 
@@ -430,7 +430,7 @@ done:
 static inline const H5FD_core_fapl_t *
 H5FD__core_get_default_config(void)
 {
-    char *driver = HDgetenv(HDF5_DRIVER);
+    char *driver = getenv(HDF5_DRIVER);
 
     if (driver) {
         if (!strcmp(driver, "core"))
@@ -462,7 +462,7 @@ H5FD_core_init(void)
     FUNC_ENTER_NOAPI_NOERR
 
     /* Check the use disabled file locks environment variable */
-    lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING);
+    lock_env_var = getenv(HDF5_USE_FILE_LOCKING);
     if (lock_env_var && !strcmp(lock_env_var, "BEST_EFFORT"))
         ignore_disabled_file_locks_s = true; /* Override: Ignore disabled locks */
     else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1")))
diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c
index b7dd18d..d370cd0 100644
--- a/src/H5FDdirect.c
+++ b/src/H5FDdirect.c
@@ -203,7 +203,7 @@ H5FD_direct_init(void)
     FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
     /* Check the use disabled file locks environment variable */
-    lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING);
+    lock_env_var = getenv(HDF5_USE_FILE_LOCKING);
     if (lock_env_var && !strcmp(lock_env_var, "BEST_EFFORT"))
         ignore_disabled_file_locks_s = true; /* Override: Ignore disabled locks */
     else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1")))
diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c
index 6f2c559..3bd2502 100644
--- a/src/H5FDhdfs.c
+++ b/src/H5FDhdfs.c
@@ -926,7 +926,7 @@ hdfs__fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
     unsigned long long max_raw      = 0;
     unsigned long long bytes_raw    = 0;
     unsigned long long bytes_meta   = 0;
-    double             re_dub       = 0.0; /* re-usable double variable */
+    double             re_dub       = 0.0; /* reusable double variable */
     unsigned           suffix_i     = 0;
     const char         suffixes[]   = {' ', 'K', 'M', 'G', 'T', 'P'};
 
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index 35374a8..8d43dc8 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -244,7 +244,7 @@ H5FD_log_init(void)
     FUNC_ENTER_NOAPI_NOERR
 
     /* Check the use disabled file locks environment variable */
-    lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING);
+    lock_env_var = getenv(HDF5_USE_FILE_LOCKING);
     if (lock_env_var && !strcmp(lock_env_var, "BEST_EFFORT"))
         ignore_disabled_file_locks_s = true; /* Override: Ignore disabled locks */
     else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1")))
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index d2377cb..f571122 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -280,7 +280,7 @@ H5FD_mpio_init(void)
         H5FD_MPIO_g = H5FD_register((const H5FD_class_t *)&H5FD_mpio_g, sizeof(H5FD_class_t), false);
 
         /* Check if MPI driver has been loaded dynamically */
-        env = HDgetenv(HDF5_DRIVER);
+        env = getenv(HDF5_DRIVER);
         if (env && !strcmp(env, "mpio")) {
             int mpi_initialized = 0;
 
@@ -299,7 +299,7 @@ H5FD_mpio_init(void)
         const char *s; /* String for environment variables */
 
         /* Allow MPI buf-and-file-type optimizations? */
-        s = HDgetenv("HDF5_MPI_OPT_TYPES");
+        s = getenv("HDF5_MPI_OPT_TYPES");
         if (s && isdigit(*s))
             H5FD_mpi_opt_types_g = (0 == strtol(s, NULL, 0)) ? false : true;
 
@@ -308,7 +308,7 @@ H5FD_mpio_init(void)
         memset(H5FD_mpio_debug_flags_s, 0, sizeof(H5FD_mpio_debug_flags_s));
 
         /* Retrieve MPI-IO debugging environment variable */
-        s = HDgetenv("H5FD_mpio_Debug");
+        s = getenv("H5FD_mpio_Debug");
         if (s)
             H5FD__mpio_parse_debug_str(s);
 #endif /* H5FDmpio_DEBUG */
@@ -559,13 +559,13 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_dxpl_mpio_collective_opt
  *
- * Purpose:     To set a flag to choose linked chunk I/O or multi-chunk I/O
- *              without involving decision-making inside HDF5
- *
- * Note:        The library will do linked chunk I/O or multi-chunk I/O without
- *              involving communications for decision-making process.
- *              The library won't behave as it asks for only when we find
- *              that the low-level MPI-IO package doesn't support this.
+ * Purpose:     Set the data transfer property list DXPL_ID to use transfer
+ *              mode OPT_MODE during I/O. This allows the application to
+ *              specify collective I/O at the HDF5 interface level (with
+ *              the H5Pset_dxpl_mpio routine), while controlling whether
+ *              the actual I/O is performed collectively (e.g., via
+ *              MPI_File_write_at_all) or independently (e.g., via
+ *              MPI_File_write_at).
  *
  * Return:      Success:    Non-negative
  *              Failure:    Negative
@@ -2032,7 +2032,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_read_vector()
  *
- * Purpose:     The behaviour of this function dependes on the value of
+ * Purpose:     The behavior of this function depends on the value of
  *              the io_xfer_mode obtained from the context.
  *
  *              If it is H5FD_MPIO_COLLECTIVE, this is a collective
@@ -2432,7 +2432,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_write_vector
  *
- * Purpose:     The behaviour of this function dependes on the value of
+ * Purpose:     The behavior of this function depends on the value of
  *              the io_xfer_mode obtained from the context.
  *
  *              If it is H5FD_MPIO_COLLECTIVE, this is a collective
@@ -2694,7 +2694,7 @@ H5FD__mpio_write_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t co
      */
     file->eof = HADDR_UNDEF;
 
-    /* check to see if the local eof has changed been extended, and update if so */
+    /* check to see if the local eof has been extended, and update if so */
     if (max_addr > file->local_eof)
         file->local_eof = max_addr;
 
@@ -2954,7 +2954,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_read_selection
  *
- * Purpose:     The behaviour of this function dependes on the value of
+ * Purpose:     The behavior of this function depends on the value of
  *              the transfer mode obtained from the context.
  *
  *              If the transfer mode is H5FD_MPIO_COLLECTIVE:
@@ -3325,7 +3325,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_write_selection
  *
- * Purpose:     The behaviour of this function dependes on the value of
+ * Purpose:     The behavior of this function depends on the value of
  *              the transfer mode obtained from the context.
  *
  *              If the transfer mode is H5FD_MPIO_COLLECTIVE:
@@ -3744,7 +3744,7 @@ H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, bool H5_ATTR_UN
 
         /* In principle, it is possible for the size returned by the
          * call to MPI_File_get_size() to depend on whether writes from
-         * all proceeses have completed at the time process 0 makes the
+         * all processes have completed at the time process 0 makes the
          * call.
          *
          * In practice, most (all?) truncate calls will come after a barrier
diff --git a/src/H5FDmpio.h b/src/H5FDmpio.h
index 3678601..96a9366 100644
--- a/src/H5FDmpio.h
+++ b/src/H5FDmpio.h
@@ -164,18 +164,24 @@ H5_DLL herr_t H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode /*out*
 /**
  * \ingroup DXPL
  *
- * \brief Sets data transfer mode
+ * \brief Sets low-level data transfer mode
  *
  * \dxpl_id
  * \param[in] opt_mode Transfer mode
  * \returns \herr_t
  *
- * \details H5Pset_dxpl_mpio() sets the data transfer property list \p dxpl_id
- *          to use transfer mode xfer_mode. The property list can then be used
- *          to control the I/O transfer mode during data I/O operations.
- *
- *          Valid transfer modes are #H5FD_MPIO_INDEPENDENT (default) and
- *          #H5FD_MPIO_COLLECTIVE.
+ * \details H5Pset_dxpl_mpio_collective_opt() sets the data transfer property
+ *          list \p dxpl_id to use transfer mode \p opt_mode when performing
+ *          I/O. This allows the application to specify collective I/O at the
+ *          HDF5 interface level (with the H5Pset_dxpl_mpio() API routine),
+ *          while controlling whether the actual I/O is performed collectively
+ *          (e.g., via MPI_File_write_at_all) or independently (e.g., via
+ *          MPI_File_write_at). If the collectivity setting at the HDF5
+ *          interface level (set via H5Pset_dxpl_mpio()) is not set to
+ *          H5FD_MPIO_COLLECTIVE, this setting will be ignored.
+ *
+ *          Valid transfer modes are #H5FD_MPIO_COLLECTIVE_IO (default) and
+ *          #H5FD_MPIO_INDIVIDUAL_IO.
  *
  * \since 1.4.0
  *
diff --git a/src/H5FDonion.c b/src/H5FDonion.c
index 5c0994c..a16338b 100644
--- a/src/H5FDonion.c
+++ b/src/H5FDonion.c
@@ -492,7 +492,7 @@ H5FD__onion_commit_new_revision_record(H5FD_onion_t *file)
     /* Update history info to accommodate new revision */
 
     if (history->n_revisions == 0) {
-        unsigned char *ptr = buf; /* re-use buffer space to compute checksum */
+        unsigned char *ptr = buf; /* reuse buffer space to compute checksum */
 
         assert(history->record_locs == NULL);
         history->n_revisions = 1;
@@ -508,7 +508,7 @@ H5FD__onion_commit_new_revision_record(H5FD_onion_t *file)
         file->header.history_size += H5FD_ONION_ENCODED_SIZE_RECORD_POINTER;
     } /* end if no extant revisions in history */
     else {
-        unsigned char *ptr = buf; /* re-use buffer space to compute checksum */
+        unsigned char *ptr = buf; /* reuse buffer space to compute checksum */
 
         assert(history->record_locs != NULL);
 
diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index 0eceb2f..5f40bff 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -76,7 +76,7 @@
 /*
  * Defining H5FD_FEAT_DATA_SIEVE for a VFL driver means that
  * the library will attempt to cache raw data as it is read from/written to
- * a file in a "data seive" buffer.  See Rajeev Thakur's papers:
+ * a file in a "data sieve" buffer.  See Rajeev Thakur's papers:
  *  http://www.mcs.anl.gov/~thakur/papers/romio-coll.ps.gz
  *  http://www.mcs.anl.gov/~thakur/papers/mpio-high-perf.ps.gz
  */
diff --git a/src/H5FDros3.c b/src/H5FDros3.c
index 2137703..3f3413c 100644
--- a/src/H5FDros3.c
+++ b/src/H5FDros3.c
@@ -960,7 +960,7 @@ H5FD__ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     if (fa.authenticate == true) {
         /* compute signing key (part of AWS/S3 REST API)
          * can be re-used by user/key for 7 days after creation.
-         * find way to re-use/share
+         * find way to reuse/share
          */
         now = gmnow();
         assert(now != NULL);
@@ -1084,7 +1084,7 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
     unsigned long long max_raw      = 0;
     unsigned long long bytes_raw    = 0;
     unsigned long long bytes_meta   = 0;
-    double             re_dub       = 0.0; /* re-usable double variable */
+    double             re_dub       = 0.0; /* reusable double variable */
     unsigned           suffix_i     = 0;
     const char         suffixes[]   = {' ', 'K', 'M', 'G', 'T', 'P'};
 
diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c
index 7c5ff1d..58fc435 100644
--- a/src/H5FDs3comms.c
+++ b/src/H5FDs3comms.c
@@ -571,7 +571,7 @@ done:
  *
  *    Headers list at `first_header` is not touched.
  *
- *    - Programmer should re-use or destroy `first_header` pointer
+ *    - Programmer should reuse or destroy `first_header` pointer
  *      (hrb_node_t *) as suits their purposes.
  *    - Recommend fetching prior to destroy()
  *      e.g., `reuse_node = hrb_to_die->first_header; destroy(hrb_to_die);`
@@ -2074,9 +2074,9 @@ H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char *
 #endif
 
 #ifdef H5_HAVE_WIN32_API
-    ret = snprintf(awspath, 117, "%s/.aws/", HDgetenv("USERPROFILE"));
+    ret = snprintf(awspath, 117, "%s/.aws/", getenv("USERPROFILE"));
 #else
-    ret = snprintf(awspath, 117, "%s/.aws/", HDgetenv("HOME"));
+    ret = snprintf(awspath, 117, "%s/.aws/", getenv("HOME"));
 #endif
     if (ret < 0 || (size_t)ret >= 117)
         HGOTO_ERROR(H5E_ARGS, H5E_CANTCOPY, FAIL, "unable to format home-aws path");
@@ -2531,7 +2531,7 @@ done:
  *     Create AWS4 "Signing Key" from secret key, AWS region, and timestamp.
  *
  *     Sequentially runs HMAC_SHA256 on strings in specified order,
- *     generating re-usable checksum (according to documentation, valid for
+ *     generating reusable checksum (according to documentation, valid for
  *     7 days from time given).
  *
  *     `secret` is `access key id` for targeted service/bucket/resource.
@@ -2756,7 +2756,7 @@ H5FD_s3comms_trim(char *dest, char *s, size_t s_len, size_t *n_written)
         /* Find first non-whitespace character from start;
          * reduce total length per character.
          */
-        while ((s_len > 0) && isspace((unsigned char)s[0]) && s_len > 0) {
+        while (s_len > 0 && isspace((unsigned char)s[0])) {
             s++;
             s_len--;
         }
diff --git a/src/H5FDs3comms.h b/src/H5FDs3comms.h
index b29d2d8..120a71a 100644
--- a/src/H5FDs3comms.h
+++ b/src/H5FDs3comms.h
@@ -211,7 +211,7 @@
  *
  * `magic` (unsigned long)
  *
- *     "unique" idenfier number for the structure type
+ *     "unique" identifier number for the structure type
  *
  * `name` (char *)
  *
@@ -458,7 +458,7 @@ typedef struct {
  *
  * `signing_key` (unsigned char *)
  *
- *     Pointer to `SHA256_DIGEST_LENGTH`-long string for "re-usable" signing
+ *     Pointer to `SHA256_DIGEST_LENGTH`-long string for "reusable" signing
  *     key, generated via
  *     `HMAC-SHA256(HMAC-SHA256(HMAC-SHA256(HMAC-SHA256("AWS4<secret_key>",
  *         "<yyyyMMDD"), "<aws-region>"), "<aws-service>"), "aws4_request")`
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index fa48aa3..2961684 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -204,7 +204,7 @@ H5FD_sec2_init(void)
     FUNC_ENTER_NOAPI_NOERR
 
     /* Check the use disabled file locks environment variable */
-    lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING);
+    lock_env_var = getenv(HDF5_USE_FILE_LOCKING);
     if (lock_env_var && !strcmp(lock_env_var, "BEST_EFFORT"))
         ignore_disabled_file_locks_s = true; /* Override: Ignore disabled locks */
     else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1")))
diff --git a/src/H5FDsubfiling/H5FDioc.c b/src/H5FDsubfiling/H5FDioc.c
index 0dfcc36..39766de 100644
--- a/src/H5FDsubfiling/H5FDioc.c
+++ b/src/H5FDsubfiling/H5FDioc.c
@@ -32,6 +32,8 @@
 #include "H5MMprivate.h"  /* Memory management        */
 #include "H5Pprivate.h"   /* Property lists           */
 
+#define CANBE_UNUSED(X) (void)(X)
+
 /* The driver identification number, initialized at runtime */
 static hid_t H5FD_IOC_g = H5I_INVALID_HID;
 
@@ -223,7 +225,7 @@ H5FD_ioc_init(void)
             H5_SUBFILING_GOTO_ERROR(H5E_ID, H5E_CANTREGISTER, H5I_INVALID_HID, "can't register IOC VFD");
 
         /* Check if IOC VFD has been loaded dynamically */
-        env_var = HDgetenv(HDF5_DRIVER);
+        env_var = getenv(HDF5_DRIVER);
         if (env_var && !strcmp(env_var, H5FD_IOC_NAME)) {
             int mpi_initialized = 0;
             int provided        = 0;
@@ -1223,6 +1225,7 @@ H5FD__ioc_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS
     H5FD_IOC_LOG_CALL(__func__);
 
     assert(file && file->pub.cls);
+    CANBE_UNUSED(file);
     assert(buf);
 
     /* Check for overflow conditions */
@@ -1491,7 +1494,7 @@ H5FD__ioc_del(const char *name, hid_t fapl)
                                     "can't allocate config file name buffer");
 
         /* Check if a prefix has been set for the configuration file name */
-        prefix_env = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX);
+        prefix_env = getenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX);
 
         /* TODO: No support for subfile directory prefix currently */
         /* TODO: Possibly try loading config file prefix from file before deleting */
diff --git a/src/H5FDsubfiling/H5FDioc_threads.c b/src/H5FDsubfiling/H5FDioc_threads.c
index 98dd00b..0b82b8f 100644
--- a/src/H5FDsubfiling/H5FDioc_threads.c
+++ b/src/H5FDsubfiling/H5FDioc_threads.c
@@ -167,7 +167,7 @@ initialize_ioc_threads(void *_sf_context)
         H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, (-1), "can't initialize IOC thread queue mutex");
 
     /* Allow experimentation with the number of helper threads */
-    if ((env_value = HDgetenv(H5FD_IOC_THREAD_POOL_SIZE)) != NULL) {
+    if ((env_value = getenv(H5FD_IOC_THREAD_POOL_SIZE)) != NULL) {
         int value_check = atoi(env_value);
         if (value_check > 0) {
             thread_pool_size = (unsigned int)value_check;
diff --git a/src/H5FDsubfiling/H5FDsubfile_int.c b/src/H5FDsubfiling/H5FDsubfile_int.c
index 68deb83..cb210b6 100644
--- a/src/H5FDsubfiling/H5FDsubfile_int.c
+++ b/src/H5FDsubfiling/H5FDsubfile_int.c
@@ -347,6 +347,7 @@ H5FD__subfiling__get_real_eof(hid_t context_id, int64_t *logical_eof_ptr)
 
         assert(ioc_rank >= 0);
         assert(ioc_rank < n_io_concentrators);
+        CANBE_UNUSED(ioc_rank);
         assert(sf_eofs[i] == -1);
 
         sf_eofs[i] = recv_msg[(3 * i) + 1];
diff --git a/src/H5FDsubfiling/H5FDsubfiling.c b/src/H5FDsubfiling/H5FDsubfiling.c
index 058ac83..d8616c8 100644
--- a/src/H5FDsubfiling/H5FDsubfiling.c
+++ b/src/H5FDsubfiling/H5FDsubfiling.c
@@ -585,7 +585,7 @@ H5FD__subfiling_get_default_config(hid_t fapl_id, H5FD_subfiling_config_t *confi
     config_out->shared_cfg.stripe_size   = H5FD_SUBFILING_DEFAULT_STRIPE_SIZE;
     config_out->shared_cfg.stripe_count  = H5FD_SUBFILING_DEFAULT_STRIPE_COUNT;
 
-    if ((h5_require_ioc = HDgetenv("H5_REQUIRE_IOC")) != NULL) {
+    if ((h5_require_ioc = getenv("H5_REQUIRE_IOC")) != NULL) {
         int value_check = atoi(h5_require_ioc);
         if (value_check == 0)
             config_out->require_ioc = false;
@@ -2031,7 +2031,7 @@ done:
  *                          The contents of supplied buffers are undefined.
  *
  * Notes:       Thus function doesn't actually implement vector read.
- *              Instead, it comverts the vector read call into a series
+ *              Instead, it converts the vector read call into a series
  *              of scalar read calls.  Fix this when time permits.
  *
  *              Also, it didn't support the sizes and types optimization.
@@ -2191,7 +2191,7 @@ done:
  *                          subfiling writes have failed for some reason.
  *
  * Notes:       Thus function doesn't actually implement vector write.
- *              Instead, it comverts the vector write call into a series
+ *              Instead, it converts the vector write call into a series
  *              of scalar read calls.  Fix this when time permits.
  *
  *              Also, it didn't support the sizes and types optimization.
diff --git a/src/H5FDsubfiling/H5FDsubfiling.h b/src/H5FDsubfiling/H5FDsubfiling.h
index 5a520ce..d6d2ffd 100644
--- a/src/H5FDsubfiling/H5FDsubfiling.h
+++ b/src/H5FDsubfiling/H5FDsubfiling.h
@@ -61,32 +61,42 @@
 
 /**
  * \def H5FD_SUBFILING_FILENAME_TEMPLATE
- * The basic template for a subfile filename. The format specifiers
- * correspond to:
+ * The basic printf-style template for a #H5FD_SUBFILING driver
+ * subfile filename. The format specifiers correspond to:
  *
- * %s      -> base filename, e.g. "file.h5"
- * %PRIu64 -> file inode, e.g. 11273556
- * %0*d    -> number (starting at 1) signifying the Nth (out of total
- *            number of subfiles) subfile. Zero-padded according
- *            to the number of digits in the number of subfiles
- *            (calculated by log10(num_subfiles) + 1)
- * %d      -> number of subfiles
+ * \par \%s
+ *   base filename, e.g. "file.h5"
+ *
+ * \par \%PRIu64
+ *   file inode, e.g. 11273556
+ *
+ * \par \%0*d
+ *   number (starting at 1) signifying the Nth (out of
+ *   total number of subfiles) subfile. Zero-padded
+ *   according to the number of digits in the number of
+ *   subfiles (calculated by <tt>log10(num_subfiles) + 1)</tt>
+ *
+ * \par \%d
+ *   number of subfiles
  *
  * yielding filenames such as:
  *
- * file.h5.subfile_11273556_01_of_10
- * file.h5.subfile_11273556_02_of_10
- * file.h5.subfile_11273556_10_of_10
+ * file.h5.subfile_11273556_01_of_10 \n
+ * file.h5.subfile_11273556_02_of_10 \n
+ * file.h5.subfile_11273556_10_of_10 \n
  */
 #define H5FD_SUBFILING_FILENAME_TEMPLATE "%s.subfile_%" PRIu64 "_%0*d_of_%d"
 
 /**
  * \def H5FD_SUBFILING_CONFIG_FILENAME_TEMPLATE
- * The basic template for a #H5FD_SUBFILING driver configuration filename.
- * The format specifiers correspond to:
+ * The basic printf-style template for a #H5FD_SUBFILING driver
+ * configuration filename. The format specifiers correspond to:
+ *
+ * \par \%s
+ *   base filename, e.g. "file.h5"
  *
- * %s      -> base filename, e.g. "file.h5"
- * %PRIu64 -> file inode, e.g. 11273556
+ * \par \%PRIu64
+ *   file inode, e.g. 11273556
  *
  * yielding a filename such as:
  *
diff --git a/src/H5FDsubfiling/H5FDsubfiling_priv.h b/src/H5FDsubfiling/H5FDsubfiling_priv.h
index 08fef7d..9cc32f1 100644
--- a/src/H5FDsubfiling/H5FDsubfiling_priv.h
+++ b/src/H5FDsubfiling/H5FDsubfiling_priv.h
@@ -63,4 +63,6 @@ H5_DLL herr_t H5FD__subfiling__get_real_eof(hid_t context_id, int64_t *logical_e
 }
 #endif
 
+#define CANBE_UNUSED(X) (void)(X)
+
 #endif /* H5FDsubfiling_priv_H */
diff --git a/src/H5FDsubfiling/H5subfiling_common.c b/src/H5FDsubfiling/H5subfiling_common.c
index 50ca6af..f9cc0dc 100644
--- a/src/H5FDsubfiling/H5subfiling_common.c
+++ b/src/H5FDsubfiling/H5subfiling_common.c
@@ -618,7 +618,7 @@ done:
  *              new MPI communicators that facilitate messaging between
  *              HDF5 clients and the IOCs.
  *
- * Return:      Success (0) or Faiure (non-zero)
+ * Return:      Success (0) or Failure (non-zero)
  * Errors:      If MPI operations fail for some reason.
  *
  *-------------------------------------------------------------------------
@@ -776,7 +776,7 @@ init_subfiling(const char *base_filename, uint64_t file_id, H5FD_subfiling_param
     new_context->sf_group_comm = MPI_COMM_NULL;
 
     /* Check if a prefix has been set for the configuration file name */
-    prefix_env = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX);
+    prefix_env = getenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX);
     if (prefix_env) {
         if (NULL == (new_context->config_file_prefix = strdup(prefix_env)))
             H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTCOPY, FAIL, "couldn't copy config file prefix string");
@@ -851,7 +851,7 @@ init_subfiling(const char *base_filename, uint64_t file_id, H5FD_subfiling_param
         char *env_value = NULL;
 
         /* Check for a subfiling stripe size setting from the environment */
-        if ((env_value = HDgetenv(H5FD_SUBFILING_STRIPE_SIZE))) {
+        if ((env_value = getenv(H5FD_SUBFILING_STRIPE_SIZE))) {
             long long stripe_size = -1;
 
             errno = 0;
@@ -981,7 +981,7 @@ init_app_topology(int64_t sf_context_id, H5FD_subfiling_params_t *subfiling_conf
         case SELECT_IOC_ONE_PER_NODE: {
             if (comm_size > 1) {
                 /* Check for an IOC-per-node value set in the environment */
-                if ((env_value = HDgetenv(H5FD_SUBFILING_IOC_PER_NODE))) {
+                if ((env_value = getenv(H5FD_SUBFILING_IOC_PER_NODE))) {
                     errno          = 0;
                     ioc_select_val = strtol(env_value, NULL, 0);
                     if ((ERANGE == errno)) {
@@ -1178,7 +1178,7 @@ static herr_t
 get_ioc_selection_criteria_from_env(H5FD_subfiling_ioc_select_t *ioc_selection_type, char **ioc_sel_info_str)
 {
     char  *opt_value = NULL;
-    char  *env_value = HDgetenv(H5FD_SUBFILING_IOC_SELECTION_CRITERIA);
+    char  *env_value = getenv(H5FD_SUBFILING_IOC_SELECTION_CRITERIA);
     herr_t ret_value = SUCCEED;
 
     assert(ioc_selection_type);
@@ -1365,7 +1365,8 @@ init_app_layout(sf_topology_t *app_topology, MPI_Comm comm, MPI_Comm node_comm)
         if (app_layout->layout[i].node_local_rank == 0)
             app_layout->node_count++;
 
-    assert(app_layout->node_count > 0);
+    if (app_layout->node_count <= 0)
+        H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "node count less than or equal to zero");
 
     if (NULL ==
         (app_layout->node_ranks = malloc((size_t)app_layout->node_count * sizeof(*app_layout->node_ranks))))
@@ -1820,7 +1821,7 @@ init_subfiling_context(subfiling_context_t *sf_context, const char *base_filenam
                                 "couldn't allocate space for subfiling filename");
 
     /* Check for a subfile name prefix setting in the environment */
-    if ((env_value = HDgetenv(H5FD_SUBFILING_SUBFILE_PREFIX))) {
+    if ((env_value = getenv(H5FD_SUBFILING_SUBFILE_PREFIX))) {
         if (NULL == (sf_context->subfile_prefix = strdup(env_value)))
             H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "couldn't copy subfile prefix value");
     }
@@ -1950,7 +1951,7 @@ done:
  *              discovery.  The number and mapping of IOC to MPI_rank
  *              is part of the sf_context->topology structure.
  *
- * Return:      Success (0) or Faiure (non-zero)
+ * Return:      Success (0) or Failure (non-zero)
  * Errors:      If MPI operations fail for some reason.
  *
  *-------------------------------------------------------------------------
@@ -2685,7 +2686,7 @@ done:
  *              which actually manages all subfile closing via commands
  *              to the set of IO Concentrators.
  *
- * Return:      Success (0) or Faiure (non-zero)
+ * Return:      Success (0) or Failure (non-zero)
  * Errors:      If MPI operations fail for some reason.
  *
  *-------------------------------------------------------------------------
@@ -2706,7 +2707,7 @@ done:
  *              Once the subfiles are closed, we initiate a teardown of
  *              the IOC and associated thread_pool threads.
  *
- * Return:      Success (0) or Faiure (non-zero)
+ * Return:      Success (0) or Failure (non-zero)
  * Errors:      If MPI operations fail for some reason.
  *
  *-------------------------------------------------------------------------
diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h
index 3b9a84a..348cfda 100644
--- a/src/H5FLprivate.h
+++ b/src/H5FLprivate.h
@@ -201,7 +201,7 @@ typedef struct H5FL_blk_head_t {
 #define H5FL_BLK_REALLOC(t, blk, new_size)                                                                   \
     (uint8_t *)H5FL_blk_realloc(&(H5FL_BLK_NAME(t)), blk, new_size H5FL_TRACK_INFO)
 
-/* Check if there is a free block available to re-use */
+/* Check if there is a free block available to reuse */
 #define H5FL_BLK_AVAIL(t, size) H5FL_blk_free_block_avail(&(H5FL_BLK_NAME(t)), size)
 
 #else /* H5_NO_BLK_FREE_LISTS */
diff --git a/src/H5Fint.c b/src/H5Fint.c
index 2aadcca..014f619 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -244,7 +244,7 @@ H5F__parse_file_lock_env_var(htri_t *use_locks)
     FUNC_ENTER_PACKAGE_NOERR
 
     /* Check the file locking environment variable */
-    lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING);
+    lock_env_var = getenv(HDF5_USE_FILE_LOCKING);
     if (lock_env_var && (!strcmp(lock_env_var, "FALSE") || !strcmp(lock_env_var, "0")))
         *use_locks = false; /* Override: Never use locks */
     else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "BEST_EFFORT") ||
@@ -875,9 +875,9 @@ H5F_prefix_open_file(H5F_t *primary_file, H5F_prefix_open_t prefix_type, const c
 
         /* Get the appropriate environment variable */
         if (H5F_PREFIX_VDS == prefix_type)
-            env_prefix = HDgetenv("HDF5_VDS_PREFIX");
+            env_prefix = getenv("HDF5_VDS_PREFIX");
         else if (H5F_PREFIX_ELINK == prefix_type)
-            env_prefix = HDgetenv("HDF5_EXT_PREFIX");
+            env_prefix = getenv("HDF5_EXT_PREFIX");
         else
             HGOTO_ERROR(H5E_FILE, H5E_BADTYPE, NULL, "prefix type is not sensible");
 
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index a21ffa2..cc04680 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -809,7 +809,7 @@ H5_DLL herr_t H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
  *          any object identifier is open for the object, the space will not be
  *          released until after the object identifier is closed.
  *
- *          Note that space identified as freespace is available for re-use only
+ *          Note that space identified as freespace is available for reuse only
  *          as long as the file remains open; once a file has been closed, the
  *          HDF5 library loses track of freespace. See “Freespace Management” in
  *          the \ref UG for further details.
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index 9f2fa0a..ad8e4d2 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -2521,7 +2521,7 @@ H5HF__cache_dblock_fsf_size(const void *_thing, hsize_t *fsf_size)
  *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily
+ *		This means that the fractal heap is no longer necessarily
  *		flushed from the bottom up.
  *
  *		For example, it is now possible for a dirty fractal heap
@@ -2881,7 +2881,7 @@ done:
  *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily
+ *		This means that the fractal heap is no longer necessarily
  *		flushed from the bottom up.
  *
  *		For example, it is now possible for a dirty fractal heap
@@ -2994,7 +2994,7 @@ done:
  *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily
+ *		This means that the fractal heap is no longer necessarily
  *		flushed from the bottom up.
  *
  *		For example, it is now possible for a dirty fractal heap
@@ -3153,7 +3153,7 @@ done:
  *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily
+ *		This means that the fractal heap is no longer necessarily
  *		flushed from the bottom up.
  *
  *		For example, it is now possible for a dirty fractal heap
diff --git a/src/H5Iint.c b/src/H5Iint.c
index 63557c5..7d8b4ac 100644
--- a/src/H5Iint.c
+++ b/src/H5Iint.c
@@ -1149,7 +1149,7 @@ H5I_dec_app_ref_async(hid_t id, void **token)
     /* Sanity check */
     assert(id >= 0);
 
-    /* [Possibly] aynchronously decrement refcount on ID */
+    /* [Possibly] asynchronously decrement refcount on ID */
     if ((ret_value = H5I__dec_app_ref(id, token)) < 0)
         HGOTO_ERROR(H5E_ID, H5E_CANTDEC, (-1), "can't asynchronously decrement ID ref count");
 
@@ -1254,7 +1254,7 @@ H5I_dec_app_ref_always_close_async(hid_t id, void **token)
     /* Sanity check */
     assert(id >= 0);
 
-    /* [Possibly] aynchronously decrement refcount on ID */
+    /* [Possibly] asynchronously decrement refcount on ID */
     if ((ret_value = H5I__dec_app_ref_always_close(id, token)) < 0)
         HGOTO_ERROR(H5E_ID, H5E_CANTDEC, (-1), "can't asynchronously decrement ID ref count");
 
diff --git a/src/H5MFaggr.c b/src/H5MFaggr.c
index 80d25f2..fa39c72 100644
--- a/src/H5MFaggr.c
+++ b/src/H5MFaggr.c
@@ -182,7 +182,7 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
         if ((f->shared->feature_flags & aggr->feature_flag) &&
             f->shared->fs_strategy != H5F_FSPACE_STRATEGY_NONE && !f->shared->closing) {
 #endif
-            haddr_t    aggr_frag_addr = HADDR_UNDEF; /* Address of aggregrator fragment */
+            haddr_t    aggr_frag_addr = HADDR_UNDEF; /* Address of aggregator fragment */
             hsize_t    aggr_frag_size = 0;           /* Size of aggregator fragment */
             hsize_t    alignment;                    /* Alignment of this section */
             hsize_t    aggr_mis_align = 0;           /* Misalignment of aggregator */
@@ -472,7 +472,7 @@ done:
                     }     /* end else */
                 }         /* end if */
                 else {
-                    /* The aggreator is not at end of file */
+                    /* The aggregator is not at end of file */
                     /* Check if aggregator has enough internal space to satisfy the extension. */
                     if (aggr->size >= extra_requested) {
                         /* Extend block into aggregator */
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c
index d7ede47..4eadc31 100644
--- a/src/H5Oalloc.c
+++ b/src/H5Oalloc.c
@@ -1810,7 +1810,7 @@ H5O__move_msgs_forward(H5F_t *f, H5O_t *oh)
                                                  null_msg->raw + null_msg->raw_size, gap_size) < 0)
                                     HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert gap in chunk");
 
-                                /* Re-use message # for new null message taking place of non-null message */
+                                /* Reuse message # for new null message taking place of non-null message */
                                 new_null_msg = v;
                             } /* end if */
                             else {
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index 571c8da..c06ecf6 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -346,7 +346,7 @@ H5O__efl_size(const H5F_t *f, bool H5_ATTR_UNUSED disable_shared, const void *_m
  * Function:	H5O__efl_reset
  *
  * Purpose:	Frees internal pointers and resets the message to an
- *		initialial state.
+ *		initial state.
  *
  * Return:	Non-negative on success/Negative on failure
  *
diff --git a/src/H5PLint.c b/src/H5PLint.c
index 23eec72..23d0750 100644
--- a/src/H5PLint.c
+++ b/src/H5PLint.c
@@ -140,7 +140,7 @@ H5PL_init(void)
      * to ignore plugins. The special symbol H5PL_NO_PLUGIN (defined in
      * H5PLpublic.h) means we don't want to load plugins.
      */
-    if (NULL != (env_var = HDgetenv(HDF5_PLUGIN_PRELOAD)))
+    if (NULL != (env_var = getenv(HDF5_PLUGIN_PRELOAD)))
         if (!strcmp(env_var, H5PL_NO_PLUGIN)) {
             H5PL_plugin_control_mask_g = 0;
             H5PL_allow_plugins_g       = false;
diff --git a/src/H5PLpath.c b/src/H5PLpath.c
index fafce62..4dd4b17 100644
--- a/src/H5PLpath.c
+++ b/src/H5PLpath.c
@@ -248,7 +248,7 @@ H5PL__create_path_table(void)
     /* Retrieve paths from HDF5_PLUGIN_PATH if the user sets it
      * or from the default paths if it isn't set.
      */
-    env_var = HDgetenv(HDF5_PLUGIN_PATH);
+    env_var = getenv(HDF5_PLUGIN_PATH);
     if (NULL == env_var)
         paths = H5MM_strdup(H5PL_DEFAULT_PATH);
     else
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 8338109..5f5782c 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -851,7 +851,7 @@ H5P__facc_set_def_driver(void)
     FUNC_ENTER_PACKAGE
 
     /* Check if VFL driver environment variable is set */
-    driver_env_var = HDgetenv(HDF5_DRIVER);
+    driver_env_var = getenv(HDF5_DRIVER);
 
     /* Only parse VFL driver string if it's set */
     if (driver_env_var && *driver_env_var) {
@@ -889,7 +889,7 @@ H5P__facc_set_def_driver(void)
         }     /* end else */
 
         /* Retrieve driver configuration string from environment variable, if set. */
-        driver_config_env_var = HDgetenv(HDF5_DRIVER_CONFIG);
+        driver_config_env_var = getenv(HDF5_DRIVER_CONFIG);
 
         driver_prop.driver_id         = driver_id;
         driver_prop.driver_info       = NULL;
@@ -2596,10 +2596,10 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_sieve_buf_size
  *
- * Purpose:    Sets the maximum size of the data seive buffer used for file
+ * Purpose:    Sets the maximum size of the data sieve buffer used for file
  *      drivers which are capable of using data sieving.  The data sieve
  *      buffer is used when performing I/O on datasets in the file.  Using a
- *      buffer which is large anough to hold several pieces of the dataset
+ *      buffer which is large enough to hold several pieces of the dataset
  *      being read in for hyperslab selections boosts performance by quite a
  *      bit.
  *
diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c
index 95cc0bd..ca70e1a 100644
--- a/src/H5Pocpl.c
+++ b/src/H5Pocpl.c
@@ -1001,7 +1001,7 @@ done:
  * Function: H5Premove_filter
  *
  * Purpose: Deletes a filter from the dataset creation property list;
- *  deletes all filters if FILTER is H5Z_FILTER_NONE
+ *  deletes all filters if FILTER is H5Z_FILTER_ALL
  *
  * Return: Non-negative on success/Negative on failure
  *
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 4f43a79..70b0930 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -1296,7 +1296,7 @@ H5T_get_actual_type(H5T_t *dt)
 /*-------------------------------------------------------------------------
  * Function:    H5T_save_refresh_state
  *
- * Purpose:     Save state for datatype reconstuction after a refresh.
+ * Purpose:     Save state for datatype reconstruction after a refresh.
  *
  * Return:      SUCCEED/FAIL
  *
@@ -1336,7 +1336,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5T_restore_refresh_state
  *
- * Purpose:     Restore state for datatype reconstuction after a refresh.
+ * Purpose:     Restore state for datatype reconstruction after a refresh.
  *
  * Return:      SUCCEED/FAIL
  *
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index 7574748..f83e9c3 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -579,7 +579,7 @@ H5T__get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
             match       = H5T_NATIVE_INT_MATCH_LLONG;
             native_size = sizeof(long long);
         }
-        else { /* If no native type matches the querried datatype, simply choose the type of biggest size. */
+        else { /* If no native type matches the queried datatype, simply choose the type of biggest size. */
             match       = H5T_NATIVE_INT_MATCH_LLONG;
             native_size = sizeof(long long);
         }
@@ -838,7 +838,7 @@ H5T__get_native_bitfield(size_t prec, H5T_direction_t direction, size_t *struct_
             native_size = 8;
             align       = H5T_NATIVE_UINT64_ALIGN_g;
         }
-        else { /* If no native type matches the querried datatype, simply choose the type of biggest size. */
+        else { /* If no native type matches the queried datatype, simply choose the type of biggest size. */
             tid         = H5T_NATIVE_B64;
             native_size = 8;
             align       = H5T_NATIVE_UINT64_ALIGN_g;
diff --git a/src/H5VLint.c b/src/H5VLint.c
index 0b18a7c..feb2deb 100644
--- a/src/H5VLint.c
+++ b/src/H5VLint.c
@@ -370,7 +370,7 @@ H5VL__set_def_conn(void)
     } /* end if */
 
     /* Check for environment variable set */
-    env_var = HDgetenv(HDF5_VOL_CONNECTOR);
+    env_var = getenv(HDF5_VOL_CONNECTOR);
 
     /* Only parse the string if it's set */
     if (env_var && *env_var) {
diff --git a/src/H5WB.c b/src/H5WB.c
index 7be258d..d9b9c5e 100644
--- a/src/H5WB.c
+++ b/src/H5WB.c
@@ -153,10 +153,10 @@ H5WB_actual(H5WB_t *wb, size_t need)
         /* Sanity check */
         assert(wb->actual_size > wb->wrapped_size);
 
-        /* Check if we can re-use existing buffer */
+        /* Check if we can reuse existing buffer */
         if (need <= wb->alloc_size)
             HGOTO_DONE(wb->actual_buf);
-        /* Can't re-use existing buffer, free it and proceed */
+        /* Can't reuse existing buffer, free it and proceed */
         else
             wb->actual_buf = H5FL_BLK_FREE(extra_buf, wb->actual_buf);
     } /* end if */
diff --git a/src/H5Z.c b/src/H5Z.c
index ef2e276..b514f62 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -1568,7 +1568,7 @@ done:
  * Function: H5Z_delete
  *
  * Purpose:  Delete filter FILTER from pipeline PLINE;
- *           deletes all filters if FILTER is H5Z_FILTER_NONE
+ *           deletes all filters if FILTER is H5Z_FILTER_ALL
  *
  * Return:   Non-negative on success
  *           Negative on failure
diff --git a/src/H5Zfletcher32.c b/src/H5Zfletcher32.c
index e5b98be..37f1381 100644
--- a/src/H5Zfletcher32.c
+++ b/src/H5Zfletcher32.c
@@ -104,7 +104,7 @@ H5Z__filter_fletcher32(unsigned flags, size_t H5_ATTR_UNUSED cd_nelmts,
         }
 
         /* Set return values */
-        /* (Re-use the input buffer, just note that the size is smaller by the size of the checksum) */
+        /* (Reuse the input buffer, just note that the size is smaller by the size of the checksum) */
         ret_value = nbytes - FLETCHER_LEN;
     }
     else {                  /* Write */
diff --git a/src/H5mpi.c b/src/H5mpi.c
index 2cd335d..005a99a 100644
--- a/src/H5mpi.c
+++ b/src/H5mpi.c
@@ -819,7 +819,7 @@ H5_mpio_get_file_sync_required(MPI_File fh, bool *file_sync_required)
         HGOTO_ERROR(H5E_LIB, H5E_CANTFREE, FAIL, "can't free MPI info");
 
     /* Force setting the flag via env variable (temp solution before the flag is implemented in MPI) */
-    sync_env_var = HDgetenv("HDF5_DO_MPI_FILE_SYNC");
+    sync_env_var = getenv("HDF5_DO_MPI_FILE_SYNC");
     if (sync_env_var && (!strcmp(sync_env_var, "TRUE") || !strcmp(sync_env_var, "1")))
         *file_sync_required = true;
     if (sync_env_var && (!strcmp(sync_env_var, "FALSE") || !strcmp(sync_env_var, "0")))
diff --git a/src/H5private.h b/src/H5private.h
index b3e3dc8..14a0ac3 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -694,9 +694,6 @@ H5_DLL H5_ATTR_CONST int Nflock(int fd, int operation);
 #define HDgetdrive() 0
 #endif
 
-#ifndef HDgetenv
-#define HDgetenv(S) getenv(S)
-#endif
 #ifndef HDgetpid
 #define HDgetpid() getpid()
 #endif
@@ -1585,7 +1582,7 @@ H5_DLL herr_t H5CX_pop(bool update_dxpl_props);
         H5_PUSH_FUNC                                                                                         \
         {
 
-/* Use this macro for package-level functions which propgate errors, but don't issue them */
+/* Use this macro for package-level functions which propagate errors, but don't issue them */
 #define FUNC_ENTER_PACKAGE_NOERR                                                                             \
     {                                                                                                        \
         FUNC_ENTER_COMMON_NOERR(H5_IS_PKG(__func__));                                                        \
@@ -1603,7 +1600,7 @@ H5_DLL herr_t H5CX_pop(bool update_dxpl_props);
         H5_PUSH_FUNC                                                                                         \
         {
 
-/* Use this macro for staticly-scoped functions which propgate errors, but don't issue them */
+/* Use this macro for staticly-scoped functions which propagate errors, but don't issue them */
 /* And that shouldn't push their name on the function stack */
 #define FUNC_ENTER_PACKAGE_NOERR_NOFS                                                                        \
     {                                                                                                        \
diff --git a/test/API/H5_api_test.c b/test/API/H5_api_test.c
index 98dd260..654eb40 100644
--- a/test/API/H5_api_test.c
+++ b/test/API/H5_api_test.c
@@ -155,12 +155,12 @@ main(int argc, char **argv)
     seed = (unsigned)HDtime(NULL);
     srand(seed);
 
-    if (NULL == (test_path_prefix = HDgetenv(HDF5_API_TEST_PATH_PREFIX)))
+    if (NULL == (test_path_prefix = getenv(HDF5_API_TEST_PATH_PREFIX)))
         test_path_prefix = "";
 
     snprintf(H5_api_test_filename, H5_API_TEST_FILENAME_MAX_LENGTH, "%s%s", test_path_prefix, TEST_FILE_NAME);
 
-    if (NULL == (vol_connector_string = HDgetenv(HDF5_VOL_CONNECTOR))) {
+    if (NULL == (vol_connector_string = getenv(HDF5_VOL_CONNECTOR))) {
         printf("No VOL connector selected; using native VOL connector\n");
         vol_connector_name = "native";
         vol_connector_info = NULL;
diff --git a/test/API/testhdf5.c b/test/API/testhdf5.c
index c2b4260..ca5d0e4 100644
--- a/test/API/testhdf5.c
+++ b/test/API/testhdf5.c
@@ -121,7 +121,7 @@ getenv_all(MPI_Comm comm, int root, const char *name)
         /* The root task does the getenv call
          * and sends the result to the other tasks */
         if (mpi_rank == root) {
-            env = HDgetenv(name);
+            env = getenv(name);
             if (env) {
                 len = (int)strlen(env);
                 MPI_Bcast(&len, 1, MPI_INT, root, comm);
@@ -158,7 +158,7 @@ getenv_all(MPI_Comm comm, int root, const char *name)
         /* use original getenv */
         if (env)
             free(env);
-        env = HDgetenv(name);
+        env = getenv(name);
     } /* end if */
 
     return env;
@@ -218,7 +218,7 @@ h5_get_libver_fapl(hid_t fapl)
     char        buf[1024];    /* buffer for tokenizing HDF5_DRIVER    */
 
     /* Get the environment variable, if it exists */
-    env = HDgetenv("HDF5_LIBVER_BOUNDS");
+    env = getenv("HDF5_LIBVER_BOUNDS");
 #ifdef HDF5_LIBVER_BOUNDS
     /* Use the environment variable, then the compile-time constant */
     if (!env)
@@ -280,7 +280,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu
     /* Determine if driver is set by environment variable. If it is,
      * only generate a suffix if fixing the filename for the superblock
      * file. */
-    driver_env_var = HDgetenv(HDF5_DRIVER);
+    driver_env_var = getenv(HDF5_DRIVER);
     if (driver_env_var && (H5P_DEFAULT == fapl) && subst_for_superblock)
         fapl = H5P_FILE_ACCESS_DEFAULT;
 
@@ -334,7 +334,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu
 #endif /* H5_HAVE_PARALLEL */
     }
     else {
-        if (HDgetenv(HDF5_NOCLEANUP))
+        if (getenv(HDF5_NOCLEANUP))
             SetTestNoCleanup();
     }
 #endif
@@ -382,7 +382,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu
          * For serial:
          *      First use the environment variable, then try the constant
          */
-        prefix = HDgetenv("HDF5_PREFIX");
+        prefix = getenv("HDF5_PREFIX");
 
 #ifdef HDF5_PREFIX
         if (!prefix)
@@ -404,8 +404,8 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu
                  */
                 char *user, *login;
 
-                user   = HDgetenv("USER");
-                login  = HDgetenv("LOGIN");
+                user   = getenv("USER");
+                login  = getenv("LOGIN");
                 subdir = (user ? user : login);
 
                 if (subdir) {
@@ -503,7 +503,7 @@ h5_using_default_driver(const char *drv_name)
     assert(H5_DEFAULT_VFD == H5FD_SEC2);
 
     if (!drv_name)
-        drv_name = HDgetenv(HDF5_DRIVER);
+        drv_name = getenv(HDF5_DRIVER);
 
     if (drv_name)
         return (!strcmp(drv_name, "sec2") || !strcmp(drv_name, "nomatch"));
diff --git a/test/API/tfile.c b/test/API/tfile.c
index d404a82..6b316d4 100644
--- a/test/API/tfile.c
+++ b/test/API/tfile.c
@@ -2657,7 +2657,7 @@ test_file_double_file_dataset_open(bool new_format)
     hsize_t e_ext_dims[1] = {7};              /* Expanded dimension sizes */
     hsize_t s_ext_dims[1] = {3};              /* Shrunk dimension sizes */
     hsize_t max_dims0[1]  = {8};              /* Maximum dimension sizes */
-    hsize_t max_dims1[1]  = {H5S_UNLIMITED};  /* Maximum dimesion sizes for extensible array index */
+    hsize_t max_dims1[1]  = {H5S_UNLIMITED};  /* Maximum dimension sizes for extensible array index */
     hsize_t max_dims2[2]  = {H5S_UNLIMITED, H5S_UNLIMITED}; /* Maximum dimension sizes for v2 B-tree index */
     hsize_t chunks[1] = {2}, chunks2[2] = {4, 5};           /* Chunk dimension sizes */
 #if 0
@@ -8260,7 +8260,7 @@ test_file(void)
     MESSAGE(5, ("Testing Low-Level File I/O\n"));
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/API/trefer.c b/test/API/trefer.c
index 69b9bbf..e8abe16 100644
--- a/test/API/trefer.c
+++ b/test/API/trefer.c
@@ -3571,7 +3571,7 @@ test_reference(void)
     MESSAGE(5, ("Testing References\n"));
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/API/tselect.c b/test/API/tselect.c
index befa360..9d398be 100644
--- a/test/API/tselect.c
+++ b/test/API/tselect.c
@@ -11334,7 +11334,7 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i
     /* Now select the checkerboard selection in the (possibly larger) n-cube.
      *
      * Since we have already calculated the base start, stride, count,
-     * and block, re-use the values in setting up start, stride, count,
+     * and block, reuse the values in setting up start, stride, count,
      * and block.
      */
     for (i = 0; i < SS_DR_MAX_RANK; i++) {
@@ -12790,7 +12790,7 @@ test_space_update_diminfo(void)
     hid_t space_id; /* Dataspace id */
 #if 0
     H5S_diminfo_valid_t diminfo_valid;  /* Diminfo status */
-    H5S_diminfo_valid_t rebuild_status; /* Diminfo status after rebuid */
+    H5S_diminfo_valid_t rebuild_status; /* Diminfo status after rebuild */
 #endif
     H5S_sel_type sel_type; /* Selection type */
     herr_t       ret;      /* Return value */
@@ -16093,7 +16093,7 @@ test_select(void)
     MESSAGE(5, ("Testing Selections\n"));
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/CMakePassthroughVOLTests.cmake b/test/CMakePassthroughVOLTests.cmake
index 94433de..a5d9b59 100644
--- a/test/CMakePassthroughVOLTests.cmake
+++ b/test/CMakePassthroughVOLTests.cmake
@@ -37,26 +37,26 @@ endforeach ()
 
 foreach (voltest ${VOL_LIST})
   foreach (h5_tfile ${HDF5_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/${voltest}/${h5_tfile}" "HDF5_VOLTEST_LIB_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/${voltest}/${h5_tfile}" "HDF5_VOLTEST_LIB_files")
   endforeach ()
 endforeach ()
 
 foreach (voltest ${VOL_LIST})
   foreach (ref_file ${HDF5_REFERENCE_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/${voltest}/${ref_file}" "HDF5_VOLTEST_LIB_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/${voltest}/${ref_file}" "HDF5_VOLTEST_LIB_files")
   endforeach ()
 endforeach ()
 
 foreach (voltest ${VOL_LIST})
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_TEST_BINARY_DIR}/${voltest}/${h5_file}" "HDF5_VOLTEST_LIB_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${voltest}/${h5_file}" "HDF5_VOLTEST_LIB_files")
   endforeach ()
 endforeach ()
 
 foreach (voltest ${VOL_LIST})
   foreach (plistfile ${HDF5_REFERENCE_PLIST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/${voltest}/testfiles/plist_files/${plistfile}" "HDF5_VOLTEST_LIB_files")
-    HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/${voltest}/testfiles/plist_files/def_${plistfile}" "HDF5_VOLTEST_LIB_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/${voltest}/testfiles/plist_files/${plistfile}" "HDF5_VOLTEST_LIB_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/${voltest}/testfiles/plist_files/def_${plistfile}" "HDF5_VOLTEST_LIB_files")
   endforeach ()
 endforeach ()
 
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index fa38a76..cab01f6 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -36,12 +36,9 @@ add_custom_command (
 )
 
 foreach (h5_tfile ${HDF5_TEST_FILES})
-  HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/H5TEST/${h5_tfile}" "HDF5_TEST_LIB_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/${h5_tfile}" "HDF5_TEST_LIB_files")
 endforeach ()
 
-# --------------------------------------------------------------------
-# Copy all the HDF5 files from the test directory into the source directory
-# --------------------------------------------------------------------
 set (HDF5_REFERENCE_FILES
     err_compat_1
     err_compat_2
@@ -51,7 +48,7 @@ set (HDF5_REFERENCE_FILES
 )
 
 foreach (ref_file ${HDF5_REFERENCE_FILES})
-  HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/H5TEST/${ref_file}" "HDF5_TEST_LIB_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/${ref_file}" "HDF5_TEST_LIB_files")
 endforeach ()
 
 # --------------------------------------------------------------------
@@ -109,8 +106,8 @@ set (HDF5_REFERENCE_PLIST_FILES
 )
 
 foreach (plistfile ${HDF5_REFERENCE_PLIST_FILES})
-  HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files/${plistfile}" "HDF5_TEST_LIB_files")
-  HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files/def_${plistfile}" "HDF5_TEST_LIB_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files/${plistfile}" "HDF5_TEST_LIB_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/H5TEST/testfiles/plist_files/def_${plistfile}" "HDF5_TEST_LIB_files")
 endforeach ()
 
 # --------------------------------------------------------------------
@@ -172,7 +169,7 @@ set (HDF5_REFERENCE_TEST_FILES
 )
 
 foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-  HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_TEST_BINARY_DIR}/H5TEST/${h5_file}" "HDF5_TEST_LIB_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${HDF5_TEST_BINARY_DIR}/H5TEST/testfiles/${h5_file}" "HDF5_TEST_LIB_files")
 endforeach ()
 
 add_custom_target(HDF5_TEST_LIB_files ALL COMMENT "Copying files needed by HDF5_TEST_LIB tests" DEPENDS ${HDF5_TEST_LIB_files_list})
diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake
index 7648166..ed7bd86 100644
--- a/test/CMakeVFDTests.cmake
+++ b/test/CMakeVFDTests.cmake
@@ -26,26 +26,26 @@ endforeach ()
 
 foreach (vfdtest ${VFD_LIST})
   foreach (h5_tfile ${HDF5_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}" "HDF5_VFDTEST_LIB_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/${h5_tfile}" "HDF5_VFDTEST_LIB_files")
   endforeach ()
 endforeach ()
 
 foreach (vfdtest ${VFD_LIST})
   foreach (ref_file ${HDF5_REFERENCE_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/${vfdtest}/${ref_file}" "HDF5_VFDTEST_LIB_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${ref_file}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/${ref_file}" "HDF5_VFDTEST_LIB_files")
   endforeach ()
 endforeach ()
 
 foreach (vfdtest ${VFD_LIST})
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/${h5_file}" "${HDF5_TEST_BINARY_DIR}/${vfdtest}/${h5_file}" "HDF5_VFDTEST_LIB_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${HDF5_TEST_BINARY_DIR}/${vfdtest}/testfiles/${h5_file}" "HDF5_VFDTEST_LIB_files")
   endforeach ()
 endforeach ()
 
 foreach (vfdtest ${VFD_LIST})
   foreach (plistfile ${HDF5_REFERENCE_PLIST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files/${plistfile}" "HDF5_VFDTEST_LIB_files")
-    HDFTEST_COPY_FILE("${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files/def_${plistfile}" "HDF5_VFDTEST_LIB_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/${plistfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files/${plistfile}" "HDF5_VFDTEST_LIB_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/plist_files/def_${plistfile}" "${PROJECT_BINARY_DIR}/${vfdtest}/testfiles/plist_files/def_${plistfile}" "HDF5_VFDTEST_LIB_files")
   endforeach ()
 endforeach ()
 
diff --git a/test/accum.c b/test/accum.c
index e3e79de..5a19efe 100644
--- a/test/accum.c
+++ b/test/accum.c
@@ -2077,7 +2077,7 @@ test_swmr_write_big(bool newest_format)
     /* Skip this test if SWMR I/O is not supported for the VFD specified
      * by the environment variable.
      */
-    driver = HDgetenv(HDF5_DRIVER);
+    driver = getenv(HDF5_DRIVER);
     if (!H5FD__supports_swmr_test(driver)) {
         SKIPPED();
         puts("    Test skipped due to VFD not supporting SWMR I/O.");
diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c
index a606506..5b3ecd8 100644
--- a/test/accum_swmr_reader.c
+++ b/test/accum_swmr_reader.c
@@ -56,7 +56,7 @@ main(void)
     /* Skip this test if SWMR I/O is not supported for the VFD specified
      * by the environment variable.
      */
-    driver = HDgetenv(HDF5_DRIVER);
+    driver = getenv(HDF5_DRIVER);
     if (!H5FD__supports_swmr_test(driver))
         return EXIT_SUCCESS;
 
diff --git a/test/app_ref.c b/test/app_ref.c
index 5e52fe7..729862e 100644
--- a/test/app_ref.c
+++ b/test/app_ref.c
@@ -94,7 +94,7 @@ main(void)
     TESTING("library shutdown with reference count > 1");
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/atomic_reader.c b/test/atomic_reader.c
index c8bbbae..12e2d5c 100644
--- a/test/atomic_reader.c
+++ b/test/atomic_reader.c
@@ -114,7 +114,7 @@ verify(int fd, unsigned int k)
     } /* end if */
 
     /* Position the file at the beginning */
-    if (lseek(fd, (off_t)0, SEEK_SET) < 0) {
+    if (lseek(fd, 0, SEEK_SET) < 0) {
         printf("READER: error from lseek\n");
         goto error;
     } /* end if */
diff --git a/test/atomic_writer.c b/test/atomic_writer.c
index 33252f1..89edfe7 100644
--- a/test/atomic_writer.c
+++ b/test/atomic_writer.c
@@ -190,7 +190,7 @@ main(int argc, char *argv[])
                 buf[u] = n;
 
             /* Position the file to the proper location */
-            if (lseek(fd, (off_t)(n * sizeof(unsigned int)), SEEK_SET) < 0) {
+            if (lseek(fd, (n * sizeof(unsigned int)), SEEK_SET) < 0) {
                 printf("WRITER: error from lseek\n");
                 goto error;
             } /* end if */
diff --git a/test/big.c b/test/big.c
index fc422b1..428da0a 100644
--- a/test/big.c
+++ b/test/big.c
@@ -143,7 +143,7 @@ is_sparse(void)
 
     if ((fd = HDopen("x.h5", O_RDWR | O_TRUNC | O_CREAT, H5_POSIX_CREATE_MODE_RW)) < 0)
         return 0;
-    if (HDlseek(fd, (off_t)(1024 * 1024), SEEK_SET) != 1024 * 1024)
+    if (HDlseek(fd, (HDoff_t)(1024 * 1024), SEEK_SET) != 1024 * 1024)
         return 0;
     if (5 != HDwrite(fd, "hello", (size_t)5))
         return 0;
@@ -267,7 +267,7 @@ enough_room(hid_t fapl)
         if ((fd[i] = HDopen(name, O_RDWR | O_CREAT | O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
             goto done;
         }
-        if ((off_t)size != HDlseek(fd[i], (off_t)size, SEEK_SET)) {
+        if ((HDoff_t)size != HDlseek(fd[i], (HDoff_t)size, SEEK_SET)) {
             goto done;
         }
         if (1 != HDwrite(fd[i], "X", (size_t)1)) {
diff --git a/test/btree2.c b/test/btree2.c
index 8970d89..3ad30ac 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -9918,7 +9918,7 @@ main(void)
     const char      *envval         = NULL;
     bool             api_ctx_pushed = false; /* Whether API context pushed */
 
-    envval = HDgetenv(HDF5_DRIVER);
+    envval = getenv(HDF5_DRIVER);
     if (envval == NULL)
         envval = "nomatch";
 
diff --git a/test/cache_api.c b/test/cache_api.c
index 746f2f0..de636cf 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -243,7 +243,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id)
         }
     }
 
-    /* conpare the cache's internal configuration with the expected value */
+    /* compare the cache's internal configuration with the expected value */
     if (pass) {
 
         if (!resize_configs_are_equal(&default_auto_size_ctl, &cache_ptr->resize_ctl, true)) {
@@ -386,7 +386,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id)
         }
     }
 
-    /* conpare the cache's internal configuration with the expected value */
+    /* compare the cache's internal configuration with the expected value */
     if (pass) {
 
         if (!resize_configs_are_equal(&mod_auto_size_ctl, &cache_ptr->resize_ctl, true)) {
diff --git a/test/cache_image.c b/test/cache_image.c
index 4768916..60e2398 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -7758,7 +7758,7 @@ main(void)
     int         express_test;
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/cork.c b/test/cork.c
index 98abdec..e0a7196 100644
--- a/test/cork.c
+++ b/test/cork.c
@@ -2234,7 +2234,7 @@ main(void)
             /* Skip these tests if SWMR I/O is not supported for the VFD specified
              * by the environment variable.
              */
-            driver = HDgetenv(HDF5_DRIVER);
+            driver = getenv(HDF5_DRIVER);
             if (!H5FD__supports_swmr_test(driver)) {
                 puts("-- SKIPPED SWMR tests for SWMR-incompatible VFD --");
                 continue;
diff --git a/test/dangle.c b/test/dangle.c
index 490bb2f..4079fce 100644
--- a/test/dangle.c
+++ b/test/dangle.c
@@ -627,7 +627,7 @@ main(void)
     int         nerrors = 0;
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/direct_chunk.c b/test/direct_chunk.c
index 548bfc3..bde67db 100644
--- a/test/direct_chunk.c
+++ b/test/direct_chunk.c
@@ -407,7 +407,7 @@ test_direct_chunk_overwrite_data(hid_t fid)
     if ((sid = H5Screate_simple(OVERWRITE_NDIMS, dset_dims, dset_max_dims)) < 0)
         FAIL_STACK_ERROR;
 
-    /* Set chunk size and filll value */
+    /* Set chunk size and fill value */
     if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR;
     if (H5Pset_fill_value(dcpl_id, tid, &fill_value) < 0)
diff --git a/test/dsets.c b/test/dsets.c
index ecf6db0..9bebbb8 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -626,7 +626,7 @@ test_simple_io(const char *env_h5_drvr, hid_t fapl)
         file = -1;
 
         f = HDopen(filename, O_RDONLY);
-        HDlseek(f, (off_t)offset, SEEK_SET);
+        HDlseek(f, (HDoff_t)offset, SEEK_SET);
         if (HDread(f, rdata_bytes, sizeof(int) * DSET_DIM1 * DSET_DIM2) < 0)
             goto error;
 
@@ -763,7 +763,7 @@ test_userblock_offset(const char *env_h5_drvr, hid_t fapl, bool new_format)
         file = -1;
 
         f = HDopen(filename, O_RDONLY);
-        HDlseek(f, (off_t)offset, SEEK_SET);
+        HDlseek(f, (HDoff_t)offset, SEEK_SET);
         if (HDread(f, rdata_bytes, sizeof(int) * DSET_DIM1 * DSET_DIM2) < 0)
             goto error;
 
@@ -15427,7 +15427,7 @@ main(void)
     int         i;
 
     /* Don't run this test using certain file drivers */
-    envval = HDgetenv(HDF5_DRIVER);
+    envval = getenv(HDF5_DRIVER);
     if (envval == NULL)
         envval = "nomatch";
 
diff --git a/test/enc_dec_plist_cross_platform.c b/test/enc_dec_plist_cross_platform.c
index b9dc16a..a368214 100644
--- a/test/enc_dec_plist_cross_platform.c
+++ b/test/enc_dec_plist_cross_platform.c
@@ -31,121 +31,121 @@ main(void)
 
     /******* ENCODE/DECODE DCPLS *****/
     TESTING("Default DCPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/def_dcpl_") < 0)
+    if (test_plists("plist_files/def_dcpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
     TESTING("DCPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/dcpl_") < 0)
+    if (test_plists("plist_files/dcpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE DAPLS *****/
     TESTING("Default DAPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/def_dapl_") < 0)
+    if (test_plists("plist_files/def_dapl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
     TESTING("DAPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/dapl_") < 0)
+    if (test_plists("plist_files/dapl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE DXPLS *****/
     TESTING("Default DXPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/def_dxpl_") < 0)
+    if (test_plists("plist_files/def_dxpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
     TESTING("DXPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/dxpl_") < 0)
+    if (test_plists("plist_files/dxpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE GCPLS *****/
     TESTING("Default GCPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/def_gcpl_") < 0)
+    if (test_plists("plist_files/def_gcpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
     TESTING("GCPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/gcpl_") < 0)
+    if (test_plists("plist_files/gcpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE LCPLS *****/
     TESTING("Default LCPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/def_lcpl_") < 0)
+    if (test_plists("plist_files/def_lcpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
     TESTING("LCPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/lcpl_") < 0)
+    if (test_plists("plist_files/lcpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE LAPLS *****/
     TESTING("Default LAPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/def_lapl_") < 0)
+    if (test_plists("plist_files/def_lapl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
     TESTING("LAPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/lapl_") < 0)
+    if (test_plists("plist_files/lapl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE OCPLS *****/
     TESTING("Default OCPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/def_ocpl_") < 0)
+    if (test_plists("plist_files/def_ocpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
     TESTING("OCPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/ocpl_") < 0)
+    if (test_plists("plist_files/ocpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE OCPYPLS *****/
     TESTING("Default OCPYPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/def_ocpypl_") < 0)
+    if (test_plists("plist_files/def_ocpypl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
     TESTING("OCPYPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/ocpypl_") < 0)
+    if (test_plists("plist_files/ocpypl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE FCPLS *****/
     TESTING("Default FCPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/def_fcpl_") < 0)
+    if (test_plists("plist_files/def_fcpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
     TESTING("FCPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/fcpl_") < 0)
+    if (test_plists("plist_files/fcpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE FAPLS *****/
     TESTING("Default FAPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/def_fapl_") < 0)
+    if (test_plists("plist_files/def_fapl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
     TESTING("FAPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/fapl_") < 0)
+    if (test_plists("plist_files/fapl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE STRCPLS *****/
     TESTING("Default STRCPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/def_strcpl_") < 0)
+    if (test_plists("plist_files/def_strcpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
     TESTING("STRCPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/strcpl_") < 0)
+    if (test_plists("plist_files/strcpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
 
     /******* ENCODE/DECODE ACPLS *****/
     TESTING("Default ACPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/def_acpl_") < 0)
+    if (test_plists("plist_files/def_acpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
     TESTING("ACPL Encoding/Decoding");
-    if (test_plists("testfiles/plist_files/acpl_") < 0)
+    if (test_plists("plist_files/acpl_") < 0)
         FAIL_STACK_ERROR;
     PASSED();
 
diff --git a/test/error_test.c b/test/error_test.c
index 9fe8117..57b1eb7a 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -786,7 +786,7 @@ main(void)
     int         i;
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/external.c b/test/external.c
index 30abc00..bf3c5bd 100644
--- a/test/external.c
+++ b/test/external.c
@@ -513,7 +513,7 @@ test_multiple_files(hid_t file)
         FAIL_STACK_ERROR;
     if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR;
-    /* Re-use space below */
+    /* Reuse space below */
 
     /* ----------------------------------------------
      * Verify that too-small external files will fail
diff --git a/test/fheap.c b/test/fheap.c
index 337e387..19a1e6a 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -15963,7 +15963,7 @@ main(void)
     bool        api_ctx_pushed = false; /* Whether API context pushed */
 
     /* Don't run this test using certain file drivers */
-    envval = HDgetenv(HDF5_DRIVER);
+    envval = getenv(HDF5_DRIVER);
     if (envval == NULL)
         envval = "nomatch";
 
diff --git a/test/file_image.c b/test/file_image.c
index b7d3c27..81b49d6 100644
--- a/test/file_image.c
+++ b/test/file_image.c
@@ -871,7 +871,7 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl
             HDoff_t off;
 
             /* Position at userblock */
-            off = HDlseek(fd, (off_t)USERBLOCK_SIZE, SEEK_SET);
+            off = HDlseek(fd, (HDoff_t)USERBLOCK_SIZE, SEEK_SET);
             VERIFY(off >= 0, "HDlseek() failed.");
         }
 
diff --git a/test/filenotclosed.c b/test/filenotclosed.c
index a838a89..806a7a4 100644
--- a/test/filenotclosed.c
+++ b/test/filenotclosed.c
@@ -63,7 +63,7 @@ main(void)
     bool        contig_addr_vfd;                /* Contiguous address vfd */
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/flush1.c b/test/flush1.c
index 4adddab..566d561 100644
--- a/test/flush1.c
+++ b/test/flush1.c
@@ -188,7 +188,7 @@ main(void)
         TEST_ERROR;
 
     /* Check if the current VFD supports SWMR */
-    driver            = HDgetenv(HDF5_DRIVER);
+    driver            = getenv(HDF5_DRIVER);
     vfd_supports_swmr = H5FD__supports_swmr_test(driver);
 
     /*************************************************/
diff --git a/test/flush2.c b/test/flush2.c
index c807612..ccec232 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -236,7 +236,7 @@ main(void)
         PUTS_ERROR("bad vfd-dependent fapl");
 
     /* Check if the current VFD supports SWMR */
-    driver            = HDgetenv(HDF5_DRIVER);
+    driver            = getenv(HDF5_DRIVER);
     vfd_supports_swmr = H5FD__supports_swmr_test(driver);
 
     if (h5_driver_is_default_vfd_compatible(fapl_id, &driver_is_default_vfd_compatible) < 0) {
diff --git a/test/flushrefresh.c b/test/flushrefresh.c
index ce94026..297db60 100644
--- a/test/flushrefresh.c
+++ b/test/flushrefresh.c
@@ -146,7 +146,7 @@ main(int argc, char *argv[])
          * anything. */
 
         /* Determine driver being used */
-        envval = HDgetenv(HDF5_DRIVER);
+        envval = getenv(HDF5_DRIVER);
 
         if (envval == NULL || H5FD__supports_swmr_test(envval)) {
             if (test_flush() != SUCCEED)
diff --git a/test/gen_plist.c b/test/gen_plist.c
index ba16a4f..6d40ae7 100644
--- a/test/gen_plist.c
+++ b/test/gen_plist.c
@@ -105,7 +105,7 @@ main(void)
     if ((dcpl1 = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         assert(dcpl1 > 0);
 
-    if ((ret = encode_plist(dcpl1, little_endian, word_length, "testfiles/plist_files/def_dcpl_")) < 0)
+    if ((ret = encode_plist(dcpl1, little_endian, word_length, "plist_files/def_dcpl_")) < 0)
         assert(ret > 0);
 
     if ((ret = H5Pset_chunk(dcpl1, 1, &chunk_size)) < 0)
@@ -132,7 +132,7 @@ main(void)
     if ((ret = H5Pset_external(dcpl1, "ext4.data", (off_t)0, (hsize_t)(max_size[0] * sizeof(int) / 4))) < 0)
         assert(ret > 0);
 
-    if ((ret = encode_plist(dcpl1, little_endian, word_length, "testfiles/plist_files/dcpl_")) < 0)
+    if ((ret = encode_plist(dcpl1, little_endian, word_length, "plist_files/dcpl_")) < 0)
         assert(ret > 0);
 
     /* release resource */
@@ -143,13 +143,13 @@ main(void)
     if ((dapl1 = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         assert(dapl1 > 0);
 
-    if ((ret = encode_plist(dapl1, little_endian, word_length, "testfiles/plist_files/def_dapl_")) < 0)
+    if ((ret = encode_plist(dapl1, little_endian, word_length, "plist_files/def_dapl_")) < 0)
         assert(ret > 0);
 
     if ((ret = H5Pset_chunk_cache(dapl1, nslots, nbytes, w0)) < 0)
         assert(ret > 0);
 
-    if ((ret = encode_plist(dapl1, little_endian, word_length, "testfiles/plist_files/dapl_")) < 0)
+    if ((ret = encode_plist(dapl1, little_endian, word_length, "plist_files/dapl_")) < 0)
         assert(ret > 0);
 
     /* release resource */
@@ -160,7 +160,7 @@ main(void)
     if ((dxpl1 = H5Pcreate(H5P_DATASET_XFER)) < 0)
         assert(dxpl1 > 0);
 
-    if ((ret = encode_plist(dxpl1, little_endian, word_length, "testfiles/plist_files/def_dxpl_")) < 0)
+    if ((ret = encode_plist(dxpl1, little_endian, word_length, "plist_files/def_dxpl_")) < 0)
         assert(ret > 0);
 
     if ((ret = H5Pset_btree_ratios(dxpl1, 0.2, 0.6, 0.2)) < 0)
@@ -189,7 +189,7 @@ main(void)
     if ((ret = H5Pset_modify_write_buf(dxpl1, true)) < 0)
         assert(ret > 0);
 
-    if ((ret = encode_plist(dxpl1, little_endian, word_length, "testfiles/plist_files/dxpl_")) < 0)
+    if ((ret = encode_plist(dxpl1, little_endian, word_length, "plist_files/dxpl_")) < 0)
         assert(ret > 0);
 
     /* release resource */
@@ -200,7 +200,7 @@ main(void)
     if ((gcpl1 = H5Pcreate(H5P_GROUP_CREATE)) < 0)
         assert(gcpl1 > 0);
 
-    if ((ret = encode_plist(gcpl1, little_endian, word_length, "testfiles/plist_files/def_gcpl_")) < 0)
+    if ((ret = encode_plist(gcpl1, little_endian, word_length, "plist_files/def_gcpl_")) < 0)
         assert(ret > 0);
 
     if ((ret = H5Pset_local_heap_size_hint(gcpl1, 256)) < 0)
@@ -219,7 +219,7 @@ main(void)
     if ((ret = H5Pset_link_creation_order(gcpl1, (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED))) < 0)
         assert(ret > 0);
 
-    if ((ret = encode_plist(gcpl1, little_endian, word_length, "testfiles/plist_files/gcpl_")) < 0)
+    if ((ret = encode_plist(gcpl1, little_endian, word_length, "plist_files/gcpl_")) < 0)
         assert(ret > 0);
 
     /* release resource */
@@ -230,13 +230,13 @@ main(void)
     if ((lcpl1 = H5Pcreate(H5P_LINK_CREATE)) < 0)
         assert(lcpl1 > 0);
 
-    if ((ret = encode_plist(lcpl1, little_endian, word_length, "testfiles/plist_files/def_lcpl_")) < 0)
+    if ((ret = encode_plist(lcpl1, little_endian, word_length, "plist_files/def_lcpl_")) < 0)
         assert(ret > 0);
 
     if ((ret = H5Pset_create_intermediate_group(lcpl1, 1 /*true*/)) < 0)
         assert(ret > 0);
 
-    if ((ret = encode_plist(lcpl1, little_endian, word_length, "testfiles/plist_files/lcpl_")) < 0)
+    if ((ret = encode_plist(lcpl1, little_endian, word_length, "plist_files/lcpl_")) < 0)
         assert(ret > 0);
 
     /* release resource */
@@ -247,7 +247,7 @@ main(void)
     if ((ocpypl1 = H5Pcreate(H5P_OBJECT_COPY)) < 0)
         assert(ocpypl1 > 0);
 
-    if ((ret = encode_plist(ocpypl1, little_endian, word_length, "testfiles/plist_files/def_ocpypl_")) < 0)
+    if ((ret = encode_plist(ocpypl1, little_endian, word_length, "plist_files/def_ocpypl_")) < 0)
         assert(ret > 0);
 
     ret = H5Pset_copy_object(ocpypl1, H5O_COPY_EXPAND_EXT_LINK_FLAG);
@@ -259,7 +259,7 @@ main(void)
     ret = H5Padd_merge_committed_dtype_path(ocpypl1, "bar");
     assert(ret >= 0);
 
-    if ((ret = encode_plist(ocpypl1, little_endian, word_length, "testfiles/plist_files/ocpypl_")) < 0)
+    if ((ret = encode_plist(ocpypl1, little_endian, word_length, "plist_files/ocpypl_")) < 0)
         assert(ret > 0);
 
     /* release resource */
@@ -270,7 +270,7 @@ main(void)
     if ((ocpl1 = H5Pcreate(H5P_OBJECT_CREATE)) < 0)
         assert(ocpl1 > 0);
 
-    if ((ret = encode_plist(ocpl1, little_endian, word_length, "testfiles/plist_files/def_ocpl_")) < 0)
+    if ((ret = encode_plist(ocpl1, little_endian, word_length, "plist_files/def_ocpl_")) < 0)
         assert(ret > 0);
 
     if ((ret = H5Pset_attr_creation_order(ocpl1, (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED))) < 0)
@@ -282,7 +282,7 @@ main(void)
     if ((ret = H5Pset_filter(ocpl1, H5Z_FILTER_FLETCHER32, 0, (size_t)0, NULL)) < 0)
         assert(ret > 0);
 
-    if ((ret = encode_plist(ocpl1, little_endian, word_length, "testfiles/plist_files/ocpl_")) < 0)
+    if ((ret = encode_plist(ocpl1, little_endian, word_length, "plist_files/ocpl_")) < 0)
         assert(ret > 0);
 
     /* release resource */
@@ -293,7 +293,7 @@ main(void)
     if ((lapl1 = H5Pcreate(H5P_LINK_ACCESS)) < 0)
         assert(lapl1 > 0);
 
-    if ((ret = encode_plist(lapl1, little_endian, word_length, "testfiles/plist_files/def_lapl_")) < 0)
+    if ((ret = encode_plist(lapl1, little_endian, word_length, "plist_files/def_lapl_")) < 0)
         assert(ret > 0);
 
     if ((ret = H5Pset_nlinks(lapl1, (size_t)134)) < 0)
@@ -318,7 +318,7 @@ main(void)
     if ((ret = H5Pclose(fapl1)) < 0)
         assert(ret > 0);
 
-    if ((ret = encode_plist(lapl1, little_endian, word_length, "testfiles/plist_files/lapl_")) < 0)
+    if ((ret = encode_plist(lapl1, little_endian, word_length, "plist_files/lapl_")) < 0)
         assert(ret > 0);
 
     /* release resource */
@@ -329,7 +329,7 @@ main(void)
     if ((fapl1 = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         assert(fapl1 > 0);
 
-    if ((ret = encode_plist(fapl1, little_endian, word_length, "testfiles/plist_files/def_fapl_")) < 0)
+    if ((ret = encode_plist(fapl1, little_endian, word_length, "plist_files/def_fapl_")) < 0)
         assert(ret > 0);
 
     if ((ret = H5Pset_family_offset(fapl1, 1024)) < 0)
@@ -359,7 +359,7 @@ main(void)
     if ((ret = H5Pset_mdc_image_config(fapl1, &my_cache_image_config)) < 0)
         assert(ret > 0);
 
-    if ((ret = encode_plist(fapl1, little_endian, word_length, "testfiles/plist_files/fapl_")) < 0)
+    if ((ret = encode_plist(fapl1, little_endian, word_length, "plist_files/fapl_")) < 0)
         assert(ret > 0);
 
     /* release resource */
@@ -370,7 +370,7 @@ main(void)
     if ((fcpl1 = H5Pcreate(H5P_FILE_CREATE)) < 0)
         assert(fcpl1 > 0);
 
-    if ((ret = encode_plist(fcpl1, little_endian, word_length, "testfiles/plist_files/def_fcpl_")) < 0)
+    if ((ret = encode_plist(fcpl1, little_endian, word_length, "plist_files/def_fcpl_")) < 0)
         assert(ret > 0);
 
     if ((ret = H5Pset_userblock(fcpl1, 1024) < 0))
@@ -400,7 +400,7 @@ main(void)
     if ((ret = H5Pset_file_space_page_size(fcpl1, (hsize_t)4096)) < 0)
         assert(ret > 0);
 
-    if ((ret = encode_plist(fcpl1, little_endian, word_length, "testfiles/plist_files/fcpl_")) < 0)
+    if ((ret = encode_plist(fcpl1, little_endian, word_length, "plist_files/fcpl_")) < 0)
         assert(ret > 0);
 
     /* release resource */
@@ -411,13 +411,13 @@ main(void)
     strcpl1 = H5Pcreate(H5P_STRING_CREATE);
     assert(strcpl1 > 0);
 
-    ret = encode_plist(strcpl1, little_endian, word_length, "testfiles/plist_files/def_strcpl_");
+    ret = encode_plist(strcpl1, little_endian, word_length, "plist_files/def_strcpl_");
     assert(ret > 0);
 
     ret = H5Pset_char_encoding(strcpl1, H5T_CSET_UTF8);
     assert(ret >= 0);
 
-    ret = encode_plist(strcpl1, little_endian, word_length, "testfiles/plist_files/strcpl_");
+    ret = encode_plist(strcpl1, little_endian, word_length, "plist_files/strcpl_");
     assert(ret > 0);
 
     /* release resource */
@@ -428,13 +428,13 @@ main(void)
     acpl1 = H5Pcreate(H5P_ATTRIBUTE_CREATE);
     assert(acpl1 > 0);
 
-    ret = encode_plist(acpl1, little_endian, word_length, "testfiles/plist_files/def_acpl_");
+    ret = encode_plist(acpl1, little_endian, word_length, "plist_files/def_acpl_");
     assert(ret > 0);
 
     ret = H5Pset_char_encoding(acpl1, H5T_CSET_UTF8);
     assert(ret >= 0);
 
-    ret = encode_plist(acpl1, little_endian, word_length, "testfiles/plist_files/acpl_");
+    ret = encode_plist(acpl1, little_endian, word_length, "plist_files/acpl_");
     assert(ret > 0);
 
     /* release resource */
diff --git a/test/h5test.c b/test/h5test.c
index 21585f7..5348e1b 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -467,7 +467,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu
     /* Determine if driver is set by environment variable. If it is,
      * only generate a suffix if fixing the filename for the superblock
      * file. */
-    driver_env_var = HDgetenv(HDF5_DRIVER);
+    driver_env_var = getenv(HDF5_DRIVER);
     if (driver_env_var && (H5P_DEFAULT == fapl) && subst_for_superblock)
         fapl = H5P_FILE_ACCESS_DEFAULT;
 
@@ -480,8 +480,14 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu
             if (H5FD_FAMILY == driver) {
                 if (subst_for_superblock)
                     suffix = "-000000.h5";
-                else
-                    suffix = nest_printf ? "-%%06d.h5" : "-%06d.h5";
+                else {
+                    if (nest_printf) {
+                        suffix = "-%%06d.h5";
+                    }
+                    else {
+                        suffix = "-%06d.h5";
+                    }
+                }
             }
             else if (H5FD_MULTI == driver) {
 
@@ -526,7 +532,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu
 #endif /* H5_HAVE_PARALLEL */
     }
     else {
-        if (HDgetenv(HDF5_NOCLEANUP))
+        if (getenv(HDF5_NOCLEANUP))
             SetTestNoCleanup();
     }
 
@@ -574,7 +580,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu
          * For serial:
          *      First use the environment variable, then try the constant
          */
-        prefix = HDgetenv("HDF5_PREFIX");
+        prefix = getenv("HDF5_PREFIX");
 
 #ifdef HDF5_PREFIX
         if (!prefix)
@@ -596,8 +602,8 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu
                  */
                 char *user, *login;
 
-                user   = HDgetenv("USER");
-                login  = HDgetenv("LOGIN");
+                user   = getenv("USER");
+                login  = getenv("LOGIN");
                 subdir = (user ? user : login);
 
                 if (subdir) {
@@ -787,7 +793,7 @@ h5_get_libver_fapl(hid_t fapl)
     char        buf[1024];    /* buffer for tokenizing HDF5_DRIVER    */
 
     /* Get the environment variable, if it exists */
-    env = HDgetenv("HDF5_LIBVER_BOUNDS");
+    env = getenv("HDF5_LIBVER_BOUNDS");
 #ifdef HDF5_LIBVER_BOUNDS
     /* Use the environment variable, then the compile-time constant */
     if (!env)
@@ -925,7 +931,7 @@ h5_set_info_object(void)
     int   ret_value = 0;
 
     /* handle any MPI INFO hints via $HDF5_MPI_INFO */
-    if ((envp = HDgetenv("HDF5_MPI_INFO")) != NULL) {
+    if ((envp = getenv("HDF5_MPI_INFO")) != NULL) {
         char *next, *valp;
 
         valp = envp = next = strdup(envp);
@@ -1088,7 +1094,7 @@ h5_get_file_size(const char *filename, hid_t fapl)
             h5_stat_size_t tot_size       = 0;
             char          *driver_env_var = NULL;
 
-            driver_env_var = HDgetenv(HDF5_DRIVER);
+            driver_env_var = getenv(HDF5_DRIVER);
             if (driver_env_var && !strcmp(driver_env_var, "split")) {
                 for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) {
                     if (mt != H5FD_MEM_DRAW && mt != H5FD_MEM_SUPER)
@@ -1302,7 +1308,7 @@ getenv_all(MPI_Comm comm, int root, const char *name)
         /* The root task does the getenv call
          * and sends the result to the other tasks */
         if (mpi_rank == root) {
-            env = HDgetenv(name);
+            env = getenv(name);
             if (env) {
                 len = (int)strlen(env);
                 MPI_Bcast(&len, 1, MPI_INT, root, comm);
@@ -1339,7 +1345,7 @@ getenv_all(MPI_Comm comm, int root, const char *name)
         /* use original getenv */
         if (env)
             free(env);
-        env = HDgetenv(name);
+        env = getenv(name);
     } /* end if */
 
     return env;
@@ -1894,9 +1900,9 @@ H5_get_srcdir_filename(const char *filename)
     /* Build path to test file. We're checking the length so suppress
      * the gcc format-truncation warning.
      */
-    if ((strlen(srcdir) + strlen(filename) + 1) < sizeof(srcdir_testpath)) {
+    if ((strlen(srcdir) + strlen("testfiles/") + strlen(filename) + 1) < sizeof(srcdir_testpath)) {
         H5_GCC_DIAG_OFF("format-truncation")
-        snprintf(srcdir_testpath, sizeof(srcdir_testpath), "%s%s", srcdir, filename);
+        snprintf(srcdir_testpath, sizeof(srcdir_testpath), "%stestfiles/%s", srcdir, filename);
         H5_GCC_DIAG_ON("format-truncation")
         return srcdir_testpath;
     }
@@ -1917,7 +1923,7 @@ H5_get_srcdir_filename(const char *filename)
 const char *
 H5_get_srcdir(void)
 {
-    const char *srcdir = HDgetenv("srcdir");
+    const char *srcdir = getenv("srcdir");
 
     /* Check for using the srcdir from configure time */
     if (NULL == srcdir)
@@ -2076,7 +2082,7 @@ h5_using_default_driver(const char *drv_name)
     assert(H5_DEFAULT_VFD == H5FD_SEC2);
 
     if (!drv_name)
-        drv_name = HDgetenv(HDF5_DRIVER);
+        drv_name = getenv(HDF5_DRIVER);
 
     if (drv_name)
         return (!strcmp(drv_name, "sec2") || !strcmp(drv_name, "nomatch"));
@@ -2197,7 +2203,7 @@ h5_driver_uses_multiple_files(const char *drv_name, unsigned flags)
     bool ret_val = false;
 
     if (!drv_name)
-        drv_name = HDgetenv(HDF5_DRIVER);
+        drv_name = getenv(HDF5_DRIVER);
 
     if (drv_name) {
         if ((flags & H5_EXCLUDE_MULTIPART_DRIVERS) == 0) {
diff --git a/test/hdfs.c b/test/hdfs.c
index fe876fa..857a54c 100644
--- a/test/hdfs.c
+++ b/test/hdfs.c
@@ -1579,7 +1579,7 @@ main(void)
     static char hdfs_namenode_name[HDFS_NAMENODE_NAME_MAX_SIZE] = "";
     const char *hdfs_namenode_name_env                          = NULL;
 
-    hdfs_namenode_name_env = HDgetenv("HDFS_TEST_NAMENODE_NAME");
+    hdfs_namenode_name_env = getenv("HDFS_TEST_NAMENODE_NAME");
     if (hdfs_namenode_name_env == NULL || hdfs_namenode_name_env[0] == '\0') {
         strncpy(hdfs_namenode_name, "localhost", HDFS_NAMENODE_NAME_MAX_SIZE);
     }
diff --git a/test/istore.c b/test/istore.c
index 921d200..33032d1 100644
--- a/test/istore.c
+++ b/test/istore.c
@@ -62,7 +62,7 @@ is_sparse(void)
 
     if ((fd = HDopen("x.h5", O_RDWR | O_TRUNC | O_CREAT, H5_POSIX_CREATE_MODE_RW)) < 0)
         return 0;
-    if (HDlseek(fd, (off_t)(1024 * 1024), SEEK_SET) != 1024 * 1024)
+    if (HDlseek(fd, (HDoff_t)(1024 * 1024), SEEK_SET) != 1024 * 1024)
         return 0;
     if (5 != HDwrite(fd, "hello", (size_t)5))
         return 0;
diff --git a/test/links.c b/test/links.c
index d707430..6f07d32 100644
--- a/test/links.c
+++ b/test/links.c
@@ -22656,7 +22656,7 @@ main(void)
     const char *env_h5_drvr; /* File Driver value from environment */
     bool        driver_is_default_compatible;
 
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/links_env.c b/test/links_env.c
index 3c67623..1eae52a 100644
--- a/test/links_env.c
+++ b/test/links_env.c
@@ -61,7 +61,7 @@ external_link_env(hid_t fapl, bool new_format)
     else
         TESTING("external links via environment variable");
 
-    if ((envval = HDgetenv("HDF5_EXT_PREFIX")) == NULL)
+    if ((envval = getenv("HDF5_EXT_PREFIX")) == NULL)
         envval = "nomatch";
     if (strcmp(envval, ".:tmp_links_env") != 0)
         TEST_ERROR;
@@ -149,7 +149,7 @@ main(void)
     int         nerrors = 0; /* Error from tests */
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/mf.c b/test/mf.c
index 6399caf..269419f 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -1979,7 +1979,7 @@ error:
  *-------------------------------------------------------------------------
  * To verify that an aggregator is absorbed into a section.
  *
- *    Test 1: To aborb the aggregator onto the beginning of the section
+ *    Test 1: To absorb the aggregator onto the beginning of the section
  *        Allocate block A from meta_aggr
  *        Create a free-space section node with an address that adjoins
  *            the end of meta_aggr and a size to make the aggregator
@@ -9134,7 +9134,7 @@ main(void)
     bool        api_ctx_pushed = false;     /* Whether API context pushed */
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/objcopy.c b/test/objcopy.c
index 2afff4b..d604c54 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -17128,7 +17128,7 @@ main(void)
     bool        same_file;   /* Whether to run tests that only use one file */
     bool        driver_is_default_compatible;
 
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/ohdr.c b/test/ohdr.c
index 7d8eb75..99b979b 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -1839,7 +1839,7 @@ main(void)
     herr_t         ret;                    /* Generic return value */
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/onion.c b/test/onion.c
index bbbcaf5..5b9bb92 100644
--- a/test/onion.c
+++ b/test/onion.c
@@ -1678,7 +1678,7 @@ verify_history_as_expected_onion(H5FD_t *raw_file, struct expected_history *filt
     if (H5FD__onion_history_decode(buf, &history_out) != readsize)
         TEST_ERROR;
 
-    /* Re-use buffer space to sanity-check checksum for record pointer(s). */
+    /* Reuse buffer space to sanity-check checksum for record pointer(s). */
     assert(readsize >= sizeof(H5FD_onion_record_loc_t));
     for (size_t i = 0; i < history_out.n_revisions; i++) {
 
@@ -4918,7 +4918,7 @@ main(void)
     /* The onion VFD only supports the sec2 VFD under the hood, so skip this
      * test when the environment variable has been set to something else
      */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
     if ((0 != strcmp(env_h5_drvr, "nomatch")) && (0 != strcmp(env_h5_drvr, "sec2"))) {
diff --git a/test/page_buffer.c b/test/page_buffer.c
index 65f2038..651e84a 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -2072,7 +2072,7 @@ main(void)
     h5_reset();
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/reserved.c b/test/reserved.c
index ff37baf..5540d04 100644
--- a/test/reserved.c
+++ b/test/reserved.c
@@ -466,7 +466,7 @@ main(void)
     hid_t       fapl;
     const char *envval = NULL;
 
-    envval = HDgetenv(HDF5_DRIVER);
+    envval = getenv(HDF5_DRIVER);
     if (envval == NULL)
         envval = "nomatch";
     /* QAK: should be able to use the core driver? */
diff --git a/test/ros3.c b/test/ros3.c
index 5ab2dec..cc058fb 100644
--- a/test/ros3.c
+++ b/test/ros3.c
@@ -1695,7 +1695,7 @@ main(void)
      * initialize test urls *
      ************************/
 
-    bucket_url_env = HDgetenv("HDF5_ROS3_TEST_BUCKET_URL");
+    bucket_url_env = getenv("HDF5_ROS3_TEST_BUCKET_URL");
     if (bucket_url_env == NULL || bucket_url_env[0] == '\0') {
         printf("WARNING: S3 bucket url is not defined in environment "
                "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n");
diff --git a/test/s3comms.c b/test/s3comms.c
index b9b2802..40f163e 100644
--- a/test/s3comms.c
+++ b/test/s3comms.c
@@ -2520,7 +2520,7 @@ main(void)
         s3_test_credentials_loaded = 1;
     }
 
-    bucket_url_env = HDgetenv("HDF5_ROS3_TEST_BUCKET_URL");
+    bucket_url_env = getenv("HDF5_ROS3_TEST_BUCKET_URL");
     if (bucket_url_env == NULL || bucket_url_env[0] == '\0') {
         printf("WARNING: S3 bucket url is not defined in environment "
                "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n");
diff --git a/test/select_io_dset.c b/test/select_io_dset.c
index 4c67190..d75b76b 100644
--- a/test/select_io_dset.c
+++ b/test/select_io_dset.c
@@ -2859,7 +2859,7 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_
 
         /* The split and multi driver are not compatible with page buffering.  No message since the other
          * cases aren't skipped. */
-        env_h5_drvr = HDgetenv(HDF5_DRIVER);
+        env_h5_drvr = getenv(HDF5_DRIVER);
         if (env_h5_drvr && (!strcmp(env_h5_drvr, "split") || !strcmp(env_h5_drvr, "multi")))
             return 0;
     }
diff --git a/test/set_extent.c b/test/set_extent.c
index 08b96a5..d418f2e 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -113,7 +113,7 @@ main(void)
     const char *env_h5_drvr;     /* File Driver value from environment */
     bool        contig_addr_vfd; /* Whether VFD used has a contiguous address space */
 
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
     /* Current VFD that does not support contiguous address space */
diff --git a/test/stab.c b/test/stab.c
index e43e9c0..1b7da01 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -1381,7 +1381,7 @@ main(void)
     int         nerrors = 0;
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/swmr.c b/test/swmr.c
index e7eec67..aacf498 100644
--- a/test/swmr.c
+++ b/test/swmr.c
@@ -4054,7 +4054,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl)
 
     hsize_t dims[2]       = {100, 0};             /* The dataset dimension sizes */
     hsize_t maxdims[2]    = {100, H5S_UNLIMITED}; /* The dataset maximum dimension sizes */
-    hsize_t chunk_dims[2] = {5, 2};               /* The chunk dimesion sizes */
+    hsize_t chunk_dims[2] = {5, 2};               /* The chunk dimension sizes */
 
     TESTING("H5Fget/set_append_flush() for a chunked dataset's access property list");
 
@@ -4498,7 +4498,7 @@ test_append_flush_dataset_multiple(hid_t in_fapl)
 
     hsize_t dims[2]       = {0, 0};                         /* The dataset dimension sizes */
     hsize_t maxdims[2]    = {H5S_UNLIMITED, H5S_UNLIMITED}; /* The dataset maximum dimension sizes */
-    hsize_t chunk_dims[2] = {5, 2};                         /* The chunk dimesion sizes */
+    hsize_t chunk_dims[2] = {5, 2};                         /* The chunk dimension sizes */
 
     TESTING("H5Fget/set_append_flush() for multiple opens of a chunked dataset");
 
@@ -7742,7 +7742,7 @@ main(void)
     /* Skip this test if SWMR I/O is not supported for the VFD specified
      * by the environment variable.
      */
-    driver = HDgetenv(HDF5_DRIVER);
+    driver = getenv(HDF5_DRIVER);
     if (!H5FD__supports_swmr_test(driver)) {
         printf("This VFD does not support SWMR I/O\n");
         return EXIT_SUCCESS;
@@ -7752,7 +7752,7 @@ main(void)
      * about file locking. File locking should be used unless explicitly
      * disabled.
      */
-    lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING);
+    lock_env_var = getenv(HDF5_USE_FILE_LOCKING);
     if (lock_env_var && !strcmp(lock_env_var, "FALSE"))
         use_file_locking = false;
     else
diff --git a/test/aggr.h5 b/test/testfiles/aggr.h5
index b24365d..b24365d 100644
--- a/test/aggr.h5
+++ b/test/testfiles/aggr.h5
diff --git a/test/bad_compound.h5 b/test/testfiles/bad_compound.h5
index 1834a2e..1834a2e 100644
--- a/test/bad_compound.h5
+++ b/test/testfiles/bad_compound.h5
diff --git a/test/bad_offset.h5 b/test/testfiles/bad_offset.h5
index 231dca2..231dca2 100644
--- a/test/bad_offset.h5
+++ b/test/testfiles/bad_offset.h5
diff --git a/test/be_data.h5 b/test/testfiles/be_data.h5
index e6629d3..e6629d3 100644
--- a/test/be_data.h5
+++ b/test/testfiles/be_data.h5
diff --git a/test/be_extlink1.h5 b/test/testfiles/be_extlink1.h5
index f800185..f800185 100644
--- a/test/be_extlink1.h5
+++ b/test/testfiles/be_extlink1.h5
diff --git a/test/be_extlink2.h5 b/test/testfiles/be_extlink2.h5
index 92ed32c..92ed32c 100644
--- a/test/be_extlink2.h5
+++ b/test/testfiles/be_extlink2.h5
diff --git a/test/btree_idx_1_6.h5 b/test/testfiles/btree_idx_1_6.h5
index 92f939b..92f939b 100644
--- a/test/btree_idx_1_6.h5
+++ b/test/testfiles/btree_idx_1_6.h5
diff --git a/test/btree_idx_1_8.h5 b/test/testfiles/btree_idx_1_8.h5
index 36662b2..36662b2 100644
--- a/test/btree_idx_1_8.h5
+++ b/test/testfiles/btree_idx_1_8.h5
diff --git a/test/corrupt_stab_msg.h5 b/test/testfiles/corrupt_stab_msg.h5
index 4fa287c..4fa287c 100644
--- a/test/corrupt_stab_msg.h5
+++ b/test/testfiles/corrupt_stab_msg.h5
diff --git a/test/cve_2020_10810.h5 b/test/testfiles/cve_2020_10810.h5
index 5cface3..5cface3 100644
--- a/test/cve_2020_10810.h5
+++ b/test/testfiles/cve_2020_10810.h5
diff --git a/test/cve_2020_10812.h5 b/test/testfiles/cve_2020_10812.h5
index a20369d..a20369d 100755
--- a/test/cve_2020_10812.h5
+++ b/test/testfiles/cve_2020_10812.h5
diff --git a/test/deflate.h5 b/test/testfiles/deflate.h5
index 2f62e25..2f62e25 100644
--- a/test/deflate.h5
+++ b/test/testfiles/deflate.h5
diff --git a/test/family_v16-000000.h5 b/test/testfiles/family_v16-000000.h5
index ac75ea9..ac75ea9 100644
--- a/test/family_v16-000000.h5
+++ b/test/testfiles/family_v16-000000.h5
diff --git a/test/family_v16-000001.h5 b/test/testfiles/family_v16-000001.h5
index bf55b32..bf55b32 100644
--- a/test/family_v16-000001.h5
+++ b/test/testfiles/family_v16-000001.h5
diff --git a/test/family_v16-000002.h5 b/test/testfiles/family_v16-000002.h5
index 9bd0891..9bd0891 100644
--- a/test/family_v16-000002.h5
+++ b/test/testfiles/family_v16-000002.h5
diff --git a/test/family_v16-000003.h5 b/test/testfiles/family_v16-000003.h5
index fedce2a..fedce2a 100644
--- a/test/family_v16-000003.h5
+++ b/test/testfiles/family_v16-000003.h5
diff --git a/test/file_image_core_test.h5 b/test/testfiles/file_image_core_test.h5
index 1cc5130..1cc5130 100644
--- a/test/file_image_core_test.h5
+++ b/test/testfiles/file_image_core_test.h5
diff --git a/test/filespace_1_6.h5 b/test/testfiles/filespace_1_6.h5
index 5afc718..5afc718 100644
--- a/test/filespace_1_6.h5
+++ b/test/testfiles/filespace_1_6.h5
diff --git a/test/filespace_1_8.h5 b/test/testfiles/filespace_1_8.h5
index 3fa2822..3fa2822 100644
--- a/test/filespace_1_8.h5
+++ b/test/testfiles/filespace_1_8.h5
diff --git a/test/fill18.h5 b/test/testfiles/fill18.h5
index c092f59..c092f59 100644
--- a/test/fill18.h5
+++ b/test/testfiles/fill18.h5
diff --git a/test/fill_old.h5 b/test/testfiles/fill_old.h5
index e77f519..e77f519 100644
--- a/test/fill_old.h5
+++ b/test/testfiles/fill_old.h5
diff --git a/test/filter_error.h5 b/test/testfiles/filter_error.h5
index 370cc1c..370cc1c 100644
--- a/test/filter_error.h5
+++ b/test/testfiles/filter_error.h5
diff --git a/test/fsm_aggr_nopersist.h5 b/test/testfiles/fsm_aggr_nopersist.h5
index 159e7f7..159e7f7 100644
--- a/test/fsm_aggr_nopersist.h5
+++ b/test/testfiles/fsm_aggr_nopersist.h5
diff --git a/test/fsm_aggr_persist.h5 b/test/testfiles/fsm_aggr_persist.h5
index 1a837dd..1a837dd 100644
--- a/test/fsm_aggr_persist.h5
+++ b/test/testfiles/fsm_aggr_persist.h5
diff --git a/test/group_old.h5 b/test/testfiles/group_old.h5
index 58f66f8..58f66f8 100644
--- a/test/group_old.h5
+++ b/test/testfiles/group_old.h5
diff --git a/test/h5fc_ext1_f.h5 b/test/testfiles/h5fc_ext1_f.h5
index b5c5867..b5c5867 100644
--- a/test/h5fc_ext1_f.h5
+++ b/test/testfiles/h5fc_ext1_f.h5
diff --git a/test/h5fc_ext1_i.h5 b/test/testfiles/h5fc_ext1_i.h5
index 960a8d5..960a8d5 100644
--- a/test/h5fc_ext1_i.h5
+++ b/test/testfiles/h5fc_ext1_i.h5
diff --git a/test/h5fc_ext2_if.h5 b/test/testfiles/h5fc_ext2_if.h5
index 88e42e7..88e42e7 100644
--- a/test/h5fc_ext2_if.h5
+++ b/test/testfiles/h5fc_ext2_if.h5
diff --git a/test/h5fc_ext2_sf.h5 b/test/testfiles/h5fc_ext2_sf.h5
index c59a3ca..c59a3ca 100644
--- a/test/h5fc_ext2_sf.h5
+++ b/test/testfiles/h5fc_ext2_sf.h5
diff --git a/test/h5fc_ext3_isf.h5 b/test/testfiles/h5fc_ext3_isf.h5
index d00fc55..d00fc55 100644
--- a/test/h5fc_ext3_isf.h5
+++ b/test/testfiles/h5fc_ext3_isf.h5
diff --git a/test/h5fc_ext_none.h5 b/test/testfiles/h5fc_ext_none.h5
index b1b1553..b1b1553 100644
--- a/test/h5fc_ext_none.h5
+++ b/test/testfiles/h5fc_ext_none.h5
diff --git a/test/le_data.h5 b/test/testfiles/le_data.h5
index e79ab47..e79ab47 100644
--- a/test/le_data.h5
+++ b/test/testfiles/le_data.h5
diff --git a/test/le_extlink1.h5 b/test/testfiles/le_extlink1.h5
index 10ed0bc..10ed0bc 100644
--- a/test/le_extlink1.h5
+++ b/test/testfiles/le_extlink1.h5
diff --git a/test/le_extlink2.h5 b/test/testfiles/le_extlink2.h5
index 92ed32c..92ed32c 100644
--- a/test/le_extlink2.h5
+++ b/test/testfiles/le_extlink2.h5
diff --git a/test/memleak_H5O_dtype_decode_helper_H5Odtype.h5 b/test/testfiles/memleak_H5O_dtype_decode_helper_H5Odtype.h5
index b5980b7..b5980b7 100644
--- a/test/memleak_H5O_dtype_decode_helper_H5Odtype.h5
+++ b/test/testfiles/memleak_H5O_dtype_decode_helper_H5Odtype.h5
diff --git a/test/mergemsg.h5 b/test/testfiles/mergemsg.h5
index 3a9e352..3a9e352 100644
--- a/test/mergemsg.h5
+++ b/test/testfiles/mergemsg.h5
diff --git a/test/multi_file_v16-r.h5 b/test/testfiles/multi_file_v16-r.h5
index 36a4c88..36a4c88 100644
--- a/test/multi_file_v16-r.h5
+++ b/test/testfiles/multi_file_v16-r.h5
diff --git a/test/multi_file_v16-s.h5 b/test/testfiles/multi_file_v16-s.h5
index e990e95..e990e95 100644
--- a/test/multi_file_v16-s.h5
+++ b/test/testfiles/multi_file_v16-s.h5
diff --git a/test/noencoder.h5 b/test/testfiles/noencoder.h5
index 84f8752..84f8752 100644
--- a/test/noencoder.h5
+++ b/test/testfiles/noencoder.h5
diff --git a/test/none.h5 b/test/testfiles/none.h5
index bb6ff56..bb6ff56 100644
--- a/test/none.h5
+++ b/test/testfiles/none.h5
diff --git a/test/paged_nopersist.h5 b/test/testfiles/paged_nopersist.h5
index b6c945a..b6c945a 100644
--- a/test/paged_nopersist.h5
+++ b/test/testfiles/paged_nopersist.h5
diff --git a/test/paged_persist.h5 b/test/testfiles/paged_persist.h5
index f0ae836..f0ae836 100644
--- a/test/paged_persist.h5
+++ b/test/testfiles/paged_persist.h5
diff --git a/test/specmetaread.h5 b/test/testfiles/specmetaread.h5
index 50b0e69..50b0e69 100644
--- a/test/specmetaread.h5
+++ b/test/testfiles/specmetaread.h5
diff --git a/test/tarrold.h5 b/test/testfiles/tarrold.h5
index 7747ce4..7747ce4 100644
--- a/test/tarrold.h5
+++ b/test/testfiles/tarrold.h5
diff --git a/test/tbad_msg_count.h5 b/test/testfiles/tbad_msg_count.h5
index ca5eb65..ca5eb65 100644
--- a/test/tbad_msg_count.h5
+++ b/test/testfiles/tbad_msg_count.h5
diff --git a/test/tbogus.h5 b/test/testfiles/tbogus.h5
index efcbd79..efcbd79 100644
--- a/test/tbogus.h5
+++ b/test/testfiles/tbogus.h5
diff --git a/test/test_filters_be.h5 b/test/testfiles/test_filters_be.h5
index c4c127b..c4c127b 100644
--- a/test/test_filters_be.h5
+++ b/test/testfiles/test_filters_be.h5
diff --git a/test/test_filters_le.h5 b/test/testfiles/test_filters_le.h5
index ff8b846..ff8b846 100644
--- a/test/test_filters_le.h5
+++ b/test/testfiles/test_filters_le.h5
diff --git a/test/th5s.h5 b/test/testfiles/th5s.h5
index 7a0bfb3..7a0bfb3 100644
--- a/test/th5s.h5
+++ b/test/testfiles/th5s.h5
diff --git a/test/tlayouto.h5 b/test/testfiles/tlayouto.h5
index a038e68..a038e68 100644
--- a/test/tlayouto.h5
+++ b/test/testfiles/tlayouto.h5
diff --git a/test/tmtimen.h5 b/test/testfiles/tmtimen.h5
index 96e5fb3..96e5fb3 100644
--- a/test/tmtimen.h5
+++ b/test/testfiles/tmtimen.h5
diff --git a/test/tmtimeo.h5 b/test/testfiles/tmtimeo.h5
index 8cacf4a..8cacf4a 100644
--- a/test/tmtimeo.h5
+++ b/test/testfiles/tmtimeo.h5
diff --git a/tools/testfiles/tnullspace.h5 b/test/testfiles/tnullspace.h5
index b5dac5d..b5dac5d 100644
--- a/tools/testfiles/tnullspace.h5
+++ b/test/testfiles/tnullspace.h5
diff --git a/test/tsizeslheap.h5 b/test/testfiles/tsizeslheap.h5
index c7f2adb..c7f2adb 100644
--- a/test/tsizeslheap.h5
+++ b/test/testfiles/tsizeslheap.h5
diff --git a/test/testframe.c b/test/testframe.c
index 310886f..2b65027 100644
--- a/test/testframe.c
+++ b/test/testframe.c
@@ -167,7 +167,7 @@ TestUsage(void)
     print_func("verbose   controls the amount of information displayed\n");
     print_func("exclude   to exclude tests by name\n");
     print_func("only      to name tests which should be run\n");
-    print_func("begin     start at the name of the test givin\n");
+    print_func("begin     start at the name of the test given\n");
     print_func("summary   prints a summary of test results at the end\n");
     print_func("cleanoff  does not delete *.hdf files after execution of tests\n");
     print_func("help      print out this information\n");
@@ -445,7 +445,7 @@ GetTestExpress(void)
 #endif
 
         /* Check if HDF5TestExpress is set to override the default level */
-        env_val = HDgetenv("HDF5TestExpress");
+        env_val = getenv("HDF5TestExpress");
         if (env_val) {
             if (strcmp(env_val, "0") == 0)
                 express_val = 0;
@@ -633,8 +633,8 @@ void
 TestAlarmOn(void)
 {
 #ifdef H5_HAVE_ALARM
-    char         *env_val   = HDgetenv("HDF5_ALARM_SECONDS"); /* Alarm environment */
-    unsigned long alarm_sec = H5_ALARM_SEC;                   /* Number of seconds before alarm goes off */
+    char         *env_val   = getenv("HDF5_ALARM_SECONDS"); /* Alarm environment */
+    unsigned long alarm_sec = H5_ALARM_SEC;                 /* Number of seconds before alarm goes off */
 
     /* Get the alarm value from the environment variable, if set */
     if (env_val != NULL)
diff --git a/test/testhdf5.c b/test/testhdf5.c
index 82bc2b6..93da1d8 100644
--- a/test/testhdf5.c
+++ b/test/testhdf5.c
@@ -80,7 +80,7 @@ main(int argc, char *argv[])
         TestSummary();
 
     /* Clean up test files, if allowed */
-    if (GetTestCleanup() && !HDgetenv(HDF5_NOCLEANUP))
+    if (GetTestCleanup() && !getenv(HDF5_NOCLEANUP))
         TestCleanup();
 
     /* Release test infrastructure */
diff --git a/test/tfile.c b/test/tfile.c
index e5183bb..1c5196a 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -2602,7 +2602,7 @@ test_file_double_file_dataset_open(bool new_format)
     hsize_t e_ext_dims[1] = {7};                            /* Expanded dimension sizes */
     hsize_t s_ext_dims[1] = {3};                            /* Shrunk dimension sizes */
     hsize_t max_dims0[1]  = {8};                            /* Maximum dimension sizes */
-    hsize_t max_dims1[1]  = {H5S_UNLIMITED}; /* Maximum dimesion sizes for extensible array index */
+    hsize_t max_dims1[1]  = {H5S_UNLIMITED}; /* Maximum dimension sizes for extensible array index */
     hsize_t max_dims2[2]  = {H5S_UNLIMITED, H5S_UNLIMITED}; /* Maximum dimension sizes for v2 B-tree index */
     hsize_t chunks[1] = {2}, chunks2[2] = {4, 5};           /* Chunk dimension sizes */
     hsize_t size;                                           /* File size */
@@ -8123,7 +8123,7 @@ test_file(void)
     MESSAGE(5, ("Testing Low-Level File I/O\n"));
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/trefer.c b/test/trefer.c
index d69e4b1..f17e114 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -3564,7 +3564,7 @@ test_reference(void)
     MESSAGE(5, ("Testing References\n"));
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/tselect.c b/test/tselect.c
index c8450cc..55599b3 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -11323,7 +11323,7 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i
     /* Now select the checkerboard selection in the (possibly larger) n-cube.
      *
      * Since we have already calculated the base start, stride, count,
-     * and block, re-use the values in setting up start, stride, count,
+     * and block, reuse the values in setting up start, stride, count,
      * and block.
      */
     for (i = 0; i < SS_DR_MAX_RANK; i++) {
@@ -12763,7 +12763,7 @@ test_space_update_diminfo(void)
 {
     hid_t               space_id;       /* Dataspace id */
     H5S_diminfo_valid_t diminfo_valid;  /* Diminfo status */
-    H5S_diminfo_valid_t rebuild_status; /* Diminfo status after rebuid */
+    H5S_diminfo_valid_t rebuild_status; /* Diminfo status after rebuild */
     H5S_sel_type        sel_type;       /* Selection type */
     herr_t              ret;            /* Return value */
 
@@ -16057,7 +16057,7 @@ test_select(void)
     MESSAGE(5, ("Testing Selections\n"));
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/tsohm.c b/test/tsohm.c
index e507fb9..b3f48d3 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -3716,7 +3716,7 @@ test_sohm(void)
     MESSAGE(5, ("Testing Shared Object Header Messages\n"));
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/ttsafe.c b/test/ttsafe.c
index ce53cce..6fe14fc 100644
--- a/test/ttsafe.c
+++ b/test/ttsafe.c
@@ -131,7 +131,7 @@ main(int argc, char *argv[])
         TestSummary();
 
     /* Clean up test files, if allowed */
-    if (GetTestCleanup() && !HDgetenv(HDF5_NOCLEANUP))
+    if (GetTestCleanup() && !getenv(HDF5_NOCLEANUP))
         TestCleanup();
 
     /* Release test infrastructure */
diff --git a/test/vds.c b/test/vds.c
index 167fbff..c2546e5 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -12320,7 +12320,7 @@ main(void)
     bool         driver_is_parallel;
     int          nerrors = 0;
 
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/vds_env.c b/test/vds_env.c
index bf30697..e964956 100644
--- a/test/vds_env.c
+++ b/test/vds_env.c
@@ -331,7 +331,7 @@ main(void)
     bool         driver_is_parallel;
     int          nerrors = 0;
 
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/test/vfd.c b/test/vfd.c
index ca748c0..5a86920 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -5880,7 +5880,7 @@ main(void)
      * specific VFD to be set and HDF5_DRIVER being set can interfere
      * with that.
      */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr) {
         printf(" -- SKIPPED VFD tests because %s is set -- \n", HDF5_DRIVER);
         exit(EXIT_SUCCESS);
diff --git a/test/vol.c b/test/vol.c
index b8c1e03..43336c6 100644
--- a/test/vol.c
+++ b/test/vol.c
@@ -2093,7 +2093,7 @@ test_async_vol_props(void)
         FAIL_STACK_ERROR;
 
     /* Override possible environment variable & re-initialize default VOL connector */
-    conn_env_str = HDgetenv(HDF5_VOL_CONNECTOR);
+    conn_env_str = getenv(HDF5_VOL_CONNECTOR);
     if (conn_env_str) {
         if (NULL == (conn_env_str = strdup(conn_env_str)))
             TEST_ERROR;
@@ -2256,7 +2256,7 @@ test_vol_cap_flags(void)
         TEST_ERROR;
 
     /* If using the native VOL by default, check flags again with H5P_DEFAULT */
-    vol_env = HDgetenv(HDF5_VOL_CONNECTOR);
+    vol_env = getenv(HDF5_VOL_CONNECTOR);
     if (!vol_env || (0 == strcmp(vol_env, "native"))) {
         H5VL_class_t *cls;
         hid_t         connector_id;
@@ -2338,8 +2338,8 @@ test_get_vol_name(void)
 
     TESTING("getting connector name");
 
-    conn_env_str = HDgetenv(HDF5_VOL_CONNECTOR);
-    if (NULL == (conn_env_str = HDgetenv("HDF5_VOL_CONNECTOR")))
+    conn_env_str = getenv(HDF5_VOL_CONNECTOR);
+    if (NULL == (conn_env_str = getenv("HDF5_VOL_CONNECTOR")))
         conn_env_str = "native";
 
     /* Skip the connectors other than the native and pass_through connector */
@@ -2629,7 +2629,7 @@ main(void)
     int         nerrors = 0;
 
     /* Get the VFD to use */
-    env_h5_drvr = HDgetenv(HDF5_DRIVER);
+    env_h5_drvr = getenv(HDF5_DRIVER);
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
diff --git a/testpar/API/H5_api_test_parallel.c b/testpar/API/H5_api_test_parallel.c
index 92fe722..224c1b8 100644
--- a/testpar/API/H5_api_test_parallel.c
+++ b/testpar/API/H5_api_test_parallel.c
@@ -236,13 +236,13 @@ main(int argc, char **argv)
 
     srand(seed);
 
-    if (NULL == (test_path_prefix = HDgetenv(HDF5_API_TEST_PATH_PREFIX)))
+    if (NULL == (test_path_prefix = getenv(HDF5_API_TEST_PATH_PREFIX)))
         test_path_prefix = "";
 
     snprintf(H5_api_test_parallel_filename, H5_API_TEST_FILENAME_MAX_LENGTH, "%s%s", test_path_prefix,
              PARALLEL_TEST_FILE_NAME);
 
-    if (NULL == (vol_connector_string = HDgetenv(HDF5_VOL_CONNECTOR))) {
+    if (NULL == (vol_connector_string = getenv(HDF5_VOL_CONNECTOR))) {
         if (MAINPROCESS)
             printf("No VOL connector selected; using native VOL connector\n");
         vol_connector_name = "native";
diff --git a/testpar/API/t_dset.c b/testpar/API/t_dset.c
index 31422d3..0da25b0 100644
--- a/testpar/API/t_dset.c
+++ b/testpar/API/t_dset.c
@@ -3020,7 +3020,7 @@ none_selection_chunk(void)
  *
  *              TEST_ACTUAL_IO_RESET:
  *                  Performs collective and then independent I/O with hthe same dxpl to
- *                  make sure the peroperty is correctly reset to the default on each use.
+ *                  make sure the property is correctly reset to the default on each use.
  *                  Specifically, this test runs TEST_ACTUAL_IO_MULTI_CHUNK_NO_OPT_MIX_DISAGREE
  *                  (The most complex case that works on all builds) and then performs
  *                  an independent read and write with the same dxpls.
diff --git a/testpar/API/t_shapesame.c b/testpar/API/t_shapesame.c
index fd6a8dd..004ce1e 100644
--- a/testpar/API/t_shapesame.c
+++ b/testpar/API/t_shapesame.c
@@ -2479,14 +2479,14 @@ do {
                             good_data = false;
                         }
 
-                        /* zero out buffer for re-use */
+                        /* zero out buffer for reuse */
                         *val_ptr = 0;
                     }
                     else if (*val_ptr != 0) {
 
                         good_data = false;
 
-                        /* zero out buffer for re-use */
+                        /* zero out buffer for reuse */
                         *val_ptr = 0;
                     }
 
diff --git a/testpar/API/t_span_tree.c b/testpar/API/t_span_tree.c
index bf52d85..e2f148c 100644
--- a/testpar/API/t_span_tree.c
+++ b/testpar/API/t_span_tree.c
@@ -21,7 +21,7 @@
    one in collective mode,
    2) We will read two datasets with the same hyperslab selection settings,
       1.  independent read to read independent output,
-          independent read to read collecive   output,
+          independent read to read collective   output,
     Compare the result,
     If the result is the same, then collective write succeeds.
       2.  collective read to read independent output,
@@ -498,7 +498,7 @@ coll_write_test(int chunk_factor)
 
          For testing collective hyperslab selection write
          In this test, we are using independent read to check
-         the correctedness of collective write compared with
+         the correctness of collective write compared with
          independent write,
 
          In order to thoroughly test this feature, we choose
@@ -593,7 +593,7 @@ coll_write_test(int chunk_factor)
     mspaceid = H5Screate_simple(MSPACE_RANK, mdim, NULL);
 
     /*
-     * Select two hyperslabs in memory. Hyperslabs has the same
+     * Select two hyperslabs in memory. Hyperslabs have the same
      * size and shape as the selected hyperslabs for the file dataspace
      * Only the starting point is different.
      * The first selection
@@ -833,7 +833,7 @@ coll_read_test(void)
     mspaceid = H5Screate_simple(MSPACE_RANK, mdim, NULL);
 
     /*
-     * Select two hyperslabs in memory. Hyperslabs has the same
+     * Select two hyperslabs in memory. Hyperslabs have the same
      * size and shape as the selected hyperslabs for the file dataspace.
      * Only the starting point is different.
      * The first selection
@@ -967,7 +967,7 @@ coll_read_test(void)
 **      sel_rank fastest changing indices, with origin (in the
 **    higher indices) as indicated by the start array.
 **
-**    Note that this function, is hard coded to presume a
+**    Note that this function is hard-coded to presume a
 **    maximum dataspace rank of 5.
 **
 **    While this maximum is declared as a constant, increasing
@@ -1045,7 +1045,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
      * Note that the following computation depends on the C99
      * requirement that integer division discard any fraction
      * (truncation towards zero) to function correctly. As we
-     * now require C99, this shouldn't be a problem, but noting
+     * now require C99, this shouldn't be a problem, but note
      * it may save us some pain if we are ever obliged to support
      * pre-C99 compilers again.
      */
@@ -1074,7 +1074,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 
     /* Now set up the stride and block arrays, and portions of the start
      * and count arrays that will not be altered during the selection of
-     * the checker board.
+     * the checkerboard.
      */
     i = 0;
     while (i < ds_offset) {
@@ -1294,13 +1294,13 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 **    expected data.  Return true if it does, and false
 **      otherwise.
 **
-**    The supplied buffer is presumed to this process's slice
+**    The supplied buffer is presumed to be this process's slice
 **    of the target data set.  Each such slice will be an
 **    n-cube of rank (rank -1) and the supplied edge_size with
 **    origin (mpi_rank, 0, ... , 0) in the target data set.
 **
 **    Further, the buffer is presumed to be the result of reading
-**    or writing a checker board selection of an m (1 <= m <
+**    or writing a checkerboard selection of an m (1 <= m <
 **      rank) dimensional slice through this processes slice
 **    of the target data set.  Also, this slice must be parallel
 **    to the fastest changing indices.
@@ -1311,7 +1311,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 **      with the natural numbers listed in order from the origin
 **    along the fastest changing axis.
 **
-**      Thus for a 20x10x10 dataset, the value stored in location
+**      Thus, for a 20x10x10 dataset, the value stored in location
 **    (x, y, z) (assuming that z is the fastest changing index
 **    and x the slowest) is assumed to be:
 **
@@ -1319,7 +1319,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 **
 **    Further, supposing that this is process 10, this process's
 **    slice of the dataset would be a 10 x 10 2-cube with origin
-**    (10, 0, 0) in the data set, and would be initialize (prior
+**    (10, 0, 0) in the data set, and would be initialized (prior
 **    to the checkerboard selection) as follows:
 **
 **        1000, 1001, 1002, ... 1008, 1009
@@ -1453,14 +1453,14 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr,
                                 good_data = false;
                             }
 
-                            /* zero out buffer for re-use */
+                            /* zero out buffer for reuse */
                             *val_ptr = 0;
                         }
                         else if (*val_ptr != 0) {
 
                             good_data = false;
 
-                            /* zero out buffer for re-use */
+                            /* zero out buffer for reuse */
                             *val_ptr = 0;
                         }
 
@@ -2398,11 +2398,11 @@ lower_dim_size_comp_test(void)
  *
  *        1) Reads or writes exactly one chunk,
  *
- *        2) Has no in memory buffer for any other chunk.
+ *        2) Has no in-memory buffer for any other chunk.
  *
- *        The test differers from Rob Latham's bug report in
- *        that is runs with an arbitrary number of proceeses,
- *        and uses a 1 dimensional dataset.
+ *        The test differs from Rob Latham's bug report in
+ *        that it runs with an arbitrary number of processes,
+ *        and uses a 1-dimensional dataset.
  *
  * Return:    void
  *-------------------------------------------------------------------------
diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c
index 9c9953c..c2aac77 100644
--- a/testpar/t_2Gio.c
+++ b/testpar/t_2Gio.c
@@ -3323,7 +3323,7 @@ none_selection_chunk(void)
  *
  *              TEST_ACTUAL_IO_RESET:
  *                  Performs collective and then independent I/O with the same dxpl to
- *                  make sure the peroperty is correctly reset to the default on each use.
+ *                  make sure the property is correctly reset to the default on each use.
  *                  Specifically, this test runs TEST_ACTUAL_IO_MULTI_CHUNK_NO_OPT_MIX_DISAGREE
  *                  (The most complex case that works on all builds) and then performs
  *                  an independent read and write with the same dxpls.
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index c331f4c..5de6150 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -1995,7 +1995,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
  *              On failure, print an appropriate error message and
  *              return false.
  *
- * Return:      true if succussful, false otherwise.
+ * Return:      true if successful, false otherwise.
  *
  *-------------------------------------------------------------------------
  */
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 8998112..83d7511 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -2881,7 +2881,7 @@ none_selection_chunk(void)
  *
  *              TEST_ACTUAL_IO_RESET:
  *                  Performs collective and then independent I/O with hthe same dxpl to
- *                  make sure the peroperty is correctly reset to the default on each use.
+ *                  make sure the property is correctly reset to the default on each use.
  *                  Specifically, this test runs TEST_ACTUAL_IO_MULTI_CHUNK_NO_OPT_MIX_DISAGREE
  *                  (The most complex case that works on all builds) and then performs
  *                  an independent read and write with the same dxpls.
diff --git a/testpar/t_init_term.c b/testpar/t_init_term.c
index 929bb59..0268e3d 100644
--- a/testpar/t_init_term.c
+++ b/testpar/t_init_term.c
@@ -37,11 +37,9 @@ main(int argc, char **argv)
 
     MPI_Finalize();
 
-    nerrors += GetTestNumErrs();
-
     /* test if we can initialize the library with MPI being finalized
        and create a file serially */
-    H5open();
+    VRFY((H5open() >= 0), "H5open succeeded");
 
     if (mpi_rank == 0) {
         char  filename[1024];
@@ -54,7 +52,7 @@ main(int argc, char **argv)
         file_id = -1;
     }
 
-    H5close();
+    VRFY((H5close() >= 0), "H5close succeeded");
 
     if (MAINPROCESS) {
         if (0 == nerrors)
diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c
index a0771a8..a61e674 100644
--- a/testpar/t_pflush1.c
+++ b/testpar/t_pflush1.c
@@ -121,7 +121,7 @@ main(int argc, char *argv[])
         TESTING("H5Fflush (part1)");
 
     /* Don't run using the split VFD */
-    envval = HDgetenv(HDF5_DRIVER);
+    envval = getenv(HDF5_DRIVER);
     if (envval == NULL)
         envval = "nomatch";
 
diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c
index ea544f9..95ad125 100644
--- a/testpar/t_pflush2.c
+++ b/testpar/t_pflush2.c
@@ -146,7 +146,7 @@ main(int argc, char *argv[])
         TESTING("H5Fflush (part2 with flush)");
 
     /* Don't run using the split VFD */
-    envval = HDgetenv(HDF5_DRIVER);
+    envval = getenv(HDF5_DRIVER);
     if (envval == NULL)
         envval = "nomatch";
 
diff --git a/testpar/t_pread.c b/testpar/t_pread.c
index fe4ed75..b16675b 100644
--- a/testpar/t_pread.c
+++ b/testpar/t_pread.c
@@ -36,7 +36,7 @@ const char *FILENAMES[NFILENAME + 1] = {"reloc_t_pread_data_file", "reloc_t_prea
 
 bool               pass             = true;
 static const char *random_hdf5_text = "Now is the time for all first-time-users of HDF5 to read their \
-manual or go thru the tutorials!\n\
+manual or go through the tutorials!\n\
 While you\'re at it, now is also the time to read up on MPI-IO.";
 
 static const char *hitchhiker_quote = "A common mistake that people make when trying to design something\n\
@@ -359,7 +359,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id)
 
     /* Add a userblock to the head of the datafile.
      * We will use this to for a functional test of the
-     * file open optimization.  This is superblock
+     * file open optimization.  This superblock
      * relocation is done by the rank 0 process associated
      * with the communicator being used.  For test 1, we
      * utilize MPI_COMM_WORLD, so group_rank 0 is the
@@ -464,7 +464,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id)
  *
  *              The global MPI rank is used for reading and
  *              writing data for process specific data in the
- *              dataset.  We do this rather simplisticly, i.e.
+ *              dataset.  We do this rather simplistically, i.e.
  *               rank 0:  writes/reads 0-9999
  *               rank 1:  writes/reads 1000-1999
  *               rank 2:  writes/reads 2000-2999
@@ -1032,7 +1032,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id)
  *
  *              The test consists of creating two separate HDF datasets
  *              in which random text is inserted at the start of each
- *              file using the 'j5jam' application.  This forces the
+ *              file using the 'h5jam' application.  This forces the
  *              HDF5 file superblock to a non-zero offset.
  *              Having created the two independent files, we create two
  *              non-overlapping MPI groups, each of which is then tasked
@@ -1055,13 +1055,13 @@ main(int argc, char **argv)
     MPI_Comm group_comm = MPI_COMM_NULL;
 
     /* I don't believe that argv[0] can ever be NULL.
-     * It should thus be safe to dup and save as a check
-     * for cmake testing. Note that in our Cmake builds,
+     * It should thus be safe to duplicate and save as a check
+     * for CMake testing. Note that in our CMake builds,
      * all executables are located in the same directory.
      * We assume (but we'll check) that the h5jam utility
      * is in the directory as this executable.  If that
      * isn't true, then we can use a relative path that
-     * should be valid for the autotools environment.
+     * should be valid for the Autotools environment.
      */
     test_argv0 = strdup(argv[0]);
 
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index 56e2396..98e3077 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -2452,14 +2452,14 @@ do {
                             good_data = false;
                         }
 
-                        /* zero out buffer for re-use */
+                        /* zero out buffer for reuse */
                         *val_ptr = 0;
                     }
                     else if (*val_ptr != 0) {
 
                         good_data = false;
 
-                        /* zero out buffer for re-use */
+                        /* zero out buffer for reuse */
                         *val_ptr = 0;
                     }
 
diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c
index 317f889..e4ff258 100644
--- a/testpar/t_span_tree.c
+++ b/testpar/t_span_tree.c
@@ -399,7 +399,7 @@ coll_write_test(int chunk_factor)
 
          For testing collective hyperslab selection write
          In this test, we are using independent read to check
-         the correctedness of collective write compared with
+         the correctness of collective write compared with
          independent write,
 
          In order to thoroughly test this feature, we choose
@@ -494,7 +494,7 @@ coll_write_test(int chunk_factor)
     mspaceid = H5Screate_simple(MSPACE_RANK, mdim, NULL);
 
     /*
-     * Select two hyperslabs in memory. Hyperslabs has the same
+     * Select two hyperslabs in memory. Hyperslabs have the same
      * size and shape as the selected hyperslabs for the file dataspace
      * Only the starting point is different.
      * The first selection
@@ -734,7 +734,7 @@ coll_read_test(void)
     mspaceid = H5Screate_simple(MSPACE_RANK, mdim, NULL);
 
     /*
-     * Select two hyperslabs in memory. Hyperslabs has the same
+     * Select two hyperslabs in memory. Hyperslabs have the same
      * size and shape as the selected hyperslabs for the file dataspace.
      * Only the starting point is different.
      * The first selection
@@ -868,7 +868,7 @@ coll_read_test(void)
 **      sel_rank fastest changing indices, with origin (in the
 **    higher indices) as indicated by the start array.
 **
-**    Note that this function, is hard coded to presume a
+**    Note that this function is hard-coded to presume a
 **    maximum dataspace rank of 5.
 **
 **    While this maximum is declared as a constant, increasing
@@ -946,7 +946,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
      * Note that the following computation depends on the C99
      * requirement that integer division discard any fraction
      * (truncation towards zero) to function correctly. As we
-     * now require C99, this shouldn't be a problem, but noting
+     * now require C99, this shouldn't be a problem, but note
      * it may save us some pain if we are ever obliged to support
      * pre-C99 compilers again.
      */
@@ -975,7 +975,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 
     /* Now set up the stride and block arrays, and portions of the start
      * and count arrays that will not be altered during the selection of
-     * the checker board.
+     * the checkerboard.
      */
     i = 0;
     while (i < ds_offset) {
@@ -1195,13 +1195,13 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 **    expected data.  Return true if it does, and false
 **      otherwise.
 **
-**    The supplied buffer is presumed to this process's slice
+**    The supplied buffer is presumed to be this process's slice
 **    of the target data set.  Each such slice will be an
 **    n-cube of rank (rank -1) and the supplied edge_size with
 **    origin (mpi_rank, 0, ... , 0) in the target data set.
 **
 **    Further, the buffer is presumed to be the result of reading
-**    or writing a checker board selection of an m (1 <= m <
+**    or writing a checkerboard selection of an m (1 <= m <
 **      rank) dimensional slice through this processes slice
 **    of the target data set.  Also, this slice must be parallel
 **    to the fastest changing indices.
@@ -1220,7 +1220,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 **
 **    Further, supposing that this is process 10, this process's
 **    slice of the dataset would be a 10 x 10 2-cube with origin
-**    (10, 0, 0) in the data set, and would be initialize (prior
+**    (10, 0, 0) in the data set, and would be initialized (prior
 **    to the checkerboard selection) as follows:
 **
 **        1000, 1001, 1002, ... 1008, 1009
@@ -1354,14 +1354,14 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr,
                                 good_data = false;
                             }
 
-                            /* zero out buffer for re-use */
+                            /* zero out buffer for reuse */
                             *val_ptr = 0;
                         }
                         else if (*val_ptr != 0) {
 
                             good_data = false;
 
-                            /* zero out buffer for re-use */
+                            /* zero out buffer for reuse */
                             *val_ptr = 0;
                         }
 
@@ -2285,9 +2285,9 @@ lower_dim_size_comp_test(void)
  *
  *        2) Has no in memory buffer for any other chunk.
  *
- *        The test differers from Rob Latham's bug report in
- *        that is runs with an arbitrary number of proceeses,
- *        and uses a 1 dimensional dataset.
+ *        The test differs from Rob Latham's bug report in
+ *        that it runs with an arbitrary number of processes,
+ *        and uses a 1-dimensional dataset.
  *
  * Return:    void
  *
diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c
index 7d0665d..0c64bf2 100644
--- a/testpar/t_subfiling_vfd.c
+++ b/testpar/t_subfiling_vfd.c
@@ -1939,12 +1939,11 @@ test_subfiling_h5fuse(void)
                      SUBF_FILENAME, file_inode);
 
             args[0] = strdup("env");
-            args[1] = strdup("sh");
-            args[2] = strdup("h5fuse.sh");
-            args[3] = strdup("-q");
-            args[4] = strdup("-f");
-            args[5] = tmp_filename;
-            args[6] = NULL;
+            args[1] = strdup("./h5fuse.sh");
+            args[2] = strdup("-q");
+            args[3] = strdup("-f");
+            args[4] = tmp_filename;
+            args[5] = NULL;
 
             /* Call h5fuse script from MPI rank 0 */
             execvp("env", args);
@@ -2072,13 +2071,13 @@ parse_subfiling_env_vars(void)
 {
     char *env_value;
 
-    if (NULL != (env_value = HDgetenv(H5FD_SUBFILING_STRIPE_SIZE))) {
+    if (NULL != (env_value = getenv(H5FD_SUBFILING_STRIPE_SIZE))) {
         stripe_size_g = strtoll(env_value, NULL, 0);
         if ((ERANGE == errno) || (stripe_size_g <= 0))
             stripe_size_g = -1;
     }
 
-    if (NULL != (env_value = HDgetenv(H5FD_SUBFILING_IOC_PER_NODE))) {
+    if (NULL != (env_value = getenv(H5FD_SUBFILING_IOC_PER_NODE))) {
         ioc_per_node_g = strtol(env_value, NULL, 0);
         if ((ERANGE == errno) || (ioc_per_node_g <= 0))
             ioc_per_node_g = -1;
@@ -2092,13 +2091,13 @@ parse_subfiling_env_vars(void)
             ioc_per_node_g = node_local_size;
     }
 
-    if (NULL != (env_value = HDgetenv(H5FD_IOC_THREAD_POOL_SIZE))) {
+    if (NULL != (env_value = getenv(H5FD_IOC_THREAD_POOL_SIZE))) {
         ioc_thread_pool_size_g = atoi(env_value);
         if (ioc_thread_pool_size_g <= 0)
             ioc_thread_pool_size_g = -1;
     }
 
-    if (NULL != (env_value = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX))) {
+    if (NULL != (env_value = getenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX))) {
         assert(config_dir);
 
         strncpy(config_dir, env_value, PATH_MAX);
@@ -2121,7 +2120,6 @@ main(int argc, char **argv)
     bool     must_unset_ioc_per_node_env     = false;
     bool     must_unset_ioc_thread_count_env = false;
     bool     must_unset_config_dir_env       = false;
-    char    *env_value                       = NULL;
     int      required                        = MPI_THREAD_MULTIPLE;
     int      provided                        = 0;
 
@@ -2347,7 +2345,7 @@ main(int argc, char **argv)
         must_unset_ioc_thread_count_env = true;
     }
 
-    if (!(env_value = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX))) {
+    if (NULL == getenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX)) {
         int rand_value = 0;
 
         if (MAINPROCESS)
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index 5820610..dfffac6 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -994,7 +994,7 @@ h5tools_getenv_update_hyperslab_bufsize(void)
     int         ret_value = 1;
 
     /* check if environment variable is set for the hyperslab buffer size */
-    if (NULL != (env_str = HDgetenv("H5TOOLS_BUFSIZE"))) {
+    if (NULL != (env_str = getenv("H5TOOLS_BUFSIZE"))) {
         errno                = 0;
         hyperslab_bufsize_mb = strtol(env_str, (char **)NULL, 10);
         if (errno != 0 || hyperslab_bufsize_mb <= 0)
diff --git a/tools/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c
index 9fea8b8..d97d339 100644
--- a/tools/src/h5jam/h5jam.c
+++ b/tools/src/h5jam/h5jam.c
@@ -420,8 +420,8 @@ copy_some_to_file(int infid, int outfid, hsize_t starting, hsize_t startout, ssi
     } /* end if */
 
     while (howmuch > 0) {
-        HDlseek(outfid, (off_t)to, SEEK_SET);
-        HDlseek(infid, (off_t)from, SEEK_SET);
+        HDlseek(outfid, (HDoff_t)to, SEEK_SET);
+        HDlseek(infid, (HDoff_t)from, SEEK_SET);
 
         if (howmuch > 512) {
             nchars = HDread(infid, buf, (unsigned)512);
@@ -499,7 +499,7 @@ write_pad(int ofile, hsize_t old_where, hsize_t *new_where)
 
     buf[0] = '\0';
 
-    HDlseek(ofile, (off_t)old_where, SEEK_SET);
+    HDlseek(ofile, (HDoff_t)old_where, SEEK_SET);
 
     psize = compute_user_block_size(old_where);
     psize -= old_where;
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index ae002a3..04c5ff3 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -2529,7 +2529,7 @@ get_width(void)
 
     /* Try to get it from the COLUMNS environment variable first since it's
      * value is sometimes wrong. */
-    if ((s = HDgetenv("COLUMNS")) && *s && isdigit((int)*s))
+    if ((s = getenv("COLUMNS")) && *s && isdigit((int)*s))
         width = (int)strtol(s, NULL, 0);
 
 #if defined(H5_HAVE_STRUCT_VIDEOCONFIG) && defined(H5_HAVE__GETVIDEOCONFIG)
diff --git a/tools/src/h5perf/pio_engine.c b/tools/src/h5perf/pio_engine.c
index c2131ac..fc2f0c7 100644
--- a/tools/src/h5perf/pio_engine.c
+++ b/tools/src/h5perf/pio_engine.c
@@ -402,7 +402,7 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
     }
 
     /* First use the environment variable and then try the constant */
-    prefix = HDgetenv("HDF5_PARAPREFIX");
+    prefix = getenv("HDF5_PARAPREFIX");
 
 #ifdef HDF5_PARAPREFIX
     if (!prefix)
@@ -416,8 +416,8 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
          * directory instead. */
         char *user, *login, *subdir;
 
-        user   = HDgetenv("USER");
-        login  = HDgetenv("LOGIN");
+        user   = getenv("USER");
+        login  = getenv("LOGIN");
         subdir = (user ? user : login);
 
         if (subdir) {
diff --git a/tools/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c
index 232ac93..e72de32 100644
--- a/tools/src/h5perf/pio_perf.c
+++ b/tools/src/h5perf/pio_perf.c
@@ -736,7 +736,7 @@ h5_set_info_object(void)
     int   ret_value = 0;
 
     /* handle any MPI INFO hints via $HDF5_MPI_INFO */
-    if ((envp = HDgetenv("HDF5_MPI_INFO")) != NULL) {
+    if ((envp = getenv("HDF5_MPI_INFO")) != NULL) {
         char *next, *valp;
 
         valp = envp = next = strdup(envp);
@@ -1215,7 +1215,7 @@ report_parameters(struct options *opts)
         fprintf(output, "Contiguous\n");
 
     {
-        char *prefix = HDgetenv("HDF5_PARAPREFIX");
+        char *prefix = getenv("HDF5_PARAPREFIX");
 
         fprintf(output, "rank %d: Env HDF5_PARAPREFIX=%s\n", rank, (prefix ? prefix : "not set"));
     }
diff --git a/tools/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c
index 28f4eed..2363f6a 100644
--- a/tools/src/h5perf/sio_engine.c
+++ b/tools/src/h5perf/sio_engine.c
@@ -139,9 +139,7 @@ do_sio(parameters param, results *res)
     /* IO type */
     iot = param.io_type;
 
-    if (NULL == (fname = calloc(FILENAME_MAX, sizeof(char))))
-        GOTOERROR(FAIL);
-
+    /* MUST initialize fd early since we check its file IDs in cleanup code */
     switch (iot) {
         case POSIXIO:
             fd.posixfd  = -1;
@@ -157,6 +155,9 @@ do_sio(parameters param, results *res)
             GOTOERROR(FAIL);
     }
 
+    if (NULL == (fname = calloc(FILENAME_MAX, sizeof(char))))
+        GOTOERROR(FAIL);
+
     linear_buf_size = 1;
 
     for (i = 0; i < param.rank; i++) {
@@ -310,7 +311,7 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
     }
 
     /* First use the environment variable and then try the constant */
-    prefix = HDgetenv("HDF5_PREFIX");
+    prefix = getenv("HDF5_PREFIX");
 
 #ifdef HDF5_PREFIX
     if (!prefix)
@@ -324,8 +325,8 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
          * directory instead. */
         char *user, *login, *subdir;
 
-        user   = HDgetenv("USER");
-        login  = HDgetenv("LOGIN");
+        user   = getenv("USER");
+        login  = getenv("LOGIN");
         subdir = (user ? user : login);
 
         if (subdir) {
@@ -1259,7 +1260,7 @@ do_cleanupfile(iotype iot, char *filename)
         goto done;
 
     if (clean_file_g == -1)
-        clean_file_g = (HDgetenv(HDF5_NOCLEANUP) == NULL) ? 1 : 0;
+        clean_file_g = (getenv(HDF5_NOCLEANUP) == NULL) ? 1 : 0;
 
     if (clean_file_g) {
 
diff --git a/tools/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c
index ca3d5c0..ad536ba 100644
--- a/tools/src/h5perf/sio_perf.c
+++ b/tools/src/h5perf/sio_perf.c
@@ -777,7 +777,7 @@ report_parameters(struct options *opts)
     }
 
     {
-        char *prefix = HDgetenv("HDF5_PREFIX");
+        char *prefix = getenv("HDF5_PREFIX");
 
         fprintf(output, "Env HDF5_PREFIX=%s\n", (prefix ? prefix : "not set"));
     }
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index 942e266..3921913 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -416,7 +416,7 @@ done:
  *   * hslab_nbytes_p : [OUT] total byte of the hyperslab
  *
  * Update:
- *   The hyperslab calucation would be depend on if the dataset is chunked
+ *   The hyperslab calculation would depend on if the dataset is chunked
  *   or not.
  *
  *   There care 3 conditions to cover:
diff --git a/tools/test/h5copy/CMakeTests.cmake b/tools/test/h5copy/CMakeTests.cmake
index b47000a..e443827 100644
--- a/tools/test/h5copy/CMakeTests.cmake
+++ b/tools/test/h5copy/CMakeTests.cmake
@@ -20,32 +20,35 @@
   # Copy all the HDF5 files from the source directory into the test directory
   # --------------------------------------------------------------------
   set (LIST_HDF5_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_extlinks_src.h5
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_extlinks_trg.h5
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_ref.h5
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copytst.h5
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter2.h5
+      h5copy_extlinks_src.h5
+      h5copy_extlinks_trg.h5
+      h5copy_ref.h5
+      h5copytst.h5
+      tudfilter.h5
+      tudfilter2.h5
   )
 
   set (LIST_OTHER_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_misc1.out
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_misc1.err
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5.txt
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5_ERR.txt
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_plugin_fail_ERR.out.h5.txt
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_plugin_test.out.h5.txt
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_help1.ddl
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_help2.ddl
+      h5copy_misc1.out
+      h5copy_misc1.err
+      tudfilter.h5.txt
+      tudfilter.h5_ERR.txt
+      h5copy_plugin_fail_ERR.out.h5.txt
+      h5copy_plugin_test.out.h5.txt
+      h5copy_help1.ddl
+      h5copy_help2.ddl
   )
 
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 
-  foreach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
-    get_filename_component(fname "${listfiles}" NAME)
-    HDFTEST_COPY_FILE("${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5copy_files")
+  foreach (listfiles ${LIST_HDF5_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listfiles}" "h5copy_files")
   endforeach ()
-  add_custom_target(h5copy_files ALL COMMENT "Copying files needed by h5copy tests" DEPENDS ${h5copy_files_list})
+
+  foreach (listothers ${LIST_OTHER_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/${listothers}" "h5copy_files")
+  endforeach ()
+   add_custom_target(h5copy_files ALL COMMENT "Copying files needed by h5copy tests" DEPENDS ${h5copy_files_list})
 
 ##############################################################################
 ##############################################################################
diff --git a/tools/test/h5copy/testfiles/h5copy_extlinks_src.out.ls b/tools/test/h5copy/expected/h5copy_extlinks_src.out.ls
index af499a5..af499a5 100644
--- a/tools/test/h5copy/testfiles/h5copy_extlinks_src.out.ls
+++ b/tools/test/h5copy/expected/h5copy_extlinks_src.out.ls
diff --git a/tools/test/h5copy/testfiles/h5copy_help1.ddl b/tools/test/h5copy/expected/h5copy_help1.ddl
index 418faea..418faea 100644
--- a/tools/test/h5copy/testfiles/h5copy_help1.ddl
+++ b/tools/test/h5copy/expected/h5copy_help1.ddl
diff --git a/tools/test/h5copy/testfiles/h5copy_help2.ddl b/tools/test/h5copy/expected/h5copy_help2.ddl
index 418faea..418faea 100644
--- a/tools/test/h5copy/testfiles/h5copy_help2.ddl
+++ b/tools/test/h5copy/expected/h5copy_help2.ddl
diff --git a/tools/test/h5copy/testfiles/h5copy_misc1.err b/tools/test/h5copy/expected/h5copy_misc1.err
index 2c2c867..2c2c867 100644
--- a/tools/test/h5copy/testfiles/h5copy_misc1.err
+++ b/tools/test/h5copy/expected/h5copy_misc1.err
diff --git a/tools/test/h5copy/testfiles/h5copy_misc1.out b/tools/test/h5copy/expected/h5copy_misc1.out
index 1c7181b..1c7181b 100644
--- a/tools/test/h5copy/testfiles/h5copy_misc1.out
+++ b/tools/test/h5copy/expected/h5copy_misc1.out
diff --git a/tools/test/h5copy/testfiles/h5copy_plugin_fail_ERR.out.h5.txt b/tools/test/h5copy/expected/h5copy_plugin_fail_ERR.out.h5.txt
index 66e9eb2..66e9eb2 100644
--- a/tools/test/h5copy/testfiles/h5copy_plugin_fail_ERR.out.h5.txt
+++ b/tools/test/h5copy/expected/h5copy_plugin_fail_ERR.out.h5.txt
diff --git a/tools/test/h5copy/testfiles/h5copy_plugin_test.out.h5.txt b/tools/test/h5copy/expected/h5copy_plugin_test.out.h5.txt
index 66e9eb2..66e9eb2 100644
--- a/tools/test/h5copy/testfiles/h5copy_plugin_test.out.h5.txt
+++ b/tools/test/h5copy/expected/h5copy_plugin_test.out.h5.txt
diff --git a/tools/test/h5copy/testfiles/h5copy_ref.out.ls b/tools/test/h5copy/expected/h5copy_ref.out.ls
index f5b31a7..f5b31a7 100644
--- a/tools/test/h5copy/testfiles/h5copy_ref.out.ls
+++ b/tools/test/h5copy/expected/h5copy_ref.out.ls
diff --git a/tools/test/h5copy/testfiles/h5copytst.out.ls b/tools/test/h5copy/expected/h5copytst.out.ls
index 629915e..629915e 100644
--- a/tools/test/h5copy/testfiles/h5copytst.out.ls
+++ b/tools/test/h5copy/expected/h5copytst.out.ls
diff --git a/tools/test/h5copy/testfiles/h5copytst_new.out.ls b/tools/test/h5copy/expected/h5copytst_new.out.ls
index 9df6b2e..9df6b2e 100644
--- a/tools/test/h5copy/testfiles/h5copytst_new.out.ls
+++ b/tools/test/h5copy/expected/h5copytst_new.out.ls
diff --git a/tools/test/h5copy/testfiles/tudfilter.h5.txt b/tools/test/h5copy/expected/tudfilter.h5.txt
index eabe407..eabe407 100644
--- a/tools/test/h5copy/testfiles/tudfilter.h5.txt
+++ b/tools/test/h5copy/expected/tudfilter.h5.txt
diff --git a/tools/test/h5copy/testfiles/tudfilter.h5_ERR.txt b/tools/test/h5copy/expected/tudfilter.h5_ERR.txt
index 3c5b3ca..3c5b3ca 100644
--- a/tools/test/h5copy/testfiles/tudfilter.h5_ERR.txt
+++ b/tools/test/h5copy/expected/tudfilter.h5_ERR.txt
diff --git a/tools/test/h5copy/testh5copy.sh.in b/tools/test/h5copy/testh5copy.sh.in
index 1f64d15..f2c4a8e 100644
--- a/tools/test/h5copy/testh5copy.sh.in
+++ b/tools/test/h5copy/testh5copy.sh.in
@@ -24,16 +24,16 @@ USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5COPY_OUTFILES="$SRC_TOOLS/test/h5copy/expected"
 
 TESTNAME=h5copy
 EXIT_SUCCESS=0
@@ -58,10 +58,10 @@ $SRC_H5COPY_TESTFILES/h5copy_extlinks_trg.h5
 
 # List of expect files that will be copied over to local test dir
 LIST_OTHER_TEST_FILES="
-$SRC_H5COPY_TESTFILES/h5copy_misc1.out
-$SRC_H5COPY_TESTFILES/h5copy_misc1.err
-$SRC_H5COPY_TESTFILES/h5copy_help1.ddl
-$SRC_H5COPY_TESTFILES/h5copy_help2.ddl
+$SRC_H5COPY_OUTFILES/h5copy_misc1.out
+$SRC_H5COPY_OUTFILES/h5copy_misc1.err
+$SRC_H5COPY_OUTFILES/h5copy_help1.ddl
+$SRC_H5COPY_OUTFILES/h5copy_help2.ddl
 "
 
 H5COPY=../../src/h5copy/h5copy               # The tool name
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index b23f885..d89df46 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -19,303 +19,307 @@
   # --------------------------------------------------------------------
   # Copy all the HDF5 files from the test directory into the source directory
   # --------------------------------------------------------------------
-  set (LIST_HDF5_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_basic1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_basic2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_types.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dtypes.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr3.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset3.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_hyper1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_hyper2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_empty.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_links.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_softlinks.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_linked_softlink.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_extlink_src.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_extlink_trg.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ext2softlink_src.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ext2softlink_trg.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset_zero_dim_size1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset_zero_dim_size2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_danglelinks1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_danglelinks2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext2-1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext2-2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext2-3.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude1-1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude1-2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude2-1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude2-2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude3-1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude3-2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_comp_vl_strs.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr_v_level1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr_v_level2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_enum_invalid_values.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/compounds_array_vlen1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/compounds_array_vlen2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/non_comparables1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/non_comparables2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tudfilter.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tudfilter2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_strings1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_strings2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps2.h5
+  # tools/testfiles/vds
+  set (LIST_VDS_TEST_FILES
+      1_a.h5
+      1_b.h5
+      1_c.h5
+      1_d.h5
+      1_e.h5
+      1_f.h5
+      1_vds.h5
+      2_a.h5
+      2_b.h5
+      2_c.h5
+      2_d.h5
+      2_e.h5
+      2_vds.h5
+      3_1_vds.h5
+      3_2_vds.h5
+      4_0.h5
+      4_1.h5
+      4_2.h5
+      4_vds.h5
+      5_a.h5
+      5_b.h5
+      5_c.h5
+      5_vds.h5
+  )
+  set (LIST_DIFF_TEST_FILES
+      h5diff_basic1.h5
+      h5diff_basic2.h5
+      h5diff_types.h5
+      h5diff_dtypes.h5
+      h5diff_attr1.h5
+      h5diff_attr2.h5
+      h5diff_attr3.h5
+      h5diff_dset1.h5
+      h5diff_dset2.h5
+      h5diff_dset3.h5
+      h5diff_hyper1.h5
+      h5diff_hyper2.h5
+      h5diff_empty.h5
+      h5diff_links.h5
+      h5diff_softlinks.h5
+      h5diff_linked_softlink.h5
+      h5diff_extlink_src.h5
+      h5diff_extlink_trg.h5
+      h5diff_ext2softlink_src.h5
+      h5diff_ext2softlink_trg.h5
+      h5diff_dset_zero_dim_size1.h5
+      h5diff_dset_zero_dim_size2.h5
+      h5diff_danglelinks1.h5
+      h5diff_danglelinks2.h5
+      h5diff_grp_recurse1.h5
+      h5diff_grp_recurse2.h5
+      h5diff_grp_recurse_ext1.h5
+      h5diff_grp_recurse_ext2-1.h5
+      h5diff_grp_recurse_ext2-2.h5
+      h5diff_grp_recurse_ext2-3.h5
+      h5diff_exclude1-1.h5
+      h5diff_exclude1-2.h5
+      h5diff_exclude2-1.h5
+      h5diff_exclude2-2.h5
+      h5diff_exclude3-1.h5
+      h5diff_exclude3-2.h5
+      h5diff_comp_vl_strs.h5
+      h5diff_attr_v_level1.h5
+      h5diff_attr_v_level2.h5
+      h5diff_enum_invalid_values.h5
+      compounds_array_vlen1.h5
+      compounds_array_vlen2.h5
+      non_comparables1.h5
+      non_comparables2.h5
+      tudfilter.h5
+      tudfilter2.h5
+      h5diff_strings1.h5
+      h5diff_strings2.h5
+      h5diff_eps1.h5
+      h5diff_eps2.h5
       # onion VFD files
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_objs.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_objs.h5.onion
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_ext.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_ext.h5.onion
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_1d.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_1d.h5.onion
-      # tools/testfiles/vds
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_e.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_f.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_e.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/3_1_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/3_2_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_0.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5
+      h5diff_onion_objs.h5
+      h5diff_onion_objs.h5.onion
+      h5diff_onion_dset_ext.h5
+      h5diff_onion_dset_ext.h5.onion
+      h5diff_onion_dset_1d.h5
+      h5diff_onion_dset_1d.h5.onion
+  )
+  set (LIST_HDF5_TEST_FILES
       # tools/testfiles
-      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5
+      tvlstr.h5
       #STD_REF_OBJ files
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_compat.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_ext1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_ext2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_grp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_del.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_param.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5
+      trefer_attr.h5
+      trefer_compat.h5
+      trefer_ext1.h5
+      trefer_ext2.h5
+      trefer_grp.h5
+      trefer_obj_del.h5
+      trefer_obj.h5
+      trefer_param.h5
+      trefer_reg_1d.h5
+      trefer_reg.h5
   )
 
   set (LIST_OTHER_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_10.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_100.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_11.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_12.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_13.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_14.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_15.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_16_1.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_16_2.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_16_3.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_17.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_171.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_172.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_18_1.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_18.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_20.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_200.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_201.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_202.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_203.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_204.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_205.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_206.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_207.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_208.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_220.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_221.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_222.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_223.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_224.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_21.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_22.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_23.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_24.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_25.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_26.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_27.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_28.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_30.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_300.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_400.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_401.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_402.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_403.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_404.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_405.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_406.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_407.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_408.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_409.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_410.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_411.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_412.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_413.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_414.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_415.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_416.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_417.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_418.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_419.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_420.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_421.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_422.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_423.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_424.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_425.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_450.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_451.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_452.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_453.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_454.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/dangling_link.err
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_455.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_456.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_457.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_458.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_459.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_465.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_466.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_467.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_468.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_469.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_471.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_472.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_473.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_474.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_475.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_480.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_481.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_482.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_483.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_484.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_485.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_486.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_487.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_50.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_51.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_52.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_53.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_54.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_55.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_56.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_57.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_58.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_58_ref.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_59.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_500.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_501.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_502.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_503.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_504.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_505.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_506.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_507.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_508.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_509.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_510.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_511.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_512.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_513.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_514.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_515.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_516.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_517.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_518.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_530.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_540.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_60.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_61.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_62.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_63.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_600.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601_ERR.err
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_603.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_604.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_605.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_606.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_607.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_608.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_609.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_610.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_612.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_613.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_614.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_615.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_616.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_617.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_618.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_619.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_621.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_622.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_623.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_624.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_625.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_626.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_627.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_628.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_629.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_630.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_631.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_640.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_641.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_642.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_643.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_644.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_645.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_646.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_70.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_700.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_701.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_702.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_703.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_704.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_705.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_706.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_707.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_708.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_709.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_710.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_80.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_800.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_801.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_830.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_90.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_900.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_901.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_902.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8625.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8639.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_reg.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ud.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.err
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v1.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v2.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v3.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_vlstr.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps.txt
+      h5diff_10.txt
+      h5diff_100.txt
+      h5diff_11.txt
+      h5diff_12.txt
+      h5diff_13.txt
+      h5diff_14.txt
+      h5diff_15.txt
+      h5diff_16_1.txt
+      h5diff_16_2.txt
+      h5diff_16_3.txt
+      h5diff_17.txt
+      h5diff_171.txt
+      h5diff_172.txt
+      h5diff_18_1.txt
+      h5diff_18.txt
+      h5diff_20.txt
+      h5diff_200.txt
+      h5diff_201.txt
+      h5diff_202.txt
+      h5diff_203.txt
+      h5diff_204.txt
+      h5diff_205.txt
+      h5diff_206.txt
+      h5diff_207.txt
+      h5diff_208.txt
+      h5diff_220.txt
+      h5diff_221.txt
+      h5diff_222.txt
+      h5diff_223.txt
+      h5diff_224.txt
+      h5diff_21.txt
+      h5diff_22.txt
+      h5diff_23.txt
+      h5diff_24.txt
+      h5diff_25.txt
+      h5diff_26.txt
+      h5diff_27.txt
+      h5diff_28.txt
+      h5diff_30.txt
+      h5diff_300.txt
+      h5diff_400.txt
+      h5diff_401.txt
+      h5diff_402.txt
+      h5diff_403.txt
+      h5diff_404.txt
+      h5diff_405.txt
+      h5diff_406.txt
+      h5diff_407.txt
+      h5diff_408.txt
+      h5diff_409.txt
+      h5diff_410.txt
+      h5diff_411.txt
+      h5diff_412.txt
+      h5diff_413.txt
+      h5diff_414.txt
+      h5diff_415.txt
+      h5diff_416.txt
+      h5diff_417.txt
+      h5diff_418.txt
+      h5diff_419.txt
+      h5diff_420.txt
+      h5diff_421.txt
+      h5diff_422.txt
+      h5diff_423.txt
+      h5diff_424.txt
+      h5diff_425.txt
+      h5diff_450.txt
+      h5diff_451.txt
+      h5diff_452.txt
+      h5diff_453.txt
+      h5diff_454.txt
+      dangling_link.err
+      h5diff_455.txt
+      h5diff_456.txt
+      h5diff_457.txt
+      h5diff_458.txt
+      h5diff_459.txt
+      h5diff_465.txt
+      h5diff_466.txt
+      h5diff_467.txt
+      h5diff_468.txt
+      h5diff_469.txt
+      h5diff_471.txt
+      h5diff_472.txt
+      h5diff_473.txt
+      h5diff_474.txt
+      h5diff_475.txt
+      h5diff_480.txt
+      h5diff_481.txt
+      h5diff_482.txt
+      h5diff_483.txt
+      h5diff_484.txt
+      h5diff_485.txt
+      h5diff_486.txt
+      h5diff_487.txt
+      h5diff_50.txt
+      h5diff_51.txt
+      h5diff_52.txt
+      h5diff_53.txt
+      h5diff_54.txt
+      h5diff_55.txt
+      h5diff_56.txt
+      h5diff_57.txt
+      h5diff_58.txt
+      h5diff_58_ref.txt
+      h5diff_59.txt
+      h5diff_500.txt
+      h5diff_501.txt
+      h5diff_502.txt
+      h5diff_503.txt
+      h5diff_504.txt
+      h5diff_505.txt
+      h5diff_506.txt
+      h5diff_507.txt
+      h5diff_508.txt
+      h5diff_509.txt
+      h5diff_510.txt
+      h5diff_511.txt
+      h5diff_512.txt
+      h5diff_513.txt
+      h5diff_514.txt
+      h5diff_515.txt
+      h5diff_516.txt
+      h5diff_517.txt
+      h5diff_518.txt
+      h5diff_530.txt
+      h5diff_540.txt
+      h5diff_60.txt
+      h5diff_61.txt
+      h5diff_62.txt
+      h5diff_63.txt
+      h5diff_600.txt
+      h5diff_601.txt
+      h5diff_601_ERR.err
+      h5diff_603.txt
+      h5diff_604.txt
+      h5diff_605.txt
+      h5diff_606.txt
+      h5diff_607.txt
+      h5diff_608.txt
+      h5diff_609.txt
+      h5diff_610.txt
+      h5diff_612.txt
+      h5diff_613.txt
+      h5diff_614.txt
+      h5diff_615.txt
+      h5diff_616.txt
+      h5diff_617.txt
+      h5diff_618.txt
+      h5diff_619.txt
+      h5diff_621.txt
+      h5diff_622.txt
+      h5diff_623.txt
+      h5diff_624.txt
+      h5diff_625.txt
+      h5diff_626.txt
+      h5diff_627.txt
+      h5diff_628.txt
+      h5diff_629.txt
+      h5diff_630.txt
+      h5diff_631.txt
+      h5diff_640.txt
+      h5diff_641.txt
+      h5diff_642.txt
+      h5diff_643.txt
+      h5diff_644.txt
+      h5diff_645.txt
+      h5diff_646.txt
+      h5diff_70.txt
+      h5diff_700.txt
+      h5diff_701.txt
+      h5diff_702.txt
+      h5diff_703.txt
+      h5diff_704.txt
+      h5diff_705.txt
+      h5diff_706.txt
+      h5diff_707.txt
+      h5diff_708.txt
+      h5diff_709.txt
+      h5diff_710.txt
+      h5diff_80.txt
+      h5diff_800.txt
+      h5diff_801.txt
+      h5diff_830.txt
+      h5diff_90.txt
+      h5diff_900.txt
+      h5diff_901.txt
+      h5diff_902.txt
+      h5diff_8625.txt
+      h5diff_8639.txt
+      h5diff_reg.txt
+      h5diff_ud.txt
+      h5diff_udfail.err
+      h5diff_udfail.txt
+      h5diff_v1.txt
+      h5diff_v2.txt
+      h5diff_v3.txt
+      h5diff_vlstr.txt
+      h5diff_eps.txt
   )
 
   set (LIST_WIN_TEST_FILES
@@ -334,17 +338,34 @@
   #
   # copy test files from source to build dir
   #
-  foreach (h5_tstfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
-    get_filename_component(fname "${h5_tstfiles}" NAME)
-    HDFTEST_COPY_FILE("${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5diff_files")
+  foreach (h5_tstfiles ${LIST_DIFF_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
+    if (H5_HAVE_PARALLEL)
+      HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
+    endif ()
+  endforeach ()
+  foreach (h5_tstfiles ${LIST_VDS_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
+    if (H5_HAVE_PARALLEL)
+      HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
+    endif ()
+  endforeach ()
+  foreach (h5_tstfiles ${LIST_HDF5_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
+    if (H5_HAVE_PARALLEL)
+      HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
+    endif ()
+  endforeach ()
+  foreach (h5_tstfiles ${LIST_OTHER_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
     if (H5_HAVE_PARALLEL)
-      HDFTEST_COPY_FILE("${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}" "h5diff_files")
+      HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
     endif ()
   endforeach ()
   # copy second version of tvlstr.h5
-  HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files")
+  HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files")
   if (H5_HAVE_PARALLEL)
-      HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/PAR/testfiles/tvlstr2.h5" "h5diff_files")
+      HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/PAR/testfiles/tvlstr2.h5" "h5diff_files")
   endif ()
 
 
@@ -361,18 +382,16 @@
   endif ()
   if (COPY_WINDOWS_FILES)
     foreach (h5_tstfiles ${LIST_WIN_TEST_FILES})
-      get_filename_component(fname "${h5_tstfiles}" NAME)
-      HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/testfiles/${fname}.txt" "h5diff_files")
+      HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}.txt" "h5diff_files")
       if (H5_HAVE_PARALLEL)
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}.txt" "h5diff_files")
+        HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}.txt" "h5diff_files")
       endif ()
     endforeach ()
   else ()
     foreach (h5_tstfiles ${LIST_WIN_TEST_FILES})
-      get_filename_component(fname "${h5_tstfiles}" NAME)
-      HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/testfiles/${fname}.txt" "h5diff_files")
+      HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}.txt" "h5diff_files")
       if (H5_HAVE_PARALLEL)
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}.txt" "h5diff_files")
+        HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}.txt" "h5diff_files")
       endif ()
     endforeach ()
   endif ()
diff --git a/tools/test/h5diff/testfiles/dangling_link.err b/tools/test/h5diff/expected/dangling_link.err
index 82802a1..82802a1 100644
--- a/tools/test/h5diff/testfiles/dangling_link.err
+++ b/tools/test/h5diff/expected/dangling_link.err
diff --git a/tools/test/h5diff/testfiles/h5diff_10.txt b/tools/test/h5diff/expected/h5diff_10.txt
index dbd5418..dbd5418 100644
--- a/tools/test/h5diff/testfiles/h5diff_10.txt
+++ b/tools/test/h5diff/expected/h5diff_10.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_100.txt b/tools/test/h5diff/expected/h5diff_100.txt
index 363daa3..363daa3 100644
--- a/tools/test/h5diff/testfiles/h5diff_100.txt
+++ b/tools/test/h5diff/expected/h5diff_100.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_101.txt b/tools/test/h5diff/expected/h5diff_101.txt
index f915439..f915439 100644
--- a/tools/test/h5diff/testfiles/h5diff_101.txt
+++ b/tools/test/h5diff/expected/h5diff_101.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_101w.txt b/tools/test/h5diff/expected/h5diff_101w.txt
index 71f4e87..71f4e87 100644
--- a/tools/test/h5diff/testfiles/h5diff_101w.txt
+++ b/tools/test/h5diff/expected/h5diff_101w.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_102.txt b/tools/test/h5diff/expected/h5diff_102.txt
index 476067b..476067b 100644
--- a/tools/test/h5diff/testfiles/h5diff_102.txt
+++ b/tools/test/h5diff/expected/h5diff_102.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_102w.txt b/tools/test/h5diff/expected/h5diff_102w.txt
index 19a097c..19a097c 100644
--- a/tools/test/h5diff/testfiles/h5diff_102w.txt
+++ b/tools/test/h5diff/expected/h5diff_102w.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_103.txt b/tools/test/h5diff/expected/h5diff_103.txt
index 5700459..5700459 100644
--- a/tools/test/h5diff/testfiles/h5diff_103.txt
+++ b/tools/test/h5diff/expected/h5diff_103.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_103w.txt b/tools/test/h5diff/expected/h5diff_103w.txt
index b1abea2..b1abea2 100644
--- a/tools/test/h5diff/testfiles/h5diff_103w.txt
+++ b/tools/test/h5diff/expected/h5diff_103w.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_104.txt b/tools/test/h5diff/expected/h5diff_104.txt
index 2997f10..2997f10 100644
--- a/tools/test/h5diff/testfiles/h5diff_104.txt
+++ b/tools/test/h5diff/expected/h5diff_104.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_104w.txt b/tools/test/h5diff/expected/h5diff_104w.txt
index 28ef705..28ef705 100644
--- a/tools/test/h5diff/testfiles/h5diff_104w.txt
+++ b/tools/test/h5diff/expected/h5diff_104w.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_11.txt b/tools/test/h5diff/expected/h5diff_11.txt
index c06305c..c06305c 100644
--- a/tools/test/h5diff/testfiles/h5diff_11.txt
+++ b/tools/test/h5diff/expected/h5diff_11.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_12.txt b/tools/test/h5diff/expected/h5diff_12.txt
index 371df79..371df79 100644
--- a/tools/test/h5diff/testfiles/h5diff_12.txt
+++ b/tools/test/h5diff/expected/h5diff_12.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_13.txt b/tools/test/h5diff/expected/h5diff_13.txt
index 729859b..729859b 100644
--- a/tools/test/h5diff/testfiles/h5diff_13.txt
+++ b/tools/test/h5diff/expected/h5diff_13.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_14.txt b/tools/test/h5diff/expected/h5diff_14.txt
index 454463a..454463a 100644
--- a/tools/test/h5diff/testfiles/h5diff_14.txt
+++ b/tools/test/h5diff/expected/h5diff_14.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_15.txt b/tools/test/h5diff/expected/h5diff_15.txt
index 7685f75..7685f75 100644
--- a/tools/test/h5diff/testfiles/h5diff_15.txt
+++ b/tools/test/h5diff/expected/h5diff_15.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_16_1.txt b/tools/test/h5diff/expected/h5diff_16_1.txt
index 482a42f..482a42f 100644
--- a/tools/test/h5diff/testfiles/h5diff_16_1.txt
+++ b/tools/test/h5diff/expected/h5diff_16_1.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_16_2.txt b/tools/test/h5diff/expected/h5diff_16_2.txt
index 34c1afb..34c1afb 100644
--- a/tools/test/h5diff/testfiles/h5diff_16_2.txt
+++ b/tools/test/h5diff/expected/h5diff_16_2.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_16_3.txt b/tools/test/h5diff/expected/h5diff_16_3.txt
index 173a39b..173a39b 100644
--- a/tools/test/h5diff/testfiles/h5diff_16_3.txt
+++ b/tools/test/h5diff/expected/h5diff_16_3.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_17.txt b/tools/test/h5diff/expected/h5diff_17.txt
index 4906a2a..4906a2a 100644
--- a/tools/test/h5diff/testfiles/h5diff_17.txt
+++ b/tools/test/h5diff/expected/h5diff_17.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_171.txt b/tools/test/h5diff/expected/h5diff_171.txt
index aabe16a..aabe16a 100644
--- a/tools/test/h5diff/testfiles/h5diff_171.txt
+++ b/tools/test/h5diff/expected/h5diff_171.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_172.txt b/tools/test/h5diff/expected/h5diff_172.txt
index 852f7b5..852f7b5 100644
--- a/tools/test/h5diff/testfiles/h5diff_172.txt
+++ b/tools/test/h5diff/expected/h5diff_172.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_18.txt b/tools/test/h5diff/expected/h5diff_18.txt
index 1255241..1255241 100644
--- a/tools/test/h5diff/testfiles/h5diff_18.txt
+++ b/tools/test/h5diff/expected/h5diff_18.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_18_1.txt b/tools/test/h5diff/expected/h5diff_18_1.txt
index 0067075..0067075 100644
--- a/tools/test/h5diff/testfiles/h5diff_18_1.txt
+++ b/tools/test/h5diff/expected/h5diff_18_1.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_19.txt b/tools/test/h5diff/expected/h5diff_19.txt
index 1155d55..1155d55 100644
--- a/tools/test/h5diff/testfiles/h5diff_19.txt
+++ b/tools/test/h5diff/expected/h5diff_19.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_20.txt b/tools/test/h5diff/expected/h5diff_20.txt
index 09c20cb..09c20cb 100644
--- a/tools/test/h5diff/testfiles/h5diff_20.txt
+++ b/tools/test/h5diff/expected/h5diff_20.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_200.txt b/tools/test/h5diff/expected/h5diff_200.txt
index 40e3fb6..40e3fb6 100644
--- a/tools/test/h5diff/testfiles/h5diff_200.txt
+++ b/tools/test/h5diff/expected/h5diff_200.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_201.txt b/tools/test/h5diff/expected/h5diff_201.txt
index ede94e1..ede94e1 100644
--- a/tools/test/h5diff/testfiles/h5diff_201.txt
+++ b/tools/test/h5diff/expected/h5diff_201.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_202.txt b/tools/test/h5diff/expected/h5diff_202.txt
index 95ef1da..95ef1da 100644
--- a/tools/test/h5diff/testfiles/h5diff_202.txt
+++ b/tools/test/h5diff/expected/h5diff_202.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_203.txt b/tools/test/h5diff/expected/h5diff_203.txt
index 61a773a..61a773a 100644
--- a/tools/test/h5diff/testfiles/h5diff_203.txt
+++ b/tools/test/h5diff/expected/h5diff_203.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_204.txt b/tools/test/h5diff/expected/h5diff_204.txt
index e02e831..e02e831 100644
--- a/tools/test/h5diff/testfiles/h5diff_204.txt
+++ b/tools/test/h5diff/expected/h5diff_204.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_205.txt b/tools/test/h5diff/expected/h5diff_205.txt
index bf5650f..bf5650f 100644
--- a/tools/test/h5diff/testfiles/h5diff_205.txt
+++ b/tools/test/h5diff/expected/h5diff_205.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_206.txt b/tools/test/h5diff/expected/h5diff_206.txt
index 659321f..659321f 100644
--- a/tools/test/h5diff/testfiles/h5diff_206.txt
+++ b/tools/test/h5diff/expected/h5diff_206.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_207.txt b/tools/test/h5diff/expected/h5diff_207.txt
index 1ef3dbe..1ef3dbe 100644
--- a/tools/test/h5diff/testfiles/h5diff_207.txt
+++ b/tools/test/h5diff/expected/h5diff_207.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_208.txt b/tools/test/h5diff/expected/h5diff_208.txt
index 783be90..783be90 100644
--- a/tools/test/h5diff/testfiles/h5diff_208.txt
+++ b/tools/test/h5diff/expected/h5diff_208.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_21.txt b/tools/test/h5diff/expected/h5diff_21.txt
index 1c625fe..1c625fe 100644
--- a/tools/test/h5diff/testfiles/h5diff_21.txt
+++ b/tools/test/h5diff/expected/h5diff_21.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_22.txt b/tools/test/h5diff/expected/h5diff_22.txt
index 2ef22d0..2ef22d0 100644
--- a/tools/test/h5diff/testfiles/h5diff_22.txt
+++ b/tools/test/h5diff/expected/h5diff_22.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_220.txt b/tools/test/h5diff/expected/h5diff_220.txt
index 0092fc1..0092fc1 100644
--- a/tools/test/h5diff/testfiles/h5diff_220.txt
+++ b/tools/test/h5diff/expected/h5diff_220.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_221.txt b/tools/test/h5diff/expected/h5diff_221.txt
index 5f10860..5f10860 100644
--- a/tools/test/h5diff/testfiles/h5diff_221.txt
+++ b/tools/test/h5diff/expected/h5diff_221.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_222.txt b/tools/test/h5diff/expected/h5diff_222.txt
index 77447da..77447da 100644
--- a/tools/test/h5diff/testfiles/h5diff_222.txt
+++ b/tools/test/h5diff/expected/h5diff_222.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_223.txt b/tools/test/h5diff/expected/h5diff_223.txt
index c8e0f65..c8e0f65 100644
--- a/tools/test/h5diff/testfiles/h5diff_223.txt
+++ b/tools/test/h5diff/expected/h5diff_223.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_224.txt b/tools/test/h5diff/expected/h5diff_224.txt
index a4ebedb..a4ebedb 100644
--- a/tools/test/h5diff/testfiles/h5diff_224.txt
+++ b/tools/test/h5diff/expected/h5diff_224.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_23.txt b/tools/test/h5diff/expected/h5diff_23.txt
index bd1cadb..bd1cadb 100644
--- a/tools/test/h5diff/testfiles/h5diff_23.txt
+++ b/tools/test/h5diff/expected/h5diff_23.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_24.txt b/tools/test/h5diff/expected/h5diff_24.txt
index fa5723a..fa5723a 100644
--- a/tools/test/h5diff/testfiles/h5diff_24.txt
+++ b/tools/test/h5diff/expected/h5diff_24.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_25.txt b/tools/test/h5diff/expected/h5diff_25.txt
index e463ba1..e463ba1 100644
--- a/tools/test/h5diff/testfiles/h5diff_25.txt
+++ b/tools/test/h5diff/expected/h5diff_25.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_26.txt b/tools/test/h5diff/expected/h5diff_26.txt
index 54a5121..54a5121 100644
--- a/tools/test/h5diff/testfiles/h5diff_26.txt
+++ b/tools/test/h5diff/expected/h5diff_26.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_27.txt b/tools/test/h5diff/expected/h5diff_27.txt
index cbc128e..cbc128e 100644
--- a/tools/test/h5diff/testfiles/h5diff_27.txt
+++ b/tools/test/h5diff/expected/h5diff_27.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_28.txt b/tools/test/h5diff/expected/h5diff_28.txt
index 07d01fe..07d01fe 100644
--- a/tools/test/h5diff/testfiles/h5diff_28.txt
+++ b/tools/test/h5diff/expected/h5diff_28.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_30.txt b/tools/test/h5diff/expected/h5diff_30.txt
index 187589a..187589a 100644
--- a/tools/test/h5diff/testfiles/h5diff_30.txt
+++ b/tools/test/h5diff/expected/h5diff_30.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_300.txt b/tools/test/h5diff/expected/h5diff_300.txt
index e51643f..e51643f 100644
--- a/tools/test/h5diff/testfiles/h5diff_300.txt
+++ b/tools/test/h5diff/expected/h5diff_300.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_400.txt b/tools/test/h5diff/expected/h5diff_400.txt
index 8b3c03c..8b3c03c 100644
--- a/tools/test/h5diff/testfiles/h5diff_400.txt
+++ b/tools/test/h5diff/expected/h5diff_400.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_401.txt b/tools/test/h5diff/expected/h5diff_401.txt
index 278729e..278729e 100644
--- a/tools/test/h5diff/testfiles/h5diff_401.txt
+++ b/tools/test/h5diff/expected/h5diff_401.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_402.txt b/tools/test/h5diff/expected/h5diff_402.txt
index b0f30ca..b0f30ca 100644
--- a/tools/test/h5diff/testfiles/h5diff_402.txt
+++ b/tools/test/h5diff/expected/h5diff_402.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_403.txt b/tools/test/h5diff/expected/h5diff_403.txt
index 068d01d..068d01d 100644
--- a/tools/test/h5diff/testfiles/h5diff_403.txt
+++ b/tools/test/h5diff/expected/h5diff_403.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_404.txt b/tools/test/h5diff/expected/h5diff_404.txt
index db317d1..db317d1 100644
--- a/tools/test/h5diff/testfiles/h5diff_404.txt
+++ b/tools/test/h5diff/expected/h5diff_404.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_405.txt b/tools/test/h5diff/expected/h5diff_405.txt
index 890dd33..890dd33 100644
--- a/tools/test/h5diff/testfiles/h5diff_405.txt
+++ b/tools/test/h5diff/expected/h5diff_405.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_406.txt b/tools/test/h5diff/expected/h5diff_406.txt
index 7fa442a..7fa442a 100644
--- a/tools/test/h5diff/testfiles/h5diff_406.txt
+++ b/tools/test/h5diff/expected/h5diff_406.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_407.txt b/tools/test/h5diff/expected/h5diff_407.txt
index 3693ab9..3693ab9 100644
--- a/tools/test/h5diff/testfiles/h5diff_407.txt
+++ b/tools/test/h5diff/expected/h5diff_407.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_408.txt b/tools/test/h5diff/expected/h5diff_408.txt
index e941f9b..e941f9b 100644
--- a/tools/test/h5diff/testfiles/h5diff_408.txt
+++ b/tools/test/h5diff/expected/h5diff_408.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_409.txt b/tools/test/h5diff/expected/h5diff_409.txt
index 007da7d..007da7d 100644
--- a/tools/test/h5diff/testfiles/h5diff_409.txt
+++ b/tools/test/h5diff/expected/h5diff_409.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_410.txt b/tools/test/h5diff/expected/h5diff_410.txt
index 6087bb8..6087bb8 100644
--- a/tools/test/h5diff/testfiles/h5diff_410.txt
+++ b/tools/test/h5diff/expected/h5diff_410.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_411.txt b/tools/test/h5diff/expected/h5diff_411.txt
index 161ab34..161ab34 100644
--- a/tools/test/h5diff/testfiles/h5diff_411.txt
+++ b/tools/test/h5diff/expected/h5diff_411.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_412.txt b/tools/test/h5diff/expected/h5diff_412.txt
index bb8209c..bb8209c 100644
--- a/tools/test/h5diff/testfiles/h5diff_412.txt
+++ b/tools/test/h5diff/expected/h5diff_412.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_413.txt b/tools/test/h5diff/expected/h5diff_413.txt
index 8df3d51..8df3d51 100644
--- a/tools/test/h5diff/testfiles/h5diff_413.txt
+++ b/tools/test/h5diff/expected/h5diff_413.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_414.txt b/tools/test/h5diff/expected/h5diff_414.txt
index a47349e..a47349e 100644
--- a/tools/test/h5diff/testfiles/h5diff_414.txt
+++ b/tools/test/h5diff/expected/h5diff_414.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_415.txt b/tools/test/h5diff/expected/h5diff_415.txt
index 30cc947..30cc947 100644
--- a/tools/test/h5diff/testfiles/h5diff_415.txt
+++ b/tools/test/h5diff/expected/h5diff_415.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_416.txt b/tools/test/h5diff/expected/h5diff_416.txt
index 551a6c3..551a6c3 100644
--- a/tools/test/h5diff/testfiles/h5diff_416.txt
+++ b/tools/test/h5diff/expected/h5diff_416.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_417.txt b/tools/test/h5diff/expected/h5diff_417.txt
index 0ea2542..0ea2542 100644
--- a/tools/test/h5diff/testfiles/h5diff_417.txt
+++ b/tools/test/h5diff/expected/h5diff_417.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_418.txt b/tools/test/h5diff/expected/h5diff_418.txt
index 46222bb..46222bb 100644
--- a/tools/test/h5diff/testfiles/h5diff_418.txt
+++ b/tools/test/h5diff/expected/h5diff_418.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_419.txt b/tools/test/h5diff/expected/h5diff_419.txt
index 387c600..387c600 100644
--- a/tools/test/h5diff/testfiles/h5diff_419.txt
+++ b/tools/test/h5diff/expected/h5diff_419.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_420.txt b/tools/test/h5diff/expected/h5diff_420.txt
index f3e65d9..f3e65d9 100644
--- a/tools/test/h5diff/testfiles/h5diff_420.txt
+++ b/tools/test/h5diff/expected/h5diff_420.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_421.txt b/tools/test/h5diff/expected/h5diff_421.txt
index 833c60c..833c60c 100644
--- a/tools/test/h5diff/testfiles/h5diff_421.txt
+++ b/tools/test/h5diff/expected/h5diff_421.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_422.txt b/tools/test/h5diff/expected/h5diff_422.txt
index 3e675d5..3e675d5 100644
--- a/tools/test/h5diff/testfiles/h5diff_422.txt
+++ b/tools/test/h5diff/expected/h5diff_422.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_423.txt b/tools/test/h5diff/expected/h5diff_423.txt
index 1ebc157..1ebc157 100644
--- a/tools/test/h5diff/testfiles/h5diff_423.txt
+++ b/tools/test/h5diff/expected/h5diff_423.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_424.txt b/tools/test/h5diff/expected/h5diff_424.txt
index 9099c41..9099c41 100644
--- a/tools/test/h5diff/testfiles/h5diff_424.txt
+++ b/tools/test/h5diff/expected/h5diff_424.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_425.txt b/tools/test/h5diff/expected/h5diff_425.txt
index 03ceb78..03ceb78 100644
--- a/tools/test/h5diff/testfiles/h5diff_425.txt
+++ b/tools/test/h5diff/expected/h5diff_425.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_450.txt b/tools/test/h5diff/expected/h5diff_450.txt
index a63d78f..a63d78f 100644
--- a/tools/test/h5diff/testfiles/h5diff_450.txt
+++ b/tools/test/h5diff/expected/h5diff_450.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_451.txt b/tools/test/h5diff/expected/h5diff_451.txt
index fd0691f..fd0691f 100644
--- a/tools/test/h5diff/testfiles/h5diff_451.txt
+++ b/tools/test/h5diff/expected/h5diff_451.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_452.txt b/tools/test/h5diff/expected/h5diff_452.txt
index 05403af..05403af 100644
--- a/tools/test/h5diff/testfiles/h5diff_452.txt
+++ b/tools/test/h5diff/expected/h5diff_452.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_453.txt b/tools/test/h5diff/expected/h5diff_453.txt
index 8a5ca52..8a5ca52 100644
--- a/tools/test/h5diff/testfiles/h5diff_453.txt
+++ b/tools/test/h5diff/expected/h5diff_453.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_454.txt b/tools/test/h5diff/expected/h5diff_454.txt
index dcc2e9c..dcc2e9c 100644
--- a/tools/test/h5diff/testfiles/h5diff_454.txt
+++ b/tools/test/h5diff/expected/h5diff_454.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_455.txt b/tools/test/h5diff/expected/h5diff_455.txt
index dcc2e9c..dcc2e9c 100644
--- a/tools/test/h5diff/testfiles/h5diff_455.txt
+++ b/tools/test/h5diff/expected/h5diff_455.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_456.txt b/tools/test/h5diff/expected/h5diff_456.txt
index 9317988..9317988 100644
--- a/tools/test/h5diff/testfiles/h5diff_456.txt
+++ b/tools/test/h5diff/expected/h5diff_456.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_457.txt b/tools/test/h5diff/expected/h5diff_457.txt
index 762ccdc..762ccdc 100644
--- a/tools/test/h5diff/testfiles/h5diff_457.txt
+++ b/tools/test/h5diff/expected/h5diff_457.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_458.txt b/tools/test/h5diff/expected/h5diff_458.txt
index 067d665..067d665 100644
--- a/tools/test/h5diff/testfiles/h5diff_458.txt
+++ b/tools/test/h5diff/expected/h5diff_458.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_459.txt b/tools/test/h5diff/expected/h5diff_459.txt
index 762ccdc..762ccdc 100644
--- a/tools/test/h5diff/testfiles/h5diff_459.txt
+++ b/tools/test/h5diff/expected/h5diff_459.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_465.txt b/tools/test/h5diff/expected/h5diff_465.txt
index eca5994..eca5994 100644
--- a/tools/test/h5diff/testfiles/h5diff_465.txt
+++ b/tools/test/h5diff/expected/h5diff_465.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_466.txt b/tools/test/h5diff/expected/h5diff_466.txt
index 3e00ca3..3e00ca3 100644
--- a/tools/test/h5diff/testfiles/h5diff_466.txt
+++ b/tools/test/h5diff/expected/h5diff_466.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_467.txt b/tools/test/h5diff/expected/h5diff_467.txt
index f5195c0..f5195c0 100644
--- a/tools/test/h5diff/testfiles/h5diff_467.txt
+++ b/tools/test/h5diff/expected/h5diff_467.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_468.txt b/tools/test/h5diff/expected/h5diff_468.txt
index 75b16c6..75b16c6 100644
--- a/tools/test/h5diff/testfiles/h5diff_468.txt
+++ b/tools/test/h5diff/expected/h5diff_468.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_469.txt b/tools/test/h5diff/expected/h5diff_469.txt
index 594fd80..594fd80 100644
--- a/tools/test/h5diff/testfiles/h5diff_469.txt
+++ b/tools/test/h5diff/expected/h5diff_469.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_471.txt b/tools/test/h5diff/expected/h5diff_471.txt
index 124cdd7..124cdd7 100644
--- a/tools/test/h5diff/testfiles/h5diff_471.txt
+++ b/tools/test/h5diff/expected/h5diff_471.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_472.txt b/tools/test/h5diff/expected/h5diff_472.txt
index 57a8af4..57a8af4 100644
--- a/tools/test/h5diff/testfiles/h5diff_472.txt
+++ b/tools/test/h5diff/expected/h5diff_472.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_473.txt b/tools/test/h5diff/expected/h5diff_473.txt
index 4c1855d..4c1855d 100644
--- a/tools/test/h5diff/testfiles/h5diff_473.txt
+++ b/tools/test/h5diff/expected/h5diff_473.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_474.txt b/tools/test/h5diff/expected/h5diff_474.txt
index 7807551..7807551 100644
--- a/tools/test/h5diff/testfiles/h5diff_474.txt
+++ b/tools/test/h5diff/expected/h5diff_474.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_475.txt b/tools/test/h5diff/expected/h5diff_475.txt
index be6110e..be6110e 100644
--- a/tools/test/h5diff/testfiles/h5diff_475.txt
+++ b/tools/test/h5diff/expected/h5diff_475.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_480.txt b/tools/test/h5diff/expected/h5diff_480.txt
index 3e1f900..3e1f900 100644
--- a/tools/test/h5diff/testfiles/h5diff_480.txt
+++ b/tools/test/h5diff/expected/h5diff_480.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_481.txt b/tools/test/h5diff/expected/h5diff_481.txt
index c4f2448..c4f2448 100644
--- a/tools/test/h5diff/testfiles/h5diff_481.txt
+++ b/tools/test/h5diff/expected/h5diff_481.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_482.txt b/tools/test/h5diff/expected/h5diff_482.txt
index 5b3c8c1..5b3c8c1 100644
--- a/tools/test/h5diff/testfiles/h5diff_482.txt
+++ b/tools/test/h5diff/expected/h5diff_482.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_483.txt b/tools/test/h5diff/expected/h5diff_483.txt
index a45e928..a45e928 100644
--- a/tools/test/h5diff/testfiles/h5diff_483.txt
+++ b/tools/test/h5diff/expected/h5diff_483.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_484.txt b/tools/test/h5diff/expected/h5diff_484.txt
index 87d9c7c..87d9c7c 100644
--- a/tools/test/h5diff/testfiles/h5diff_484.txt
+++ b/tools/test/h5diff/expected/h5diff_484.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_485.txt b/tools/test/h5diff/expected/h5diff_485.txt
index 4175809..4175809 100644
--- a/tools/test/h5diff/testfiles/h5diff_485.txt
+++ b/tools/test/h5diff/expected/h5diff_485.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_486.txt b/tools/test/h5diff/expected/h5diff_486.txt
index 4175809..4175809 100644
--- a/tools/test/h5diff/testfiles/h5diff_486.txt
+++ b/tools/test/h5diff/expected/h5diff_486.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_487.txt b/tools/test/h5diff/expected/h5diff_487.txt
index 8555a71..8555a71 100644
--- a/tools/test/h5diff/testfiles/h5diff_487.txt
+++ b/tools/test/h5diff/expected/h5diff_487.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_50.txt b/tools/test/h5diff/expected/h5diff_50.txt
index 434b458..434b458 100644
--- a/tools/test/h5diff/testfiles/h5diff_50.txt
+++ b/tools/test/h5diff/expected/h5diff_50.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_500.txt b/tools/test/h5diff/expected/h5diff_500.txt
index 7d688d2..7d688d2 100644
--- a/tools/test/h5diff/testfiles/h5diff_500.txt
+++ b/tools/test/h5diff/expected/h5diff_500.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_501.txt b/tools/test/h5diff/expected/h5diff_501.txt
index 75e91da..75e91da 100644
--- a/tools/test/h5diff/testfiles/h5diff_501.txt
+++ b/tools/test/h5diff/expected/h5diff_501.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_502.txt b/tools/test/h5diff/expected/h5diff_502.txt
index d3de6e5..d3de6e5 100644
--- a/tools/test/h5diff/testfiles/h5diff_502.txt
+++ b/tools/test/h5diff/expected/h5diff_502.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_503.txt b/tools/test/h5diff/expected/h5diff_503.txt
index cf01598..cf01598 100644
--- a/tools/test/h5diff/testfiles/h5diff_503.txt
+++ b/tools/test/h5diff/expected/h5diff_503.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_504.txt b/tools/test/h5diff/expected/h5diff_504.txt
index 6cf43b3..6cf43b3 100644
--- a/tools/test/h5diff/testfiles/h5diff_504.txt
+++ b/tools/test/h5diff/expected/h5diff_504.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_505.txt b/tools/test/h5diff/expected/h5diff_505.txt
index 607b99b..607b99b 100644
--- a/tools/test/h5diff/testfiles/h5diff_505.txt
+++ b/tools/test/h5diff/expected/h5diff_505.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_506.txt b/tools/test/h5diff/expected/h5diff_506.txt
index efef9a7..efef9a7 100644
--- a/tools/test/h5diff/testfiles/h5diff_506.txt
+++ b/tools/test/h5diff/expected/h5diff_506.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_507.txt b/tools/test/h5diff/expected/h5diff_507.txt
index 06b7fe6..06b7fe6 100644
--- a/tools/test/h5diff/testfiles/h5diff_507.txt
+++ b/tools/test/h5diff/expected/h5diff_507.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_508.txt b/tools/test/h5diff/expected/h5diff_508.txt
index 9796345..9796345 100644
--- a/tools/test/h5diff/testfiles/h5diff_508.txt
+++ b/tools/test/h5diff/expected/h5diff_508.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_509.txt b/tools/test/h5diff/expected/h5diff_509.txt
index 2e3e87a..2e3e87a 100644
--- a/tools/test/h5diff/testfiles/h5diff_509.txt
+++ b/tools/test/h5diff/expected/h5diff_509.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_51.txt b/tools/test/h5diff/expected/h5diff_51.txt
index 621ba2a..621ba2a 100644
--- a/tools/test/h5diff/testfiles/h5diff_51.txt
+++ b/tools/test/h5diff/expected/h5diff_51.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_510.txt b/tools/test/h5diff/expected/h5diff_510.txt
index 9d92768..9d92768 100644
--- a/tools/test/h5diff/testfiles/h5diff_510.txt
+++ b/tools/test/h5diff/expected/h5diff_510.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_511.txt b/tools/test/h5diff/expected/h5diff_511.txt
index 4bac100..4bac100 100644
--- a/tools/test/h5diff/testfiles/h5diff_511.txt
+++ b/tools/test/h5diff/expected/h5diff_511.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_512.txt b/tools/test/h5diff/expected/h5diff_512.txt
index 23fbc12..23fbc12 100644
--- a/tools/test/h5diff/testfiles/h5diff_512.txt
+++ b/tools/test/h5diff/expected/h5diff_512.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_513.txt b/tools/test/h5diff/expected/h5diff_513.txt
index b0af15d..b0af15d 100644
--- a/tools/test/h5diff/testfiles/h5diff_513.txt
+++ b/tools/test/h5diff/expected/h5diff_513.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_514.txt b/tools/test/h5diff/expected/h5diff_514.txt
index f8e16e9..f8e16e9 100644
--- a/tools/test/h5diff/testfiles/h5diff_514.txt
+++ b/tools/test/h5diff/expected/h5diff_514.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_515.txt b/tools/test/h5diff/expected/h5diff_515.txt
index 263441d..263441d 100644
--- a/tools/test/h5diff/testfiles/h5diff_515.txt
+++ b/tools/test/h5diff/expected/h5diff_515.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_516.txt b/tools/test/h5diff/expected/h5diff_516.txt
index 32f4bd5..32f4bd5 100644
--- a/tools/test/h5diff/testfiles/h5diff_516.txt
+++ b/tools/test/h5diff/expected/h5diff_516.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_517.txt b/tools/test/h5diff/expected/h5diff_517.txt
index 91c69fb..91c69fb 100644
--- a/tools/test/h5diff/testfiles/h5diff_517.txt
+++ b/tools/test/h5diff/expected/h5diff_517.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_518.txt b/tools/test/h5diff/expected/h5diff_518.txt
index f4761ad..f4761ad 100644
--- a/tools/test/h5diff/testfiles/h5diff_518.txt
+++ b/tools/test/h5diff/expected/h5diff_518.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_52.txt b/tools/test/h5diff/expected/h5diff_52.txt
index 6667659..6667659 100644
--- a/tools/test/h5diff/testfiles/h5diff_52.txt
+++ b/tools/test/h5diff/expected/h5diff_52.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_53.txt b/tools/test/h5diff/expected/h5diff_53.txt
index 458d166..458d166 100644
--- a/tools/test/h5diff/testfiles/h5diff_53.txt
+++ b/tools/test/h5diff/expected/h5diff_53.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_530.txt b/tools/test/h5diff/expected/h5diff_530.txt
index 73d736e..73d736e 100644
--- a/tools/test/h5diff/testfiles/h5diff_530.txt
+++ b/tools/test/h5diff/expected/h5diff_530.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_54.txt b/tools/test/h5diff/expected/h5diff_54.txt
index 2ca60f8..2ca60f8 100644
--- a/tools/test/h5diff/testfiles/h5diff_54.txt
+++ b/tools/test/h5diff/expected/h5diff_54.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_540.txt b/tools/test/h5diff/expected/h5diff_540.txt
index a6903c8..a6903c8 100644
--- a/tools/test/h5diff/testfiles/h5diff_540.txt
+++ b/tools/test/h5diff/expected/h5diff_540.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_55.txt b/tools/test/h5diff/expected/h5diff_55.txt
index 1288887..1288887 100644
--- a/tools/test/h5diff/testfiles/h5diff_55.txt
+++ b/tools/test/h5diff/expected/h5diff_55.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_56.txt b/tools/test/h5diff/expected/h5diff_56.txt
index 0e82860..0e82860 100644
--- a/tools/test/h5diff/testfiles/h5diff_56.txt
+++ b/tools/test/h5diff/expected/h5diff_56.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_57.txt b/tools/test/h5diff/expected/h5diff_57.txt
index d5125fe..d5125fe 100644
--- a/tools/test/h5diff/testfiles/h5diff_57.txt
+++ b/tools/test/h5diff/expected/h5diff_57.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_58.txt b/tools/test/h5diff/expected/h5diff_58.txt
index da147bc..da147bc 100644
--- a/tools/test/h5diff/testfiles/h5diff_58.txt
+++ b/tools/test/h5diff/expected/h5diff_58.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_58_ref.txt b/tools/test/h5diff/expected/h5diff_58_ref.txt
index 48a4b33..48a4b33 100644
--- a/tools/test/h5diff/testfiles/h5diff_58_ref.txt
+++ b/tools/test/h5diff/expected/h5diff_58_ref.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_59.txt b/tools/test/h5diff/expected/h5diff_59.txt
index 996a7b2..996a7b2 100644
--- a/tools/test/h5diff/testfiles/h5diff_59.txt
+++ b/tools/test/h5diff/expected/h5diff_59.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_60.txt b/tools/test/h5diff/expected/h5diff_60.txt
index dde17f6..dde17f6 100644
--- a/tools/test/h5diff/testfiles/h5diff_60.txt
+++ b/tools/test/h5diff/expected/h5diff_60.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_600.txt b/tools/test/h5diff/expected/h5diff_600.txt
index 46a1c45..46a1c45 100644
--- a/tools/test/h5diff/testfiles/h5diff_600.txt
+++ b/tools/test/h5diff/expected/h5diff_600.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_601.txt b/tools/test/h5diff/expected/h5diff_601.txt
index eb12f38..eb12f38 100644
--- a/tools/test/h5diff/testfiles/h5diff_601.txt
+++ b/tools/test/h5diff/expected/h5diff_601.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_601_ERR.err b/tools/test/h5diff/expected/h5diff_601_ERR.err
index f9a7212..f9a7212 100644
--- a/tools/test/h5diff/testfiles/h5diff_601_ERR.err
+++ b/tools/test/h5diff/expected/h5diff_601_ERR.err
diff --git a/tools/test/h5diff/testfiles/h5diff_603.txt b/tools/test/h5diff/expected/h5diff_603.txt
index e930dbe..e930dbe 100644
--- a/tools/test/h5diff/testfiles/h5diff_603.txt
+++ b/tools/test/h5diff/expected/h5diff_603.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_604.txt b/tools/test/h5diff/expected/h5diff_604.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_604.txt
+++ b/tools/test/h5diff/expected/h5diff_604.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_605.txt b/tools/test/h5diff/expected/h5diff_605.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_605.txt
+++ b/tools/test/h5diff/expected/h5diff_605.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_606.txt b/tools/test/h5diff/expected/h5diff_606.txt
index 02b80eb..02b80eb 100644
--- a/tools/test/h5diff/testfiles/h5diff_606.txt
+++ b/tools/test/h5diff/expected/h5diff_606.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_607.txt b/tools/test/h5diff/expected/h5diff_607.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_607.txt
+++ b/tools/test/h5diff/expected/h5diff_607.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_608.txt b/tools/test/h5diff/expected/h5diff_608.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_608.txt
+++ b/tools/test/h5diff/expected/h5diff_608.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_609.txt b/tools/test/h5diff/expected/h5diff_609.txt
index eca5994..eca5994 100644
--- a/tools/test/h5diff/testfiles/h5diff_609.txt
+++ b/tools/test/h5diff/expected/h5diff_609.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_61.txt b/tools/test/h5diff/expected/h5diff_61.txt
index 5553d63..5553d63 100644
--- a/tools/test/h5diff/testfiles/h5diff_61.txt
+++ b/tools/test/h5diff/expected/h5diff_61.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_610.txt b/tools/test/h5diff/expected/h5diff_610.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_610.txt
+++ b/tools/test/h5diff/expected/h5diff_610.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_612.txt b/tools/test/h5diff/expected/h5diff_612.txt
index 4cccece..4cccece 100644
--- a/tools/test/h5diff/testfiles/h5diff_612.txt
+++ b/tools/test/h5diff/expected/h5diff_612.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_613.txt b/tools/test/h5diff/expected/h5diff_613.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_613.txt
+++ b/tools/test/h5diff/expected/h5diff_613.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_614.txt b/tools/test/h5diff/expected/h5diff_614.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_614.txt
+++ b/tools/test/h5diff/expected/h5diff_614.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_615.txt b/tools/test/h5diff/expected/h5diff_615.txt
index 3641164..3641164 100644
--- a/tools/test/h5diff/testfiles/h5diff_615.txt
+++ b/tools/test/h5diff/expected/h5diff_615.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_616.txt b/tools/test/h5diff/expected/h5diff_616.txt
index 3bc194a..3bc194a 100644
--- a/tools/test/h5diff/testfiles/h5diff_616.txt
+++ b/tools/test/h5diff/expected/h5diff_616.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_617.txt b/tools/test/h5diff/expected/h5diff_617.txt
index 3bc194a..3bc194a 100644
--- a/tools/test/h5diff/testfiles/h5diff_617.txt
+++ b/tools/test/h5diff/expected/h5diff_617.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_618.txt b/tools/test/h5diff/expected/h5diff_618.txt
index eca5994..eca5994 100644
--- a/tools/test/h5diff/testfiles/h5diff_618.txt
+++ b/tools/test/h5diff/expected/h5diff_618.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_619.txt b/tools/test/h5diff/expected/h5diff_619.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_619.txt
+++ b/tools/test/h5diff/expected/h5diff_619.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_62.txt b/tools/test/h5diff/expected/h5diff_62.txt
index 934f61e..934f61e 100644
--- a/tools/test/h5diff/testfiles/h5diff_62.txt
+++ b/tools/test/h5diff/expected/h5diff_62.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_621.txt b/tools/test/h5diff/expected/h5diff_621.txt
index 05b952c..05b952c 100644
--- a/tools/test/h5diff/testfiles/h5diff_621.txt
+++ b/tools/test/h5diff/expected/h5diff_621.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_622.txt b/tools/test/h5diff/expected/h5diff_622.txt
index 4d3e945..4d3e945 100644
--- a/tools/test/h5diff/testfiles/h5diff_622.txt
+++ b/tools/test/h5diff/expected/h5diff_622.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_623.txt b/tools/test/h5diff/expected/h5diff_623.txt
index fd992ef..fd992ef 100644
--- a/tools/test/h5diff/testfiles/h5diff_623.txt
+++ b/tools/test/h5diff/expected/h5diff_623.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/expected/h5diff_624.txt
index cc9578f..cc9578f 100644
--- a/tools/test/h5diff/testfiles/h5diff_624.txt
+++ b/tools/test/h5diff/expected/h5diff_624.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_625.txt b/tools/test/h5diff/expected/h5diff_625.txt
index 3bc194a..3bc194a 100644
--- a/tools/test/h5diff/testfiles/h5diff_625.txt
+++ b/tools/test/h5diff/expected/h5diff_625.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_626.txt b/tools/test/h5diff/expected/h5diff_626.txt
index 6494066..6494066 100644
--- a/tools/test/h5diff/testfiles/h5diff_626.txt
+++ b/tools/test/h5diff/expected/h5diff_626.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_627.txt b/tools/test/h5diff/expected/h5diff_627.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_627.txt
+++ b/tools/test/h5diff/expected/h5diff_627.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_628.txt b/tools/test/h5diff/expected/h5diff_628.txt
index e11d8ee..e11d8ee 100644
--- a/tools/test/h5diff/testfiles/h5diff_628.txt
+++ b/tools/test/h5diff/expected/h5diff_628.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_629.txt b/tools/test/h5diff/expected/h5diff_629.txt
index 962c2b0..962c2b0 100644
--- a/tools/test/h5diff/testfiles/h5diff_629.txt
+++ b/tools/test/h5diff/expected/h5diff_629.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_63.txt b/tools/test/h5diff/expected/h5diff_63.txt
index 6b46c18..6b46c18 100644
--- a/tools/test/h5diff/testfiles/h5diff_63.txt
+++ b/tools/test/h5diff/expected/h5diff_63.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_630.txt b/tools/test/h5diff/expected/h5diff_630.txt
index aaf0148..aaf0148 100644
--- a/tools/test/h5diff/testfiles/h5diff_630.txt
+++ b/tools/test/h5diff/expected/h5diff_630.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_631.txt b/tools/test/h5diff/expected/h5diff_631.txt
index aaf0148..aaf0148 100644
--- a/tools/test/h5diff/testfiles/h5diff_631.txt
+++ b/tools/test/h5diff/expected/h5diff_631.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_640.txt b/tools/test/h5diff/expected/h5diff_640.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_640.txt
+++ b/tools/test/h5diff/expected/h5diff_640.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_641.txt b/tools/test/h5diff/expected/h5diff_641.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_641.txt
+++ b/tools/test/h5diff/expected/h5diff_641.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_642.txt b/tools/test/h5diff/expected/h5diff_642.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_642.txt
+++ b/tools/test/h5diff/expected/h5diff_642.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_643.txt b/tools/test/h5diff/expected/h5diff_643.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_643.txt
+++ b/tools/test/h5diff/expected/h5diff_643.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_644.txt b/tools/test/h5diff/expected/h5diff_644.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_644.txt
+++ b/tools/test/h5diff/expected/h5diff_644.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_645.txt b/tools/test/h5diff/expected/h5diff_645.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_645.txt
+++ b/tools/test/h5diff/expected/h5diff_645.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_646.txt b/tools/test/h5diff/expected/h5diff_646.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_646.txt
+++ b/tools/test/h5diff/expected/h5diff_646.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_70.txt b/tools/test/h5diff/expected/h5diff_70.txt
index b0b8bf6..b0b8bf6 100644
--- a/tools/test/h5diff/testfiles/h5diff_70.txt
+++ b/tools/test/h5diff/expected/h5diff_70.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_700.txt b/tools/test/h5diff/expected/h5diff_700.txt
index 6cf9893..6cf9893 100644
--- a/tools/test/h5diff/testfiles/h5diff_700.txt
+++ b/tools/test/h5diff/expected/h5diff_700.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_701.txt b/tools/test/h5diff/expected/h5diff_701.txt
index 4187754..4187754 100644
--- a/tools/test/h5diff/testfiles/h5diff_701.txt
+++ b/tools/test/h5diff/expected/h5diff_701.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_702.txt b/tools/test/h5diff/expected/h5diff_702.txt
index 6cf9893..6cf9893 100644
--- a/tools/test/h5diff/testfiles/h5diff_702.txt
+++ b/tools/test/h5diff/expected/h5diff_702.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_703.txt b/tools/test/h5diff/expected/h5diff_703.txt
index 4187754..4187754 100644
--- a/tools/test/h5diff/testfiles/h5diff_703.txt
+++ b/tools/test/h5diff/expected/h5diff_703.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_704.txt b/tools/test/h5diff/expected/h5diff_704.txt
index e752a01..e752a01 100644
--- a/tools/test/h5diff/testfiles/h5diff_704.txt
+++ b/tools/test/h5diff/expected/h5diff_704.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_705.txt b/tools/test/h5diff/expected/h5diff_705.txt
index 2e52f18..2e52f18 100644
--- a/tools/test/h5diff/testfiles/h5diff_705.txt
+++ b/tools/test/h5diff/expected/h5diff_705.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_706.txt b/tools/test/h5diff/expected/h5diff_706.txt
index 5825150..5825150 100644
--- a/tools/test/h5diff/testfiles/h5diff_706.txt
+++ b/tools/test/h5diff/expected/h5diff_706.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_707.txt b/tools/test/h5diff/expected/h5diff_707.txt
index 4d6378b..4d6378b 100644
--- a/tools/test/h5diff/testfiles/h5diff_707.txt
+++ b/tools/test/h5diff/expected/h5diff_707.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_708.txt b/tools/test/h5diff/expected/h5diff_708.txt
index a10a8b7..a10a8b7 100644
--- a/tools/test/h5diff/testfiles/h5diff_708.txt
+++ b/tools/test/h5diff/expected/h5diff_708.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_709.txt b/tools/test/h5diff/expected/h5diff_709.txt
index d0e68bf..d0e68bf 100644
--- a/tools/test/h5diff/testfiles/h5diff_709.txt
+++ b/tools/test/h5diff/expected/h5diff_709.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_710.txt b/tools/test/h5diff/expected/h5diff_710.txt
index 10a8501..10a8501 100644
--- a/tools/test/h5diff/testfiles/h5diff_710.txt
+++ b/tools/test/h5diff/expected/h5diff_710.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_80.txt b/tools/test/h5diff/expected/h5diff_80.txt
index 11dccd8..11dccd8 100644
--- a/tools/test/h5diff/testfiles/h5diff_80.txt
+++ b/tools/test/h5diff/expected/h5diff_80.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_800.txt b/tools/test/h5diff/expected/h5diff_800.txt
index e43e7b4..e43e7b4 100644
--- a/tools/test/h5diff/testfiles/h5diff_800.txt
+++ b/tools/test/h5diff/expected/h5diff_800.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_801.txt b/tools/test/h5diff/expected/h5diff_801.txt
index 043e7e3..043e7e3 100644
--- a/tools/test/h5diff/testfiles/h5diff_801.txt
+++ b/tools/test/h5diff/expected/h5diff_801.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_830.txt b/tools/test/h5diff/expected/h5diff_830.txt
index 8f00d8b..8f00d8b 100644
--- a/tools/test/h5diff/testfiles/h5diff_830.txt
+++ b/tools/test/h5diff/expected/h5diff_830.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_8625.txt b/tools/test/h5diff/expected/h5diff_8625.txt
index a7ddb86..a7ddb86 100644
--- a/tools/test/h5diff/testfiles/h5diff_8625.txt
+++ b/tools/test/h5diff/expected/h5diff_8625.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_8639.txt b/tools/test/h5diff/expected/h5diff_8639.txt
index 4022e06..4022e06 100644
--- a/tools/test/h5diff/testfiles/h5diff_8639.txt
+++ b/tools/test/h5diff/expected/h5diff_8639.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_90.txt b/tools/test/h5diff/expected/h5diff_90.txt
index 9965ab0..9965ab0 100644
--- a/tools/test/h5diff/testfiles/h5diff_90.txt
+++ b/tools/test/h5diff/expected/h5diff_90.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_900.txt b/tools/test/h5diff/expected/h5diff_900.txt
index eca7872..eca7872 100644
--- a/tools/test/h5diff/testfiles/h5diff_900.txt
+++ b/tools/test/h5diff/expected/h5diff_900.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_901.txt b/tools/test/h5diff/expected/h5diff_901.txt
index eb1f7d9..eb1f7d9 100644
--- a/tools/test/h5diff/testfiles/h5diff_901.txt
+++ b/tools/test/h5diff/expected/h5diff_901.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_902.txt b/tools/test/h5diff/expected/h5diff_902.txt
index 3863e16..3863e16 100644
--- a/tools/test/h5diff/testfiles/h5diff_902.txt
+++ b/tools/test/h5diff/expected/h5diff_902.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_eps.txt b/tools/test/h5diff/expected/h5diff_eps.txt
index 3a71366..3a71366 100644
--- a/tools/test/h5diff/testfiles/h5diff_eps.txt
+++ b/tools/test/h5diff/expected/h5diff_eps.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_reg.txt b/tools/test/h5diff/expected/h5diff_reg.txt
index ecb6275..ecb6275 100644
--- a/tools/test/h5diff/testfiles/h5diff_reg.txt
+++ b/tools/test/h5diff/expected/h5diff_reg.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_ud.txt b/tools/test/h5diff/expected/h5diff_ud.txt
index ddda3ff..ddda3ff 100644
--- a/tools/test/h5diff/testfiles/h5diff_ud.txt
+++ b/tools/test/h5diff/expected/h5diff_ud.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_udfail.err b/tools/test/h5diff/expected/h5diff_udfail.err
index d51de38..d51de38 100644
--- a/tools/test/h5diff/testfiles/h5diff_udfail.err
+++ b/tools/test/h5diff/expected/h5diff_udfail.err
diff --git a/tools/test/h5diff/testfiles/h5diff_udfail.txt b/tools/test/h5diff/expected/h5diff_udfail.txt
index e6000fc..e6000fc 100644
--- a/tools/test/h5diff/testfiles/h5diff_udfail.txt
+++ b/tools/test/h5diff/expected/h5diff_udfail.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_v1.txt b/tools/test/h5diff/expected/h5diff_v1.txt
index 8210cf9..8210cf9 100644
--- a/tools/test/h5diff/testfiles/h5diff_v1.txt
+++ b/tools/test/h5diff/expected/h5diff_v1.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_v2.txt b/tools/test/h5diff/expected/h5diff_v2.txt
index aa327b1..aa327b1 100644
--- a/tools/test/h5diff/testfiles/h5diff_v2.txt
+++ b/tools/test/h5diff/expected/h5diff_v2.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_v3.txt b/tools/test/h5diff/expected/h5diff_v3.txt
index 57af303..57af303 100644
--- a/tools/test/h5diff/testfiles/h5diff_v3.txt
+++ b/tools/test/h5diff/expected/h5diff_v3.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_vlstr.txt b/tools/test/h5diff/expected/h5diff_vlstr.txt
index 67141f1..67141f1 100644
--- a/tools/test/h5diff/testfiles/h5diff_vlstr.txt
+++ b/tools/test/h5diff/expected/h5diff_vlstr.txt
diff --git a/tools/test/h5diff/h5diff_plugin.sh.in b/tools/test/h5diff/h5diff_plugin.sh.in
index e3f0f01..525503d 100644
--- a/tools/test/h5diff/h5diff_plugin.sh.in
+++ b/tools/test/h5diff/h5diff_plugin.sh.in
@@ -45,6 +45,7 @@ SRC_TOOLS="$srcdir/../.."
 
 # testfiles source dirs for tools
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
+SRC_H5DIFF_OUTFILES="$SRC_TOOLS/test/h5diff/expected"
 
 TESTDIR=./testplug
 test -d $TESTDIR || mkdir $TESTDIR
@@ -61,9 +62,9 @@ test -d $TESTDIR || mkdir $TESTDIR
 LIST_HDF5_TEST_FILES="
 $SRC_H5DIFF_TESTFILES/tudfilter.h5
 $SRC_H5DIFF_TESTFILES/tudfilter2.h5
-$SRC_H5DIFF_TESTFILES/h5diff_ud.txt
-$SRC_H5DIFF_TESTFILES/h5diff_udfail.err
-$SRC_H5DIFF_TESTFILES/h5diff_udfail.txt
+$SRC_H5DIFF_OUTFILES/h5diff_ud.txt
+$SRC_H5DIFF_OUTFILES/h5diff_udfail.err
+$SRC_H5DIFF_OUTFILES/h5diff_udfail.txt
 "
 
 # Main Body
diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in
index 7cc82a1..efaac2e 100644
--- a/tools/test/h5diff/testh5diff.sh.in
+++ b/tools/test/h5diff/testh5diff.sh.in
@@ -38,16 +38,16 @@ mydomainname=`domainname 2>/dev/null`
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5DIFF_OUTFILES="$SRC_TOOLS/test/h5diff/expected"
 
 TESTDIR=./testfiles
 test -d $TESTDIR || mkdir $TESTDIR
@@ -116,249 +116,249 @@ $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_ext.h5
 $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_ext.h5.onion
 $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_1d.h5
 $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_1d.h5.onion
-$SRC_TOOLS_TESTFILES/tvlstr.h5
 "
 
 LIST_HDF5_VDS_TEST_FILES="
-$SRC_TOOLS_TESTFILES/vds/1_a.h5
-$SRC_TOOLS_TESTFILES/vds/1_b.h5
-$SRC_TOOLS_TESTFILES/vds/1_c.h5
-$SRC_TOOLS_TESTFILES/vds/1_d.h5
-$SRC_TOOLS_TESTFILES/vds/1_e.h5
-$SRC_TOOLS_TESTFILES/vds/1_f.h5
-$SRC_TOOLS_TESTFILES/vds/1_vds.h5
-$SRC_TOOLS_TESTFILES/vds/2_a.h5
-$SRC_TOOLS_TESTFILES/vds/2_b.h5
-$SRC_TOOLS_TESTFILES/vds/2_c.h5
-$SRC_TOOLS_TESTFILES/vds/2_d.h5
-$SRC_TOOLS_TESTFILES/vds/2_e.h5
-$SRC_TOOLS_TESTFILES/vds/2_vds.h5
-$SRC_TOOLS_TESTFILES/vds/3_1_vds.h5
-$SRC_TOOLS_TESTFILES/vds/3_2_vds.h5
-$SRC_TOOLS_TESTFILES/vds/4_0.h5
-$SRC_TOOLS_TESTFILES/vds/4_1.h5
-$SRC_TOOLS_TESTFILES/vds/4_2.h5
-$SRC_TOOLS_TESTFILES/vds/4_vds.h5
-$SRC_TOOLS_TESTFILES/vds/5_a.h5
-$SRC_TOOLS_TESTFILES/vds/5_b.h5
-$SRC_TOOLS_TESTFILES/vds/5_c.h5
-$SRC_TOOLS_TESTFILES/vds/5_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/1_a.h5
+$SRC_H5DUMP_TESTFILES/vds/1_b.h5
+$SRC_H5DUMP_TESTFILES/vds/1_c.h5
+$SRC_H5DUMP_TESTFILES/vds/1_d.h5
+$SRC_H5DUMP_TESTFILES/vds/1_e.h5
+$SRC_H5DUMP_TESTFILES/vds/1_f.h5
+$SRC_H5DUMP_TESTFILES/vds/1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/2_a.h5
+$SRC_H5DUMP_TESTFILES/vds/2_b.h5
+$SRC_H5DUMP_TESTFILES/vds/2_c.h5
+$SRC_H5DUMP_TESTFILES/vds/2_d.h5
+$SRC_H5DUMP_TESTFILES/vds/2_e.h5
+$SRC_H5DUMP_TESTFILES/vds/2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/4_0.h5
+$SRC_H5DUMP_TESTFILES/vds/4_1.h5
+$SRC_H5DUMP_TESTFILES/vds/4_2.h5
+$SRC_H5DUMP_TESTFILES/vds/4_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/5_a.h5
+$SRC_H5DUMP_TESTFILES/vds/5_b.h5
+$SRC_H5DUMP_TESTFILES/vds/5_c.h5
+$SRC_H5DUMP_TESTFILES/vds/5_vds.h5
 "
 
 LIST_HDF5_STD_REF_OBJ_TEST_FILES="
-$SRC_TOOLS_TESTFILES/trefer_attr.h5
-$SRC_TOOLS_TESTFILES/trefer_compat.h5
-$SRC_TOOLS_TESTFILES/trefer_ext1.h5
-$SRC_TOOLS_TESTFILES/trefer_ext2.h5
-$SRC_TOOLS_TESTFILES/trefer_grp.h5
-$SRC_TOOLS_TESTFILES/trefer_obj_del.h5
-$SRC_TOOLS_TESTFILES/trefer_obj.h5
-$SRC_TOOLS_TESTFILES/trefer_param.h5
-$SRC_TOOLS_TESTFILES/trefer_reg_1d.h5
-$SRC_TOOLS_TESTFILES/trefer_reg.h5
+$SRC_H5DUMP_TESTFILES/tvlstr.h5
+$SRC_H5DUMP_TESTFILES/trefer_attr.h5
+$SRC_H5DUMP_TESTFILES/trefer_compat.h5
+$SRC_H5DUMP_TESTFILES/trefer_ext1.h5
+$SRC_H5DUMP_TESTFILES/trefer_ext2.h5
+$SRC_H5DUMP_TESTFILES/trefer_grp.h5
+$SRC_H5DUMP_TESTFILES/trefer_obj_del.h5
+$SRC_H5DUMP_TESTFILES/trefer_obj.h5
+$SRC_H5DUMP_TESTFILES/trefer_param.h5
+$SRC_H5DUMP_TESTFILES/trefer_reg_1d.h5
+$SRC_H5DUMP_TESTFILES/trefer_reg.h5
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5DIFF_TESTFILES/h5diff_10.txt
-$SRC_H5DIFF_TESTFILES/h5diff_100.txt
-$SRC_H5DIFF_TESTFILES/h5diff_101.txt
-$SRC_H5DIFF_TESTFILES/h5diff_102.txt
-$SRC_H5DIFF_TESTFILES/h5diff_103.txt
-$SRC_H5DIFF_TESTFILES/h5diff_104.txt
-$SRC_H5DIFF_TESTFILES/h5diff_11.txt
-$SRC_H5DIFF_TESTFILES/h5diff_12.txt
-$SRC_H5DIFF_TESTFILES/h5diff_13.txt
-$SRC_H5DIFF_TESTFILES/h5diff_14.txt
-$SRC_H5DIFF_TESTFILES/h5diff_15.txt
-$SRC_H5DIFF_TESTFILES/h5diff_16_1.txt
-$SRC_H5DIFF_TESTFILES/h5diff_16_2.txt
-$SRC_H5DIFF_TESTFILES/h5diff_16_3.txt
-$SRC_H5DIFF_TESTFILES/h5diff_17.txt
-$SRC_H5DIFF_TESTFILES/h5diff_171.txt
-$SRC_H5DIFF_TESTFILES/h5diff_172.txt
-$SRC_H5DIFF_TESTFILES/h5diff_18_1.txt
-$SRC_H5DIFF_TESTFILES/h5diff_18.txt
-$SRC_H5DIFF_TESTFILES/h5diff_20.txt
-$SRC_H5DIFF_TESTFILES/h5diff_200.txt
-$SRC_H5DIFF_TESTFILES/h5diff_201.txt
-$SRC_H5DIFF_TESTFILES/h5diff_202.txt
-$SRC_H5DIFF_TESTFILES/h5diff_203.txt
-$SRC_H5DIFF_TESTFILES/h5diff_204.txt
-$SRC_H5DIFF_TESTFILES/h5diff_205.txt
-$SRC_H5DIFF_TESTFILES/h5diff_206.txt
-$SRC_H5DIFF_TESTFILES/h5diff_207.txt
-$SRC_H5DIFF_TESTFILES/h5diff_208.txt
-$SRC_H5DIFF_TESTFILES/h5diff_220.txt
-$SRC_H5DIFF_TESTFILES/h5diff_221.txt
-$SRC_H5DIFF_TESTFILES/h5diff_222.txt
-$SRC_H5DIFF_TESTFILES/h5diff_223.txt
-$SRC_H5DIFF_TESTFILES/h5diff_224.txt
-$SRC_H5DIFF_TESTFILES/h5diff_21.txt
-$SRC_H5DIFF_TESTFILES/h5diff_22.txt
-$SRC_H5DIFF_TESTFILES/h5diff_23.txt
-$SRC_H5DIFF_TESTFILES/h5diff_24.txt
-$SRC_H5DIFF_TESTFILES/h5diff_25.txt
-$SRC_H5DIFF_TESTFILES/h5diff_26.txt
-$SRC_H5DIFF_TESTFILES/h5diff_27.txt
-$SRC_H5DIFF_TESTFILES/h5diff_28.txt
-$SRC_H5DIFF_TESTFILES/h5diff_30.txt
-$SRC_H5DIFF_TESTFILES/h5diff_300.txt
-$SRC_H5DIFF_TESTFILES/h5diff_400.txt
-$SRC_H5DIFF_TESTFILES/h5diff_401.txt
-$SRC_H5DIFF_TESTFILES/h5diff_402.txt
-$SRC_H5DIFF_TESTFILES/h5diff_403.txt
-$SRC_H5DIFF_TESTFILES/h5diff_404.txt
-$SRC_H5DIFF_TESTFILES/h5diff_405.txt
-$SRC_H5DIFF_TESTFILES/h5diff_406.txt
-$SRC_H5DIFF_TESTFILES/h5diff_407.txt
-$SRC_H5DIFF_TESTFILES/h5diff_408.txt
-$SRC_H5DIFF_TESTFILES/h5diff_409.txt
-$SRC_H5DIFF_TESTFILES/h5diff_410.txt
-$SRC_H5DIFF_TESTFILES/h5diff_411.txt
-$SRC_H5DIFF_TESTFILES/h5diff_412.txt
-$SRC_H5DIFF_TESTFILES/h5diff_413.txt
-$SRC_H5DIFF_TESTFILES/h5diff_414.txt
-$SRC_H5DIFF_TESTFILES/h5diff_415.txt
-$SRC_H5DIFF_TESTFILES/h5diff_416.txt
-$SRC_H5DIFF_TESTFILES/h5diff_417.txt
-$SRC_H5DIFF_TESTFILES/h5diff_418.txt
-$SRC_H5DIFF_TESTFILES/h5diff_419.txt
-$SRC_H5DIFF_TESTFILES/h5diff_420.txt
-$SRC_H5DIFF_TESTFILES/h5diff_421.txt
-$SRC_H5DIFF_TESTFILES/h5diff_422.txt
-$SRC_H5DIFF_TESTFILES/h5diff_423.txt
-$SRC_H5DIFF_TESTFILES/h5diff_424.txt
-$SRC_H5DIFF_TESTFILES/h5diff_425.txt
-$SRC_H5DIFF_TESTFILES/h5diff_450.txt
-$SRC_H5DIFF_TESTFILES/h5diff_451.txt
-$SRC_H5DIFF_TESTFILES/h5diff_452.txt
-$SRC_H5DIFF_TESTFILES/h5diff_453.txt
-$SRC_H5DIFF_TESTFILES/h5diff_454.txt
-$SRC_H5DIFF_TESTFILES/dangling_link.err
-$SRC_H5DIFF_TESTFILES/h5diff_455.txt
-$SRC_H5DIFF_TESTFILES/h5diff_456.txt
-$SRC_H5DIFF_TESTFILES/h5diff_457.txt
-$SRC_H5DIFF_TESTFILES/h5diff_458.txt
-$SRC_H5DIFF_TESTFILES/h5diff_459.txt
-$SRC_H5DIFF_TESTFILES/h5diff_465.txt
-$SRC_H5DIFF_TESTFILES/h5diff_466.txt
-$SRC_H5DIFF_TESTFILES/h5diff_467.txt
-$SRC_H5DIFF_TESTFILES/h5diff_468.txt
-$SRC_H5DIFF_TESTFILES/h5diff_469.txt
-$SRC_H5DIFF_TESTFILES/h5diff_471.txt
-$SRC_H5DIFF_TESTFILES/h5diff_472.txt
-$SRC_H5DIFF_TESTFILES/h5diff_473.txt
-$SRC_H5DIFF_TESTFILES/h5diff_474.txt
-$SRC_H5DIFF_TESTFILES/h5diff_475.txt
-$SRC_H5DIFF_TESTFILES/h5diff_480.txt
-$SRC_H5DIFF_TESTFILES/h5diff_481.txt
-$SRC_H5DIFF_TESTFILES/h5diff_482.txt
-$SRC_H5DIFF_TESTFILES/h5diff_483.txt
-$SRC_H5DIFF_TESTFILES/h5diff_484.txt
-$SRC_H5DIFF_TESTFILES/h5diff_485.txt
-$SRC_H5DIFF_TESTFILES/h5diff_486.txt
-$SRC_H5DIFF_TESTFILES/h5diff_487.txt
-$SRC_H5DIFF_TESTFILES/h5diff_50.txt
-$SRC_H5DIFF_TESTFILES/h5diff_51.txt
-$SRC_H5DIFF_TESTFILES/h5diff_52.txt
-$SRC_H5DIFF_TESTFILES/h5diff_53.txt
-$SRC_H5DIFF_TESTFILES/h5diff_54.txt
-$SRC_H5DIFF_TESTFILES/h5diff_55.txt
-$SRC_H5DIFF_TESTFILES/h5diff_56.txt
-$SRC_H5DIFF_TESTFILES/h5diff_57.txt
-$SRC_H5DIFF_TESTFILES/h5diff_58.txt
-$SRC_H5DIFF_TESTFILES/h5diff_58_ref.txt
-$SRC_H5DIFF_TESTFILES/h5diff_59.txt
-$SRC_H5DIFF_TESTFILES/h5diff_500.txt
-$SRC_H5DIFF_TESTFILES/h5diff_501.txt
-$SRC_H5DIFF_TESTFILES/h5diff_502.txt
-$SRC_H5DIFF_TESTFILES/h5diff_503.txt
-$SRC_H5DIFF_TESTFILES/h5diff_504.txt
-$SRC_H5DIFF_TESTFILES/h5diff_505.txt
-$SRC_H5DIFF_TESTFILES/h5diff_506.txt
-$SRC_H5DIFF_TESTFILES/h5diff_507.txt
-$SRC_H5DIFF_TESTFILES/h5diff_508.txt
-$SRC_H5DIFF_TESTFILES/h5diff_509.txt
-$SRC_H5DIFF_TESTFILES/h5diff_510.txt
-$SRC_H5DIFF_TESTFILES/h5diff_511.txt
-$SRC_H5DIFF_TESTFILES/h5diff_512.txt
-$SRC_H5DIFF_TESTFILES/h5diff_513.txt
-$SRC_H5DIFF_TESTFILES/h5diff_514.txt
-$SRC_H5DIFF_TESTFILES/h5diff_515.txt
-$SRC_H5DIFF_TESTFILES/h5diff_516.txt
-$SRC_H5DIFF_TESTFILES/h5diff_517.txt
-$SRC_H5DIFF_TESTFILES/h5diff_518.txt
-$SRC_H5DIFF_TESTFILES/h5diff_530.txt
-$SRC_H5DIFF_TESTFILES/h5diff_540.txt
-$SRC_H5DIFF_TESTFILES/h5diff_60.txt
-$SRC_H5DIFF_TESTFILES/h5diff_61.txt
-$SRC_H5DIFF_TESTFILES/h5diff_62.txt
-$SRC_H5DIFF_TESTFILES/h5diff_63.txt
-$SRC_H5DIFF_TESTFILES/h5diff_600.txt
-$SRC_H5DIFF_TESTFILES/h5diff_601.txt
-$SRC_H5DIFF_TESTFILES/h5diff_601_ERR.err
-$SRC_H5DIFF_TESTFILES/h5diff_603.txt
-$SRC_H5DIFF_TESTFILES/h5diff_604.txt
-$SRC_H5DIFF_TESTFILES/h5diff_605.txt
-$SRC_H5DIFF_TESTFILES/h5diff_606.txt
-$SRC_H5DIFF_TESTFILES/h5diff_607.txt
-$SRC_H5DIFF_TESTFILES/h5diff_608.txt
-$SRC_H5DIFF_TESTFILES/h5diff_609.txt
-$SRC_H5DIFF_TESTFILES/h5diff_610.txt
-$SRC_H5DIFF_TESTFILES/h5diff_612.txt
-$SRC_H5DIFF_TESTFILES/h5diff_613.txt
-$SRC_H5DIFF_TESTFILES/h5diff_614.txt
-$SRC_H5DIFF_TESTFILES/h5diff_615.txt
-$SRC_H5DIFF_TESTFILES/h5diff_616.txt
-$SRC_H5DIFF_TESTFILES/h5diff_617.txt
-$SRC_H5DIFF_TESTFILES/h5diff_618.txt
-$SRC_H5DIFF_TESTFILES/h5diff_619.txt
-$SRC_H5DIFF_TESTFILES/h5diff_621.txt
-$SRC_H5DIFF_TESTFILES/h5diff_622.txt
-$SRC_H5DIFF_TESTFILES/h5diff_623.txt
-$SRC_H5DIFF_TESTFILES/h5diff_624.txt
-$SRC_H5DIFF_TESTFILES/h5diff_625.txt
-$SRC_H5DIFF_TESTFILES/h5diff_626.txt
-$SRC_H5DIFF_TESTFILES/h5diff_627.txt
-$SRC_H5DIFF_TESTFILES/h5diff_628.txt
-$SRC_H5DIFF_TESTFILES/h5diff_629.txt
-$SRC_H5DIFF_TESTFILES/h5diff_630.txt
-$SRC_H5DIFF_TESTFILES/h5diff_631.txt
-$SRC_H5DIFF_TESTFILES/h5diff_640.txt
-$SRC_H5DIFF_TESTFILES/h5diff_641.txt
-$SRC_H5DIFF_TESTFILES/h5diff_642.txt
-$SRC_H5DIFF_TESTFILES/h5diff_643.txt
-$SRC_H5DIFF_TESTFILES/h5diff_644.txt
-$SRC_H5DIFF_TESTFILES/h5diff_645.txt
-$SRC_H5DIFF_TESTFILES/h5diff_646.txt
-$SRC_H5DIFF_TESTFILES/h5diff_70.txt
-$SRC_H5DIFF_TESTFILES/h5diff_700.txt
-$SRC_H5DIFF_TESTFILES/h5diff_701.txt
-$SRC_H5DIFF_TESTFILES/h5diff_702.txt
-$SRC_H5DIFF_TESTFILES/h5diff_703.txt
-$SRC_H5DIFF_TESTFILES/h5diff_704.txt
-$SRC_H5DIFF_TESTFILES/h5diff_705.txt
-$SRC_H5DIFF_TESTFILES/h5diff_706.txt
-$SRC_H5DIFF_TESTFILES/h5diff_707.txt
-$SRC_H5DIFF_TESTFILES/h5diff_708.txt
-$SRC_H5DIFF_TESTFILES/h5diff_709.txt
-$SRC_H5DIFF_TESTFILES/h5diff_710.txt
-$SRC_H5DIFF_TESTFILES/h5diff_80.txt
-$SRC_H5DIFF_TESTFILES/h5diff_800.txt
-$SRC_H5DIFF_TESTFILES/h5diff_801.txt
-$SRC_H5DIFF_TESTFILES/h5diff_830.txt
-$SRC_H5DIFF_TESTFILES/h5diff_90.txt
-$SRC_H5DIFF_TESTFILES/h5diff_900.txt
-$SRC_H5DIFF_TESTFILES/h5diff_901.txt
-$SRC_H5DIFF_TESTFILES/h5diff_902.txt
-$SRC_H5DIFF_TESTFILES/h5diff_8625.txt
-$SRC_H5DIFF_TESTFILES/h5diff_8639.txt
-$SRC_H5DIFF_TESTFILES/h5diff_reg.txt
-$SRC_H5DIFF_TESTFILES/h5diff_v1.txt
-$SRC_H5DIFF_TESTFILES/h5diff_v2.txt
-$SRC_H5DIFF_TESTFILES/h5diff_v3.txt
-$SRC_H5DIFF_TESTFILES/h5diff_vlstr.txt
-$SRC_H5DIFF_TESTFILES/h5diff_eps.txt
+$SRC_H5DIFF_OUTFILES/h5diff_10.txt
+$SRC_H5DIFF_OUTFILES/h5diff_100.txt
+$SRC_H5DIFF_OUTFILES/h5diff_101.txt
+$SRC_H5DIFF_OUTFILES/h5diff_102.txt
+$SRC_H5DIFF_OUTFILES/h5diff_103.txt
+$SRC_H5DIFF_OUTFILES/h5diff_104.txt
+$SRC_H5DIFF_OUTFILES/h5diff_11.txt
+$SRC_H5DIFF_OUTFILES/h5diff_12.txt
+$SRC_H5DIFF_OUTFILES/h5diff_13.txt
+$SRC_H5DIFF_OUTFILES/h5diff_14.txt
+$SRC_H5DIFF_OUTFILES/h5diff_15.txt
+$SRC_H5DIFF_OUTFILES/h5diff_16_1.txt
+$SRC_H5DIFF_OUTFILES/h5diff_16_2.txt
+$SRC_H5DIFF_OUTFILES/h5diff_16_3.txt
+$SRC_H5DIFF_OUTFILES/h5diff_17.txt
+$SRC_H5DIFF_OUTFILES/h5diff_171.txt
+$SRC_H5DIFF_OUTFILES/h5diff_172.txt
+$SRC_H5DIFF_OUTFILES/h5diff_18_1.txt
+$SRC_H5DIFF_OUTFILES/h5diff_18.txt
+$SRC_H5DIFF_OUTFILES/h5diff_20.txt
+$SRC_H5DIFF_OUTFILES/h5diff_200.txt
+$SRC_H5DIFF_OUTFILES/h5diff_201.txt
+$SRC_H5DIFF_OUTFILES/h5diff_202.txt
+$SRC_H5DIFF_OUTFILES/h5diff_203.txt
+$SRC_H5DIFF_OUTFILES/h5diff_204.txt
+$SRC_H5DIFF_OUTFILES/h5diff_205.txt
+$SRC_H5DIFF_OUTFILES/h5diff_206.txt
+$SRC_H5DIFF_OUTFILES/h5diff_207.txt
+$SRC_H5DIFF_OUTFILES/h5diff_208.txt
+$SRC_H5DIFF_OUTFILES/h5diff_220.txt
+$SRC_H5DIFF_OUTFILES/h5diff_221.txt
+$SRC_H5DIFF_OUTFILES/h5diff_222.txt
+$SRC_H5DIFF_OUTFILES/h5diff_223.txt
+$SRC_H5DIFF_OUTFILES/h5diff_224.txt
+$SRC_H5DIFF_OUTFILES/h5diff_21.txt
+$SRC_H5DIFF_OUTFILES/h5diff_22.txt
+$SRC_H5DIFF_OUTFILES/h5diff_23.txt
+$SRC_H5DIFF_OUTFILES/h5diff_24.txt
+$SRC_H5DIFF_OUTFILES/h5diff_25.txt
+$SRC_H5DIFF_OUTFILES/h5diff_26.txt
+$SRC_H5DIFF_OUTFILES/h5diff_27.txt
+$SRC_H5DIFF_OUTFILES/h5diff_28.txt
+$SRC_H5DIFF_OUTFILES/h5diff_30.txt
+$SRC_H5DIFF_OUTFILES/h5diff_300.txt
+$SRC_H5DIFF_OUTFILES/h5diff_400.txt
+$SRC_H5DIFF_OUTFILES/h5diff_401.txt
+$SRC_H5DIFF_OUTFILES/h5diff_402.txt
+$SRC_H5DIFF_OUTFILES/h5diff_403.txt
+$SRC_H5DIFF_OUTFILES/h5diff_404.txt
+$SRC_H5DIFF_OUTFILES/h5diff_405.txt
+$SRC_H5DIFF_OUTFILES/h5diff_406.txt
+$SRC_H5DIFF_OUTFILES/h5diff_407.txt
+$SRC_H5DIFF_OUTFILES/h5diff_408.txt
+$SRC_H5DIFF_OUTFILES/h5diff_409.txt
+$SRC_H5DIFF_OUTFILES/h5diff_410.txt
+$SRC_H5DIFF_OUTFILES/h5diff_411.txt
+$SRC_H5DIFF_OUTFILES/h5diff_412.txt
+$SRC_H5DIFF_OUTFILES/h5diff_413.txt
+$SRC_H5DIFF_OUTFILES/h5diff_414.txt
+$SRC_H5DIFF_OUTFILES/h5diff_415.txt
+$SRC_H5DIFF_OUTFILES/h5diff_416.txt
+$SRC_H5DIFF_OUTFILES/h5diff_417.txt
+$SRC_H5DIFF_OUTFILES/h5diff_418.txt
+$SRC_H5DIFF_OUTFILES/h5diff_419.txt
+$SRC_H5DIFF_OUTFILES/h5diff_420.txt
+$SRC_H5DIFF_OUTFILES/h5diff_421.txt
+$SRC_H5DIFF_OUTFILES/h5diff_422.txt
+$SRC_H5DIFF_OUTFILES/h5diff_423.txt
+$SRC_H5DIFF_OUTFILES/h5diff_424.txt
+$SRC_H5DIFF_OUTFILES/h5diff_425.txt
+$SRC_H5DIFF_OUTFILES/h5diff_450.txt
+$SRC_H5DIFF_OUTFILES/h5diff_451.txt
+$SRC_H5DIFF_OUTFILES/h5diff_452.txt
+$SRC_H5DIFF_OUTFILES/h5diff_453.txt
+$SRC_H5DIFF_OUTFILES/h5diff_454.txt
+$SRC_H5DIFF_OUTFILES/dangling_link.err
+$SRC_H5DIFF_OUTFILES/h5diff_455.txt
+$SRC_H5DIFF_OUTFILES/h5diff_456.txt
+$SRC_H5DIFF_OUTFILES/h5diff_457.txt
+$SRC_H5DIFF_OUTFILES/h5diff_458.txt
+$SRC_H5DIFF_OUTFILES/h5diff_459.txt
+$SRC_H5DIFF_OUTFILES/h5diff_465.txt
+$SRC_H5DIFF_OUTFILES/h5diff_466.txt
+$SRC_H5DIFF_OUTFILES/h5diff_467.txt
+$SRC_H5DIFF_OUTFILES/h5diff_468.txt
+$SRC_H5DIFF_OUTFILES/h5diff_469.txt
+$SRC_H5DIFF_OUTFILES/h5diff_471.txt
+$SRC_H5DIFF_OUTFILES/h5diff_472.txt
+$SRC_H5DIFF_OUTFILES/h5diff_473.txt
+$SRC_H5DIFF_OUTFILES/h5diff_474.txt
+$SRC_H5DIFF_OUTFILES/h5diff_475.txt
+$SRC_H5DIFF_OUTFILES/h5diff_480.txt
+$SRC_H5DIFF_OUTFILES/h5diff_481.txt
+$SRC_H5DIFF_OUTFILES/h5diff_482.txt
+$SRC_H5DIFF_OUTFILES/h5diff_483.txt
+$SRC_H5DIFF_OUTFILES/h5diff_484.txt
+$SRC_H5DIFF_OUTFILES/h5diff_485.txt
+$SRC_H5DIFF_OUTFILES/h5diff_486.txt
+$SRC_H5DIFF_OUTFILES/h5diff_487.txt
+$SRC_H5DIFF_OUTFILES/h5diff_50.txt
+$SRC_H5DIFF_OUTFILES/h5diff_51.txt
+$SRC_H5DIFF_OUTFILES/h5diff_52.txt
+$SRC_H5DIFF_OUTFILES/h5diff_53.txt
+$SRC_H5DIFF_OUTFILES/h5diff_54.txt
+$SRC_H5DIFF_OUTFILES/h5diff_55.txt
+$SRC_H5DIFF_OUTFILES/h5diff_56.txt
+$SRC_H5DIFF_OUTFILES/h5diff_57.txt
+$SRC_H5DIFF_OUTFILES/h5diff_58.txt
+$SRC_H5DIFF_OUTFILES/h5diff_58_ref.txt
+$SRC_H5DIFF_OUTFILES/h5diff_59.txt
+$SRC_H5DIFF_OUTFILES/h5diff_500.txt
+$SRC_H5DIFF_OUTFILES/h5diff_501.txt
+$SRC_H5DIFF_OUTFILES/h5diff_502.txt
+$SRC_H5DIFF_OUTFILES/h5diff_503.txt
+$SRC_H5DIFF_OUTFILES/h5diff_504.txt
+$SRC_H5DIFF_OUTFILES/h5diff_505.txt
+$SRC_H5DIFF_OUTFILES/h5diff_506.txt
+$SRC_H5DIFF_OUTFILES/h5diff_507.txt
+$SRC_H5DIFF_OUTFILES/h5diff_508.txt
+$SRC_H5DIFF_OUTFILES/h5diff_509.txt
+$SRC_H5DIFF_OUTFILES/h5diff_510.txt
+$SRC_H5DIFF_OUTFILES/h5diff_511.txt
+$SRC_H5DIFF_OUTFILES/h5diff_512.txt
+$SRC_H5DIFF_OUTFILES/h5diff_513.txt
+$SRC_H5DIFF_OUTFILES/h5diff_514.txt
+$SRC_H5DIFF_OUTFILES/h5diff_515.txt
+$SRC_H5DIFF_OUTFILES/h5diff_516.txt
+$SRC_H5DIFF_OUTFILES/h5diff_517.txt
+$SRC_H5DIFF_OUTFILES/h5diff_518.txt
+$SRC_H5DIFF_OUTFILES/h5diff_530.txt
+$SRC_H5DIFF_OUTFILES/h5diff_540.txt
+$SRC_H5DIFF_OUTFILES/h5diff_60.txt
+$SRC_H5DIFF_OUTFILES/h5diff_61.txt
+$SRC_H5DIFF_OUTFILES/h5diff_62.txt
+$SRC_H5DIFF_OUTFILES/h5diff_63.txt
+$SRC_H5DIFF_OUTFILES/h5diff_600.txt
+$SRC_H5DIFF_OUTFILES/h5diff_601.txt
+$SRC_H5DIFF_OUTFILES/h5diff_601_ERR.err
+$SRC_H5DIFF_OUTFILES/h5diff_603.txt
+$SRC_H5DIFF_OUTFILES/h5diff_604.txt
+$SRC_H5DIFF_OUTFILES/h5diff_605.txt
+$SRC_H5DIFF_OUTFILES/h5diff_606.txt
+$SRC_H5DIFF_OUTFILES/h5diff_607.txt
+$SRC_H5DIFF_OUTFILES/h5diff_608.txt
+$SRC_H5DIFF_OUTFILES/h5diff_609.txt
+$SRC_H5DIFF_OUTFILES/h5diff_610.txt
+$SRC_H5DIFF_OUTFILES/h5diff_612.txt
+$SRC_H5DIFF_OUTFILES/h5diff_613.txt
+$SRC_H5DIFF_OUTFILES/h5diff_614.txt
+$SRC_H5DIFF_OUTFILES/h5diff_615.txt
+$SRC_H5DIFF_OUTFILES/h5diff_616.txt
+$SRC_H5DIFF_OUTFILES/h5diff_617.txt
+$SRC_H5DIFF_OUTFILES/h5diff_618.txt
+$SRC_H5DIFF_OUTFILES/h5diff_619.txt
+$SRC_H5DIFF_OUTFILES/h5diff_621.txt
+$SRC_H5DIFF_OUTFILES/h5diff_622.txt
+$SRC_H5DIFF_OUTFILES/h5diff_623.txt
+$SRC_H5DIFF_OUTFILES/h5diff_624.txt
+$SRC_H5DIFF_OUTFILES/h5diff_625.txt
+$SRC_H5DIFF_OUTFILES/h5diff_626.txt
+$SRC_H5DIFF_OUTFILES/h5diff_627.txt
+$SRC_H5DIFF_OUTFILES/h5diff_628.txt
+$SRC_H5DIFF_OUTFILES/h5diff_629.txt
+$SRC_H5DIFF_OUTFILES/h5diff_630.txt
+$SRC_H5DIFF_OUTFILES/h5diff_631.txt
+$SRC_H5DIFF_OUTFILES/h5diff_640.txt
+$SRC_H5DIFF_OUTFILES/h5diff_641.txt
+$SRC_H5DIFF_OUTFILES/h5diff_642.txt
+$SRC_H5DIFF_OUTFILES/h5diff_643.txt
+$SRC_H5DIFF_OUTFILES/h5diff_644.txt
+$SRC_H5DIFF_OUTFILES/h5diff_645.txt
+$SRC_H5DIFF_OUTFILES/h5diff_646.txt
+$SRC_H5DIFF_OUTFILES/h5diff_70.txt
+$SRC_H5DIFF_OUTFILES/h5diff_700.txt
+$SRC_H5DIFF_OUTFILES/h5diff_701.txt
+$SRC_H5DIFF_OUTFILES/h5diff_702.txt
+$SRC_H5DIFF_OUTFILES/h5diff_703.txt
+$SRC_H5DIFF_OUTFILES/h5diff_704.txt
+$SRC_H5DIFF_OUTFILES/h5diff_705.txt
+$SRC_H5DIFF_OUTFILES/h5diff_706.txt
+$SRC_H5DIFF_OUTFILES/h5diff_707.txt
+$SRC_H5DIFF_OUTFILES/h5diff_708.txt
+$SRC_H5DIFF_OUTFILES/h5diff_709.txt
+$SRC_H5DIFF_OUTFILES/h5diff_710.txt
+$SRC_H5DIFF_OUTFILES/h5diff_80.txt
+$SRC_H5DIFF_OUTFILES/h5diff_800.txt
+$SRC_H5DIFF_OUTFILES/h5diff_801.txt
+$SRC_H5DIFF_OUTFILES/h5diff_830.txt
+$SRC_H5DIFF_OUTFILES/h5diff_90.txt
+$SRC_H5DIFF_OUTFILES/h5diff_900.txt
+$SRC_H5DIFF_OUTFILES/h5diff_901.txt
+$SRC_H5DIFF_OUTFILES/h5diff_902.txt
+$SRC_H5DIFF_OUTFILES/h5diff_8625.txt
+$SRC_H5DIFF_OUTFILES/h5diff_8639.txt
+$SRC_H5DIFF_OUTFILES/h5diff_reg.txt
+$SRC_H5DIFF_OUTFILES/h5diff_v1.txt
+$SRC_H5DIFF_OUTFILES/h5diff_v2.txt
+$SRC_H5DIFF_OUTFILES/h5diff_v3.txt
+$SRC_H5DIFF_OUTFILES/h5diff_vlstr.txt
+$SRC_H5DIFF_OUTFILES/h5diff_eps.txt
 "
 
 #
@@ -588,7 +588,7 @@ SKIP() {
 # prepare for test
 COPY_TESTFILES_TO_TESTDIR
 # second copy of tvlstr.h5
-$CP -f $SRC_TOOLS_TESTFILES/tvlstr.h5 $TESTDIR/tvlstr2.h5
+$CP -f $SRC_H5DUMP_TESTFILES/tvlstr.h5 $TESTDIR/tvlstr2.h5
 
 # ############################################################################
 # # Common usage
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index c328ef1..7ed021f 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -20,210 +20,210 @@
   # Copy all the HDF5 files from the test directory into the source directory
   # --------------------------------------------------------------------
   set (HDF5_REFERENCE_FILES
-      ${HDF5_TOOLS_DIR}/testfiles/charsets.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/err_attr_dspace.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/file_space.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/filter_fail.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/non_existing.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/packedbits.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-2A.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-2A0.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-2B.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-4s.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-5s.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-6.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-7.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-7N.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tallfilters.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1_big.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray5.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray6.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray7.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray8.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattr-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattr-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattr-3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattr-4_be.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattrcontents1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattrcontents2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattrintsize.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattrregR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbin2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbin3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbin4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbinregR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbigdims.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque_be.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque_le.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tboot1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tboot2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tboot2A.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tboot2B.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tchar1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tchunked.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdattrintsize.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdintarray.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdints.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdintsize.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcomp-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcomp-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcomp-3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcomp-4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcompact.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcontents.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcontiguos.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tdataregR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tdeflate.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tdset-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tdset-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tdset-3s.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tempty.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/texceedsubstart.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/texceedsubcount.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/texceedsubstride.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/texceedsubblock.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/texternal.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tfill.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tfletcher32.ddl
-      #${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.ddl #native
-      #${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.wddl #special for windows
-      ${HDF5_TOOLS_DIR}/testfiles/tfpformat.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/thlink-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/thlink-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/thlink-3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/thlink-4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/thlink-5.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/thyperslab.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tindicesno.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tindicessub1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tindicessub2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tindicessub3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tindicessub4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tindicesyes.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dims.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsBlock2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsBlockEq.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsCount2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsCountEq.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsStride2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tintsattrs.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tintsnodata.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tlarge_objname.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tldouble.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tldouble_scalar.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tlonglinks.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tloop-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tmultifile.ddl
-      #${HDF5_TOOLS_DIR}/testfiles/tqmarkfile.ddl
-      #${HDF5_TOOLS_DIR}/testfiles/tstarfile.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnestedcmpddt.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnbit.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnoattrdata.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnoattrddl.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnodata.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnoddl.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnoddlfile.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tno-subset.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnullspace.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr5.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordercontents1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordercontents2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/torderlinks1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/torderlinks2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tperror.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trawdatafile.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trawssetfile.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/treadfilter.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/treadintfilter.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/treference.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tsaf.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarattrintsize.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarintattrsize.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarintsize.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarstring.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tscaleoffset.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tshuffle.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tslink-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tslink-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tslink-D.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tsplit_file.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tstr-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tstr-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tstring.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tstring2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tstringe.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tszip.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tudfilter.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tuserfilter.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvlenstr_array.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvms.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/twidedisplay.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/twithddlfile.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/h5dump-help.txt
-      ${HDF5_TOOLS_DIR}/testfiles/out3.h5import
-      ${HDF5_TOOLS_DIR}/testfiles/zerodim.ddl
+      charsets.ddl
+      err_attr_dspace.ddl
+      file_space.ddl
+      filter_fail.ddl
+      non_existing.ddl
+      packedbits.ddl
+      tall-1.ddl
+      tall-2.ddl
+      tall-2A.ddl
+      tall-2A0.ddl
+      tall-2B.ddl
+      tall-3.ddl
+      tall-4s.ddl
+      tall-5s.ddl
+      tall-6.ddl
+      tall-7.ddl
+      tall-7N.ddl
+      tallfilters.ddl
+      tarray1.ddl
+      tarray1_big.ddl
+      tarray2.ddl
+      tarray3.ddl
+      tarray4.ddl
+      tarray5.ddl
+      tarray6.ddl
+      tarray7.ddl
+      tarray8.ddl
+      tattr-1.ddl
+      tattr-2.ddl
+      tattr-3.ddl
+      tattr-4_be.ddl
+      tattrcontents1.ddl
+      tattrcontents2.ddl
+      tattrintsize.ddl
+      tattrreg.ddl
+      tattrregR.ddl
+      tbin1.ddl
+      tbin1.ddl
+      tbin2.ddl
+      tbin3.ddl
+      tbin4.ddl
+      tbinregR.ddl
+      tbigdims.ddl
+      tbitnopaque_be.ddl
+      tbitnopaque_le.ddl
+      tboot1.ddl
+      tboot2.ddl
+      tboot2A.ddl
+      tboot2B.ddl
+      tchar1.ddl
+      tchunked.ddl
+      tcmpdattrintsize.ddl
+      tcmpdintarray.ddl
+      tcmpdints.ddl
+      tcmpdintsize.ddl
+      tcompound_complex2.ddl
+      tcomp-1.ddl
+      tcomp-2.ddl
+      tcomp-3.ddl
+      tcomp-4.ddl
+      tcompact.ddl
+      tcontents.ddl
+      tcontiguos.ddl
+      tdatareg.ddl
+      tdataregR.ddl
+      tdeflate.ddl
+      tdset-1.ddl
+      tdset-2.ddl
+      tdset-3s.ddl
+      tempty.ddl
+      texceedsubstart.ddl
+      texceedsubcount.ddl
+      texceedsubstride.ddl
+      texceedsubblock.ddl
+      texternal.ddl
+      textlinksrc.ddl
+      textlinkfar.ddl
+      textlink.ddl
+      tfamily.ddl
+      tfill.ddl
+      tfletcher32.ddl
+      #tfloatsattrs.ddl #native
+      #tfloatsattrs.wddl #special for windows
+      tfpformat.ddl
+      tgroup-1.ddl
+      tgroup-2.ddl
+      tgrp_comments.ddl
+      tgrpnullspace.ddl
+      thlink-1.ddl
+      thlink-2.ddl
+      thlink-3.ddl
+      thlink-4.ddl
+      thlink-5.ddl
+      thyperslab.ddl
+      tindicesno.ddl
+      tindicessub1.ddl
+      tindicessub2.ddl
+      tindicessub3.ddl
+      tindicessub4.ddl
+      tindicesyes.ddl
+      tints4dims.ddl
+      tints4dimsBlock2.ddl
+      tints4dimsBlockEq.ddl
+      tints4dimsCount2.ddl
+      tints4dimsCountEq.ddl
+      tints4dimsStride2.ddl
+      tintsattrs.ddl
+      tintsnodata.ddl
+      tlarge_objname.ddl
+      tldouble.ddl
+      tldouble_scalar.ddl
+      tlonglinks.ddl
+      tloop-1.ddl
+      tmulti.ddl
+      tmultifile.ddl
+      #tqmarkfile.ddl
+      #tstarfile.ddl
+      tnamed_dtype_attr.ddl
+      tnestcomp-1.ddl
+      tnestedcmpddt.ddl
+      tnbit.ddl
+      tnoattrdata.ddl
+      tnoattrddl.ddl
+      tnodata.ddl
+      tnoddl.ddl
+      tnoddlfile.ddl
+      tno-subset.ddl
+      tnullspace.ddl
+      tordergr1.ddl
+      tordergr2.ddl
+      tordergr3.ddl
+      tordergr4.ddl
+      tordergr5.ddl
+      torderattr1.ddl
+      torderattr2.ddl
+      torderattr3.ddl
+      torderattr4.ddl
+      tordercontents1.ddl
+      tordercontents2.ddl
+      torderlinks1.ddl
+      torderlinks2.ddl
+      tperror.ddl
+      trawdatafile.ddl
+      trawssetfile.ddl
+      treadfilter.ddl
+      treadintfilter.ddl
+      treference.ddl
+      tsaf.ddl
+      tscalarattrintsize.ddl
+      tscalarintattrsize.ddl
+      tscalarintsize.ddl
+      tscalarstring.ddl
+      tscaleoffset.ddl
+      tshuffle.ddl
+      tslink-1.ddl
+      tslink-2.ddl
+      tslink-D.ddl
+      tsplit_file.ddl
+      tstr-1.ddl
+      tstr-2.ddl
+      tstring.ddl
+      tstring2.ddl
+      tstringe.ddl
+      tszip.ddl
+      tudfilter.ddl
+      tudlink-1.ddl
+      tudlink-2.ddl
+      tuserfilter.ddl
+      tvldtypes1.ddl
+      tvldtypes2.ddl
+      tvldtypes3.ddl
+      tvldtypes4.ddl
+      tvldtypes5.ddl
+      tvlenstr_array.ddl
+      tvlstr.ddl
+      tvms.ddl
+      twidedisplay.ddl
+      twithddlfile.ddl
+      h5dump-help.txt
+      out3.h5import
+      zerodim.ddl
       #STD_REF_OBJ files
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_attrR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_compatR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_extR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_grpR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_delR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_objR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_paramR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1dR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_regR.ddl
+      trefer_attrR.ddl
+      trefer_compatR.ddl
+      trefer_extR.ddl
+      trefer_grpR.ddl
+      trefer_obj_delR.ddl
+      trefer_objR.ddl
+      trefer_paramR.ddl
+      trefer_reg_1dR.ddl
+      trefer_regR.ddl
       # Onion VFD files
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_revision_count.ddl
+      tst_onion_objs.ddl
+      tst_onion_dset_ext.ddl
+      tst_onion_dset_1d.ddl
+      tst_onion_revision_count.ddl
   )
   set (HDF5_N_REFERENCE_FILES
-      tall-3
-      tattr-2
-      tcomp-2
-      thlink-4
-      thlink-5
-      tslink-2
+      tall-3.ddl
+      tattr-2.ddl
+      tcomp-2.ddl
+      thlink-4.ddl
+      thlink-5.ddl
+      tslink-2.ddl
   )
   set (HDF5_REFERENCE_EXP_FILES
       tall-6.exp
@@ -236,159 +236,159 @@
       twithddlfile.exp
   )
   set (HDF5_REFERENCE_TEST_FILES
-      ${HDF5_TOOLS_DIR}/testfiles/charsets.h5
-      ${HDF5_TOOLS_DIR}/testfiles/err_attr_dspace.h5
-      ${HDF5_TOOLS_DIR}/testfiles/file_space.h5
-      ${HDF5_TOOLS_DIR}/testfiles/filter_fail.h5
-      ${HDF5_TOOLS_DIR}/testfiles/packedbits.h5
-      ${HDF5_TOOLS_DIR}/testfiles/taindices.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tall.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1_big.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray4.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray5.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray8.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattr2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattr4_be.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattrintsize.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tbigdims.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tbinary.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tchar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdattrintsize.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdintarray.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdints.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdintsize.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdset.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tempty.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00000.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00001.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00002.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00003.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00004.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00005.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00006.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00007.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00008.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00009.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00010.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfcontents1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfcontents2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfilters.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfvalues.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.h5
-      ${HDF5_TOOLS_DIR}/testfiles/thlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/thyperslab.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dims.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tintsnodata.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tlarge_objname.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tldouble.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tldouble_scalar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tlonglinks.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tloop.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti-b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti-g.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti-l.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti-o.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti-r.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti-s.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnestedcmpddt.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tno-subset.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarattrintsize.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarintattrsize.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarintsize.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarstring.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tslink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsplit_file-m.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsplit_file-r.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstr3.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tudfilter.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvlenstr_array.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvms.h5
-      ${HDF5_TOOLS_DIR}/testfiles/t128bit_float.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tCVE_2018_11206_fill_old.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tCVE_2018_11206_fill_new.h5
-      ${HDF5_TOOLS_DIR}/testfiles/zerodim.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tCVE-2021-37501_attr_decode.h5
+      charsets.h5
+      err_attr_dspace.h5
+      file_space.h5
+      filter_fail.h5
+      packedbits.h5
+      taindices.h5
+      tall.h5
+      tarray1.h5
+      tarray1_big.h5
+      tarray2.h5
+      tarray3.h5
+      tarray4.h5
+      tarray5.h5
+      tarray6.h5
+      tarray7.h5
+      tarray8.h5
+      tattr.h5
+      tattr2.h5
+      tattr4_be.h5
+      tattrintsize.h5
+      tattrreg.h5
+      tbigdims.h5
+      tbinary.h5
+      tbitnopaque.h5
+      tchar.h5
+      tcmpdattrintsize.h5
+      tcmpdintarray.h5
+      tcmpdints.h5
+      tcmpdintsize.h5
+      tcompound.h5
+      tcompound_complex.h5
+      tcompound_complex2.h5
+      tdatareg.h5
+      tdset.h5
+      tempty.h5
+      tsoftlinks.h5
+      textlinkfar.h5
+      textlinksrc.h5
+      textlinktar.h5
+      textlink.h5
+      tfamily00000.h5
+      tfamily00001.h5
+      tfamily00002.h5
+      tfamily00003.h5
+      tfamily00004.h5
+      tfamily00005.h5
+      tfamily00006.h5
+      tfamily00007.h5
+      tfamily00008.h5
+      tfamily00009.h5
+      tfamily00010.h5
+      tfcontents1.h5
+      tfcontents2.h5
+      tfilters.h5
+      tfloatsattrs.h5
+      tfpformat.h5
+      tfvalues.h5
+      tgroup.h5
+      tgrp_comments.h5
+      tgrpnullspace.h5
+      thlink.h5
+      thyperslab.h5
+      tints4dims.h5
+      tintsattrs.h5
+      tintsnodata.h5
+      tlarge_objname.h5
+      tldouble.h5
+      tldouble_scalar.h5
+      tlonglinks.h5
+      tloop.h5
+      tmulti-b.h5
+      tmulti-g.h5
+      tmulti-l.h5
+      tmulti-o.h5
+      tmulti-r.h5
+      tmulti-s.h5
+      tnamed_dtype_attr.h5
+      tnestedcomp.h5
+      tnestedcmpddt.h5
+      tno-subset.h5
+      tnullspace.h5
+      torderattr.h5
+      tordergr.h5
+      tsaf.h5
+      tscalarattrintsize.h5
+      tscalarintattrsize.h5
+      tscalarintsize.h5
+      tscalarstring.h5
+      tslink.h5
+      tsplit_file-m.h5
+      tsplit_file-r.h5
+      tstr.h5
+      tstr2.h5
+      tstr3.h5
+      tudfilter.h5
+      tudlink.h5
+      tvldtypes1.h5
+      tvldtypes2.h5
+      tvldtypes3.h5
+      tvldtypes4.h5
+      tvldtypes5.h5
+      tvlenstr_array.h5
+      tvlstr.h5
+      tvms.h5
+      t128bit_float.h5
+      tCVE_2018_11206_fill_old.h5
+      tCVE_2018_11206_fill_new.h5
+      zerodim.h5
+      tCVE-2021-37501_attr_decode.h5
       #STD_REF_OBJ files
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_compat.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_ext1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_ext2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_grp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_del.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_param.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5
+      trefer_attr.h5
+      trefer_compat.h5
+      trefer_ext1.h5
+      trefer_ext2.h5
+      trefer_grp.h5
+      trefer_obj_del.h5
+      trefer_obj.h5
+      trefer_param.h5
+      trefer_reg_1d.h5
+      trefer_reg.h5
       # Onion VFD files
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5.onion
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5.onion
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5.onion
+      tst_onion_objs.h5
+      tst_onion_objs.h5.onion
+      tst_onion_dset_ext.h5
+      tst_onion_dset_ext.h5.onion
+      tst_onion_dset_1d.h5
+      tst_onion_dset_1d.h5.onion
   )
   set (HDF5_ERROR_REFERENCE_TEST_FILES
-      ${PROJECT_SOURCE_DIR}/errfiles/filter_fail.err
-      ${PROJECT_SOURCE_DIR}/errfiles/non_existing.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tall-1.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tall-2A.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tall-2A0.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tall-2B.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tarray1_big.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tattrregR.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tattr-3.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tcomp-3.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tdataregR.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tdset-2.err
-      ${PROJECT_SOURCE_DIR}/errfiles/texceedsubblock.err
-      ${PROJECT_SOURCE_DIR}/errfiles/texceedsubcount.err
-      ${PROJECT_SOURCE_DIR}/errfiles/texceedsubstart.err
-      ${PROJECT_SOURCE_DIR}/errfiles/texceedsubstride.err
-      ${PROJECT_SOURCE_DIR}/errfiles/textlink.err
-      ${PROJECT_SOURCE_DIR}/errfiles/textlinkfar.err
-      ${PROJECT_SOURCE_DIR}/errfiles/textlinksrc.err
-      ${PROJECT_SOURCE_DIR}/errfiles/torderlinks1.err
-      ${PROJECT_SOURCE_DIR}/errfiles/torderlinks2.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tgroup-2.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tperror.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tslink-D.err
+      filter_fail.err
+      non_existing.err
+      tall-1.err
+      tall-2A.err
+      tall-2A0.err
+      tall-2B.err
+      tarray1_big.err
+      tattrregR.err
+      tattr-3.err
+      tcomp-3.err
+      tdataregR.err
+      tdset-2.err
+      texceedsubblock.err
+      texceedsubcount.err
+      texceedsubstart.err
+      texceedsubstride.err
+      textlink.err
+      textlinkfar.err
+      textlinksrc.err
+      torderlinks1.err
+      torderlinks2.err
+      tgroup-2.err
+      tperror.err
+      tslink-D.err
   )
 
   # make test dir
@@ -398,40 +398,38 @@
   # copy test files from source dir to test dir
   #
   foreach (tst_h5_file ${HDF5_REFERENCE_TEST_FILES})
-    get_filename_component (fname "${tst_h5_file}" NAME)
-    HDFTEST_COPY_FILE("${tst_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${tst_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5_file}" "h5dump_std_files")
   endforeach ()
 
   foreach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${tst_exp_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file}" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/exportfiles/${tst_exp_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file}" "h5dump_std_files")
   endforeach ()
 
   foreach (tst_other_file ${HDF5_REFERENCE_FILES})
-    get_filename_component (fname "${tst_other_file}" NAME)
-    HDFTEST_COPY_FILE("${tst_other_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${tst_other_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_other_file}" "h5dump_std_files")
   endforeach ()
+  
   foreach (tst_h5N_file ${HDF5_N_REFERENCE_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${tst_h5N_file}.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5N_file}-N.ddl" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${tst_h5N_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5N_file}-N" "h5dump_std_files")
   endforeach ()
 
   foreach (tst_error_file ${HDF5_ERROR_REFERENCE_TEST_FILES})
-    get_filename_component (fname "${tst_error_file}" NAME)
-    HDFTEST_COPY_FILE("${tst_error_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${tst_error_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_error_file}" "h5dump_std_files")
   endforeach ()
 
   # --------------------------------------------------------------------
   # Special file handling
   # --------------------------------------------------------------------
-  HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files")
 
   if (WIN32 AND CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION VERSION_LESS 10.0.18362.0)
-    configure_file(${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp NEWLINE_STYLE CRLF)
-    #file (READ ${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp TEST_STREAM)
+    configure_file(${PROJECT_SOURCE_DIR}/exportfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp NEWLINE_STYLE CRLF)
+    #file (READ ${PROJECT_SOURCE_DIR}/exportfiles/tbinregR.exp TEST_STREAM)
     #file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp "${TEST_STREAM}")
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.wddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/tfloatsattrs.wddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files")
   else ()
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp" "${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp" "h5dump_std_files")
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/exportfiles/tbinregR.exp" "${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/tfloatsattrs.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files")
   endif ()
   add_custom_target(h5dump_std_files ALL COMMENT "Copying files needed by h5dump_std tests" DEPENDS ${h5dump_std_files_list})
 
diff --git a/tools/test/h5dump/CMakeTestsPBITS.cmake b/tools/test/h5dump/CMakeTestsPBITS.cmake
index caca4b7..118b314 100644
--- a/tools/test/h5dump/CMakeTestsPBITS.cmake
+++ b/tools/test/h5dump/CMakeTestsPBITS.cmake
@@ -76,9 +76,9 @@
       tpbitsUnsignedLongLong16.ddl
   )
   set (HDF5_REFERENCE_TEST_PBITS
-      ${HDF5_TOOLS_DIR}/testfiles/packedbits.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5
+      packedbits.h5
+      tarray1.h5
+      tcompound.h5
   )
   set (HDF5_ERROR_REFERENCE_PBITS
       tnofilename-with-packed-bits.err
@@ -97,19 +97,15 @@
   )
 
   foreach (pbits_h5_file ${HDF5_REFERENCE_TEST_PBITS})
-    get_filename_component(fname "${pbits_h5_file}" NAME)
-    HDFTEST_COPY_FILE("${pbits_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${fname}" "h5dump_pbits_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${pbits_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${pbits_h5_file}" "h5dump_pbits_files")
   endforeach ()
 
-
   foreach (ddl_pbits ${HDF5_REFERENCE_PBITS})
-    get_filename_component(fname "${ddl_pbits}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/pbits/${ddl_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${fname}" "h5dump_pbits_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/pbits/${ddl_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${ddl_pbits}" "h5dump_pbits_files")
   endforeach ()
 
-  foreach (ddl_pbits ${HDF5_ERROR_REFERENCE_PBITS})
-    get_filename_component(fname "${ddl_pbits}" NAME)
-    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${ddl_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${fname}" "h5dump_pbits_files")
+  foreach (ddl_err_pbits ${HDF5_ERROR_REFERENCE_PBITS})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/pbits/${ddl_err_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${ddl_err_pbits}" "h5dump_pbits_files")
   endforeach ()
   add_custom_target(h5dump_pbits_files ALL COMMENT "Copying files needed by h5dump_pbits tests" DEPENDS ${h5dump_pbits_files_list})
 
diff --git a/tools/test/h5dump/CMakeTestsVDS.cmake b/tools/test/h5dump/CMakeTestsVDS.cmake
index 42f08c9..c910acd 100644
--- a/tools/test/h5dump/CMakeTestsVDS.cmake
+++ b/tools/test/h5dump/CMakeTestsVDS.cmake
@@ -84,28 +84,19 @@
   )
 
   foreach (vds_h5_file ${HDF5_REFERENCE_TEST_VDS})
-    get_filename_component(fname "${vds_h5_file}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5dump_vds_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/${vds_h5_file}" "h5dump_vds_files")
   endforeach ()
 
   foreach (vds_h5_file ${HDF5_REFERENCE_PREFIX_VDS})
-    get_filename_component(fname "${vds_h5_file}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5dump_vds_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${vds_h5_file}" "h5dump_vds_files")
   endforeach ()
 
   foreach (ddl_vds ${HDF5_REFERENCE_VDS})
-    get_filename_component(fname "${ddl_vds}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5dump_vds_files")
-  endforeach ()
-
-  foreach (ddl_vds ${HDF5_REFERENCE_VDS})
-    get_filename_component(fname "${ddl_vds}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5dump_vds_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/vds/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${ddl_vds}" "h5dump_vds_files")
   endforeach ()
 
   foreach (ddl_vds ${HDF5_ERROR_REFERENCE_VDS})
-    get_filename_component(fname "${ddl_vds}" NAME)
-    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5dump_vds_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/${ddl_vds}" "h5dump_vds_files")
   endforeach ()
   add_custom_target(h5dump_vds_files ALL COMMENT "Copying files needed by h5dump_vds tests" DEPENDS ${h5dump_vds_files_list})
 
diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake
index 833a616..d78e738 100644
--- a/tools/test/h5dump/CMakeTestsXML.cmake
+++ b/tools/test/h5dump/CMakeTestsXML.cmake
@@ -19,138 +19,143 @@
   #
   # copy XML test files from source dir to test dir
   #
+  set (HDF5_XML_REFERENCE_ONLY_FILES
+      tbitfields.h5
+      tcompound2.h5
+      tdset2.h5
+      tenum.h5
+      test35.nc
+      tloop2.h5
+      tmany.h5
+      tname-amp.h5
+      tname-apos.h5
+      tname-gt.h5
+      tname-lt.h5
+      tname-quot.h5
+      tname-sp.h5
+      tnodata.h5
+      tobjref.h5
+      topaque.h5
+      tref.h5
+      tref-escapes.h5
+      tref-escapes-at.h5
+      tstring.h5
+      tstring-at.h5
+  )
+
   set (HDF5_XML_REFERENCE_TEST_FILES
-      ${HDF5_TOOLS_DIR}/testfiles/tall.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tbitfields.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdset.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdset2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tempty.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tenum.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5
-      ${HDF5_TOOLS_DIR}/testfiles/thlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tloop.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tloop2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmany.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tname-amp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tname-apos.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tname-gt.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tname-lt.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/test35.nc
-      ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5
-      ${HDF5_TOOLS_DIR}/testfiles/topaque.h5
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tref.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tref-escapes.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tref-escapes-at.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tslink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstring.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstring-at.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5
+      tall.h5
+      tarray1.h5
+      tarray2.h5
+      tarray3.h5
+      tarray6.h5
+      tarray7.h5
+      tattr.h5
+      tcompound.h5
+      tcompound_complex.h5
+      tdatareg.h5
+      tdset.h5
+      tempty.h5
+      textlink.h5
+      tfpformat.h5
+      tgroup.h5
+      thlink.h5
+      tloop.h5
+      tnamed_dtype_attr.h5
+      tnestedcomp.h5
+      tnullspace.h5
+      torderattr.h5
+      tsaf.h5
+      tslink.h5
+      tstr.h5
+      tstr2.h5
+      tudlink.h5
+      tvldtypes1.h5
+      tvldtypes2.h5
+      tvldtypes3.h5
+      tvldtypes4.h5
+      tvldtypes5.h5
+      tvlstr.h5
   )
   set (HDF5_XML_REFERENCE_FILES
-      ${HDF5_TOOLS_DIR}/testfiles/tall.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tall-2A.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tattr.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tbitfields_be.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tbitfields_le.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tdset.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tdset2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd-2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd-uri.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-nons.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-nons-2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-nons-uri.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-ns.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-ns-2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tenum.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/test35.nc.xml
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/thlink.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tloop.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tloop2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tmany.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tname-amp.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tname-apos.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tname-gt.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tname-lt.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/topaque.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr1.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr3.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr4.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tref.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tref-escapes.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tref-escapes-at.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tslink.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tstr.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tstring.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tstring-at.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5.xml
+      tall.h5.xml
+      tall-2A.h5.xml
+      tarray1.h5.xml
+      tarray2.h5.xml
+      tarray3.h5.xml
+      tarray6.h5.xml
+      tarray7.h5.xml
+      tattr.h5.xml
+      tbitfields_be.h5.xml
+      tbitfields_le.h5.xml
+      tcompound_complex.h5.xml
+      tcompound.h5.xml
+      tcompound2.h5.xml
+      tdatareg.h5.xml
+      tdset.h5.xml
+      tdset2.h5.xml
+      tempty.h5.xml
+      tempty-dtd.h5.xml
+      tempty-dtd-2.h5.xml
+      tempty-dtd-uri.h5.xml
+      tempty-nons.h5.xml
+      tempty-nons-2.h5.xml
+      tempty-nons-uri.h5.xml
+      tempty-ns.h5.xml
+      tempty-ns-2.h5.xml
+      tenum.h5.xml
+      test35.nc.xml
+      textlink.h5.xml
+      tfpformat.h5.xml
+      tgroup.h5.xml
+      thlink.h5.xml
+      tloop.h5.xml
+      tloop2.h5.xml
+      tmany.h5.xml
+      tname-amp.h5.xml
+      tname-apos.h5.xml
+      tnamed_dtype_attr.h5.xml
+      tname-gt.h5.xml
+      tname-lt.h5.xml
+      tname-quot.h5.xml
+      tname-sp.h5.xml
+      tnestedcomp.h5.xml
+      tnodata.h5.xml
+      tnullspace.h5.xml
+      tobjref.h5.xml
+      topaque.h5.xml
+      torderattr1.h5.xml
+      torderattr2.h5.xml
+      torderattr3.h5.xml
+      torderattr4.h5.xml
+      tref.h5.xml
+      tref-escapes.h5.xml
+      tref-escapes-at.h5.xml
+      tsaf.h5.xml
+      tslink.h5.xml
+      tstr.h5.xml
+      tstr2.h5.xml
+      tstring.h5.xml
+      tstring-at.h5.xml
+      tudlink.h5.xml
+      tvldtypes1.h5.xml
+      tvldtypes2.h5.xml
+      tvldtypes3.h5.xml
+      tvldtypes4.h5.xml
+      tvldtypes5.h5.xml
+      tvlstr.h5.xml
   )
 
   foreach (tst_xml_h5_file ${HDF5_XML_REFERENCE_TEST_FILES})
-    get_filename_component(fname "${tst_xml_h5_file}" NAME)
-    HDFTEST_COPY_FILE("${tst_xml_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${fname}" "h5dump_xml_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${tst_xml_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xml_h5_file}" "h5dump_xml_files")
+  endforeach ()
+
+  foreach (tst_xmlonly_h5_file ${HDF5_XML_REFERENCE_ONLY_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/xml/${tst_xmlonly_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xmlonly_h5_file}" "h5dump_xml_files")
   endforeach ()
 
   foreach (tst_xml_other_file ${HDF5_XML_REFERENCE_FILES})
-    get_filename_component(fname "${tst_xml_other_file}" NAME)
-    HDFTEST_COPY_FILE("${tst_xml_other_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${fname}" "h5dump_xml_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/xml/${tst_xml_other_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xml_other_file}" "h5dump_xml_files")
   endforeach ()
   add_custom_target(h5dump_xml_files ALL COMMENT "Copying files needed by h5dump_xml tests" DEPENDS ${h5dump_xml_files_list})
 
diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake
index 7ab8c1f..b303032 100644
--- a/tools/test/h5dump/CMakeVFDTests.cmake
+++ b/tools/test/h5dump/CMakeVFDTests.cmake
@@ -26,8 +26,8 @@ set (HDF5_VFD_H5DUMP_FILES
 
 foreach (vfdtest ${VFD_LIST})
   foreach (h5_tfile ${HDF5_VFD_H5DUMP_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}.h5" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.h5" "HDF5_VFD_H5DUMP_files")
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}.ddl" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.ddl" "HDF5_VFD_H5DUMP_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}.h5" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.h5" "HDF5_VFD_H5DUMP_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tfile}.ddl" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.ddl" "HDF5_VFD_H5DUMP_files")
   endforeach ()
 endforeach ()
 
diff --git a/tools/test/h5dump/errfiles/tnofilename-with-packed-bits.err b/tools/test/h5dump/errfiles/pbits/tnofilename-with-packed-bits.err
index 84a7011..84a7011 100644
--- a/tools/test/h5dump/errfiles/tnofilename-with-packed-bits.err
+++ b/tools/test/h5dump/errfiles/pbits/tnofilename-with-packed-bits.err
diff --git a/tools/test/h5dump/errfiles/tpbitsCharLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsCharLengthExceeded.err
index e5854ea..e5854ea 100644
--- a/tools/test/h5dump/errfiles/tpbitsCharLengthExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsCharLengthExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsCharOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsCharOffsetExceeded.err
index e5854ea..e5854ea 100644
--- a/tools/test/h5dump/errfiles/tpbitsCharOffsetExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsCharOffsetExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsIncomplete.err b/tools/test/h5dump/errfiles/pbits/tpbitsIncomplete.err
index e0abee5..e0abee5 100644
--- a/tools/test/h5dump/errfiles/tpbitsIncomplete.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsIncomplete.err
diff --git a/tools/test/h5dump/errfiles/tpbitsIntLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsIntLengthExceeded.err
index 7dd88ed..7dd88ed 100644
--- a/tools/test/h5dump/errfiles/tpbitsIntLengthExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsIntLengthExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsIntOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsIntOffsetExceeded.err
index 7dd88ed..7dd88ed 100644
--- a/tools/test/h5dump/errfiles/tpbitsIntOffsetExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsIntOffsetExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsLengthExceeded.err
index d4673f2..d4673f2 100644
--- a/tools/test/h5dump/errfiles/tpbitsLengthExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsLengthExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsLengthPositive.err b/tools/test/h5dump/errfiles/pbits/tpbitsLengthPositive.err
index 4928007..4928007 100644
--- a/tools/test/h5dump/errfiles/tpbitsLengthPositive.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsLengthPositive.err
diff --git a/tools/test/h5dump/errfiles/tpbitsLongLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsLongLengthExceeded.err
index 0318f79..0318f79 100644
--- a/tools/test/h5dump/errfiles/tpbitsLongLengthExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsLongLengthExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsLongOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsLongOffsetExceeded.err
index 0318f79..0318f79 100644
--- a/tools/test/h5dump/errfiles/tpbitsLongOffsetExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsLongOffsetExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsMaxExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsMaxExceeded.err
index a8d12fc..a8d12fc 100644
--- a/tools/test/h5dump/errfiles/tpbitsMaxExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsMaxExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsOffsetExceeded.err
index b7d6dad..b7d6dad 100644
--- a/tools/test/h5dump/errfiles/tpbitsOffsetExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsOffsetExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsOffsetNegative.err b/tools/test/h5dump/errfiles/pbits/tpbitsOffsetNegative.err
index 8a027c1..8a027c1 100644
--- a/tools/test/h5dump/errfiles/tpbitsOffsetNegative.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsOffsetNegative.err
diff --git a/tools/testfiles/charsets.ddl b/tools/test/h5dump/expected/charsets.ddl
index c2301fb..c2301fb 100644
--- a/tools/testfiles/charsets.ddl
+++ b/tools/test/h5dump/expected/charsets.ddl
diff --git a/tools/testfiles/err_attr_dspace.ddl b/tools/test/h5dump/expected/err_attr_dspace.ddl
index 48ef659..48ef659 100644
--- a/tools/testfiles/err_attr_dspace.ddl
+++ b/tools/test/h5dump/expected/err_attr_dspace.ddl
diff --git a/tools/testfiles/file_space.ddl b/tools/test/h5dump/expected/file_space.ddl
index 6b8aa47..6b8aa47 100644
--- a/tools/testfiles/file_space.ddl
+++ b/tools/test/h5dump/expected/file_space.ddl
diff --git a/tools/testfiles/filter_fail.ddl b/tools/test/h5dump/expected/filter_fail.ddl
index 3a456f5..3a456f5 100644
--- a/tools/testfiles/filter_fail.ddl
+++ b/tools/test/h5dump/expected/filter_fail.ddl
diff --git a/tools/testfiles/h5dump-help.txt b/tools/test/h5dump/expected/h5dump-help.txt
index 9274600..9274600 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/test/h5dump/expected/h5dump-help.txt
diff --git a/tools/testfiles/non_existing.ddl b/tools/test/h5dump/expected/non_existing.ddl
index 4407eae..4407eae 100644
--- a/tools/testfiles/non_existing.ddl
+++ b/tools/test/h5dump/expected/non_existing.ddl
diff --git a/tools/testfiles/out3.h5import b/tools/test/h5dump/expected/out3.h5import
index 29346e1..29346e1 100644
--- a/tools/testfiles/out3.h5import
+++ b/tools/test/h5dump/expected/out3.h5import
diff --git a/tools/testfiles/packedbits.ddl b/tools/test/h5dump/expected/packedbits.ddl
index 1bca459..1bca459 100644
--- a/tools/testfiles/packedbits.ddl
+++ b/tools/test/h5dump/expected/packedbits.ddl
diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/test/h5dump/expected/pbits/tnofilename-with-packed-bits.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
+++ b/tools/test/h5dump/expected/pbits/tnofilename-with-packed-bits.ddl
diff --git a/tools/testfiles/pbits/tpbitsArray.ddl b/tools/test/h5dump/expected/pbits/tpbitsArray.ddl
index 125abb8..125abb8 100644
--- a/tools/testfiles/pbits/tpbitsArray.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsArray.ddl
diff --git a/tools/testfiles/pbits/tpbitsCharLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsCharLengthExceeded.ddl
index b281827..b281827 100644
--- a/tools/testfiles/pbits/tpbitsCharLengthExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsCharLengthExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsCharOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsCharOffsetExceeded.ddl
index ee56a5c..ee56a5c 100644
--- a/tools/testfiles/pbits/tpbitsCharOffsetExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsCharOffsetExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsCompound.ddl b/tools/test/h5dump/expected/pbits/tpbitsCompound.ddl
index c84272a..c84272a 100644
--- a/tools/testfiles/pbits/tpbitsCompound.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsCompound.ddl
diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/test/h5dump/expected/pbits/tpbitsIncomplete.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tpbitsIncomplete.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsIncomplete.ddl
diff --git a/tools/testfiles/pbits/tpbitsIntLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsIntLengthExceeded.ddl
index 1cba6d5..1cba6d5 100644
--- a/tools/testfiles/pbits/tpbitsIntLengthExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsIntLengthExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsIntOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsIntOffsetExceeded.ddl
index 330d61f..330d61f 100644
--- a/tools/testfiles/pbits/tpbitsIntOffsetExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsIntOffsetExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsLengthExceeded.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsLengthExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/test/h5dump/expected/pbits/tpbitsLengthPositive.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tpbitsLengthPositive.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsLengthPositive.ddl
diff --git a/tools/testfiles/pbits/tpbitsLongLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsLongLengthExceeded.ddl
index 44ec077..44ec077 100644
--- a/tools/testfiles/pbits/tpbitsLongLengthExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsLongLengthExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsLongOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsLongOffsetExceeded.ddl
index c775557..c775557 100644
--- a/tools/testfiles/pbits/tpbitsLongOffsetExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsLongOffsetExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsMax.ddl b/tools/test/h5dump/expected/pbits/tpbitsMax.ddl
index e569488..e569488 100644
--- a/tools/testfiles/pbits/tpbitsMax.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsMax.ddl
diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsMaxExceeded.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsMaxExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsOffsetExceeded.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsOffsetExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/test/h5dump/expected/pbits/tpbitsOffsetNegative.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsOffsetNegative.ddl
diff --git a/tools/testfiles/pbits/tpbitsOverlapped.ddl b/tools/test/h5dump/expected/pbits/tpbitsOverlapped.ddl
index 9dcc9d2..9dcc9d2 100644
--- a/tools/testfiles/pbits/tpbitsOverlapped.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsOverlapped.ddl
diff --git a/tools/testfiles/pbits/tpbitsSigned.ddl b/tools/test/h5dump/expected/pbits/tpbitsSigned.ddl
index b843388..b843388 100644
--- a/tools/testfiles/pbits/tpbitsSigned.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSigned.ddl
diff --git a/tools/testfiles/pbits/tpbitsSigned2.ddl b/tools/test/h5dump/expected/pbits/tpbitsSigned2.ddl
index 932b5fd..932b5fd 100644
--- a/tools/testfiles/pbits/tpbitsSigned2.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSigned2.ddl
diff --git a/tools/testfiles/pbits/tpbitsSigned4.ddl b/tools/test/h5dump/expected/pbits/tpbitsSigned4.ddl
index 9eacd83..9eacd83 100644
--- a/tools/testfiles/pbits/tpbitsSigned4.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSigned4.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedInt.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedInt.ddl
index 5c37e77..5c37e77 100644
--- a/tools/testfiles/pbits/tpbitsSignedInt.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedInt.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedInt4.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedInt4.ddl
index 4e9f0f6..4e9f0f6 100644
--- a/tools/testfiles/pbits/tpbitsSignedInt4.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedInt4.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedInt8.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedInt8.ddl
index f2d6069..f2d6069 100644
--- a/tools/testfiles/pbits/tpbitsSignedInt8.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedInt8.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedIntWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedIntWhole.ddl
index 598c446..598c446 100644
--- a/tools/testfiles/pbits/tpbitsSignedIntWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedIntWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLong.ddl
index b3eba61..b3eba61 100644
--- a/tools/testfiles/pbits/tpbitsSignedLong.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLong.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLong16.ddl
index 83fa889..83fa889 100644
--- a/tools/testfiles/pbits/tpbitsSignedLong16.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLong16.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLong8.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLong8.ddl
index e99b1d0..e99b1d0 100644
--- a/tools/testfiles/pbits/tpbitsSignedLong8.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLong8.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong.ddl
index 2be8a55..2be8a55 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongLong.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong16.ddl
index 44e336d..44e336d 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongLong16.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong16.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongLong32.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong32.ddl
index 6ab4ac4..6ab4ac4 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongLong32.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong32.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole.ddl
index 134f3be..134f3be 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongLongWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongLongWhole1.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole1.ddl
index 7431670..7431670 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongLongWhole1.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole1.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongLongWhole63.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole63.ddl
index c7cc65f..c7cc65f 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongLongWhole63.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole63.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongWhole.ddl
index e583f1d..e583f1d 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedWhole.ddl
index f044e23..f044e23 100644
--- a/tools/testfiles/pbits/tpbitsSignedWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsigned.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsigned.ddl
index 9e7ac50..9e7ac50 100644
--- a/tools/testfiles/pbits/tpbitsUnsigned.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsigned.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsigned2.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsigned2.ddl
index b7e6f79..b7e6f79 100644
--- a/tools/testfiles/pbits/tpbitsUnsigned2.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsigned2.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsigned4.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsigned4.ddl
index d25d838..d25d838 100644
--- a/tools/testfiles/pbits/tpbitsUnsigned4.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsigned4.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedInt.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt.ddl
index 5e0fefe..5e0fefe 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedInt.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedInt4.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt4.ddl
index 0d3e38f..0d3e38f 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedInt4.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt4.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedInt8.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt8.ddl
index 861ed3e..861ed3e 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedInt8.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt8.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedIntWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedIntWhole.ddl
index c054011..c054011 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedIntWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedIntWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong.ddl
index 9f8bcb4..9f8bcb4 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLong.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong16.ddl
index 7a1984f..7a1984f 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLong16.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong16.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLong8.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong8.ddl
index 17b896c..17b896c 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLong8.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong8.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong.ddl
index 1cd9a6c..1cd9a6c 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongLong.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong16.ddl
index f8b0189..f8b0189 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongLong16.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong16.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLong32.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong32.ddl
index befaf5b..befaf5b 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongLong32.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong32.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole.ddl
index 27c8879..27c8879 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole1.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole1.ddl
index 0302105..0302105 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole1.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole1.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole63.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole63.ddl
index 6a9b503..6a9b503 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole63.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole63.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongWhole.ddl
index 50ad02f..50ad02f 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedWhole.ddl
index 7c9e736..7c9e736 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedWhole.ddl
diff --git a/tools/testfiles/tall-1.ddl b/tools/test/h5dump/expected/tall-1.ddl
index ae375c4..ae375c4 100644
--- a/tools/testfiles/tall-1.ddl
+++ b/tools/test/h5dump/expected/tall-1.ddl
diff --git a/tools/testfiles/tall-2.ddl b/tools/test/h5dump/expected/tall-2.ddl
index d669639..d669639 100644
--- a/tools/testfiles/tall-2.ddl
+++ b/tools/test/h5dump/expected/tall-2.ddl
diff --git a/tools/testfiles/tall-2A.ddl b/tools/test/h5dump/expected/tall-2A.ddl
index 0ae5210..0ae5210 100644
--- a/tools/testfiles/tall-2A.ddl
+++ b/tools/test/h5dump/expected/tall-2A.ddl
diff --git a/tools/testfiles/tall-2A0.ddl b/tools/test/h5dump/expected/tall-2A0.ddl
index e0955f3..e0955f3 100644
--- a/tools/testfiles/tall-2A0.ddl
+++ b/tools/test/h5dump/expected/tall-2A0.ddl
diff --git a/tools/testfiles/tall-2B.ddl b/tools/test/h5dump/expected/tall-2B.ddl
index dc8aab7..dc8aab7 100644
--- a/tools/testfiles/tall-2B.ddl
+++ b/tools/test/h5dump/expected/tall-2B.ddl
diff --git a/tools/testfiles/tall-3.ddl b/tools/test/h5dump/expected/tall-3.ddl
index 1c54e6d..1c54e6d 100644
--- a/tools/testfiles/tall-3.ddl
+++ b/tools/test/h5dump/expected/tall-3.ddl
diff --git a/tools/testfiles/tall-4s.ddl b/tools/test/h5dump/expected/tall-4s.ddl
index 36cb659..36cb659 100644
--- a/tools/testfiles/tall-4s.ddl
+++ b/tools/test/h5dump/expected/tall-4s.ddl
diff --git a/tools/testfiles/tall-5s.ddl b/tools/test/h5dump/expected/tall-5s.ddl
index b35be18..b35be18 100644
--- a/tools/testfiles/tall-5s.ddl
+++ b/tools/test/h5dump/expected/tall-5s.ddl
diff --git a/tools/testfiles/tall-6.ddl b/tools/test/h5dump/expected/tall-6.ddl
index a408608..a408608 100644
--- a/tools/testfiles/tall-6.ddl
+++ b/tools/test/h5dump/expected/tall-6.ddl
diff --git a/tools/testfiles/tall-7.ddl b/tools/test/h5dump/expected/tall-7.ddl
index f0ad5ea..f0ad5ea 100644
--- a/tools/testfiles/tall-7.ddl
+++ b/tools/test/h5dump/expected/tall-7.ddl
diff --git a/tools/testfiles/tall-7N.ddl b/tools/test/h5dump/expected/tall-7N.ddl
index cba5774..cba5774 100644
--- a/tools/testfiles/tall-7N.ddl
+++ b/tools/test/h5dump/expected/tall-7N.ddl
diff --git a/tools/testfiles/tallfilters.ddl b/tools/test/h5dump/expected/tallfilters.ddl
index ff2454c..ff2454c 100644
--- a/tools/testfiles/tallfilters.ddl
+++ b/tools/test/h5dump/expected/tallfilters.ddl
diff --git a/tools/testfiles/tarray1.ddl b/tools/test/h5dump/expected/tarray1.ddl
index 8ff01e1..8ff01e1 100644
--- a/tools/testfiles/tarray1.ddl
+++ b/tools/test/h5dump/expected/tarray1.ddl
diff --git a/tools/testfiles/tarray1_big.ddl b/tools/test/h5dump/expected/tarray1_big.ddl
index 102847a..102847a 100644
--- a/tools/testfiles/tarray1_big.ddl
+++ b/tools/test/h5dump/expected/tarray1_big.ddl
diff --git a/tools/testfiles/tarray2.ddl b/tools/test/h5dump/expected/tarray2.ddl
index 5a8460a..5a8460a 100644
--- a/tools/testfiles/tarray2.ddl
+++ b/tools/test/h5dump/expected/tarray2.ddl
diff --git a/tools/testfiles/tarray3.ddl b/tools/test/h5dump/expected/tarray3.ddl
index 63f6d32..63f6d32 100644
--- a/tools/testfiles/tarray3.ddl
+++ b/tools/test/h5dump/expected/tarray3.ddl
diff --git a/tools/testfiles/tarray4.ddl b/tools/test/h5dump/expected/tarray4.ddl
index 7fb310b..7fb310b 100644
--- a/tools/testfiles/tarray4.ddl
+++ b/tools/test/h5dump/expected/tarray4.ddl
diff --git a/tools/testfiles/tarray5.ddl b/tools/test/h5dump/expected/tarray5.ddl
index 883ee09..883ee09 100644
--- a/tools/testfiles/tarray5.ddl
+++ b/tools/test/h5dump/expected/tarray5.ddl
diff --git a/tools/testfiles/tarray6.ddl b/tools/test/h5dump/expected/tarray6.ddl
index 343002b..343002b 100644
--- a/tools/testfiles/tarray6.ddl
+++ b/tools/test/h5dump/expected/tarray6.ddl
diff --git a/tools/testfiles/tarray7.ddl b/tools/test/h5dump/expected/tarray7.ddl
index cc537d7..cc537d7 100644
--- a/tools/testfiles/tarray7.ddl
+++ b/tools/test/h5dump/expected/tarray7.ddl
diff --git a/tools/testfiles/tarray8.ddl b/tools/test/h5dump/expected/tarray8.ddl
index f482901..f482901 100644
--- a/tools/testfiles/tarray8.ddl
+++ b/tools/test/h5dump/expected/tarray8.ddl
diff --git a/tools/testfiles/tattr-1.ddl b/tools/test/h5dump/expected/tattr-1.ddl
index b58731b..b58731b 100644
--- a/tools/testfiles/tattr-1.ddl
+++ b/tools/test/h5dump/expected/tattr-1.ddl
diff --git a/tools/testfiles/tattr-2.ddl b/tools/test/h5dump/expected/tattr-2.ddl
index 328b54f..328b54f 100644
--- a/tools/testfiles/tattr-2.ddl
+++ b/tools/test/h5dump/expected/tattr-2.ddl
diff --git a/tools/testfiles/tattr-3.ddl b/tools/test/h5dump/expected/tattr-3.ddl
index 943dc0d..943dc0d 100644
--- a/tools/testfiles/tattr-3.ddl
+++ b/tools/test/h5dump/expected/tattr-3.ddl
diff --git a/tools/testfiles/tattr-4_be.ddl b/tools/test/h5dump/expected/tattr-4_be.ddl
index 8b8076e..8b8076e 100644
--- a/tools/testfiles/tattr-4_be.ddl
+++ b/tools/test/h5dump/expected/tattr-4_be.ddl
diff --git a/tools/testfiles/tattrcontents1.ddl b/tools/test/h5dump/expected/tattrcontents1.ddl
index e118d89..e118d89 100644
--- a/tools/testfiles/tattrcontents1.ddl
+++ b/tools/test/h5dump/expected/tattrcontents1.ddl
diff --git a/tools/testfiles/tattrcontents2.ddl b/tools/test/h5dump/expected/tattrcontents2.ddl
index 4076385..4076385 100644
--- a/tools/testfiles/tattrcontents2.ddl
+++ b/tools/test/h5dump/expected/tattrcontents2.ddl
diff --git a/tools/testfiles/tattrintsize.ddl b/tools/test/h5dump/expected/tattrintsize.ddl
index 638384e..638384e 100644
--- a/tools/testfiles/tattrintsize.ddl
+++ b/tools/test/h5dump/expected/tattrintsize.ddl
diff --git a/tools/testfiles/tattrreg.ddl b/tools/test/h5dump/expected/tattrreg.ddl
index 9d9753c..9d9753c 100644
--- a/tools/testfiles/tattrreg.ddl
+++ b/tools/test/h5dump/expected/tattrreg.ddl
diff --git a/tools/testfiles/tattrregR.ddl b/tools/test/h5dump/expected/tattrregR.ddl
index c4323b1..c4323b1 100644
--- a/tools/testfiles/tattrregR.ddl
+++ b/tools/test/h5dump/expected/tattrregR.ddl
diff --git a/tools/testfiles/tbigdims.ddl b/tools/test/h5dump/expected/tbigdims.ddl
index 13f2052..13f2052 100644
--- a/tools/testfiles/tbigdims.ddl
+++ b/tools/test/h5dump/expected/tbigdims.ddl
diff --git a/tools/testfiles/tbin1.ddl b/tools/test/h5dump/expected/tbin1.ddl
index ed43e69..ed43e69 100644
--- a/tools/testfiles/tbin1.ddl
+++ b/tools/test/h5dump/expected/tbin1.ddl
diff --git a/tools/testfiles/tbin2.ddl b/tools/test/h5dump/expected/tbin2.ddl
index 4cc33c6..4cc33c6 100644
--- a/tools/testfiles/tbin2.ddl
+++ b/tools/test/h5dump/expected/tbin2.ddl
diff --git a/tools/testfiles/tbin3.ddl b/tools/test/h5dump/expected/tbin3.ddl
index ed43e69..ed43e69 100644
--- a/tools/testfiles/tbin3.ddl
+++ b/tools/test/h5dump/expected/tbin3.ddl
diff --git a/tools/testfiles/tbin4.ddl b/tools/test/h5dump/expected/tbin4.ddl
index 78a6cd2..78a6cd2 100644
--- a/tools/testfiles/tbin4.ddl
+++ b/tools/test/h5dump/expected/tbin4.ddl
diff --git a/tools/testfiles/tbinregR.ddl b/tools/test/h5dump/expected/tbinregR.ddl
index a44daa0..a44daa0 100644
--- a/tools/testfiles/tbinregR.ddl
+++ b/tools/test/h5dump/expected/tbinregR.ddl
diff --git a/tools/testfiles/tbitnopaque_be.ddl b/tools/test/h5dump/expected/tbitnopaque_be.ddl
index b0de7c4..b0de7c4 100644
--- a/tools/testfiles/tbitnopaque_be.ddl
+++ b/tools/test/h5dump/expected/tbitnopaque_be.ddl
diff --git a/tools/testfiles/tbitnopaque_le.ddl b/tools/test/h5dump/expected/tbitnopaque_le.ddl
index 0c59c0b..0c59c0b 100644
--- a/tools/testfiles/tbitnopaque_le.ddl
+++ b/tools/test/h5dump/expected/tbitnopaque_le.ddl
diff --git a/tools/testfiles/tboot1.ddl b/tools/test/h5dump/expected/tboot1.ddl
index 73ae4e5..73ae4e5 100644
--- a/tools/testfiles/tboot1.ddl
+++ b/tools/test/h5dump/expected/tboot1.ddl
diff --git a/tools/testfiles/tboot2.ddl b/tools/test/h5dump/expected/tboot2.ddl
index 504a634..504a634 100644
--- a/tools/testfiles/tboot2.ddl
+++ b/tools/test/h5dump/expected/tboot2.ddl
diff --git a/tools/testfiles/tboot2A.ddl b/tools/test/h5dump/expected/tboot2A.ddl
index 504a634..504a634 100644
--- a/tools/testfiles/tboot2A.ddl
+++ b/tools/test/h5dump/expected/tboot2A.ddl
diff --git a/tools/testfiles/tboot2B.ddl b/tools/test/h5dump/expected/tboot2B.ddl
index 504a634..504a634 100644
--- a/tools/testfiles/tboot2B.ddl
+++ b/tools/test/h5dump/expected/tboot2B.ddl
diff --git a/tools/testfiles/tchar1.ddl b/tools/test/h5dump/expected/tchar1.ddl
index 78acaf0..78acaf0 100644
--- a/tools/testfiles/tchar1.ddl
+++ b/tools/test/h5dump/expected/tchar1.ddl
diff --git a/tools/testfiles/tchunked.ddl b/tools/test/h5dump/expected/tchunked.ddl
index bf620fe..bf620fe 100644
--- a/tools/testfiles/tchunked.ddl
+++ b/tools/test/h5dump/expected/tchunked.ddl
diff --git a/tools/testfiles/tcmpdattrintsize.ddl b/tools/test/h5dump/expected/tcmpdattrintsize.ddl
index 17b5b77..17b5b77 100644
--- a/tools/testfiles/tcmpdattrintsize.ddl
+++ b/tools/test/h5dump/expected/tcmpdattrintsize.ddl
diff --git a/tools/testfiles/tcmpdintarray.ddl b/tools/test/h5dump/expected/tcmpdintarray.ddl
index ef21cd2..ef21cd2 100644
--- a/tools/testfiles/tcmpdintarray.ddl
+++ b/tools/test/h5dump/expected/tcmpdintarray.ddl
diff --git a/tools/testfiles/tcmpdints.ddl b/tools/test/h5dump/expected/tcmpdints.ddl
index f2986f3..f2986f3 100644
--- a/tools/testfiles/tcmpdints.ddl
+++ b/tools/test/h5dump/expected/tcmpdints.ddl
diff --git a/tools/testfiles/tcmpdintsize.ddl b/tools/test/h5dump/expected/tcmpdintsize.ddl
index ba296e1..ba296e1 100644
--- a/tools/testfiles/tcmpdintsize.ddl
+++ b/tools/test/h5dump/expected/tcmpdintsize.ddl
diff --git a/tools/testfiles/tcomp-1.ddl b/tools/test/h5dump/expected/tcomp-1.ddl
index f86ed16..f86ed16 100644
--- a/tools/testfiles/tcomp-1.ddl
+++ b/tools/test/h5dump/expected/tcomp-1.ddl
diff --git a/tools/testfiles/tcomp-2.ddl b/tools/test/h5dump/expected/tcomp-2.ddl
index a733a3c..a733a3c 100644
--- a/tools/testfiles/tcomp-2.ddl
+++ b/tools/test/h5dump/expected/tcomp-2.ddl
diff --git a/tools/testfiles/tcomp-3.ddl b/tools/test/h5dump/expected/tcomp-3.ddl
index 0294220..0294220 100644
--- a/tools/testfiles/tcomp-3.ddl
+++ b/tools/test/h5dump/expected/tcomp-3.ddl
diff --git a/tools/testfiles/tcomp-4.ddl b/tools/test/h5dump/expected/tcomp-4.ddl
index 4ab5191..4ab5191 100644
--- a/tools/testfiles/tcomp-4.ddl
+++ b/tools/test/h5dump/expected/tcomp-4.ddl
diff --git a/tools/testfiles/tcompact.ddl b/tools/test/h5dump/expected/tcompact.ddl
index 977f959..977f959 100644
--- a/tools/testfiles/tcompact.ddl
+++ b/tools/test/h5dump/expected/tcompact.ddl
diff --git a/tools/testfiles/tcompound_complex2.ddl b/tools/test/h5dump/expected/tcompound_complex2.ddl
index 562235d..562235d 100644
--- a/tools/testfiles/tcompound_complex2.ddl
+++ b/tools/test/h5dump/expected/tcompound_complex2.ddl
diff --git a/tools/testfiles/tcontents.ddl b/tools/test/h5dump/expected/tcontents.ddl
index 14e12d6..14e12d6 100644
--- a/tools/testfiles/tcontents.ddl
+++ b/tools/test/h5dump/expected/tcontents.ddl
diff --git a/tools/testfiles/tcontiguos.ddl b/tools/test/h5dump/expected/tcontiguos.ddl
index 3f045e5..3f045e5 100644
--- a/tools/testfiles/tcontiguos.ddl
+++ b/tools/test/h5dump/expected/tcontiguos.ddl
diff --git a/tools/testfiles/tdatareg.ddl b/tools/test/h5dump/expected/tdatareg.ddl
index ad1f64e..ad1f64e 100644
--- a/tools/testfiles/tdatareg.ddl
+++ b/tools/test/h5dump/expected/tdatareg.ddl
diff --git a/tools/testfiles/tdataregR.ddl b/tools/test/h5dump/expected/tdataregR.ddl
index 3945735..3945735 100644
--- a/tools/testfiles/tdataregR.ddl
+++ b/tools/test/h5dump/expected/tdataregR.ddl
diff --git a/tools/testfiles/tdeflate.ddl b/tools/test/h5dump/expected/tdeflate.ddl
index 9b92d0e..9b92d0e 100644
--- a/tools/testfiles/tdeflate.ddl
+++ b/tools/test/h5dump/expected/tdeflate.ddl
diff --git a/tools/testfiles/tdset-1.ddl b/tools/test/h5dump/expected/tdset-1.ddl
index 6b9b608..6b9b608 100644
--- a/tools/testfiles/tdset-1.ddl
+++ b/tools/test/h5dump/expected/tdset-1.ddl
diff --git a/tools/testfiles/tdset-2.ddl b/tools/test/h5dump/expected/tdset-2.ddl
index dfda95e..dfda95e 100644
--- a/tools/testfiles/tdset-2.ddl
+++ b/tools/test/h5dump/expected/tdset-2.ddl
diff --git a/tools/testfiles/tdset-3s.ddl b/tools/test/h5dump/expected/tdset-3s.ddl
index 93bdac8..93bdac8 100644
--- a/tools/testfiles/tdset-3s.ddl
+++ b/tools/test/h5dump/expected/tdset-3s.ddl
diff --git a/tools/testfiles/tempty.ddl b/tools/test/h5dump/expected/tempty.ddl
index 5797d48..5797d48 100644
--- a/tools/testfiles/tempty.ddl
+++ b/tools/test/h5dump/expected/tempty.ddl
diff --git a/tools/testfiles/texceedsubblock.ddl b/tools/test/h5dump/expected/texceedsubblock.ddl
index 69ec706..69ec706 100644
--- a/tools/testfiles/texceedsubblock.ddl
+++ b/tools/test/h5dump/expected/texceedsubblock.ddl
diff --git a/tools/testfiles/texceedsubcount.ddl b/tools/test/h5dump/expected/texceedsubcount.ddl
index 69ec706..69ec706 100644
--- a/tools/testfiles/texceedsubcount.ddl
+++ b/tools/test/h5dump/expected/texceedsubcount.ddl
diff --git a/tools/testfiles/texceedsubstart.ddl b/tools/test/h5dump/expected/texceedsubstart.ddl
index 69ec706..69ec706 100644
--- a/tools/testfiles/texceedsubstart.ddl
+++ b/tools/test/h5dump/expected/texceedsubstart.ddl
diff --git a/tools/testfiles/texceedsubstride.ddl b/tools/test/h5dump/expected/texceedsubstride.ddl
index 69ec706..69ec706 100644
--- a/tools/testfiles/texceedsubstride.ddl
+++ b/tools/test/h5dump/expected/texceedsubstride.ddl
diff --git a/tools/testfiles/texternal.ddl b/tools/test/h5dump/expected/texternal.ddl
index 59cd22c..59cd22c 100644
--- a/tools/testfiles/texternal.ddl
+++ b/tools/test/h5dump/expected/texternal.ddl
diff --git a/tools/testfiles/textlink.ddl b/tools/test/h5dump/expected/textlink.ddl
index 5459b30..5459b30 100644
--- a/tools/testfiles/textlink.ddl
+++ b/tools/test/h5dump/expected/textlink.ddl
diff --git a/tools/testfiles/textlinkfar.ddl b/tools/test/h5dump/expected/textlinkfar.ddl
index 32b2b49..32b2b49 100644
--- a/tools/testfiles/textlinkfar.ddl
+++ b/tools/test/h5dump/expected/textlinkfar.ddl
diff --git a/tools/testfiles/textlinksrc.ddl b/tools/test/h5dump/expected/textlinksrc.ddl
index 6ef0b44..6ef0b44 100644
--- a/tools/testfiles/textlinksrc.ddl
+++ b/tools/test/h5dump/expected/textlinksrc.ddl
diff --git a/tools/testfiles/tfamily.ddl b/tools/test/h5dump/expected/tfamily.ddl
index 489d8a8..489d8a8 100644
--- a/tools/testfiles/tfamily.ddl
+++ b/tools/test/h5dump/expected/tfamily.ddl
diff --git a/tools/testfiles/tfill.ddl b/tools/test/h5dump/expected/tfill.ddl
index 627e660..627e660 100644
--- a/tools/testfiles/tfill.ddl
+++ b/tools/test/h5dump/expected/tfill.ddl
diff --git a/tools/testfiles/tfletcher32.ddl b/tools/test/h5dump/expected/tfletcher32.ddl
index 01460e2..01460e2 100644
--- a/tools/testfiles/tfletcher32.ddl
+++ b/tools/test/h5dump/expected/tfletcher32.ddl
diff --git a/tools/testfiles/tfloatsattrs.ddl b/tools/test/h5dump/expected/tfloatsattrs.ddl
index 11c65b8..11c65b8 100644
--- a/tools/testfiles/tfloatsattrs.ddl
+++ b/tools/test/h5dump/expected/tfloatsattrs.ddl
diff --git a/tools/testfiles/tfloatsattrs.wddl b/tools/test/h5dump/expected/tfloatsattrs.wddl
index 38b735f..38b735f 100644
--- a/tools/testfiles/tfloatsattrs.wddl
+++ b/tools/test/h5dump/expected/tfloatsattrs.wddl
diff --git a/tools/testfiles/tfpformat.ddl b/tools/test/h5dump/expected/tfpformat.ddl
index 2830ad5..2830ad5 100644
--- a/tools/testfiles/tfpformat.ddl
+++ b/tools/test/h5dump/expected/tfpformat.ddl
diff --git a/tools/testfiles/tgroup-1.ddl b/tools/test/h5dump/expected/tgroup-1.ddl
index 4407eae..4407eae 100644
--- a/tools/testfiles/tgroup-1.ddl
+++ b/tools/test/h5dump/expected/tgroup-1.ddl
diff --git a/tools/testfiles/tgroup-2.ddl b/tools/test/h5dump/expected/tgroup-2.ddl
index 5374742..5374742 100644
--- a/tools/testfiles/tgroup-2.ddl
+++ b/tools/test/h5dump/expected/tgroup-2.ddl
diff --git a/tools/testfiles/tgrp_comments.ddl b/tools/test/h5dump/expected/tgrp_comments.ddl
index e33f3c2..e33f3c2 100644
--- a/tools/testfiles/tgrp_comments.ddl
+++ b/tools/test/h5dump/expected/tgrp_comments.ddl
diff --git a/tools/testfiles/tgrpnullspace.ddl b/tools/test/h5dump/expected/tgrpnullspace.ddl
index 7c1ef6c..7c1ef6c 100644
--- a/tools/testfiles/tgrpnullspace.ddl
+++ b/tools/test/h5dump/expected/tgrpnullspace.ddl
diff --git a/tools/testfiles/thlink-1.ddl b/tools/test/h5dump/expected/thlink-1.ddl
index 61ac6c2..61ac6c2 100644
--- a/tools/testfiles/thlink-1.ddl
+++ b/tools/test/h5dump/expected/thlink-1.ddl
diff --git a/tools/testfiles/thlink-2.ddl b/tools/test/h5dump/expected/thlink-2.ddl
index c1c6367..c1c6367 100644
--- a/tools/testfiles/thlink-2.ddl
+++ b/tools/test/h5dump/expected/thlink-2.ddl
diff --git a/tools/testfiles/thlink-3.ddl b/tools/test/h5dump/expected/thlink-3.ddl
index 625cf3c..625cf3c 100644
--- a/tools/testfiles/thlink-3.ddl
+++ b/tools/test/h5dump/expected/thlink-3.ddl
diff --git a/tools/testfiles/thlink-4.ddl b/tools/test/h5dump/expected/thlink-4.ddl
index 026f412..026f412 100644
--- a/tools/testfiles/thlink-4.ddl
+++ b/tools/test/h5dump/expected/thlink-4.ddl
diff --git a/tools/testfiles/thlink-5.ddl b/tools/test/h5dump/expected/thlink-5.ddl
index 058e863..058e863 100644
--- a/tools/testfiles/thlink-5.ddl
+++ b/tools/test/h5dump/expected/thlink-5.ddl
diff --git a/tools/testfiles/thyperslab.ddl b/tools/test/h5dump/expected/thyperslab.ddl
index 2f4a118..2f4a118 100644
--- a/tools/testfiles/thyperslab.ddl
+++ b/tools/test/h5dump/expected/thyperslab.ddl
diff --git a/tools/testfiles/tindicesno.ddl b/tools/test/h5dump/expected/tindicesno.ddl
index a7b726e..a7b726e 100644
--- a/tools/testfiles/tindicesno.ddl
+++ b/tools/test/h5dump/expected/tindicesno.ddl
diff --git a/tools/testfiles/tindicessub1.ddl b/tools/test/h5dump/expected/tindicessub1.ddl
index 5cf4058..5cf4058 100644
--- a/tools/testfiles/tindicessub1.ddl
+++ b/tools/test/h5dump/expected/tindicessub1.ddl
diff --git a/tools/testfiles/tindicessub2.ddl b/tools/test/h5dump/expected/tindicessub2.ddl
index 5103b49..5103b49 100644
--- a/tools/testfiles/tindicessub2.ddl
+++ b/tools/test/h5dump/expected/tindicessub2.ddl
diff --git a/tools/testfiles/tindicessub3.ddl b/tools/test/h5dump/expected/tindicessub3.ddl
index f7fb81c..f7fb81c 100644
--- a/tools/testfiles/tindicessub3.ddl
+++ b/tools/test/h5dump/expected/tindicessub3.ddl
diff --git a/tools/testfiles/tindicessub4.ddl b/tools/test/h5dump/expected/tindicessub4.ddl
index 7829875..7829875 100644
--- a/tools/testfiles/tindicessub4.ddl
+++ b/tools/test/h5dump/expected/tindicessub4.ddl
diff --git a/tools/testfiles/tindicesyes.ddl b/tools/test/h5dump/expected/tindicesyes.ddl
index 9440c54..9440c54 100644
--- a/tools/testfiles/tindicesyes.ddl
+++ b/tools/test/h5dump/expected/tindicesyes.ddl
diff --git a/tools/testfiles/tints4dims.ddl b/tools/test/h5dump/expected/tints4dims.ddl
index ba5c852..ba5c852 100644
--- a/tools/testfiles/tints4dims.ddl
+++ b/tools/test/h5dump/expected/tints4dims.ddl
diff --git a/tools/testfiles/tints4dimsBlock2.ddl b/tools/test/h5dump/expected/tints4dimsBlock2.ddl
index f414e10..f414e10 100644
--- a/tools/testfiles/tints4dimsBlock2.ddl
+++ b/tools/test/h5dump/expected/tints4dimsBlock2.ddl
diff --git a/tools/testfiles/tints4dimsBlockEq.ddl b/tools/test/h5dump/expected/tints4dimsBlockEq.ddl
index 6625780..6625780 100644
--- a/tools/testfiles/tints4dimsBlockEq.ddl
+++ b/tools/test/h5dump/expected/tints4dimsBlockEq.ddl
diff --git a/tools/testfiles/tints4dimsCount2.ddl b/tools/test/h5dump/expected/tints4dimsCount2.ddl
index 500e418..500e418 100644
--- a/tools/testfiles/tints4dimsCount2.ddl
+++ b/tools/test/h5dump/expected/tints4dimsCount2.ddl
diff --git a/tools/testfiles/tints4dimsCountEq.ddl b/tools/test/h5dump/expected/tints4dimsCountEq.ddl
index 8b17bfc..8b17bfc 100644
--- a/tools/testfiles/tints4dimsCountEq.ddl
+++ b/tools/test/h5dump/expected/tints4dimsCountEq.ddl
diff --git a/tools/testfiles/tints4dimsStride2.ddl b/tools/test/h5dump/expected/tints4dimsStride2.ddl
index 7ec98fc..7ec98fc 100644
--- a/tools/testfiles/tints4dimsStride2.ddl
+++ b/tools/test/h5dump/expected/tints4dimsStride2.ddl
diff --git a/tools/testfiles/tintsattrs.ddl b/tools/test/h5dump/expected/tintsattrs.ddl
index b1f1cdf..b1f1cdf 100644
--- a/tools/testfiles/tintsattrs.ddl
+++ b/tools/test/h5dump/expected/tintsattrs.ddl
diff --git a/tools/testfiles/tintsnodata.ddl b/tools/test/h5dump/expected/tintsnodata.ddl
index a1516af..a1516af 100644
--- a/tools/testfiles/tintsnodata.ddl
+++ b/tools/test/h5dump/expected/tintsnodata.ddl
diff --git a/tools/testfiles/tlarge_objname.ddl b/tools/test/h5dump/expected/tlarge_objname.ddl
index 0facc43..0facc43 100644
--- a/tools/testfiles/tlarge_objname.ddl
+++ b/tools/test/h5dump/expected/tlarge_objname.ddl
diff --git a/tools/testfiles/tldouble.ddl b/tools/test/h5dump/expected/tldouble.ddl
index 2fed523..2fed523 100644
--- a/tools/testfiles/tldouble.ddl
+++ b/tools/test/h5dump/expected/tldouble.ddl
diff --git a/tools/testfiles/tldouble_scalar.ddl b/tools/test/h5dump/expected/tldouble_scalar.ddl
index 596d8db..596d8db 100755
--- a/tools/testfiles/tldouble_scalar.ddl
+++ b/tools/test/h5dump/expected/tldouble_scalar.ddl
diff --git a/tools/testfiles/tlonglinks.ddl b/tools/test/h5dump/expected/tlonglinks.ddl
index 0e57b3d..0e57b3d 100644
--- a/tools/testfiles/tlonglinks.ddl
+++ b/tools/test/h5dump/expected/tlonglinks.ddl
diff --git a/tools/testfiles/tloop-1.ddl b/tools/test/h5dump/expected/tloop-1.ddl
index 1f3a2fb..1f3a2fb 100644
--- a/tools/testfiles/tloop-1.ddl
+++ b/tools/test/h5dump/expected/tloop-1.ddl
diff --git a/tools/testfiles/tmulti.ddl b/tools/test/h5dump/expected/tmulti.ddl
index b6bf35e..b6bf35e 100644
--- a/tools/testfiles/tmulti.ddl
+++ b/tools/test/h5dump/expected/tmulti.ddl
diff --git a/tools/testfiles/tmultifile.ddl b/tools/test/h5dump/expected/tmultifile.ddl
index ebe1608..ebe1608 100644
--- a/tools/testfiles/tmultifile.ddl
+++ b/tools/test/h5dump/expected/tmultifile.ddl
diff --git a/tools/testfiles/tnamed_dtype_attr.ddl b/tools/test/h5dump/expected/tnamed_dtype_attr.ddl
index 7cd14ef..7cd14ef 100644
--- a/tools/testfiles/tnamed_dtype_attr.ddl
+++ b/tools/test/h5dump/expected/tnamed_dtype_attr.ddl
diff --git a/tools/testfiles/tnbit.ddl b/tools/test/h5dump/expected/tnbit.ddl
index cf2ac1f..cf2ac1f 100644
--- a/tools/testfiles/tnbit.ddl
+++ b/tools/test/h5dump/expected/tnbit.ddl
diff --git a/tools/testfiles/tnestcomp-1.ddl b/tools/test/h5dump/expected/tnestcomp-1.ddl
index fda9c7c..fda9c7c 100644
--- a/tools/testfiles/tnestcomp-1.ddl
+++ b/tools/test/h5dump/expected/tnestcomp-1.ddl
diff --git a/tools/testfiles/tnestedcmpddt.ddl b/tools/test/h5dump/expected/tnestedcmpddt.ddl
index db949f0..db949f0 100644
--- a/tools/testfiles/tnestedcmpddt.ddl
+++ b/tools/test/h5dump/expected/tnestedcmpddt.ddl
diff --git a/tools/testfiles/tno-subset.ddl b/tools/test/h5dump/expected/tno-subset.ddl
index 11aa264..11aa264 100644
--- a/tools/testfiles/tno-subset.ddl
+++ b/tools/test/h5dump/expected/tno-subset.ddl
diff --git a/tools/testfiles/tnoattrdata.ddl b/tools/test/h5dump/expected/tnoattrdata.ddl
index a5d40fe..a5d40fe 100644
--- a/tools/testfiles/tnoattrdata.ddl
+++ b/tools/test/h5dump/expected/tnoattrdata.ddl
diff --git a/tools/testfiles/tnoattrddl.ddl b/tools/test/h5dump/expected/tnoattrddl.ddl
index f7326d0..f7326d0 100644
--- a/tools/testfiles/tnoattrddl.ddl
+++ b/tools/test/h5dump/expected/tnoattrddl.ddl
diff --git a/tools/testfiles/tnodata.ddl b/tools/test/h5dump/expected/tnodata.ddl
index f99d906..f99d906 100644
--- a/tools/testfiles/tnodata.ddl
+++ b/tools/test/h5dump/expected/tnodata.ddl
diff --git a/tools/testfiles/tnoddl.ddl b/tools/test/h5dump/expected/tnoddl.ddl
index 5238777..5238777 100644
--- a/tools/testfiles/tnoddl.ddl
+++ b/tools/test/h5dump/expected/tnoddl.ddl
diff --git a/tools/testfiles/tnoddlfile.ddl b/tools/test/h5dump/expected/tnoddlfile.ddl
index e69de29..e69de29 100644
--- a/tools/testfiles/tnoddlfile.ddl
+++ b/tools/test/h5dump/expected/tnoddlfile.ddl
diff --git a/tools/testfiles/tnullspace.ddl b/tools/test/h5dump/expected/tnullspace.ddl
index 32e208f..32e208f 100644
--- a/tools/testfiles/tnullspace.ddl
+++ b/tools/test/h5dump/expected/tnullspace.ddl
diff --git a/tools/testfiles/torderattr1.ddl b/tools/test/h5dump/expected/torderattr1.ddl
index fb7fd70..fb7fd70 100644
--- a/tools/testfiles/torderattr1.ddl
+++ b/tools/test/h5dump/expected/torderattr1.ddl
diff --git a/tools/testfiles/torderattr2.ddl b/tools/test/h5dump/expected/torderattr2.ddl
index dbf615b..dbf615b 100644
--- a/tools/testfiles/torderattr2.ddl
+++ b/tools/test/h5dump/expected/torderattr2.ddl
diff --git a/tools/testfiles/torderattr3.ddl b/tools/test/h5dump/expected/torderattr3.ddl
index a2990f7..a2990f7 100644
--- a/tools/testfiles/torderattr3.ddl
+++ b/tools/test/h5dump/expected/torderattr3.ddl
diff --git a/tools/testfiles/torderattr4.ddl b/tools/test/h5dump/expected/torderattr4.ddl
index 000a852..000a852 100644
--- a/tools/testfiles/torderattr4.ddl
+++ b/tools/test/h5dump/expected/torderattr4.ddl
diff --git a/tools/testfiles/tordercontents1.ddl b/tools/test/h5dump/expected/tordercontents1.ddl
index 14e12d6..14e12d6 100644
--- a/tools/testfiles/tordercontents1.ddl
+++ b/tools/test/h5dump/expected/tordercontents1.ddl
diff --git a/tools/testfiles/tordercontents2.ddl b/tools/test/h5dump/expected/tordercontents2.ddl
index 6757338..6757338 100644
--- a/tools/testfiles/tordercontents2.ddl
+++ b/tools/test/h5dump/expected/tordercontents2.ddl
diff --git a/tools/testfiles/tordergr1.ddl b/tools/test/h5dump/expected/tordergr1.ddl
index 0fa74d9..0fa74d9 100644
--- a/tools/testfiles/tordergr1.ddl
+++ b/tools/test/h5dump/expected/tordergr1.ddl
diff --git a/tools/testfiles/tordergr2.ddl b/tools/test/h5dump/expected/tordergr2.ddl
index 500d99c..500d99c 100644
--- a/tools/testfiles/tordergr2.ddl
+++ b/tools/test/h5dump/expected/tordergr2.ddl
diff --git a/tools/testfiles/tordergr3.ddl b/tools/test/h5dump/expected/tordergr3.ddl
index 99e9a6b..99e9a6b 100644
--- a/tools/testfiles/tordergr3.ddl
+++ b/tools/test/h5dump/expected/tordergr3.ddl
diff --git a/tools/testfiles/tordergr4.ddl b/tools/test/h5dump/expected/tordergr4.ddl
index 1613d9d..1613d9d 100644
--- a/tools/testfiles/tordergr4.ddl
+++ b/tools/test/h5dump/expected/tordergr4.ddl
diff --git a/tools/testfiles/tordergr5.ddl b/tools/test/h5dump/expected/tordergr5.ddl
index 0ede967..0ede967 100644
--- a/tools/testfiles/tordergr5.ddl
+++ b/tools/test/h5dump/expected/tordergr5.ddl
diff --git a/tools/testfiles/torderlinks1.ddl b/tools/test/h5dump/expected/torderlinks1.ddl
index eaf6eea..eaf6eea 100644
--- a/tools/testfiles/torderlinks1.ddl
+++ b/tools/test/h5dump/expected/torderlinks1.ddl
diff --git a/tools/testfiles/torderlinks2.ddl b/tools/test/h5dump/expected/torderlinks2.ddl
index dd68208..dd68208 100644
--- a/tools/testfiles/torderlinks2.ddl
+++ b/tools/test/h5dump/expected/torderlinks2.ddl
diff --git a/tools/testfiles/tperror.ddl b/tools/test/h5dump/expected/tperror.ddl
index 0cb961c..0cb961c 100644
--- a/tools/testfiles/tperror.ddl
+++ b/tools/test/h5dump/expected/tperror.ddl
diff --git a/tools/testfiles/tqmarkfile.ddl b/tools/test/h5dump/expected/tqmarkfile.ddl
index 885be5f..885be5f 100644
--- a/tools/testfiles/tqmarkfile.ddl
+++ b/tools/test/h5dump/expected/tqmarkfile.ddl
diff --git a/tools/testfiles/trawdatafile.ddl b/tools/test/h5dump/expected/trawdatafile.ddl
index f99d906..f99d906 100644
--- a/tools/testfiles/trawdatafile.ddl
+++ b/tools/test/h5dump/expected/trawdatafile.ddl
diff --git a/tools/testfiles/trawssetfile.ddl b/tools/test/h5dump/expected/trawssetfile.ddl
index e8f07f8..e8f07f8 100644
--- a/tools/testfiles/trawssetfile.ddl
+++ b/tools/test/h5dump/expected/trawssetfile.ddl
diff --git a/tools/testfiles/treadfilter.ddl b/tools/test/h5dump/expected/treadfilter.ddl
index 88ca2e9..88ca2e9 100644
--- a/tools/testfiles/treadfilter.ddl
+++ b/tools/test/h5dump/expected/treadfilter.ddl
diff --git a/tools/testfiles/treadintfilter.ddl b/tools/test/h5dump/expected/treadintfilter.ddl
index fbad3f6..fbad3f6 100644
--- a/tools/testfiles/treadintfilter.ddl
+++ b/tools/test/h5dump/expected/treadintfilter.ddl
diff --git a/tools/testfiles/trefer_attrR.ddl b/tools/test/h5dump/expected/trefer_attrR.ddl
index 118e7bf..118e7bf 100644
--- a/tools/testfiles/trefer_attrR.ddl
+++ b/tools/test/h5dump/expected/trefer_attrR.ddl
diff --git a/tools/testfiles/trefer_compatR.ddl b/tools/test/h5dump/expected/trefer_compatR.ddl
index 97c7934..97c7934 100644
--- a/tools/testfiles/trefer_compatR.ddl
+++ b/tools/test/h5dump/expected/trefer_compatR.ddl
diff --git a/tools/testfiles/trefer_extR.ddl b/tools/test/h5dump/expected/trefer_extR.ddl
index a96e5fd..a96e5fd 100644
--- a/tools/testfiles/trefer_extR.ddl
+++ b/tools/test/h5dump/expected/trefer_extR.ddl
diff --git a/tools/testfiles/trefer_grpR.ddl b/tools/test/h5dump/expected/trefer_grpR.ddl
index 298b836..298b836 100644
--- a/tools/testfiles/trefer_grpR.ddl
+++ b/tools/test/h5dump/expected/trefer_grpR.ddl
diff --git a/tools/testfiles/trefer_objR.ddl b/tools/test/h5dump/expected/trefer_objR.ddl
index 0d5af28..0d5af28 100644
--- a/tools/testfiles/trefer_objR.ddl
+++ b/tools/test/h5dump/expected/trefer_objR.ddl
diff --git a/tools/testfiles/trefer_obj_delR.ddl b/tools/test/h5dump/expected/trefer_obj_delR.ddl
index fa238a5..fa238a5 100644
--- a/tools/testfiles/trefer_obj_delR.ddl
+++ b/tools/test/h5dump/expected/trefer_obj_delR.ddl
diff --git a/tools/testfiles/trefer_paramR.ddl b/tools/test/h5dump/expected/trefer_paramR.ddl
index ce9fa86..ce9fa86 100644
--- a/tools/testfiles/trefer_paramR.ddl
+++ b/tools/test/h5dump/expected/trefer_paramR.ddl
diff --git a/tools/testfiles/trefer_regR.ddl b/tools/test/h5dump/expected/trefer_regR.ddl
index 683c196..683c196 100644
--- a/tools/testfiles/trefer_regR.ddl
+++ b/tools/test/h5dump/expected/trefer_regR.ddl
diff --git a/tools/testfiles/trefer_reg_1dR.ddl b/tools/test/h5dump/expected/trefer_reg_1dR.ddl
index 3e5f652..3e5f652 100644
--- a/tools/testfiles/trefer_reg_1dR.ddl
+++ b/tools/test/h5dump/expected/trefer_reg_1dR.ddl
diff --git a/tools/testfiles/treference.ddl b/tools/test/h5dump/expected/treference.ddl
index 1145b25..1145b25 100644
--- a/tools/testfiles/treference.ddl
+++ b/tools/test/h5dump/expected/treference.ddl
diff --git a/tools/testfiles/tsaf.ddl b/tools/test/h5dump/expected/tsaf.ddl
index fe9f864..fe9f864 100644
--- a/tools/testfiles/tsaf.ddl
+++ b/tools/test/h5dump/expected/tsaf.ddl
diff --git a/tools/testfiles/tscalarattrintsize.ddl b/tools/test/h5dump/expected/tscalarattrintsize.ddl
index 46f3cef..46f3cef 100644
--- a/tools/testfiles/tscalarattrintsize.ddl
+++ b/tools/test/h5dump/expected/tscalarattrintsize.ddl
diff --git a/tools/testfiles/tscalarintattrsize.ddl b/tools/test/h5dump/expected/tscalarintattrsize.ddl
index a9de66b..a9de66b 100644
--- a/tools/testfiles/tscalarintattrsize.ddl
+++ b/tools/test/h5dump/expected/tscalarintattrsize.ddl
diff --git a/tools/testfiles/tscalarintsize.ddl b/tools/test/h5dump/expected/tscalarintsize.ddl
index 4b06a74..4b06a74 100644
--- a/tools/testfiles/tscalarintsize.ddl
+++ b/tools/test/h5dump/expected/tscalarintsize.ddl
diff --git a/tools/testfiles/tscalarstring.ddl b/tools/test/h5dump/expected/tscalarstring.ddl
index 4ba7093..4ba7093 100644
--- a/tools/testfiles/tscalarstring.ddl
+++ b/tools/test/h5dump/expected/tscalarstring.ddl
diff --git a/tools/testfiles/tscaleoffset.ddl b/tools/test/h5dump/expected/tscaleoffset.ddl
index a039736..a039736 100644
--- a/tools/testfiles/tscaleoffset.ddl
+++ b/tools/test/h5dump/expected/tscaleoffset.ddl
diff --git a/tools/testfiles/tshuffle.ddl b/tools/test/h5dump/expected/tshuffle.ddl
index b0477db..b0477db 100644
--- a/tools/testfiles/tshuffle.ddl
+++ b/tools/test/h5dump/expected/tshuffle.ddl
diff --git a/tools/testfiles/tslink-1.ddl b/tools/test/h5dump/expected/tslink-1.ddl
index d9df572..d9df572 100644
--- a/tools/testfiles/tslink-1.ddl
+++ b/tools/test/h5dump/expected/tslink-1.ddl
diff --git a/tools/testfiles/tslink-2.ddl b/tools/test/h5dump/expected/tslink-2.ddl
index 853c093..853c093 100644
--- a/tools/testfiles/tslink-2.ddl
+++ b/tools/test/h5dump/expected/tslink-2.ddl
diff --git a/tools/testfiles/tslink-D.ddl b/tools/test/h5dump/expected/tslink-D.ddl
index 9d90262..9d90262 100644
--- a/tools/testfiles/tslink-D.ddl
+++ b/tools/test/h5dump/expected/tslink-D.ddl
diff --git a/tools/testfiles/tsplit_file.ddl b/tools/test/h5dump/expected/tsplit_file.ddl
index 9a1e22d..9a1e22d 100644
--- a/tools/testfiles/tsplit_file.ddl
+++ b/tools/test/h5dump/expected/tsplit_file.ddl
diff --git a/tools/testfiles/tst_onion_dset_1d.ddl b/tools/test/h5dump/expected/tst_onion_dset_1d.ddl
index adca75f..adca75f 100644
--- a/tools/testfiles/tst_onion_dset_1d.ddl
+++ b/tools/test/h5dump/expected/tst_onion_dset_1d.ddl
diff --git a/tools/testfiles/tst_onion_dset_ext.ddl b/tools/test/h5dump/expected/tst_onion_dset_ext.ddl
index 2405774..2405774 100644
--- a/tools/testfiles/tst_onion_dset_ext.ddl
+++ b/tools/test/h5dump/expected/tst_onion_dset_ext.ddl
diff --git a/tools/testfiles/tst_onion_objs.ddl b/tools/test/h5dump/expected/tst_onion_objs.ddl
index c66275b..c66275b 100644
--- a/tools/testfiles/tst_onion_objs.ddl
+++ b/tools/test/h5dump/expected/tst_onion_objs.ddl
diff --git a/tools/testfiles/tst_onion_revision_count.ddl b/tools/test/h5dump/expected/tst_onion_revision_count.ddl
index 4f2e1db..4f2e1db 100644
--- a/tools/testfiles/tst_onion_revision_count.ddl
+++ b/tools/test/h5dump/expected/tst_onion_revision_count.ddl
diff --git a/tools/testfiles/tstarfile.ddl b/tools/test/h5dump/expected/tstarfile.ddl
index 1cd87f7..1cd87f7 100644
--- a/tools/testfiles/tstarfile.ddl
+++ b/tools/test/h5dump/expected/tstarfile.ddl
diff --git a/tools/testfiles/tstr-1.ddl b/tools/test/h5dump/expected/tstr-1.ddl
index e43b732..e43b732 100644
--- a/tools/testfiles/tstr-1.ddl
+++ b/tools/test/h5dump/expected/tstr-1.ddl
diff --git a/tools/testfiles/tstr-2.ddl b/tools/test/h5dump/expected/tstr-2.ddl
index 26425f6..26425f6 100644
--- a/tools/testfiles/tstr-2.ddl
+++ b/tools/test/h5dump/expected/tstr-2.ddl
diff --git a/tools/testfiles/tstring.ddl b/tools/test/h5dump/expected/tstring.ddl
index 398bf33..398bf33 100644
--- a/tools/testfiles/tstring.ddl
+++ b/tools/test/h5dump/expected/tstring.ddl
diff --git a/tools/testfiles/tstring2.ddl b/tools/test/h5dump/expected/tstring2.ddl
index cda2ed5..cda2ed5 100644
--- a/tools/testfiles/tstring2.ddl
+++ b/tools/test/h5dump/expected/tstring2.ddl
diff --git a/tools/testfiles/tstringe.ddl b/tools/test/h5dump/expected/tstringe.ddl
index d3f5181..d3f5181 100644
--- a/tools/testfiles/tstringe.ddl
+++ b/tools/test/h5dump/expected/tstringe.ddl
diff --git a/tools/testfiles/tszip.ddl b/tools/test/h5dump/expected/tszip.ddl
index 06e2259..06e2259 100644
--- a/tools/testfiles/tszip.ddl
+++ b/tools/test/h5dump/expected/tszip.ddl
diff --git a/tools/testfiles/tudfilter.ddl b/tools/test/h5dump/expected/tudfilter.ddl
index b2aa7e6..b2aa7e6 100644
--- a/tools/testfiles/tudfilter.ddl
+++ b/tools/test/h5dump/expected/tudfilter.ddl
diff --git a/tools/testfiles/tudlink-1.ddl b/tools/test/h5dump/expected/tudlink-1.ddl
index 53edf6b..53edf6b 100644
--- a/tools/testfiles/tudlink-1.ddl
+++ b/tools/test/h5dump/expected/tudlink-1.ddl
diff --git a/tools/testfiles/tudlink-2.ddl b/tools/test/h5dump/expected/tudlink-2.ddl
index 82b9f8e..82b9f8e 100644
--- a/tools/testfiles/tudlink-2.ddl
+++ b/tools/test/h5dump/expected/tudlink-2.ddl
diff --git a/tools/testfiles/tuserfilter.ddl b/tools/test/h5dump/expected/tuserfilter.ddl
index f77fb17..f77fb17 100644
--- a/tools/testfiles/tuserfilter.ddl
+++ b/tools/test/h5dump/expected/tuserfilter.ddl
diff --git a/tools/testfiles/tvldtypes1.ddl b/tools/test/h5dump/expected/tvldtypes1.ddl
index bdf9328..bdf9328 100644
--- a/tools/testfiles/tvldtypes1.ddl
+++ b/tools/test/h5dump/expected/tvldtypes1.ddl
diff --git a/tools/testfiles/tvldtypes2.ddl b/tools/test/h5dump/expected/tvldtypes2.ddl
index 5a91187..5a91187 100644
--- a/tools/testfiles/tvldtypes2.ddl
+++ b/tools/test/h5dump/expected/tvldtypes2.ddl
diff --git a/tools/testfiles/tvldtypes3.ddl b/tools/test/h5dump/expected/tvldtypes3.ddl
index b8f53c9..b8f53c9 100644
--- a/tools/testfiles/tvldtypes3.ddl
+++ b/tools/test/h5dump/expected/tvldtypes3.ddl
diff --git a/tools/testfiles/tvldtypes4.ddl b/tools/test/h5dump/expected/tvldtypes4.ddl
index da363fa..da363fa 100644
--- a/tools/testfiles/tvldtypes4.ddl
+++ b/tools/test/h5dump/expected/tvldtypes4.ddl
diff --git a/tools/testfiles/tvldtypes5.ddl b/tools/test/h5dump/expected/tvldtypes5.ddl
index b0f8a2c..b0f8a2c 100644
--- a/tools/testfiles/tvldtypes5.ddl
+++ b/tools/test/h5dump/expected/tvldtypes5.ddl
diff --git a/tools/testfiles/tvlenstr_array.ddl b/tools/test/h5dump/expected/tvlenstr_array.ddl
index 87efbb6..87efbb6 100644
--- a/tools/testfiles/tvlenstr_array.ddl
+++ b/tools/test/h5dump/expected/tvlenstr_array.ddl
diff --git a/tools/testfiles/tvlstr.ddl b/tools/test/h5dump/expected/tvlstr.ddl
index dfce2eb..dfce2eb 100644
--- a/tools/testfiles/tvlstr.ddl
+++ b/tools/test/h5dump/expected/tvlstr.ddl
diff --git a/tools/testfiles/tvms.ddl b/tools/test/h5dump/expected/tvms.ddl
index 49f3881..49f3881 100644
--- a/tools/testfiles/tvms.ddl
+++ b/tools/test/h5dump/expected/tvms.ddl
diff --git a/tools/testfiles/twidedisplay.ddl b/tools/test/h5dump/expected/twidedisplay.ddl
index 1e6ffee..1e6ffee 100644
--- a/tools/testfiles/twidedisplay.ddl
+++ b/tools/test/h5dump/expected/twidedisplay.ddl
diff --git a/tools/testfiles/twithddlfile.ddl b/tools/test/h5dump/expected/twithddlfile.ddl
index e69de29..e69de29 100644
--- a/tools/testfiles/twithddlfile.ddl
+++ b/tools/test/h5dump/expected/twithddlfile.ddl
diff --git a/tools/testfiles/vds/tvds-1.ddl b/tools/test/h5dump/expected/vds/tvds-1.ddl
index 47fd413..47fd413 100644
--- a/tools/testfiles/vds/tvds-1.ddl
+++ b/tools/test/h5dump/expected/vds/tvds-1.ddl
diff --git a/tools/testfiles/vds/tvds-2.ddl b/tools/test/h5dump/expected/vds/tvds-2.ddl
index 5f2ae16..5f2ae16 100644
--- a/tools/testfiles/vds/tvds-2.ddl
+++ b/tools/test/h5dump/expected/vds/tvds-2.ddl
diff --git a/tools/testfiles/vds/tvds-3_1.ddl b/tools/test/h5dump/expected/vds/tvds-3_1.ddl
index 7d7d8b6..7d7d8b6 100644
--- a/tools/testfiles/vds/tvds-3_1.ddl
+++ b/tools/test/h5dump/expected/vds/tvds-3_1.ddl
diff --git a/tools/testfiles/vds/tvds-3_2.ddl b/tools/test/h5dump/expected/vds/tvds-3_2.ddl
index baec6f0..baec6f0 100644
--- a/tools/testfiles/vds/tvds-3_2.ddl
+++ b/tools/test/h5dump/expected/vds/tvds-3_2.ddl
diff --git a/tools/testfiles/vds/tvds-4.ddl b/tools/test/h5dump/expected/vds/tvds-4.ddl
index 1832724..1832724 100644
--- a/tools/testfiles/vds/tvds-4.ddl
+++ b/tools/test/h5dump/expected/vds/tvds-4.ddl
diff --git a/tools/testfiles/vds/tvds-5.ddl b/tools/test/h5dump/expected/vds/tvds-5.ddl
index f59017b..f59017b 100644
--- a/tools/testfiles/vds/tvds-5.ddl
+++ b/tools/test/h5dump/expected/vds/tvds-5.ddl
diff --git a/tools/testfiles/vds/tvds_layout-1.ddl b/tools/test/h5dump/expected/vds/tvds_layout-1.ddl
index b5351f2..b5351f2 100644
--- a/tools/testfiles/vds/tvds_layout-1.ddl
+++ b/tools/test/h5dump/expected/vds/tvds_layout-1.ddl
diff --git a/tools/testfiles/vds/tvds_layout-2.ddl b/tools/test/h5dump/expected/vds/tvds_layout-2.ddl
index 53407c7..53407c7 100644
--- a/tools/testfiles/vds/tvds_layout-2.ddl
+++ b/tools/test/h5dump/expected/vds/tvds_layout-2.ddl
diff --git a/tools/testfiles/vds/tvds_layout-3_1.ddl b/tools/test/h5dump/expected/vds/tvds_layout-3_1.ddl
index e75fe36..e75fe36 100644
--- a/tools/testfiles/vds/tvds_layout-3_1.ddl
+++ b/tools/test/h5dump/expected/vds/tvds_layout-3_1.ddl
diff --git a/tools/testfiles/vds/tvds_layout-3_2.ddl b/tools/test/h5dump/expected/vds/tvds_layout-3_2.ddl
index 5b63269..5b63269 100644
--- a/tools/testfiles/vds/tvds_layout-3_2.ddl
+++ b/tools/test/h5dump/expected/vds/tvds_layout-3_2.ddl
diff --git a/tools/testfiles/vds/tvds_layout-4.ddl b/tools/test/h5dump/expected/vds/tvds_layout-4.ddl
index a449d0c..a449d0c 100644
--- a/tools/testfiles/vds/tvds_layout-4.ddl
+++ b/tools/test/h5dump/expected/vds/tvds_layout-4.ddl
diff --git a/tools/testfiles/vds/tvds_layout-5.ddl b/tools/test/h5dump/expected/vds/tvds_layout-5.ddl
index 1698eb4..1698eb4 100644
--- a/tools/testfiles/vds/tvds_layout-5.ddl
+++ b/tools/test/h5dump/expected/vds/tvds_layout-5.ddl
diff --git a/tools/testfiles/vds/vds-first.ddl b/tools/test/h5dump/expected/vds/vds-first.ddl
index 97b1ecf..97b1ecf 100644
--- a/tools/testfiles/vds/vds-first.ddl
+++ b/tools/test/h5dump/expected/vds/vds-first.ddl
diff --git a/tools/testfiles/vds/vds-gap1.ddl b/tools/test/h5dump/expected/vds/vds-gap1.ddl
index cace781..cace781 100644
--- a/tools/testfiles/vds/vds-gap1.ddl
+++ b/tools/test/h5dump/expected/vds/vds-gap1.ddl
diff --git a/tools/testfiles/vds/vds-gap2.ddl b/tools/test/h5dump/expected/vds/vds-gap2.ddl
index 24da48f..24da48f 100644
--- a/tools/testfiles/vds/vds-gap2.ddl
+++ b/tools/test/h5dump/expected/vds/vds-gap2.ddl
diff --git a/tools/testfiles/vds/vds_layout-eiger.ddl b/tools/test/h5dump/expected/vds/vds_layout-eiger.ddl
index d32a139..d32a139 100644
--- a/tools/testfiles/vds/vds_layout-eiger.ddl
+++ b/tools/test/h5dump/expected/vds/vds_layout-eiger.ddl
diff --git a/tools/testfiles/vds/vds_layout-maxmin.ddl b/tools/test/h5dump/expected/vds/vds_layout-maxmin.ddl
index 790fc1c..790fc1c 100644
--- a/tools/testfiles/vds/vds_layout-maxmin.ddl
+++ b/tools/test/h5dump/expected/vds/vds_layout-maxmin.ddl
diff --git a/tools/testfiles/tall-2A.h5.xml b/tools/test/h5dump/expected/xml/tall-2A.h5.xml
index c7d2fcf..c7d2fcf 100644
--- a/tools/testfiles/tall-2A.h5.xml
+++ b/tools/test/h5dump/expected/xml/tall-2A.h5.xml
diff --git a/tools/testfiles/tall.h5.xml b/tools/test/h5dump/expected/xml/tall.h5.xml
index ba130f1..ba130f1 100644
--- a/tools/testfiles/tall.h5.xml
+++ b/tools/test/h5dump/expected/xml/tall.h5.xml
diff --git a/tools/testfiles/tarray1.h5.xml b/tools/test/h5dump/expected/xml/tarray1.h5.xml
index 26d2d9b..26d2d9b 100644
--- a/tools/testfiles/tarray1.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray1.h5.xml
diff --git a/tools/testfiles/tarray2.h5.xml b/tools/test/h5dump/expected/xml/tarray2.h5.xml
index 8f4f312..8f4f312 100644
--- a/tools/testfiles/tarray2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray2.h5.xml
diff --git a/tools/testfiles/tarray3.h5.xml b/tools/test/h5dump/expected/xml/tarray3.h5.xml
index 3879994..3879994 100644
--- a/tools/testfiles/tarray3.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray3.h5.xml
diff --git a/tools/testfiles/tarray6.h5.xml b/tools/test/h5dump/expected/xml/tarray6.h5.xml
index 0fb50ed..0fb50ed 100644
--- a/tools/testfiles/tarray6.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray6.h5.xml
diff --git a/tools/testfiles/tarray7.h5.xml b/tools/test/h5dump/expected/xml/tarray7.h5.xml
index e6a5bca..e6a5bca 100644
--- a/tools/testfiles/tarray7.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray7.h5.xml
diff --git a/tools/testfiles/tattr.h5.xml b/tools/test/h5dump/expected/xml/tattr.h5.xml
index ce54360..ce54360 100644
--- a/tools/testfiles/tattr.h5.xml
+++ b/tools/test/h5dump/expected/xml/tattr.h5.xml
diff --git a/tools/testfiles/tbitfields_be.h5.xml b/tools/test/h5dump/expected/xml/tbitfields_be.h5.xml
index 26bbd91..26bbd91 100644
--- a/tools/testfiles/tbitfields_be.h5.xml
+++ b/tools/test/h5dump/expected/xml/tbitfields_be.h5.xml
diff --git a/tools/testfiles/tbitfields_le.h5.xml b/tools/test/h5dump/expected/xml/tbitfields_le.h5.xml
index c8ba026..c8ba026 100644
--- a/tools/testfiles/tbitfields_le.h5.xml
+++ b/tools/test/h5dump/expected/xml/tbitfields_le.h5.xml
diff --git a/tools/testfiles/tcompound.h5.xml b/tools/test/h5dump/expected/xml/tcompound.h5.xml
index 5c74493..5c74493 100644
--- a/tools/testfiles/tcompound.h5.xml
+++ b/tools/test/h5dump/expected/xml/tcompound.h5.xml
diff --git a/tools/testfiles/tcompound2.h5.xml b/tools/test/h5dump/expected/xml/tcompound2.h5.xml
index 5c69cef..5c69cef 100644
--- a/tools/testfiles/tcompound2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tcompound2.h5.xml
diff --git a/tools/testfiles/tcompound_complex.h5.xml b/tools/test/h5dump/expected/xml/tcompound_complex.h5.xml
index 92bd64d..92bd64d 100644
--- a/tools/testfiles/tcompound_complex.h5.xml
+++ b/tools/test/h5dump/expected/xml/tcompound_complex.h5.xml
diff --git a/tools/testfiles/tdatareg.h5.xml b/tools/test/h5dump/expected/xml/tdatareg.h5.xml
index ea65384..ea65384 100644
--- a/tools/testfiles/tdatareg.h5.xml
+++ b/tools/test/h5dump/expected/xml/tdatareg.h5.xml
diff --git a/tools/testfiles/tdset.h5.xml b/tools/test/h5dump/expected/xml/tdset.h5.xml
index 80dcf6f..80dcf6f 100644
--- a/tools/testfiles/tdset.h5.xml
+++ b/tools/test/h5dump/expected/xml/tdset.h5.xml
diff --git a/tools/testfiles/tdset2.h5.xml b/tools/test/h5dump/expected/xml/tdset2.h5.xml
index 7f78685..7f78685 100644
--- a/tools/testfiles/tdset2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tdset2.h5.xml
diff --git a/tools/testfiles/tempty-dtd-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd-2.h5.xml
index 213d582..213d582 100644
--- a/tools/testfiles/tempty-dtd-2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-dtd-2.h5.xml
diff --git a/tools/testfiles/tempty-dtd-uri.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd-uri.h5.xml
index d3c5e81..d3c5e81 100644
--- a/tools/testfiles/tempty-dtd-uri.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-dtd-uri.h5.xml
diff --git a/tools/testfiles/tempty-dtd.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd.h5.xml
index 213d582..213d582 100644
--- a/tools/testfiles/tempty-dtd.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-dtd.h5.xml
diff --git a/tools/testfiles/tempty-nons-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons-2.h5.xml
index 219dbfd..219dbfd 100644
--- a/tools/testfiles/tempty-nons-2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-nons-2.h5.xml
diff --git a/tools/testfiles/tempty-nons-uri.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons-uri.h5.xml
index 032de41..032de41 100644
--- a/tools/testfiles/tempty-nons-uri.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-nons-uri.h5.xml
diff --git a/tools/testfiles/tempty-nons.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons.h5.xml
index 219dbfd..219dbfd 100644
--- a/tools/testfiles/tempty-nons.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-nons.h5.xml
diff --git a/tools/testfiles/tempty-ns-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml
index 00040d2..00040d2 100644
--- a/tools/testfiles/tempty-ns-2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml
diff --git a/tools/testfiles/tempty-ns.h5.xml b/tools/test/h5dump/expected/xml/tempty-ns.h5.xml
index 00040d2..00040d2 100644
--- a/tools/testfiles/tempty-ns.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-ns.h5.xml
diff --git a/tools/testfiles/tempty.h5.xml b/tools/test/h5dump/expected/xml/tempty.h5.xml
index 41eef37..41eef37 100644
--- a/tools/testfiles/tempty.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty.h5.xml
diff --git a/tools/testfiles/tenum.h5.xml b/tools/test/h5dump/expected/xml/tenum.h5.xml
index 33a6e62..33a6e62 100644
--- a/tools/testfiles/tenum.h5.xml
+++ b/tools/test/h5dump/expected/xml/tenum.h5.xml
diff --git a/tools/testfiles/test35.nc.xml b/tools/test/h5dump/expected/xml/test35.nc.xml
index a38ed8a..a38ed8a 100644
--- a/tools/testfiles/test35.nc.xml
+++ b/tools/test/h5dump/expected/xml/test35.nc.xml
diff --git a/tools/testfiles/textlink.h5.xml b/tools/test/h5dump/expected/xml/textlink.h5.xml
index 9097f79..9097f79 100644
--- a/tools/testfiles/textlink.h5.xml
+++ b/tools/test/h5dump/expected/xml/textlink.h5.xml
diff --git a/tools/testfiles/tfpformat.h5.xml b/tools/test/h5dump/expected/xml/tfpformat.h5.xml
index 6445979..6445979 100644
--- a/tools/testfiles/tfpformat.h5.xml
+++ b/tools/test/h5dump/expected/xml/tfpformat.h5.xml
diff --git a/tools/testfiles/tgroup.h5.xml b/tools/test/h5dump/expected/xml/tgroup.h5.xml
index 1eaf662..1eaf662 100644
--- a/tools/testfiles/tgroup.h5.xml
+++ b/tools/test/h5dump/expected/xml/tgroup.h5.xml
diff --git a/tools/testfiles/thlink.h5.xml b/tools/test/h5dump/expected/xml/thlink.h5.xml
index d0fa36e..d0fa36e 100644
--- a/tools/testfiles/thlink.h5.xml
+++ b/tools/test/h5dump/expected/xml/thlink.h5.xml
diff --git a/tools/testfiles/tloop.h5.xml b/tools/test/h5dump/expected/xml/tloop.h5.xml
index 8cc6880..8cc6880 100644
--- a/tools/testfiles/tloop.h5.xml
+++ b/tools/test/h5dump/expected/xml/tloop.h5.xml
diff --git a/tools/testfiles/tloop2.h5.xml b/tools/test/h5dump/expected/xml/tloop2.h5.xml
index e2df102..e2df102 100644
--- a/tools/testfiles/tloop2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tloop2.h5.xml
diff --git a/tools/testfiles/tmany.h5.xml b/tools/test/h5dump/expected/xml/tmany.h5.xml
index 842f1f5..842f1f5 100644
--- a/tools/testfiles/tmany.h5.xml
+++ b/tools/test/h5dump/expected/xml/tmany.h5.xml
diff --git a/tools/testfiles/tname-amp.h5.xml b/tools/test/h5dump/expected/xml/tname-amp.h5.xml
index e40c38b..e40c38b 100644
--- a/tools/testfiles/tname-amp.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-amp.h5.xml
diff --git a/tools/testfiles/tname-apos.h5.xml b/tools/test/h5dump/expected/xml/tname-apos.h5.xml
index 2acd0bf..2acd0bf 100644
--- a/tools/testfiles/tname-apos.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-apos.h5.xml
diff --git a/tools/testfiles/tname-gt.h5.xml b/tools/test/h5dump/expected/xml/tname-gt.h5.xml
index b44949e..b44949e 100644
--- a/tools/testfiles/tname-gt.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-gt.h5.xml
diff --git a/tools/testfiles/tname-lt.h5.xml b/tools/test/h5dump/expected/xml/tname-lt.h5.xml
index b148275..b148275 100644
--- a/tools/testfiles/tname-lt.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-lt.h5.xml
diff --git a/tools/testfiles/tname-quot.h5.xml b/tools/test/h5dump/expected/xml/tname-quot.h5.xml
index 83fd347..83fd347 100644
--- a/tools/testfiles/tname-quot.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-quot.h5.xml
diff --git a/tools/testfiles/tname-sp.h5.xml b/tools/test/h5dump/expected/xml/tname-sp.h5.xml
index 07b80e4..07b80e4 100644
--- a/tools/testfiles/tname-sp.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-sp.h5.xml
diff --git a/tools/testfiles/tnamed_dtype_attr.h5.xml b/tools/test/h5dump/expected/xml/tnamed_dtype_attr.h5.xml
index c0e30b4..c0e30b4 100644
--- a/tools/testfiles/tnamed_dtype_attr.h5.xml
+++ b/tools/test/h5dump/expected/xml/tnamed_dtype_attr.h5.xml
diff --git a/tools/testfiles/tnestedcomp.h5.xml b/tools/test/h5dump/expected/xml/tnestedcomp.h5.xml
index a5ca214..a5ca214 100644
--- a/tools/testfiles/tnestedcomp.h5.xml
+++ b/tools/test/h5dump/expected/xml/tnestedcomp.h5.xml
diff --git a/tools/testfiles/tnodata.h5.xml b/tools/test/h5dump/expected/xml/tnodata.h5.xml
index b60c4dc..b60c4dc 100644
--- a/tools/testfiles/tnodata.h5.xml
+++ b/tools/test/h5dump/expected/xml/tnodata.h5.xml
diff --git a/tools/testfiles/tnullspace.h5.xml b/tools/test/h5dump/expected/xml/tnullspace.h5.xml
index b1c1974..b1c1974 100644
--- a/tools/testfiles/tnullspace.h5.xml
+++ b/tools/test/h5dump/expected/xml/tnullspace.h5.xml
diff --git a/tools/testfiles/tobjref.h5.xml b/tools/test/h5dump/expected/xml/tobjref.h5.xml
index 71eb6ed..71eb6ed 100644
--- a/tools/testfiles/tobjref.h5.xml
+++ b/tools/test/h5dump/expected/xml/tobjref.h5.xml
diff --git a/tools/testfiles/topaque.h5.xml b/tools/test/h5dump/expected/xml/topaque.h5.xml
index c0699f0..c0699f0 100644
--- a/tools/testfiles/topaque.h5.xml
+++ b/tools/test/h5dump/expected/xml/topaque.h5.xml
diff --git a/tools/testfiles/torderattr1.h5.xml b/tools/test/h5dump/expected/xml/torderattr1.h5.xml
index e3e56eb..e3e56eb 100644
--- a/tools/testfiles/torderattr1.h5.xml
+++ b/tools/test/h5dump/expected/xml/torderattr1.h5.xml
diff --git a/tools/testfiles/torderattr2.h5.xml b/tools/test/h5dump/expected/xml/torderattr2.h5.xml
index 1163afb..1163afb 100644
--- a/tools/testfiles/torderattr2.h5.xml
+++ b/tools/test/h5dump/expected/xml/torderattr2.h5.xml
diff --git a/tools/testfiles/torderattr3.h5.xml b/tools/test/h5dump/expected/xml/torderattr3.h5.xml
index 73ef223..73ef223 100644
--- a/tools/testfiles/torderattr3.h5.xml
+++ b/tools/test/h5dump/expected/xml/torderattr3.h5.xml
diff --git a/tools/testfiles/torderattr4.h5.xml b/tools/test/h5dump/expected/xml/torderattr4.h5.xml
index 1cc78fd..1cc78fd 100644
--- a/tools/testfiles/torderattr4.h5.xml
+++ b/tools/test/h5dump/expected/xml/torderattr4.h5.xml
diff --git a/tools/testfiles/tref-escapes-at.h5.xml b/tools/test/h5dump/expected/xml/tref-escapes-at.h5.xml
index 40c6b89..40c6b89 100644
--- a/tools/testfiles/tref-escapes-at.h5.xml
+++ b/tools/test/h5dump/expected/xml/tref-escapes-at.h5.xml
diff --git a/tools/testfiles/tref-escapes.h5.xml b/tools/test/h5dump/expected/xml/tref-escapes.h5.xml
index 4ebac85..4ebac85 100644
--- a/tools/testfiles/tref-escapes.h5.xml
+++ b/tools/test/h5dump/expected/xml/tref-escapes.h5.xml
diff --git a/tools/testfiles/tref.h5.xml b/tools/test/h5dump/expected/xml/tref.h5.xml
index 4c3fb8f..4c3fb8f 100644
--- a/tools/testfiles/tref.h5.xml
+++ b/tools/test/h5dump/expected/xml/tref.h5.xml
diff --git a/tools/testfiles/tsaf.h5.xml b/tools/test/h5dump/expected/xml/tsaf.h5.xml
index d646791..d646791 100644
--- a/tools/testfiles/tsaf.h5.xml
+++ b/tools/test/h5dump/expected/xml/tsaf.h5.xml
diff --git a/tools/testfiles/tslink.h5.xml b/tools/test/h5dump/expected/xml/tslink.h5.xml
index 493decd..493decd 100644
--- a/tools/testfiles/tslink.h5.xml
+++ b/tools/test/h5dump/expected/xml/tslink.h5.xml
diff --git a/tools/testfiles/tstr.h5.xml b/tools/test/h5dump/expected/xml/tstr.h5.xml
index 32d63af..32d63af 100644
--- a/tools/testfiles/tstr.h5.xml
+++ b/tools/test/h5dump/expected/xml/tstr.h5.xml
diff --git a/tools/testfiles/tstr2.h5.xml b/tools/test/h5dump/expected/xml/tstr2.h5.xml
index 1203417..1203417 100644
--- a/tools/testfiles/tstr2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tstr2.h5.xml
diff --git a/tools/testfiles/tstring-at.h5.xml b/tools/test/h5dump/expected/xml/tstring-at.h5.xml
index a8281f4..a8281f4 100644
--- a/tools/testfiles/tstring-at.h5.xml
+++ b/tools/test/h5dump/expected/xml/tstring-at.h5.xml
diff --git a/tools/testfiles/tstring.h5.xml b/tools/test/h5dump/expected/xml/tstring.h5.xml
index d68db77..d68db77 100644
--- a/tools/testfiles/tstring.h5.xml
+++ b/tools/test/h5dump/expected/xml/tstring.h5.xml
diff --git a/tools/testfiles/tudlink.h5.xml b/tools/test/h5dump/expected/xml/tudlink.h5.xml
index 137c47b..137c47b 100644
--- a/tools/testfiles/tudlink.h5.xml
+++ b/tools/test/h5dump/expected/xml/tudlink.h5.xml
diff --git a/tools/testfiles/tvldtypes1.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes1.h5.xml
index b1aa5a6..b1aa5a6 100644
--- a/tools/testfiles/tvldtypes1.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes1.h5.xml
diff --git a/tools/testfiles/tvldtypes2.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes2.h5.xml
index 662ad3a..662ad3a 100644
--- a/tools/testfiles/tvldtypes2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes2.h5.xml
diff --git a/tools/testfiles/tvldtypes3.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes3.h5.xml
index 56d81a1..56d81a1 100644
--- a/tools/testfiles/tvldtypes3.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes3.h5.xml
diff --git a/tools/testfiles/tvldtypes4.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes4.h5.xml
index 8e31bd9..8e31bd9 100644
--- a/tools/testfiles/tvldtypes4.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes4.h5.xml
diff --git a/tools/testfiles/tvldtypes5.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes5.h5.xml
index be68e09..be68e09 100644
--- a/tools/testfiles/tvldtypes5.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes5.h5.xml
diff --git a/tools/testfiles/tvlstr.h5.xml b/tools/test/h5dump/expected/xml/tvlstr.h5.xml
index d945964..d945964 100644
--- a/tools/testfiles/tvlstr.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvlstr.h5.xml
diff --git a/tools/testfiles/zerodim.ddl b/tools/test/h5dump/expected/zerodim.ddl
index 484e907..484e907 100644
--- a/tools/testfiles/zerodim.ddl
+++ b/tools/test/h5dump/expected/zerodim.ddl
diff --git a/tools/testfiles/tall-6.exp b/tools/test/h5dump/exportfiles/tall-6.exp
index 8580cd6..8580cd6 100644
--- a/tools/testfiles/tall-6.exp
+++ b/tools/test/h5dump/exportfiles/tall-6.exp
diff --git a/tools/testfiles/tbinregR.exp b/tools/test/h5dump/exportfiles/tbinregR.exp
index 3bf7ddf..3bf7ddf 100644
--- a/tools/testfiles/tbinregR.exp
+++ b/tools/test/h5dump/exportfiles/tbinregR.exp
diff --git a/tools/testfiles/tnoddlfile.exp b/tools/test/h5dump/exportfiles/tnoddlfile.exp
index dc19888..dc19888 100644
--- a/tools/testfiles/tnoddlfile.exp
+++ b/tools/test/h5dump/exportfiles/tnoddlfile.exp
diff --git a/tools/testfiles/trawdatafile.exp b/tools/test/h5dump/exportfiles/trawdatafile.exp
index dc19888..dc19888 100644
--- a/tools/testfiles/trawdatafile.exp
+++ b/tools/test/h5dump/exportfiles/trawdatafile.exp
diff --git a/tools/testfiles/trawssetfile.exp b/tools/test/h5dump/exportfiles/trawssetfile.exp
index 2de8392..2de8392 100644
--- a/tools/testfiles/trawssetfile.exp
+++ b/tools/test/h5dump/exportfiles/trawssetfile.exp
diff --git a/tools/testfiles/tstr2bin2.exp b/tools/test/h5dump/exportfiles/tstr2bin2.exp
index 5d4c544..5d4c544 100644
--- a/tools/testfiles/tstr2bin2.exp
+++ b/tools/test/h5dump/exportfiles/tstr2bin2.exp
diff --git a/tools/testfiles/tstr2bin6.exp b/tools/test/h5dump/exportfiles/tstr2bin6.exp
index 5c6c22a..5c6c22a 100644
--- a/tools/testfiles/tstr2bin6.exp
+++ b/tools/test/h5dump/exportfiles/tstr2bin6.exp
diff --git a/tools/testfiles/twithddl.exp b/tools/test/h5dump/exportfiles/twithddl.exp
index f99d906..f99d906 100644
--- a/tools/testfiles/twithddl.exp
+++ b/tools/test/h5dump/exportfiles/twithddl.exp
diff --git a/tools/testfiles/twithddlfile.exp b/tools/test/h5dump/exportfiles/twithddlfile.exp
index dc19888..dc19888 100644
--- a/tools/testfiles/twithddlfile.exp
+++ b/tools/test/h5dump/exportfiles/twithddlfile.exp
diff --git a/tools/test/h5dump/h5dump_plugin.sh.in b/tools/test/h5dump/h5dump_plugin.sh.in
index d9b77ee..d080c1d 100644
--- a/tools/test/h5dump/h5dump_plugin.sh.in
+++ b/tools/test/h5dump/h5dump_plugin.sh.in
@@ -45,8 +45,8 @@ AWK='awk'
 SRC_TOOLS="$srcdir/../.."
 
 # testfiles source dirs for tools
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
+SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected"
 
 TESTDIR=./testplug
 test -d $TESTDIR || mkdir $TESTDIR
@@ -62,7 +62,7 @@ test -d $TESTDIR || mkdir $TESTDIR
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES="
 $SRC_H5DUMP_TESTFILES/tudfilter.h5
-$SRC_H5DUMP_TESTFILES/tudfilter.ddl
+$SRC_H5DUMP_OUTFILES/tudfilter.ddl
 "
 
 # RUNSERIAL is used. Check if it can return exit code from executable correctly.
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index ddbd3af..aed3eda 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -11262,7 +11262,7 @@ gent_err_attr_dspace(void)
     hid_t   fcpl     = H5I_INVALID_HID; /* File access property list */
     hid_t   sid      = H5I_INVALID_HID; /* Dataspace identifier */
     hid_t   aid      = H5I_INVALID_HID; /* Attribute identifier */
-    hsize_t dims     = 2;               /* Dimensino size */
+    hsize_t dims     = 2;               /* Dimension size */
     int     wdata[2] = {7, 42};         /* The buffer to write */
     int     fd       = -1;              /* The file descriptor */
     char    val      = 6;               /* An invalid version */
diff --git a/tools/testfiles/charsets.h5 b/tools/test/h5dump/testfiles/charsets.h5
index 2b9e735..2b9e735 100644
--- a/tools/testfiles/charsets.h5
+++ b/tools/test/h5dump/testfiles/charsets.h5
diff --git a/tools/testfiles/err_attr_dspace.h5 b/tools/test/h5dump/testfiles/err_attr_dspace.h5
index 969c328..969c328 100644
--- a/tools/testfiles/err_attr_dspace.h5
+++ b/tools/test/h5dump/testfiles/err_attr_dspace.h5
diff --git a/tools/testfiles/file_space.h5 b/tools/test/h5dump/testfiles/file_space.h5
index d9e2890..d9e2890 100644
--- a/tools/testfiles/file_space.h5
+++ b/tools/test/h5dump/testfiles/file_space.h5
diff --git a/tools/testfiles/filter_fail.h5 b/tools/test/h5dump/testfiles/filter_fail.h5
index c140a69..c140a69 100644
--- a/tools/testfiles/filter_fail.h5
+++ b/tools/test/h5dump/testfiles/filter_fail.h5
diff --git a/tools/testfiles/packedbits.h5 b/tools/test/h5dump/testfiles/packedbits.h5
index cbb73ab..cbb73ab 100644
--- a/tools/testfiles/packedbits.h5
+++ b/tools/test/h5dump/testfiles/packedbits.h5
diff --git a/tools/testfiles/t128bit_float.h5 b/tools/test/h5dump/testfiles/t128bit_float.h5
index 134d510..134d510 100644
--- a/tools/testfiles/t128bit_float.h5
+++ b/tools/test/h5dump/testfiles/t128bit_float.h5
diff --git a/tools/testfiles/tCVE-2021-37501_attr_decode.h5 b/tools/test/h5dump/testfiles/tCVE-2021-37501_attr_decode.h5
index 331b05b..331b05b 100644
--- a/tools/testfiles/tCVE-2021-37501_attr_decode.h5
+++ b/tools/test/h5dump/testfiles/tCVE-2021-37501_attr_decode.h5
diff --git a/tools/testfiles/tCVE_2018_11206_fill_new.h5 b/tools/test/h5dump/testfiles/tCVE_2018_11206_fill_new.h5
index 643591c..643591c 100644
--- a/tools/testfiles/tCVE_2018_11206_fill_new.h5
+++ b/tools/test/h5dump/testfiles/tCVE_2018_11206_fill_new.h5
diff --git a/tools/testfiles/tCVE_2018_11206_fill_old.h5 b/tools/test/h5dump/testfiles/tCVE_2018_11206_fill_old.h5
index 7f5b41a..7f5b41a 100644
--- a/tools/testfiles/tCVE_2018_11206_fill_old.h5
+++ b/tools/test/h5dump/testfiles/tCVE_2018_11206_fill_old.h5
diff --git a/tools/testfiles/taindices.h5 b/tools/test/h5dump/testfiles/taindices.h5
index b482a21..b482a21 100644
--- a/tools/testfiles/taindices.h5
+++ b/tools/test/h5dump/testfiles/taindices.h5
diff --git a/tools/testfiles/tall.h5 b/tools/test/h5dump/testfiles/tall.h5
index 918aeee..918aeee 100644
--- a/tools/testfiles/tall.h5
+++ b/tools/test/h5dump/testfiles/tall.h5
diff --git a/tools/testfiles/tarray1.h5 b/tools/test/h5dump/testfiles/tarray1.h5
index 90371f2..90371f2 100644
--- a/tools/testfiles/tarray1.h5
+++ b/tools/test/h5dump/testfiles/tarray1.h5
diff --git a/tools/testfiles/tarray1_big.h5 b/tools/test/h5dump/testfiles/tarray1_big.h5
index 6862dd5..6862dd5 100644
--- a/tools/testfiles/tarray1_big.h5
+++ b/tools/test/h5dump/testfiles/tarray1_big.h5
diff --git a/tools/testfiles/tarray2.h5 b/tools/test/h5dump/testfiles/tarray2.h5
index e2e53e8..e2e53e8 100644
--- a/tools/testfiles/tarray2.h5
+++ b/tools/test/h5dump/testfiles/tarray2.h5
diff --git a/tools/testfiles/tarray3.h5 b/tools/test/h5dump/testfiles/tarray3.h5
index 580d846..580d846 100644
--- a/tools/testfiles/tarray3.h5
+++ b/tools/test/h5dump/testfiles/tarray3.h5
diff --git a/tools/testfiles/tarray4.h5 b/tools/test/h5dump/testfiles/tarray4.h5
index b34efb8..b34efb8 100644
--- a/tools/testfiles/tarray4.h5
+++ b/tools/test/h5dump/testfiles/tarray4.h5
diff --git a/tools/testfiles/tarray5.h5 b/tools/test/h5dump/testfiles/tarray5.h5
index 55ebf46..55ebf46 100644
--- a/tools/testfiles/tarray5.h5
+++ b/tools/test/h5dump/testfiles/tarray5.h5
diff --git a/tools/testfiles/tarray6.h5 b/tools/test/h5dump/testfiles/tarray6.h5
index 7eb078c..7eb078c 100644
--- a/tools/testfiles/tarray6.h5
+++ b/tools/test/h5dump/testfiles/tarray6.h5
diff --git a/tools/testfiles/tarray7.h5 b/tools/test/h5dump/testfiles/tarray7.h5
index 74089ea..74089ea 100644
--- a/tools/testfiles/tarray7.h5
+++ b/tools/test/h5dump/testfiles/tarray7.h5
diff --git a/tools/testfiles/tarray8.h5 b/tools/test/h5dump/testfiles/tarray8.h5
index 88022c3..88022c3 100644
--- a/tools/testfiles/tarray8.h5
+++ b/tools/test/h5dump/testfiles/tarray8.h5
diff --git a/tools/testfiles/tattr.h5 b/tools/test/h5dump/testfiles/tattr.h5
index d61def5..d61def5 100644
--- a/tools/testfiles/tattr.h5
+++ b/tools/test/h5dump/testfiles/tattr.h5
diff --git a/tools/testfiles/tattr2.h5 b/tools/test/h5dump/testfiles/tattr2.h5
index c40f3f7..c40f3f7 100644
--- a/tools/testfiles/tattr2.h5
+++ b/tools/test/h5dump/testfiles/tattr2.h5
diff --git a/tools/testfiles/tattr4_be.h5 b/tools/test/h5dump/testfiles/tattr4_be.h5
index a464ac6..a464ac6 100644
--- a/tools/testfiles/tattr4_be.h5
+++ b/tools/test/h5dump/testfiles/tattr4_be.h5
diff --git a/tools/testfiles/tattrintsize.h5 b/tools/test/h5dump/testfiles/tattrintsize.h5
index 04d6f4c..04d6f4c 100644
--- a/tools/testfiles/tattrintsize.h5
+++ b/tools/test/h5dump/testfiles/tattrintsize.h5
diff --git a/tools/testfiles/tattrreg.h5 b/tools/test/h5dump/testfiles/tattrreg.h5
index 193b3e1..193b3e1 100644
--- a/tools/testfiles/tattrreg.h5
+++ b/tools/test/h5dump/testfiles/tattrreg.h5
diff --git a/tools/testfiles/tbigdims.h5 b/tools/test/h5dump/testfiles/tbigdims.h5
index c54c2c3..c54c2c3 100644
--- a/tools/testfiles/tbigdims.h5
+++ b/tools/test/h5dump/testfiles/tbigdims.h5
diff --git a/tools/testfiles/tbinary.h5 b/tools/test/h5dump/testfiles/tbinary.h5
index c85aa51..c85aa51 100644
--- a/tools/testfiles/tbinary.h5
+++ b/tools/test/h5dump/testfiles/tbinary.h5
diff --git a/tools/testfiles/tbitnopaque.h5 b/tools/test/h5dump/testfiles/tbitnopaque.h5
index 089a86d..089a86d 100644
--- a/tools/testfiles/tbitnopaque.h5
+++ b/tools/test/h5dump/testfiles/tbitnopaque.h5
diff --git a/tools/testfiles/tchar.h5 b/tools/test/h5dump/testfiles/tchar.h5
index 4d23ea9..4d23ea9 100644
--- a/tools/testfiles/tchar.h5
+++ b/tools/test/h5dump/testfiles/tchar.h5
diff --git a/tools/testfiles/tcmpdattrintsize.h5 b/tools/test/h5dump/testfiles/tcmpdattrintsize.h5
index 40d4887..40d4887 100644
--- a/tools/testfiles/tcmpdattrintsize.h5
+++ b/tools/test/h5dump/testfiles/tcmpdattrintsize.h5
diff --git a/tools/testfiles/tcmpdintarray.h5 b/tools/test/h5dump/testfiles/tcmpdintarray.h5
index 17798fe..17798fe 100644
--- a/tools/testfiles/tcmpdintarray.h5
+++ b/tools/test/h5dump/testfiles/tcmpdintarray.h5
diff --git a/tools/testfiles/tcmpdints.h5 b/tools/test/h5dump/testfiles/tcmpdints.h5
index d4af1c4..d4af1c4 100644
--- a/tools/testfiles/tcmpdints.h5
+++ b/tools/test/h5dump/testfiles/tcmpdints.h5
diff --git a/tools/testfiles/tcmpdintsize.h5 b/tools/test/h5dump/testfiles/tcmpdintsize.h5
index 0e7bef5..0e7bef5 100644
--- a/tools/testfiles/tcmpdintsize.h5
+++ b/tools/test/h5dump/testfiles/tcmpdintsize.h5
diff --git a/tools/testfiles/tcompound.h5 b/tools/test/h5dump/testfiles/tcompound.h5
index d1ec650..d1ec650 100644
--- a/tools/testfiles/tcompound.h5
+++ b/tools/test/h5dump/testfiles/tcompound.h5
diff --git a/tools/testfiles/tcompound_complex.h5 b/tools/test/h5dump/testfiles/tcompound_complex.h5
index 5c6274f..5c6274f 100644
--- a/tools/testfiles/tcompound_complex.h5
+++ b/tools/test/h5dump/testfiles/tcompound_complex.h5
diff --git a/tools/testfiles/tcompound_complex2.h5 b/tools/test/h5dump/testfiles/tcompound_complex2.h5
index eee6073..eee6073 100644
--- a/tools/testfiles/tcompound_complex2.h5
+++ b/tools/test/h5dump/testfiles/tcompound_complex2.h5
diff --git a/tools/testfiles/tdatareg.h5 b/tools/test/h5dump/testfiles/tdatareg.h5
index 62a889f..62a889f 100644
--- a/tools/testfiles/tdatareg.h5
+++ b/tools/test/h5dump/testfiles/tdatareg.h5
diff --git a/tools/testfiles/tdset.h5 b/tools/test/h5dump/testfiles/tdset.h5
index 71dcb91..71dcb91 100644
--- a/tools/testfiles/tdset.h5
+++ b/tools/test/h5dump/testfiles/tdset.h5
diff --git a/tools/testfiles/tempty.h5 b/tools/test/h5dump/testfiles/tempty.h5
index d7d903f..d7d903f 100644
--- a/tools/testfiles/tempty.h5
+++ b/tools/test/h5dump/testfiles/tempty.h5
diff --git a/tools/testfiles/textlink.h5 b/tools/test/h5dump/testfiles/textlink.h5
index a5ec3e6..a5ec3e6 100644
--- a/tools/testfiles/textlink.h5
+++ b/tools/test/h5dump/testfiles/textlink.h5
diff --git a/tools/testfiles/textlinkfar.h5 b/tools/test/h5dump/testfiles/textlinkfar.h5
index 6fb3130..6fb3130 100644
--- a/tools/testfiles/textlinkfar.h5
+++ b/tools/test/h5dump/testfiles/textlinkfar.h5
diff --git a/tools/testfiles/textlinksrc.h5 b/tools/test/h5dump/testfiles/textlinksrc.h5
index 4db1cc4..4db1cc4 100644
--- a/tools/testfiles/textlinksrc.h5
+++ b/tools/test/h5dump/testfiles/textlinksrc.h5
diff --git a/tools/testfiles/textlinktar.h5 b/tools/test/h5dump/testfiles/textlinktar.h5
index fe33e10..fe33e10 100644
--- a/tools/testfiles/textlinktar.h5
+++ b/tools/test/h5dump/testfiles/textlinktar.h5
diff --git a/tools/testfiles/tfamily00000.h5 b/tools/test/h5dump/testfiles/tfamily00000.h5
index a130bfd..a130bfd 100644
--- a/tools/testfiles/tfamily00000.h5
+++ b/tools/test/h5dump/testfiles/tfamily00000.h5
diff --git a/tools/testfiles/tfamily00001.h5 b/tools/test/h5dump/testfiles/tfamily00001.h5
index 83119d8..83119d8 100644
--- a/tools/testfiles/tfamily00001.h5
+++ b/tools/test/h5dump/testfiles/tfamily00001.h5
diff --git a/tools/testfiles/tfamily00002.h5 b/tools/test/h5dump/testfiles/tfamily00002.h5
index 65f57c2..65f57c2 100644
--- a/tools/testfiles/tfamily00002.h5
+++ b/tools/test/h5dump/testfiles/tfamily00002.h5
diff --git a/tools/testfiles/tfamily00003.h5 b/tools/test/h5dump/testfiles/tfamily00003.h5
index 2917a8a..2917a8a 100644
--- a/tools/testfiles/tfamily00003.h5
+++ b/tools/test/h5dump/testfiles/tfamily00003.h5
diff --git a/tools/testfiles/tfamily00004.h5 b/tools/test/h5dump/testfiles/tfamily00004.h5
index a583474..a583474 100644
--- a/tools/testfiles/tfamily00004.h5
+++ b/tools/test/h5dump/testfiles/tfamily00004.h5
diff --git a/tools/testfiles/tfamily00005.h5 b/tools/test/h5dump/testfiles/tfamily00005.h5
index 65f57c2..65f57c2 100644
--- a/tools/testfiles/tfamily00005.h5
+++ b/tools/test/h5dump/testfiles/tfamily00005.h5
diff --git a/tools/testfiles/tfamily00006.h5 b/tools/test/h5dump/testfiles/tfamily00006.h5
index 65f57c2..65f57c2 100644
--- a/tools/testfiles/tfamily00006.h5
+++ b/tools/test/h5dump/testfiles/tfamily00006.h5
diff --git a/tools/testfiles/tfamily00007.h5 b/tools/test/h5dump/testfiles/tfamily00007.h5
index 65f57c2..65f57c2 100644
--- a/tools/testfiles/tfamily00007.h5
+++ b/tools/test/h5dump/testfiles/tfamily00007.h5
diff --git a/tools/testfiles/tfamily00008.h5 b/tools/test/h5dump/testfiles/tfamily00008.h5
index fb35a9c..fb35a9c 100644
--- a/tools/testfiles/tfamily00008.h5
+++ b/tools/test/h5dump/testfiles/tfamily00008.h5
diff --git a/tools/testfiles/tfamily00009.h5 b/tools/test/h5dump/testfiles/tfamily00009.h5
index fd2920a..fd2920a 100644
--- a/tools/testfiles/tfamily00009.h5
+++ b/tools/test/h5dump/testfiles/tfamily00009.h5
diff --git a/tools/testfiles/tfamily00010.h5 b/tools/test/h5dump/testfiles/tfamily00010.h5
index 3bf308f..3bf308f 100644
--- a/tools/testfiles/tfamily00010.h5
+++ b/tools/test/h5dump/testfiles/tfamily00010.h5
diff --git a/tools/testfiles/tfcontents1.h5 b/tools/test/h5dump/testfiles/tfcontents1.h5
index c16ee4d..c16ee4d 100644
--- a/tools/testfiles/tfcontents1.h5
+++ b/tools/test/h5dump/testfiles/tfcontents1.h5
diff --git a/tools/testfiles/tfcontents2.h5 b/tools/test/h5dump/testfiles/tfcontents2.h5
index 1df0779..1df0779 100644
--- a/tools/testfiles/tfcontents2.h5
+++ b/tools/test/h5dump/testfiles/tfcontents2.h5
diff --git a/tools/testfiles/tfilters.h5 b/tools/test/h5dump/testfiles/tfilters.h5
index 7c33e55..7c33e55 100644
--- a/tools/testfiles/tfilters.h5
+++ b/tools/test/h5dump/testfiles/tfilters.h5
diff --git a/tools/testfiles/tfloatsattrs.h5 b/tools/test/h5dump/testfiles/tfloatsattrs.h5
index 9e73542..9e73542 100644
--- a/tools/testfiles/tfloatsattrs.h5
+++ b/tools/test/h5dump/testfiles/tfloatsattrs.h5
diff --git a/tools/testfiles/tfpformat.h5 b/tools/test/h5dump/testfiles/tfpformat.h5
index 5f78930..5f78930 100644
--- a/tools/testfiles/tfpformat.h5
+++ b/tools/test/h5dump/testfiles/tfpformat.h5
diff --git a/tools/testfiles/tfvalues.h5 b/tools/test/h5dump/testfiles/tfvalues.h5
index a6af958..a6af958 100644
--- a/tools/testfiles/tfvalues.h5
+++ b/tools/test/h5dump/testfiles/tfvalues.h5
diff --git a/tools/testfiles/tgroup.h5 b/tools/test/h5dump/testfiles/tgroup.h5
index 565fb67..565fb67 100644
--- a/tools/testfiles/tgroup.h5
+++ b/tools/test/h5dump/testfiles/tgroup.h5
diff --git a/tools/testfiles/tgrp_comments.h5 b/tools/test/h5dump/testfiles/tgrp_comments.h5
index ddd2eec..ddd2eec 100644
--- a/tools/testfiles/tgrp_comments.h5
+++ b/tools/test/h5dump/testfiles/tgrp_comments.h5
diff --git a/tools/testfiles/tgrpnullspace.h5 b/tools/test/h5dump/testfiles/tgrpnullspace.h5
index 82a405e..82a405e 100644
--- a/tools/testfiles/tgrpnullspace.h5
+++ b/tools/test/h5dump/testfiles/tgrpnullspace.h5
diff --git a/tools/testfiles/thlink.h5 b/tools/test/h5dump/testfiles/thlink.h5
index 6e0e7e1..6e0e7e1 100644
--- a/tools/testfiles/thlink.h5
+++ b/tools/test/h5dump/testfiles/thlink.h5
diff --git a/tools/testfiles/thyperslab.h5 b/tools/test/h5dump/testfiles/thyperslab.h5
index a730aa3..a730aa3 100644
--- a/tools/testfiles/thyperslab.h5
+++ b/tools/test/h5dump/testfiles/thyperslab.h5
diff --git a/tools/testfiles/tints4dims.h5 b/tools/test/h5dump/testfiles/tints4dims.h5
index 2fe8321..2fe8321 100644
--- a/tools/testfiles/tints4dims.h5
+++ b/tools/test/h5dump/testfiles/tints4dims.h5
diff --git a/tools/testfiles/tintsattrs.h5 b/tools/test/h5dump/testfiles/tintsattrs.h5
index ca8c573..ca8c573 100644
--- a/tools/testfiles/tintsattrs.h5
+++ b/tools/test/h5dump/testfiles/tintsattrs.h5
diff --git a/tools/testfiles/tintsnodata.h5 b/tools/test/h5dump/testfiles/tintsnodata.h5
index 741da09..741da09 100644
--- a/tools/testfiles/tintsnodata.h5
+++ b/tools/test/h5dump/testfiles/tintsnodata.h5
diff --git a/tools/testfiles/tlarge_objname.h5 b/tools/test/h5dump/testfiles/tlarge_objname.h5
index 707d7b6..707d7b6 100644
--- a/tools/testfiles/tlarge_objname.h5
+++ b/tools/test/h5dump/testfiles/tlarge_objname.h5
diff --git a/tools/testfiles/tldouble.h5 b/tools/test/h5dump/testfiles/tldouble.h5
index eb031e7..eb031e7 100644
--- a/tools/testfiles/tldouble.h5
+++ b/tools/test/h5dump/testfiles/tldouble.h5
diff --git a/tools/testfiles/tldouble_scalar.h5 b/tools/test/h5dump/testfiles/tldouble_scalar.h5
index 0344ea0..0344ea0 100644
--- a/tools/testfiles/tldouble_scalar.h5
+++ b/tools/test/h5dump/testfiles/tldouble_scalar.h5
diff --git a/tools/testfiles/tlonglinks.h5 b/tools/test/h5dump/testfiles/tlonglinks.h5
index f54e5f5..f54e5f5 100644
--- a/tools/testfiles/tlonglinks.h5
+++ b/tools/test/h5dump/testfiles/tlonglinks.h5
diff --git a/tools/testfiles/tloop.h5 b/tools/test/h5dump/testfiles/tloop.h5
index d7a2f47..d7a2f47 100644
--- a/tools/testfiles/tloop.h5
+++ b/tools/test/h5dump/testfiles/tloop.h5
diff --git a/tools/testfiles/tmulti-b.h5 b/tools/test/h5dump/testfiles/tmulti-b.h5
index 3f5d51f..3f5d51f 100644
--- a/tools/testfiles/tmulti-b.h5
+++ b/tools/test/h5dump/testfiles/tmulti-b.h5
diff --git a/tools/testfiles/tmulti-g.h5 b/tools/test/h5dump/testfiles/tmulti-g.h5
index e69de29..e69de29 100644
--- a/tools/testfiles/tmulti-g.h5
+++ b/tools/test/h5dump/testfiles/tmulti-g.h5
diff --git a/tools/testfiles/tmulti-l.h5 b/tools/test/h5dump/testfiles/tmulti-l.h5
index 42fe396..42fe396 100644
--- a/tools/testfiles/tmulti-l.h5
+++ b/tools/test/h5dump/testfiles/tmulti-l.h5
diff --git a/tools/testfiles/tmulti-o.h5 b/tools/test/h5dump/testfiles/tmulti-o.h5
index b433ee8..b433ee8 100644
--- a/tools/testfiles/tmulti-o.h5
+++ b/tools/test/h5dump/testfiles/tmulti-o.h5
diff --git a/tools/testfiles/tmulti-r.h5 b/tools/test/h5dump/testfiles/tmulti-r.h5
index 928d4d5..928d4d5 100644
--- a/tools/testfiles/tmulti-r.h5
+++ b/tools/test/h5dump/testfiles/tmulti-r.h5
diff --git a/tools/testfiles/tmulti-s.h5 b/tools/test/h5dump/testfiles/tmulti-s.h5
index 3feae49..3feae49 100644
--- a/tools/testfiles/tmulti-s.h5
+++ b/tools/test/h5dump/testfiles/tmulti-s.h5
diff --git a/tools/testfiles/tnamed_dtype_attr.h5 b/tools/test/h5dump/testfiles/tnamed_dtype_attr.h5
index e7bf23d..e7bf23d 100644
--- a/tools/testfiles/tnamed_dtype_attr.h5
+++ b/tools/test/h5dump/testfiles/tnamed_dtype_attr.h5
diff --git a/tools/testfiles/tnestedcmpddt.h5 b/tools/test/h5dump/testfiles/tnestedcmpddt.h5
index f2af756..f2af756 100644
--- a/tools/testfiles/tnestedcmpddt.h5
+++ b/tools/test/h5dump/testfiles/tnestedcmpddt.h5
diff --git a/tools/testfiles/tnestedcomp.h5 b/tools/test/h5dump/testfiles/tnestedcomp.h5
index b777ee3..b777ee3 100644
--- a/tools/testfiles/tnestedcomp.h5
+++ b/tools/test/h5dump/testfiles/tnestedcomp.h5
diff --git a/tools/testfiles/tno-subset.h5 b/tools/test/h5dump/testfiles/tno-subset.h5
index e6b6f57..e6b6f57 100644
--- a/tools/testfiles/tno-subset.h5
+++ b/tools/test/h5dump/testfiles/tno-subset.h5
diff --git a/tools/test/h5dump/testfiles/tnullspace.h5 b/tools/test/h5dump/testfiles/tnullspace.h5
new file mode 100644
index 0000000..b5dac5d
--- /dev/null
+++ b/tools/test/h5dump/testfiles/tnullspace.h5
diff --git a/tools/testfiles/torderattr.h5 b/tools/test/h5dump/testfiles/torderattr.h5
index bafa846..bafa846 100644
--- a/tools/testfiles/torderattr.h5
+++ b/tools/test/h5dump/testfiles/torderattr.h5
diff --git a/tools/testfiles/tordergr.h5 b/tools/test/h5dump/testfiles/tordergr.h5
index 9ccd238..9ccd238 100644
--- a/tools/testfiles/tordergr.h5
+++ b/tools/test/h5dump/testfiles/tordergr.h5
diff --git a/tools/testfiles/trefer_attr.h5 b/tools/test/h5dump/testfiles/trefer_attr.h5
index 3110ce3..3110ce3 100644
--- a/tools/testfiles/trefer_attr.h5
+++ b/tools/test/h5dump/testfiles/trefer_attr.h5
diff --git a/tools/testfiles/trefer_compat.h5 b/tools/test/h5dump/testfiles/trefer_compat.h5
index 5f6dd60..5f6dd60 100644
--- a/tools/testfiles/trefer_compat.h5
+++ b/tools/test/h5dump/testfiles/trefer_compat.h5
diff --git a/tools/testfiles/trefer_ext1.h5 b/tools/test/h5dump/testfiles/trefer_ext1.h5
index 9fc9741..9fc9741 100644
--- a/tools/testfiles/trefer_ext1.h5
+++ b/tools/test/h5dump/testfiles/trefer_ext1.h5
diff --git a/tools/testfiles/trefer_ext2.h5 b/tools/test/h5dump/testfiles/trefer_ext2.h5
index fcbb75d..fcbb75d 100644
--- a/tools/testfiles/trefer_ext2.h5
+++ b/tools/test/h5dump/testfiles/trefer_ext2.h5
diff --git a/tools/testfiles/trefer_grp.h5 b/tools/test/h5dump/testfiles/trefer_grp.h5
index d846e75..d846e75 100644
--- a/tools/testfiles/trefer_grp.h5
+++ b/tools/test/h5dump/testfiles/trefer_grp.h5
diff --git a/tools/testfiles/trefer_obj.h5 b/tools/test/h5dump/testfiles/trefer_obj.h5
index de4c19d..de4c19d 100644
--- a/tools/testfiles/trefer_obj.h5
+++ b/tools/test/h5dump/testfiles/trefer_obj.h5
diff --git a/tools/testfiles/trefer_obj_del.h5 b/tools/test/h5dump/testfiles/trefer_obj_del.h5
index c1710e8..c1710e8 100644
--- a/tools/testfiles/trefer_obj_del.h5
+++ b/tools/test/h5dump/testfiles/trefer_obj_del.h5
diff --git a/tools/testfiles/trefer_param.h5 b/tools/test/h5dump/testfiles/trefer_param.h5
index 234629a..234629a 100644
--- a/tools/testfiles/trefer_param.h5
+++ b/tools/test/h5dump/testfiles/trefer_param.h5
diff --git a/tools/testfiles/trefer_reg.h5 b/tools/test/h5dump/testfiles/trefer_reg.h5
index 8ed9184..8ed9184 100644
--- a/tools/testfiles/trefer_reg.h5
+++ b/tools/test/h5dump/testfiles/trefer_reg.h5
diff --git a/tools/testfiles/trefer_reg_1d.h5 b/tools/test/h5dump/testfiles/trefer_reg_1d.h5
index 932454d..932454d 100644
--- a/tools/testfiles/trefer_reg_1d.h5
+++ b/tools/test/h5dump/testfiles/trefer_reg_1d.h5
diff --git a/tools/testfiles/tsaf.h5 b/tools/test/h5dump/testfiles/tsaf.h5
index c84c5b6..c84c5b6 100644
--- a/tools/testfiles/tsaf.h5
+++ b/tools/test/h5dump/testfiles/tsaf.h5
diff --git a/tools/testfiles/tscalarattrintsize.h5 b/tools/test/h5dump/testfiles/tscalarattrintsize.h5
index df91f54..df91f54 100644
--- a/tools/testfiles/tscalarattrintsize.h5
+++ b/tools/test/h5dump/testfiles/tscalarattrintsize.h5
diff --git a/tools/testfiles/tscalarintattrsize.h5 b/tools/test/h5dump/testfiles/tscalarintattrsize.h5
index 61f5fb3..61f5fb3 100644
--- a/tools/testfiles/tscalarintattrsize.h5
+++ b/tools/test/h5dump/testfiles/tscalarintattrsize.h5
diff --git a/tools/testfiles/tscalarintsize.h5 b/tools/test/h5dump/testfiles/tscalarintsize.h5
index 5a82378..5a82378 100644
--- a/tools/testfiles/tscalarintsize.h5
+++ b/tools/test/h5dump/testfiles/tscalarintsize.h5
diff --git a/tools/testfiles/tscalarstring.h5 b/tools/test/h5dump/testfiles/tscalarstring.h5
index b0993ef..b0993ef 100644
--- a/tools/testfiles/tscalarstring.h5
+++ b/tools/test/h5dump/testfiles/tscalarstring.h5
diff --git a/tools/testfiles/tslink.h5 b/tools/test/h5dump/testfiles/tslink.h5
index 753b62d..753b62d 100644
--- a/tools/testfiles/tslink.h5
+++ b/tools/test/h5dump/testfiles/tslink.h5
diff --git a/tools/testfiles/tsoftlinks.h5 b/tools/test/h5dump/testfiles/tsoftlinks.h5
index 01ea922..01ea922 100644
--- a/tools/testfiles/tsoftlinks.h5
+++ b/tools/test/h5dump/testfiles/tsoftlinks.h5
diff --git a/tools/testfiles/tsplit_file-m.h5 b/tools/test/h5dump/testfiles/tsplit_file-m.h5
index a6eef73..a6eef73 100644
--- a/tools/testfiles/tsplit_file-m.h5
+++ b/tools/test/h5dump/testfiles/tsplit_file-m.h5
diff --git a/tools/testfiles/tsplit_file-r.h5 b/tools/test/h5dump/testfiles/tsplit_file-r.h5
index 928d4d5..928d4d5 100644
--- a/tools/testfiles/tsplit_file-r.h5
+++ b/tools/test/h5dump/testfiles/tsplit_file-r.h5
diff --git a/tools/testfiles/tst_onion_dset_1d.h5 b/tools/test/h5dump/testfiles/tst_onion_dset_1d.h5
index 5042ebf..5042ebf 100644
--- a/tools/testfiles/tst_onion_dset_1d.h5
+++ b/tools/test/h5dump/testfiles/tst_onion_dset_1d.h5
diff --git a/tools/testfiles/tst_onion_dset_1d.h5.onion b/tools/test/h5dump/testfiles/tst_onion_dset_1d.h5.onion
index a86670e..a86670e 100644
--- a/tools/testfiles/tst_onion_dset_1d.h5.onion
+++ b/tools/test/h5dump/testfiles/tst_onion_dset_1d.h5.onion
diff --git a/tools/testfiles/tst_onion_dset_ext.h5 b/tools/test/h5dump/testfiles/tst_onion_dset_ext.h5
index 479aaa8..479aaa8 100644
--- a/tools/testfiles/tst_onion_dset_ext.h5
+++ b/tools/test/h5dump/testfiles/tst_onion_dset_ext.h5
diff --git a/tools/testfiles/tst_onion_dset_ext.h5.onion b/tools/test/h5dump/testfiles/tst_onion_dset_ext.h5.onion
index b5cbdb4..b5cbdb4 100644
--- a/tools/testfiles/tst_onion_dset_ext.h5.onion
+++ b/tools/test/h5dump/testfiles/tst_onion_dset_ext.h5.onion
diff --git a/tools/testfiles/tst_onion_objs.h5 b/tools/test/h5dump/testfiles/tst_onion_objs.h5
index 479aaa8..479aaa8 100644
--- a/tools/testfiles/tst_onion_objs.h5
+++ b/tools/test/h5dump/testfiles/tst_onion_objs.h5
diff --git a/tools/testfiles/tst_onion_objs.h5.onion b/tools/test/h5dump/testfiles/tst_onion_objs.h5.onion
index 4abc174..4abc174 100644
--- a/tools/testfiles/tst_onion_objs.h5.onion
+++ b/tools/test/h5dump/testfiles/tst_onion_objs.h5.onion
diff --git a/tools/testfiles/tstr.h5 b/tools/test/h5dump/testfiles/tstr.h5
index af5384f..af5384f 100644
--- a/tools/testfiles/tstr.h5
+++ b/tools/test/h5dump/testfiles/tstr.h5
diff --git a/tools/testfiles/tstr2.h5 b/tools/test/h5dump/testfiles/tstr2.h5
index d3b1588..d3b1588 100644
--- a/tools/testfiles/tstr2.h5
+++ b/tools/test/h5dump/testfiles/tstr2.h5
diff --git a/tools/testfiles/tstr3.h5 b/tools/test/h5dump/testfiles/tstr3.h5
index 9f9112f..9f9112f 100644
--- a/tools/testfiles/tstr3.h5
+++ b/tools/test/h5dump/testfiles/tstr3.h5
diff --git a/tools/testfiles/tudfilter.h5 b/tools/test/h5dump/testfiles/tudfilter.h5
index 081b000..081b000 100644
--- a/tools/testfiles/tudfilter.h5
+++ b/tools/test/h5dump/testfiles/tudfilter.h5
diff --git a/tools/testfiles/tudlink.h5 b/tools/test/h5dump/testfiles/tudlink.h5
index 5dc0c707..5dc0c707 100644
--- a/tools/testfiles/tudlink.h5
+++ b/tools/test/h5dump/testfiles/tudlink.h5
diff --git a/tools/testfiles/tvldtypes1.h5 b/tools/test/h5dump/testfiles/tvldtypes1.h5
index b5b2bd7..b5b2bd7 100644
--- a/tools/testfiles/tvldtypes1.h5
+++ b/tools/test/h5dump/testfiles/tvldtypes1.h5
diff --git a/tools/testfiles/tvldtypes2.h5 b/tools/test/h5dump/testfiles/tvldtypes2.h5
index 65bf63f..65bf63f 100644
--- a/tools/testfiles/tvldtypes2.h5
+++ b/tools/test/h5dump/testfiles/tvldtypes2.h5
diff --git a/tools/testfiles/tvldtypes3.h5 b/tools/test/h5dump/testfiles/tvldtypes3.h5
index dd4aca7..dd4aca7 100644
--- a/tools/testfiles/tvldtypes3.h5
+++ b/tools/test/h5dump/testfiles/tvldtypes3.h5
diff --git a/tools/testfiles/tvldtypes4.h5 b/tools/test/h5dump/testfiles/tvldtypes4.h5
index 70dc73e..70dc73e 100644
--- a/tools/testfiles/tvldtypes4.h5
+++ b/tools/test/h5dump/testfiles/tvldtypes4.h5
diff --git a/tools/testfiles/tvldtypes5.h5 b/tools/test/h5dump/testfiles/tvldtypes5.h5
index 776c020..776c020 100644
--- a/tools/testfiles/tvldtypes5.h5
+++ b/tools/test/h5dump/testfiles/tvldtypes5.h5
diff --git a/tools/testfiles/tvlenstr_array.h5 b/tools/test/h5dump/testfiles/tvlenstr_array.h5
index 4277f20..4277f20 100644
--- a/tools/testfiles/tvlenstr_array.h5
+++ b/tools/test/h5dump/testfiles/tvlenstr_array.h5
diff --git a/tools/testfiles/tvlstr.h5 b/tools/test/h5dump/testfiles/tvlstr.h5
index acd8a1f..acd8a1f 100644
--- a/tools/testfiles/tvlstr.h5
+++ b/tools/test/h5dump/testfiles/tvlstr.h5
diff --git a/tools/testfiles/tvms.h5 b/tools/test/h5dump/testfiles/tvms.h5
index 9c243ff..9c243ff 100644
--- a/tools/testfiles/tvms.h5
+++ b/tools/test/h5dump/testfiles/tvms.h5
diff --git a/tools/testfiles/vds/1_a.h5 b/tools/test/h5dump/testfiles/vds/1_a.h5
index 953d33d..953d33d 100644
--- a/tools/testfiles/vds/1_a.h5
+++ b/tools/test/h5dump/testfiles/vds/1_a.h5
diff --git a/tools/testfiles/vds/1_b.h5 b/tools/test/h5dump/testfiles/vds/1_b.h5
index 6ba95e6..6ba95e6 100644
--- a/tools/testfiles/vds/1_b.h5
+++ b/tools/test/h5dump/testfiles/vds/1_b.h5
diff --git a/tools/testfiles/vds/1_c.h5 b/tools/test/h5dump/testfiles/vds/1_c.h5
index 4bcebbd..4bcebbd 100644
--- a/tools/testfiles/vds/1_c.h5
+++ b/tools/test/h5dump/testfiles/vds/1_c.h5
diff --git a/tools/testfiles/vds/1_d.h5 b/tools/test/h5dump/testfiles/vds/1_d.h5
index 9c2d795..9c2d795 100644
--- a/tools/testfiles/vds/1_d.h5
+++ b/tools/test/h5dump/testfiles/vds/1_d.h5
diff --git a/tools/testfiles/vds/1_e.h5 b/tools/test/h5dump/testfiles/vds/1_e.h5
index 4f7aa7b..4f7aa7b 100644
--- a/tools/testfiles/vds/1_e.h5
+++ b/tools/test/h5dump/testfiles/vds/1_e.h5
diff --git a/tools/testfiles/vds/1_f.h5 b/tools/test/h5dump/testfiles/vds/1_f.h5
index 62e86bc..62e86bc 100644
--- a/tools/testfiles/vds/1_f.h5
+++ b/tools/test/h5dump/testfiles/vds/1_f.h5
diff --git a/tools/testfiles/vds/1_vds.h5 b/tools/test/h5dump/testfiles/vds/1_vds.h5
index 707a37f..707a37f 100644
--- a/tools/testfiles/vds/1_vds.h5
+++ b/tools/test/h5dump/testfiles/vds/1_vds.h5
diff --git a/tools/testfiles/vds/2_a.h5 b/tools/test/h5dump/testfiles/vds/2_a.h5
index 5227e9e..5227e9e 100644
--- a/tools/testfiles/vds/2_a.h5
+++ b/tools/test/h5dump/testfiles/vds/2_a.h5
diff --git a/tools/testfiles/vds/2_b.h5 b/tools/test/h5dump/testfiles/vds/2_b.h5
index 34723a3..34723a3 100644
--- a/tools/testfiles/vds/2_b.h5
+++ b/tools/test/h5dump/testfiles/vds/2_b.h5
diff --git a/tools/testfiles/vds/2_c.h5 b/tools/test/h5dump/testfiles/vds/2_c.h5
index d2252fc..d2252fc 100644
--- a/tools/testfiles/vds/2_c.h5
+++ b/tools/test/h5dump/testfiles/vds/2_c.h5
diff --git a/tools/testfiles/vds/2_d.h5 b/tools/test/h5dump/testfiles/vds/2_d.h5
index 6880c2e..6880c2e 100644
--- a/tools/testfiles/vds/2_d.h5
+++ b/tools/test/h5dump/testfiles/vds/2_d.h5
diff --git a/tools/testfiles/vds/2_e.h5 b/tools/test/h5dump/testfiles/vds/2_e.h5
index 81ffacc..81ffacc 100644
--- a/tools/testfiles/vds/2_e.h5
+++ b/tools/test/h5dump/testfiles/vds/2_e.h5
diff --git a/tools/testfiles/vds/2_vds.h5 b/tools/test/h5dump/testfiles/vds/2_vds.h5
index cbef59c..cbef59c 100644
--- a/tools/testfiles/vds/2_vds.h5
+++ b/tools/test/h5dump/testfiles/vds/2_vds.h5
diff --git a/tools/testfiles/vds/3_1_vds.h5 b/tools/test/h5dump/testfiles/vds/3_1_vds.h5
index e66e4c7..e66e4c7 100644
--- a/tools/testfiles/vds/3_1_vds.h5
+++ b/tools/test/h5dump/testfiles/vds/3_1_vds.h5
diff --git a/tools/testfiles/vds/3_2_vds.h5 b/tools/test/h5dump/testfiles/vds/3_2_vds.h5
index a19dab5..a19dab5 100644
--- a/tools/testfiles/vds/3_2_vds.h5
+++ b/tools/test/h5dump/testfiles/vds/3_2_vds.h5
diff --git a/tools/testfiles/vds/4_0.h5 b/tools/test/h5dump/testfiles/vds/4_0.h5
index 5e71d20..5e71d20 100644
--- a/tools/testfiles/vds/4_0.h5
+++ b/tools/test/h5dump/testfiles/vds/4_0.h5
diff --git a/tools/testfiles/vds/4_1.h5 b/tools/test/h5dump/testfiles/vds/4_1.h5
index edad46e..edad46e 100644
--- a/tools/testfiles/vds/4_1.h5
+++ b/tools/test/h5dump/testfiles/vds/4_1.h5
diff --git a/tools/testfiles/vds/4_2.h5 b/tools/test/h5dump/testfiles/vds/4_2.h5
index a82b012..a82b012 100644
--- a/tools/testfiles/vds/4_2.h5
+++ b/tools/test/h5dump/testfiles/vds/4_2.h5
diff --git a/tools/testfiles/vds/4_vds.h5 b/tools/test/h5dump/testfiles/vds/4_vds.h5
index 64c2288..64c2288 100644
--- a/tools/testfiles/vds/4_vds.h5
+++ b/tools/test/h5dump/testfiles/vds/4_vds.h5
diff --git a/tools/testfiles/vds/5_a.h5 b/tools/test/h5dump/testfiles/vds/5_a.h5
index e8ea552..e8ea552 100644
--- a/tools/testfiles/vds/5_a.h5
+++ b/tools/test/h5dump/testfiles/vds/5_a.h5
diff --git a/tools/testfiles/vds/5_b.h5 b/tools/test/h5dump/testfiles/vds/5_b.h5
index 6da7cf5..6da7cf5 100644
--- a/tools/testfiles/vds/5_b.h5
+++ b/tools/test/h5dump/testfiles/vds/5_b.h5
diff --git a/tools/testfiles/vds/5_c.h5 b/tools/test/h5dump/testfiles/vds/5_c.h5
index 3e3bc61..3e3bc61 100644
--- a/tools/testfiles/vds/5_c.h5
+++ b/tools/test/h5dump/testfiles/vds/5_c.h5
diff --git a/tools/testfiles/vds/5_vds.h5 b/tools/test/h5dump/testfiles/vds/5_vds.h5
index 379485e..379485e 100644
--- a/tools/testfiles/vds/5_vds.h5
+++ b/tools/test/h5dump/testfiles/vds/5_vds.h5
diff --git a/tools/testfiles/vds/a.h5 b/tools/test/h5dump/testfiles/vds/a.h5
index fa19535..fa19535 100644
--- a/tools/testfiles/vds/a.h5
+++ b/tools/test/h5dump/testfiles/vds/a.h5
diff --git a/tools/testfiles/vds/b.h5 b/tools/test/h5dump/testfiles/vds/b.h5
index 08449ca..08449ca 100644
--- a/tools/testfiles/vds/b.h5
+++ b/tools/test/h5dump/testfiles/vds/b.h5
diff --git a/tools/testfiles/vds/c.h5 b/tools/test/h5dump/testfiles/vds/c.h5
index ba9af30..ba9af30 100644
--- a/tools/testfiles/vds/c.h5
+++ b/tools/test/h5dump/testfiles/vds/c.h5
diff --git a/tools/testfiles/vds/d.h5 b/tools/test/h5dump/testfiles/vds/d.h5
index 8eceb4a..8eceb4a 100644
--- a/tools/testfiles/vds/d.h5
+++ b/tools/test/h5dump/testfiles/vds/d.h5
diff --git a/tools/testfiles/vds/f-0.h5 b/tools/test/h5dump/testfiles/vds/f-0.h5
index 242df07..242df07 100644
--- a/tools/testfiles/vds/f-0.h5
+++ b/tools/test/h5dump/testfiles/vds/f-0.h5
diff --git a/tools/testfiles/vds/f-3.h5 b/tools/test/h5dump/testfiles/vds/f-3.h5
index 539c1c9..539c1c9 100644
--- a/tools/testfiles/vds/f-3.h5
+++ b/tools/test/h5dump/testfiles/vds/f-3.h5
diff --git a/tools/testfiles/vds/vds-eiger.h5 b/tools/test/h5dump/testfiles/vds/vds-eiger.h5
index 23d1fd3..23d1fd3 100644
--- a/tools/testfiles/vds/vds-eiger.h5
+++ b/tools/test/h5dump/testfiles/vds/vds-eiger.h5
diff --git a/tools/testfiles/vds/vds-percival-unlim-maxmin.h5 b/tools/test/h5dump/testfiles/vds/vds-percival-unlim-maxmin.h5
index b7f8827..b7f8827 100644
--- a/tools/testfiles/vds/vds-percival-unlim-maxmin.h5
+++ b/tools/test/h5dump/testfiles/vds/vds-percival-unlim-maxmin.h5
diff --git a/tools/testfiles/tbitfields.h5 b/tools/test/h5dump/testfiles/xml/tbitfields.h5
index 11087f0..11087f0 100644
--- a/tools/testfiles/tbitfields.h5
+++ b/tools/test/h5dump/testfiles/xml/tbitfields.h5
diff --git a/tools/testfiles/tcompound2.h5 b/tools/test/h5dump/testfiles/xml/tcompound2.h5
index 98e80bd..98e80bd 100644
--- a/tools/testfiles/tcompound2.h5
+++ b/tools/test/h5dump/testfiles/xml/tcompound2.h5
diff --git a/tools/testfiles/tdset2.h5 b/tools/test/h5dump/testfiles/xml/tdset2.h5
index 5e17cfd..5e17cfd 100644
--- a/tools/testfiles/tdset2.h5
+++ b/tools/test/h5dump/testfiles/xml/tdset2.h5
diff --git a/tools/testfiles/tenum.h5 b/tools/test/h5dump/testfiles/xml/tenum.h5
index b1300d8..b1300d8 100644
--- a/tools/testfiles/tenum.h5
+++ b/tools/test/h5dump/testfiles/xml/tenum.h5
diff --git a/tools/testfiles/test35.nc b/tools/test/h5dump/testfiles/xml/test35.nc
index 4bd5d7f..4bd5d7f 100644
--- a/tools/testfiles/test35.nc
+++ b/tools/test/h5dump/testfiles/xml/test35.nc
diff --git a/tools/testfiles/tloop2.h5 b/tools/test/h5dump/testfiles/xml/tloop2.h5
index 995bfab..995bfab 100644
--- a/tools/testfiles/tloop2.h5
+++ b/tools/test/h5dump/testfiles/xml/tloop2.h5
diff --git a/tools/testfiles/tmany.h5 b/tools/test/h5dump/testfiles/xml/tmany.h5
index 1f2bbaa..1f2bbaa 100644
--- a/tools/testfiles/tmany.h5
+++ b/tools/test/h5dump/testfiles/xml/tmany.h5
diff --git a/tools/testfiles/tname-amp.h5 b/tools/test/h5dump/testfiles/xml/tname-amp.h5
index 27ab521..27ab521 100644
--- a/tools/testfiles/tname-amp.h5
+++ b/tools/test/h5dump/testfiles/xml/tname-amp.h5
diff --git a/tools/testfiles/tname-apos.h5 b/tools/test/h5dump/testfiles/xml/tname-apos.h5
index 42d0fc3..42d0fc3 100644
--- a/tools/testfiles/tname-apos.h5
+++ b/tools/test/h5dump/testfiles/xml/tname-apos.h5
diff --git a/tools/testfiles/tname-gt.h5 b/tools/test/h5dump/testfiles/xml/tname-gt.h5
index fabd154..fabd154 100644
--- a/tools/testfiles/tname-gt.h5
+++ b/tools/test/h5dump/testfiles/xml/tname-gt.h5
diff --git a/tools/testfiles/tname-lt.h5 b/tools/test/h5dump/testfiles/xml/tname-lt.h5
index 6b13375..6b13375 100644
--- a/tools/testfiles/tname-lt.h5
+++ b/tools/test/h5dump/testfiles/xml/tname-lt.h5
diff --git a/tools/testfiles/tname-quot.h5 b/tools/test/h5dump/testfiles/xml/tname-quot.h5
index eb8d6cc..eb8d6cc 100644
--- a/tools/testfiles/tname-quot.h5
+++ b/tools/test/h5dump/testfiles/xml/tname-quot.h5
diff --git a/tools/testfiles/tname-sp.h5 b/tools/test/h5dump/testfiles/xml/tname-sp.h5
index 0201efd..0201efd 100644
--- a/tools/testfiles/tname-sp.h5
+++ b/tools/test/h5dump/testfiles/xml/tname-sp.h5
diff --git a/tools/testfiles/tnodata.h5 b/tools/test/h5dump/testfiles/xml/tnodata.h5
index 8e0a89d..8e0a89d 100644
--- a/tools/testfiles/tnodata.h5
+++ b/tools/test/h5dump/testfiles/xml/tnodata.h5
diff --git a/tools/testfiles/tobjref.h5 b/tools/test/h5dump/testfiles/xml/tobjref.h5
index ef42ff3..ef42ff3 100644
--- a/tools/testfiles/tobjref.h5
+++ b/tools/test/h5dump/testfiles/xml/tobjref.h5
diff --git a/tools/testfiles/topaque.h5 b/tools/test/h5dump/testfiles/xml/topaque.h5
index d0b29c6..d0b29c6 100644
--- a/tools/testfiles/topaque.h5
+++ b/tools/test/h5dump/testfiles/xml/topaque.h5
diff --git a/tools/testfiles/tref-escapes-at.h5 b/tools/test/h5dump/testfiles/xml/tref-escapes-at.h5
index 641513c..641513c 100644
--- a/tools/testfiles/tref-escapes-at.h5
+++ b/tools/test/h5dump/testfiles/xml/tref-escapes-at.h5
diff --git a/tools/testfiles/tref-escapes.h5 b/tools/test/h5dump/testfiles/xml/tref-escapes.h5
index 6c7638b..6c7638b 100644
--- a/tools/testfiles/tref-escapes.h5
+++ b/tools/test/h5dump/testfiles/xml/tref-escapes.h5
diff --git a/tools/testfiles/tref.h5 b/tools/test/h5dump/testfiles/xml/tref.h5
index 73b4be5..73b4be5 100644
--- a/tools/testfiles/tref.h5
+++ b/tools/test/h5dump/testfiles/xml/tref.h5
diff --git a/tools/testfiles/tstring-at.h5 b/tools/test/h5dump/testfiles/xml/tstring-at.h5
index aa17960..aa17960 100644
--- a/tools/testfiles/tstring-at.h5
+++ b/tools/test/h5dump/testfiles/xml/tstring-at.h5
diff --git a/tools/testfiles/tstring.h5 b/tools/test/h5dump/testfiles/xml/tstring.h5
index 667fe78..667fe78 100644
--- a/tools/testfiles/tstring.h5
+++ b/tools/test/h5dump/testfiles/xml/tstring.h5
diff --git a/tools/testfiles/zerodim.h5 b/tools/test/h5dump/testfiles/zerodim.h5
index 6939353..6939353 100644
--- a/tools/testfiles/zerodim.h5
+++ b/tools/test/h5dump/testfiles/zerodim.h5
diff --git a/tools/test/h5dump/testh5dump.sh.in b/tools/test/h5dump/testh5dump.sh.in
index 6ea410b..8796aa9 100644
--- a/tools/test/h5dump/testh5dump.sh.in
+++ b/tools/test/h5dump/testh5dump.sh.in
@@ -52,11 +52,12 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_ERRORFILES="$srcdir/errfiles"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
+SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected"
+SRC_H5DUMP_ERRORFILES="$SRC_TOOLS/test/h5dump/errfiles"
+SRC_H5DUMP_EXPFILES="$SRC_TOOLS/test/h5dump/exportfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
@@ -193,195 +194,198 @@ $SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5.onion
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5DUMP_TESTFILES/charsets.ddl
-$SRC_H5DUMP_TESTFILES/file_space.ddl
-$SRC_H5DUMP_TESTFILES/filter_fail.ddl
-$SRC_H5DUMP_TESTFILES/non_existing.ddl
-$SRC_H5DUMP_TESTFILES/packedbits.ddl
-$SRC_H5DUMP_TESTFILES/tall-1.ddl
-$SRC_H5DUMP_TESTFILES/tall-2.ddl
-$SRC_H5DUMP_TESTFILES/tall-2A.ddl
-$SRC_H5DUMP_TESTFILES/tall-2A0.ddl
-$SRC_H5DUMP_TESTFILES/tall-2B.ddl
-$SRC_H5DUMP_TESTFILES/tall-3.ddl
-$SRC_H5DUMP_TESTFILES/tall-4s.ddl
-$SRC_H5DUMP_TESTFILES/tall-5s.ddl
-$SRC_H5DUMP_TESTFILES/tall-6.ddl
-$SRC_H5DUMP_TESTFILES/tall-6.exp
-$SRC_H5DUMP_TESTFILES/tall-7.ddl
-$SRC_H5DUMP_TESTFILES/tall-7N.ddl
-$SRC_H5DUMP_TESTFILES/tallfilters.ddl
-$SRC_H5DUMP_TESTFILES/tarray1.ddl
-$SRC_H5DUMP_TESTFILES/tarray1_big.ddl
-$SRC_H5DUMP_TESTFILES/tarray2.ddl
-$SRC_H5DUMP_TESTFILES/tarray3.ddl
-$SRC_H5DUMP_TESTFILES/tarray4.ddl
-$SRC_H5DUMP_TESTFILES/tarray5.ddl
-$SRC_H5DUMP_TESTFILES/tarray6.ddl
-$SRC_H5DUMP_TESTFILES/tarray7.ddl
-$SRC_H5DUMP_TESTFILES/tarray8.ddl
-$SRC_H5DUMP_TESTFILES/tattr-1.ddl
-$SRC_H5DUMP_TESTFILES/tattr-2.ddl
-$SRC_H5DUMP_TESTFILES/tattr-3.ddl
-$SRC_H5DUMP_TESTFILES/tattr-4_be.ddl
-$SRC_H5DUMP_TESTFILES/tattrcontents1.ddl
-$SRC_H5DUMP_TESTFILES/tattrcontents2.ddl
-$SRC_H5DUMP_TESTFILES/tattrintsize.ddl
-$SRC_H5DUMP_TESTFILES/tattrreg.ddl
-$SRC_H5DUMP_TESTFILES/tattrregR.ddl
-$SRC_H5DUMP_TESTFILES/tbin1.ddl
-$SRC_H5DUMP_TESTFILES/tbin1.ddl
-$SRC_H5DUMP_TESTFILES/tbin2.ddl
-$SRC_H5DUMP_TESTFILES/tbin3.ddl
-$SRC_H5DUMP_TESTFILES/tbin4.ddl
-$SRC_H5DUMP_TESTFILES/tbinregR.ddl
-$SRC_H5DUMP_TESTFILES/tbigdims.ddl
-$SRC_H5DUMP_TESTFILES/tbitnopaque_be.ddl
-$SRC_H5DUMP_TESTFILES/tbitnopaque_le.ddl
-$SRC_H5DUMP_TESTFILES/tboot1.ddl
-$SRC_H5DUMP_TESTFILES/tboot2.ddl
-$SRC_H5DUMP_TESTFILES/tboot2A.ddl
-$SRC_H5DUMP_TESTFILES/tboot2B.ddl
-$SRC_H5DUMP_TESTFILES/tchar1.ddl
-$SRC_H5DUMP_TESTFILES/tchunked.ddl
-$SRC_H5DUMP_TESTFILES/tcmpdattrintsize.ddl
-$SRC_H5DUMP_TESTFILES/tcmpdintsize.ddl
-$SRC_H5DUMP_TESTFILES/tcomp-1.ddl
-$SRC_H5DUMP_TESTFILES/tcomp-2.ddl
-$SRC_H5DUMP_TESTFILES/tcomp-3.ddl
-$SRC_H5DUMP_TESTFILES/tcomp-4.ddl
-$SRC_H5DUMP_TESTFILES/tcompound_complex2.ddl
-$SRC_H5DUMP_TESTFILES/tcompact.ddl
-$SRC_H5DUMP_TESTFILES/tcontents.ddl
-$SRC_H5DUMP_TESTFILES/tcontiguos.ddl
-$SRC_H5DUMP_TESTFILES/tdatareg.ddl
-$SRC_H5DUMP_TESTFILES/tdataregR.ddl
-$SRC_H5DUMP_TESTFILES/tdeflate.ddl
-$SRC_H5DUMP_TESTFILES/tdset-1.ddl
-$SRC_H5DUMP_TESTFILES/tdset-2.ddl
-$SRC_H5DUMP_TESTFILES/tdset-3s.ddl
-$SRC_H5DUMP_TESTFILES/tempty.ddl
-$SRC_H5DUMP_TESTFILES/texceedsubstart.ddl
-$SRC_H5DUMP_TESTFILES/texceedsubcount.ddl
-$SRC_H5DUMP_TESTFILES/texceedsubstride.ddl
-$SRC_H5DUMP_TESTFILES/texceedsubblock.ddl
-$SRC_H5DUMP_TESTFILES/texternal.ddl
-$SRC_H5DUMP_TESTFILES/textlinksrc.ddl
-$SRC_H5DUMP_TESTFILES/textlinkfar.ddl
-$SRC_H5DUMP_TESTFILES/textlink.ddl
-$SRC_H5DUMP_TESTFILES/tfamily.ddl
-$SRC_H5DUMP_TESTFILES/tfill.ddl
-$SRC_H5DUMP_TESTFILES/tfletcher32.ddl
-$SRC_H5DUMP_TESTFILES/tfloatsattrs.ddl
-$SRC_H5DUMP_TESTFILES/tfpformat.ddl
-$SRC_H5DUMP_TESTFILES/tgroup-1.ddl
-$SRC_H5DUMP_TESTFILES/tgroup-2.ddl
-$SRC_H5DUMP_TESTFILES/tgrp_comments.ddl
-$SRC_H5DUMP_TESTFILES/tgrpnullspace.ddl
-$SRC_H5DUMP_TESTFILES/thlink-1.ddl
-$SRC_H5DUMP_TESTFILES/thlink-2.ddl
-$SRC_H5DUMP_TESTFILES/thlink-3.ddl
-$SRC_H5DUMP_TESTFILES/thlink-4.ddl
-$SRC_H5DUMP_TESTFILES/thlink-5.ddl
-$SRC_H5DUMP_TESTFILES/thyperslab.ddl
-$SRC_H5DUMP_TESTFILES/tindicesno.ddl
-$SRC_H5DUMP_TESTFILES/tindicessub1.ddl
-$SRC_H5DUMP_TESTFILES/tindicessub2.ddl
-$SRC_H5DUMP_TESTFILES/tindicessub3.ddl
-$SRC_H5DUMP_TESTFILES/tindicessub4.ddl
-$SRC_H5DUMP_TESTFILES/tindicesyes.ddl
-$SRC_H5DUMP_TESTFILES/tints4dims.ddl
-$SRC_H5DUMP_TESTFILES/tints4dimsBlock2.ddl
-$SRC_H5DUMP_TESTFILES/tints4dimsBlockEq.ddl
-$SRC_H5DUMP_TESTFILES/tints4dimsCount2.ddl
-$SRC_H5DUMP_TESTFILES/tints4dimsCountEq.ddl
-$SRC_H5DUMP_TESTFILES/tints4dimsStride2.ddl
-$SRC_H5DUMP_TESTFILES/tintsattrs.ddl
-$SRC_H5DUMP_TESTFILES/tlarge_objname.ddl
-$SRC_H5DUMP_TESTFILES/tldouble.ddl
-$SRC_H5DUMP_TESTFILES/tldouble_scalar.ddl
-$SRC_H5DUMP_TESTFILES/tlonglinks.ddl
-$SRC_H5DUMP_TESTFILES/tloop-1.ddl
-$SRC_H5DUMP_TESTFILES/tmulti.ddl
-$SRC_H5DUMP_TESTFILES/tmultifile.ddl
-$SRC_H5DUMP_TESTFILES/tqmarkfile.ddl
-$SRC_H5DUMP_TESTFILES/tstarfile.ddl
-$SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.ddl
-$SRC_H5DUMP_TESTFILES/tnestcomp-1.ddl
-$SRC_H5DUMP_TESTFILES/tnestedcmpddt.ddl
-$SRC_H5DUMP_TESTFILES/tnbit.ddl
-$SRC_H5DUMP_TESTFILES/tnoattrdata.ddl
-$SRC_H5DUMP_TESTFILES/tnoattrddl.ddl
-$SRC_H5DUMP_TESTFILES/tnodata.ddl
-$SRC_H5DUMP_TESTFILES/tnoddl.ddl
-$SRC_H5DUMP_TESTFILES/tnoddlfile.ddl
-$SRC_H5DUMP_TESTFILES/tnoddlfile.exp
-$SRC_H5DUMP_TESTFILES/tno-subset.ddl
-$SRC_H5DUMP_TESTFILES/tnullspace.ddl
-$SRC_H5DUMP_TESTFILES/trawdatafile.ddl
-$SRC_H5DUMP_TESTFILES/trawdatafile.exp
-$SRC_H5DUMP_TESTFILES/trawssetfile.ddl
-$SRC_H5DUMP_TESTFILES/trawssetfile.exp
-$SRC_H5DUMP_TESTFILES/zerodim.ddl
-$SRC_H5DUMP_TESTFILES/tordergr1.ddl
-$SRC_H5DUMP_TESTFILES/tordergr2.ddl
-$SRC_H5DUMP_TESTFILES/tordergr3.ddl
-$SRC_H5DUMP_TESTFILES/tordergr4.ddl
-$SRC_H5DUMP_TESTFILES/tordergr5.ddl
-$SRC_H5DUMP_TESTFILES/torderattr1.ddl
-$SRC_H5DUMP_TESTFILES/torderattr2.ddl
-$SRC_H5DUMP_TESTFILES/torderattr3.ddl
-$SRC_H5DUMP_TESTFILES/torderattr4.ddl
-$SRC_H5DUMP_TESTFILES/tordercontents1.ddl
-$SRC_H5DUMP_TESTFILES/tordercontents2.ddl
-$SRC_H5DUMP_TESTFILES/torderlinks1.ddl
-$SRC_H5DUMP_TESTFILES/torderlinks2.ddl
-$SRC_H5DUMP_TESTFILES/tperror.ddl
-$SRC_H5DUMP_TESTFILES/treadfilter.ddl
-$SRC_H5DUMP_TESTFILES/treadintfilter.ddl
-$SRC_H5DUMP_TESTFILES/treference.ddl
-$SRC_H5DUMP_TESTFILES/tsaf.ddl
-$SRC_H5DUMP_TESTFILES/tscalarattrintsize.ddl
-$SRC_H5DUMP_TESTFILES/tscalarintattrsize.ddl
-$SRC_H5DUMP_TESTFILES/tscalarintsize.ddl
-$SRC_H5DUMP_TESTFILES/tscalarstring.ddl
-$SRC_H5DUMP_TESTFILES/tscaleoffset.ddl
-$SRC_H5DUMP_TESTFILES/tshuffle.ddl
-$SRC_H5DUMP_TESTFILES/tslink-1.ddl
-$SRC_H5DUMP_TESTFILES/tslink-2.ddl
-$SRC_H5DUMP_TESTFILES/tslink-D.ddl
-$SRC_H5DUMP_TESTFILES/tsplit_file.ddl
-$SRC_H5DUMP_TESTFILES/tstr-1.ddl
-$SRC_H5DUMP_TESTFILES/tstr-2.ddl
-$SRC_H5DUMP_TESTFILES/tstr2bin2.exp
-$SRC_H5DUMP_TESTFILES/tstr2bin6.exp
-$SRC_H5DUMP_TESTFILES/tstring.ddl
-$SRC_H5DUMP_TESTFILES/tstring2.ddl
-$SRC_H5DUMP_TESTFILES/tstringe.ddl
-$SRC_H5DUMP_TESTFILES/tszip.ddl
-$SRC_H5DUMP_TESTFILES/tudlink-1.ddl
-$SRC_H5DUMP_TESTFILES/tudlink-2.ddl
-$SRC_H5DUMP_TESTFILES/tuserfilter.ddl
-$SRC_H5DUMP_TESTFILES/tvldtypes1.ddl
-$SRC_H5DUMP_TESTFILES/tvldtypes2.ddl
-$SRC_H5DUMP_TESTFILES/tvldtypes3.ddl
-$SRC_H5DUMP_TESTFILES/tvldtypes4.ddl
-$SRC_H5DUMP_TESTFILES/tvldtypes5.ddl
-$SRC_H5DUMP_TESTFILES/tvlenstr_array.ddl
-$SRC_H5DUMP_TESTFILES/tvlstr.ddl
-$SRC_H5DUMP_TESTFILES/tvms.ddl
-$SRC_H5DUMP_TESTFILES/twidedisplay.ddl
-$SRC_H5DUMP_TESTFILES/twithddl.exp
-$SRC_H5DUMP_TESTFILES/twithddlfile.ddl
-$SRC_H5DUMP_TESTFILES/twithddlfile.exp
-$SRC_H5DUMP_TESTFILES/h5dump-help.txt
-$SRC_H5DUMP_TESTFILES/out3.h5import
-$SRC_H5DUMP_TESTFILES/tbinregR.exp
-$SRC_H5DUMP_TESTFILES/err_attr_dspace.ddl
-$SRC_H5DUMP_TESTFILES/tst_onion_objs.ddl
-$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.ddl
-$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.ddl
-$SRC_H5DUMP_TESTFILES/tst_onion_revision_count.ddl
+$SRC_H5DUMP_OUTFILES/charsets.ddl
+$SRC_H5DUMP_OUTFILES/file_space.ddl
+$SRC_H5DUMP_OUTFILES/filter_fail.ddl
+$SRC_H5DUMP_OUTFILES/non_existing.ddl
+$SRC_H5DUMP_OUTFILES/packedbits.ddl
+$SRC_H5DUMP_OUTFILES/tall-1.ddl
+$SRC_H5DUMP_OUTFILES/tall-2.ddl
+$SRC_H5DUMP_OUTFILES/tall-2A.ddl
+$SRC_H5DUMP_OUTFILES/tall-2A0.ddl
+$SRC_H5DUMP_OUTFILES/tall-2B.ddl
+$SRC_H5DUMP_OUTFILES/tall-3.ddl
+$SRC_H5DUMP_OUTFILES/tall-4s.ddl
+$SRC_H5DUMP_OUTFILES/tall-5s.ddl
+$SRC_H5DUMP_OUTFILES/tall-6.ddl
+$SRC_H5DUMP_OUTFILES/tall-7.ddl
+$SRC_H5DUMP_OUTFILES/tall-7N.ddl
+$SRC_H5DUMP_OUTFILES/tallfilters.ddl
+$SRC_H5DUMP_OUTFILES/tarray1.ddl
+$SRC_H5DUMP_OUTFILES/tarray1_big.ddl
+$SRC_H5DUMP_OUTFILES/tarray2.ddl
+$SRC_H5DUMP_OUTFILES/tarray3.ddl
+$SRC_H5DUMP_OUTFILES/tarray4.ddl
+$SRC_H5DUMP_OUTFILES/tarray5.ddl
+$SRC_H5DUMP_OUTFILES/tarray6.ddl
+$SRC_H5DUMP_OUTFILES/tarray7.ddl
+$SRC_H5DUMP_OUTFILES/tarray8.ddl
+$SRC_H5DUMP_OUTFILES/tattr-1.ddl
+$SRC_H5DUMP_OUTFILES/tattr-2.ddl
+$SRC_H5DUMP_OUTFILES/tattr-3.ddl
+$SRC_H5DUMP_OUTFILES/tattr-4_be.ddl
+$SRC_H5DUMP_OUTFILES/tattrcontents1.ddl
+$SRC_H5DUMP_OUTFILES/tattrcontents2.ddl
+$SRC_H5DUMP_OUTFILES/tattrintsize.ddl
+$SRC_H5DUMP_OUTFILES/tattrreg.ddl
+$SRC_H5DUMP_OUTFILES/tattrregR.ddl
+$SRC_H5DUMP_OUTFILES/tbin1.ddl
+$SRC_H5DUMP_OUTFILES/tbin1.ddl
+$SRC_H5DUMP_OUTFILES/tbin2.ddl
+$SRC_H5DUMP_OUTFILES/tbin3.ddl
+$SRC_H5DUMP_OUTFILES/tbin4.ddl
+$SRC_H5DUMP_OUTFILES/tbinregR.ddl
+$SRC_H5DUMP_OUTFILES/tbigdims.ddl
+$SRC_H5DUMP_OUTFILES/tbitnopaque_be.ddl
+$SRC_H5DUMP_OUTFILES/tbitnopaque_le.ddl
+$SRC_H5DUMP_OUTFILES/tboot1.ddl
+$SRC_H5DUMP_OUTFILES/tboot2.ddl
+$SRC_H5DUMP_OUTFILES/tboot2A.ddl
+$SRC_H5DUMP_OUTFILES/tboot2B.ddl
+$SRC_H5DUMP_OUTFILES/tchar1.ddl
+$SRC_H5DUMP_OUTFILES/tchunked.ddl
+$SRC_H5DUMP_OUTFILES/tcmpdattrintsize.ddl
+$SRC_H5DUMP_OUTFILES/tcmpdintsize.ddl
+$SRC_H5DUMP_OUTFILES/tcomp-1.ddl
+$SRC_H5DUMP_OUTFILES/tcomp-2.ddl
+$SRC_H5DUMP_OUTFILES/tcomp-3.ddl
+$SRC_H5DUMP_OUTFILES/tcomp-4.ddl
+$SRC_H5DUMP_OUTFILES/tcompound_complex2.ddl
+$SRC_H5DUMP_OUTFILES/tcompact.ddl
+$SRC_H5DUMP_OUTFILES/tcontents.ddl
+$SRC_H5DUMP_OUTFILES/tcontiguos.ddl
+$SRC_H5DUMP_OUTFILES/tdatareg.ddl
+$SRC_H5DUMP_OUTFILES/tdataregR.ddl
+$SRC_H5DUMP_OUTFILES/tdeflate.ddl
+$SRC_H5DUMP_OUTFILES/tdset-1.ddl
+$SRC_H5DUMP_OUTFILES/tdset-2.ddl
+$SRC_H5DUMP_OUTFILES/tdset-3s.ddl
+$SRC_H5DUMP_OUTFILES/tempty.ddl
+$SRC_H5DUMP_OUTFILES/texceedsubstart.ddl
+$SRC_H5DUMP_OUTFILES/texceedsubcount.ddl
+$SRC_H5DUMP_OUTFILES/texceedsubstride.ddl
+$SRC_H5DUMP_OUTFILES/texceedsubblock.ddl
+$SRC_H5DUMP_OUTFILES/texternal.ddl
+$SRC_H5DUMP_OUTFILES/textlinksrc.ddl
+$SRC_H5DUMP_OUTFILES/textlinkfar.ddl
+$SRC_H5DUMP_OUTFILES/textlink.ddl
+$SRC_H5DUMP_OUTFILES/tfamily.ddl
+$SRC_H5DUMP_OUTFILES/tfill.ddl
+$SRC_H5DUMP_OUTFILES/tfletcher32.ddl
+$SRC_H5DUMP_OUTFILES/tfloatsattrs.ddl
+$SRC_H5DUMP_OUTFILES/tfpformat.ddl
+$SRC_H5DUMP_OUTFILES/tgroup-1.ddl
+$SRC_H5DUMP_OUTFILES/tgroup-2.ddl
+$SRC_H5DUMP_OUTFILES/tgrp_comments.ddl
+$SRC_H5DUMP_OUTFILES/tgrpnullspace.ddl
+$SRC_H5DUMP_OUTFILES/thlink-1.ddl
+$SRC_H5DUMP_OUTFILES/thlink-2.ddl
+$SRC_H5DUMP_OUTFILES/thlink-3.ddl
+$SRC_H5DUMP_OUTFILES/thlink-4.ddl
+$SRC_H5DUMP_OUTFILES/thlink-5.ddl
+$SRC_H5DUMP_OUTFILES/thyperslab.ddl
+$SRC_H5DUMP_OUTFILES/tindicesno.ddl
+$SRC_H5DUMP_OUTFILES/tindicessub1.ddl
+$SRC_H5DUMP_OUTFILES/tindicessub2.ddl
+$SRC_H5DUMP_OUTFILES/tindicessub3.ddl
+$SRC_H5DUMP_OUTFILES/tindicessub4.ddl
+$SRC_H5DUMP_OUTFILES/tindicesyes.ddl
+$SRC_H5DUMP_OUTFILES/tints4dims.ddl
+$SRC_H5DUMP_OUTFILES/tints4dimsBlock2.ddl
+$SRC_H5DUMP_OUTFILES/tints4dimsBlockEq.ddl
+$SRC_H5DUMP_OUTFILES/tints4dimsCount2.ddl
+$SRC_H5DUMP_OUTFILES/tints4dimsCountEq.ddl
+$SRC_H5DUMP_OUTFILES/tints4dimsStride2.ddl
+$SRC_H5DUMP_OUTFILES/tintsattrs.ddl
+$SRC_H5DUMP_OUTFILES/tlarge_objname.ddl
+$SRC_H5DUMP_OUTFILES/tldouble.ddl
+$SRC_H5DUMP_OUTFILES/tldouble_scalar.ddl
+$SRC_H5DUMP_OUTFILES/tlonglinks.ddl
+$SRC_H5DUMP_OUTFILES/tloop-1.ddl
+$SRC_H5DUMP_OUTFILES/tmulti.ddl
+$SRC_H5DUMP_OUTFILES/tmultifile.ddl
+$SRC_H5DUMP_OUTFILES/tqmarkfile.ddl
+$SRC_H5DUMP_OUTFILES/tstarfile.ddl
+$SRC_H5DUMP_OUTFILES/tnamed_dtype_attr.ddl
+$SRC_H5DUMP_OUTFILES/tnestcomp-1.ddl
+$SRC_H5DUMP_OUTFILES/tnestedcmpddt.ddl
+$SRC_H5DUMP_OUTFILES/tnbit.ddl
+$SRC_H5DUMP_OUTFILES/tnoattrdata.ddl
+$SRC_H5DUMP_OUTFILES/tnoattrddl.ddl
+$SRC_H5DUMP_OUTFILES/tnodata.ddl
+$SRC_H5DUMP_OUTFILES/tnoddl.ddl
+$SRC_H5DUMP_OUTFILES/tnoddlfile.ddl
+$SRC_H5DUMP_OUTFILES/tno-subset.ddl
+$SRC_H5DUMP_OUTFILES/tnullspace.ddl
+$SRC_H5DUMP_OUTFILES/trawdatafile.ddl
+$SRC_H5DUMP_OUTFILES/trawssetfile.ddl
+$SRC_H5DUMP_OUTFILES/zerodim.ddl
+$SRC_H5DUMP_OUTFILES/tordergr1.ddl
+$SRC_H5DUMP_OUTFILES/tordergr2.ddl
+$SRC_H5DUMP_OUTFILES/tordergr3.ddl
+$SRC_H5DUMP_OUTFILES/tordergr4.ddl
+$SRC_H5DUMP_OUTFILES/tordergr5.ddl
+$SRC_H5DUMP_OUTFILES/torderattr1.ddl
+$SRC_H5DUMP_OUTFILES/torderattr2.ddl
+$SRC_H5DUMP_OUTFILES/torderattr3.ddl
+$SRC_H5DUMP_OUTFILES/torderattr4.ddl
+$SRC_H5DUMP_OUTFILES/tordercontents1.ddl
+$SRC_H5DUMP_OUTFILES/tordercontents2.ddl
+$SRC_H5DUMP_OUTFILES/torderlinks1.ddl
+$SRC_H5DUMP_OUTFILES/torderlinks2.ddl
+$SRC_H5DUMP_OUTFILES/tperror.ddl
+$SRC_H5DUMP_OUTFILES/treadfilter.ddl
+$SRC_H5DUMP_OUTFILES/treadintfilter.ddl
+$SRC_H5DUMP_OUTFILES/treference.ddl
+$SRC_H5DUMP_OUTFILES/tsaf.ddl
+$SRC_H5DUMP_OUTFILES/tscalarattrintsize.ddl
+$SRC_H5DUMP_OUTFILES/tscalarintattrsize.ddl
+$SRC_H5DUMP_OUTFILES/tscalarintsize.ddl
+$SRC_H5DUMP_OUTFILES/tscalarstring.ddl
+$SRC_H5DUMP_OUTFILES/tscaleoffset.ddl
+$SRC_H5DUMP_OUTFILES/tshuffle.ddl
+$SRC_H5DUMP_OUTFILES/tslink-1.ddl
+$SRC_H5DUMP_OUTFILES/tslink-2.ddl
+$SRC_H5DUMP_OUTFILES/tslink-D.ddl
+$SRC_H5DUMP_OUTFILES/tsplit_file.ddl
+$SRC_H5DUMP_OUTFILES/tstr-1.ddl
+$SRC_H5DUMP_OUTFILES/tstr-2.ddl
+$SRC_H5DUMP_OUTFILES/tstring.ddl
+$SRC_H5DUMP_OUTFILES/tstring2.ddl
+$SRC_H5DUMP_OUTFILES/tstringe.ddl
+$SRC_H5DUMP_OUTFILES/tszip.ddl
+$SRC_H5DUMP_OUTFILES/tudlink-1.ddl
+$SRC_H5DUMP_OUTFILES/tudlink-2.ddl
+$SRC_H5DUMP_OUTFILES/tuserfilter.ddl
+$SRC_H5DUMP_OUTFILES/tvldtypes1.ddl
+$SRC_H5DUMP_OUTFILES/tvldtypes2.ddl
+$SRC_H5DUMP_OUTFILES/tvldtypes3.ddl
+$SRC_H5DUMP_OUTFILES/tvldtypes4.ddl
+$SRC_H5DUMP_OUTFILES/tvldtypes5.ddl
+$SRC_H5DUMP_OUTFILES/tvlenstr_array.ddl
+$SRC_H5DUMP_OUTFILES/tvlstr.ddl
+$SRC_H5DUMP_OUTFILES/tvms.ddl
+$SRC_H5DUMP_OUTFILES/twidedisplay.ddl
+$SRC_H5DUMP_OUTFILES/twithddlfile.ddl
+$SRC_H5DUMP_OUTFILES/h5dump-help.txt
+$SRC_H5DUMP_OUTFILES/out3.h5import
+$SRC_H5DUMP_OUTFILES/err_attr_dspace.ddl
+$SRC_H5DUMP_OUTFILES/tst_onion_objs.ddl
+$SRC_H5DUMP_OUTFILES/tst_onion_dset_ext.ddl
+$SRC_H5DUMP_OUTFILES/tst_onion_dset_1d.ddl
+$SRC_H5DUMP_OUTFILES/tst_onion_revision_count.ddl
+"
+
+LIST_EXPORT_TEST_FILES="
+$SRC_H5DUMP_EXPFILES/tall-6.exp
+$SRC_H5DUMP_EXPFILES/tbinregR.exp
+$SRC_H5DUMP_EXPFILES/tnoddlfile.exp
+$SRC_H5DUMP_EXPFILES/trawdatafile.exp
+$SRC_H5DUMP_EXPFILES/trawssetfile.exp
+$SRC_H5DUMP_EXPFILES/tstr2bin2.exp
+$SRC_H5DUMP_EXPFILES/tstr2bin6.exp
+$SRC_H5DUMP_EXPFILES/twithddl.exp
+$SRC_H5DUMP_EXPFILES/twithddlfile.exp
 "
 
 LIST_ERROR_TEST_FILES="
@@ -415,7 +419,7 @@ ${SRC_H5DUMP_ERRORFILES}/tslink-D.err
 #
 # copy test files and expected output files from source dirs to test dir
 #
-COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES $LIST_ERROR_TEST_FILES"
+COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES $LIST_EXPORT_TEST_FILES $LIST_ERROR_TEST_FILES"
 
 COPY_TESTFILES_TO_TESTDIR()
 {
diff --git a/tools/test/h5dump/testh5dumppbits.sh.in b/tools/test/h5dump/testh5dumppbits.sh.in
index e638bb9..4094bfc 100644
--- a/tools/test/h5dump/testh5dumppbits.sh.in
+++ b/tools/test/h5dump/testh5dumppbits.sh.in
@@ -45,11 +45,11 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_ERRORFILES="$srcdir/errfiles"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
+SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected"
+SRC_H5DUMP_ERRORFILES="$SRC_TOOLS/test/h5dump/errfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
@@ -78,75 +78,75 @@ $SRC_H5DUMP_TESTFILES/tcompound.h5
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5DUMP_TESTFILES/pbits/tnofilename-with-packed-bits.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsArray.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsCompound.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsIncomplete.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsLengthExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsCharLengthExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsIntLengthExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsLongLengthExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsLengthPositive.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsMax.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsMaxExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsOffsetExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsCharOffsetExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsIntOffsetExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsLongOffsetExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsOffsetNegative.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsOverlapped.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedIntWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedIntWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole1.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole1.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole63.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole63.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned4.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned4.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt8.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt8.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong16.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong16.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong32.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong32.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned2.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned2.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt4.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt4.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong8.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong8.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong16.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong16.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tnofilename-with-packed-bits.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsArray.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsCompound.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsIncomplete.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsLengthExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsCharLengthExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsIntLengthExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsLongLengthExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsLengthPositive.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsMax.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsMaxExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsOffsetExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsCharOffsetExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsIntOffsetExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsLongOffsetExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsOffsetNegative.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsOverlapped.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSigned.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsigned.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedInt.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedInt.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLong.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLong.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLong.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLong.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedIntWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedIntWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLongWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLongWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLongWhole1.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLongWhole1.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLongWhole63.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLongWhole63.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSigned4.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsigned4.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedInt8.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedInt8.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLong16.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLong16.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLong32.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLong32.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSigned2.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsigned2.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedInt4.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedInt4.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLong8.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLong8.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLong16.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLong16.ddl
 "
 
 LIST_ERROR_TEST_FILES="
-${SRC_H5DUMP_ERRORFILES}/tnofilename-with-packed-bits.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsCharLengthExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsCharOffsetExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsIncomplete.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsIntLengthExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsIntOffsetExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsLengthExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsLengthPositive.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsLongLengthExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsLongOffsetExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsMaxExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsOffsetExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsOffsetNegative.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tnofilename-with-packed-bits.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsCharLengthExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsCharOffsetExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsIncomplete.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsIntLengthExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsIntOffsetExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLengthExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLengthPositive.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLongLengthExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLongOffsetExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsMaxExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsOffsetExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsOffsetNegative.err
 "
 
 #
diff --git a/tools/test/h5dump/testh5dumpvds.sh.in b/tools/test/h5dump/testh5dumpvds.sh.in
index 00e01e5..e09e429 100644
--- a/tools/test/h5dump/testh5dumpvds.sh.in
+++ b/tools/test/h5dump/testh5dumpvds.sh.in
@@ -45,10 +45,10 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
+SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected"
 SRC_H5DUMP_ERRORFILES="$srcdir/errfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
@@ -106,23 +106,23 @@ $SRC_H5DUMP_TESTFILES/vds/vds-eiger.h5
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5DUMP_TESTFILES/vds/tvds-1.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds-2.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds-3_1.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds-3_2.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds-4.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds-5.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds_layout-1.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds_layout-2.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds_layout-3_1.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds_layout-3_2.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds_layout-4.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds_layout-5.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds-first.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds-gap1.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds-gap2.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds_layout-eiger.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds_layout-maxmin.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds-1.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds-2.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds-3_1.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds-3_2.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds-4.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds-5.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds_layout-1.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds_layout-2.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds_layout-3_1.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds_layout-3_2.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds_layout-4.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds_layout-5.ddl
+$SRC_H5DUMP_OUTFILES/vds/vds-first.ddl
+$SRC_H5DUMP_OUTFILES/vds/vds-gap1.ddl
+$SRC_H5DUMP_OUTFILES/vds/vds-gap2.ddl
+$SRC_H5DUMP_OUTFILES/vds/vds_layout-eiger.ddl
+$SRC_H5DUMP_OUTFILES/vds/vds_layout-maxmin.ddl
 "
 
 LIST_ERROR_TEST_FILES="
diff --git a/tools/test/h5dump/testh5dumpxml.sh.in b/tools/test/h5dump/testh5dumpxml.sh.in
index cebdb97..b433fa2 100644
--- a/tools/test/h5dump/testh5dumpxml.sh.in
+++ b/tools/test/h5dump/testh5dumpxml.sh.in
@@ -37,16 +37,16 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected"
 
 TEST_P_DIR=./testfiles
 TESTDIR=./testfiles/xml
@@ -63,6 +63,30 @@ test -d $TESTDIR || mkdir -p $TESTDIR
 #       Comment '#' without space can be used.
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES_XML="
+$SRC_H5DUMP_TESTFILES/xml/tbitfields.h5
+$SRC_H5DUMP_TESTFILES/xml/tcompound2.h5
+$SRC_H5DUMP_TESTFILES/xml/tdset2.h5
+$SRC_H5DUMP_TESTFILES/xml/tenum.h5
+$SRC_H5DUMP_TESTFILES/xml/test35.nc
+$SRC_H5DUMP_TESTFILES/xml/tloop2.h5
+$SRC_H5DUMP_TESTFILES/xml/tmany.h5
+$SRC_H5DUMP_TESTFILES/xml/tname-amp.h5
+$SRC_H5DUMP_TESTFILES/xml/tname-apos.h5
+$SRC_H5DUMP_TESTFILES/xml/tname-gt.h5
+$SRC_H5DUMP_TESTFILES/xml/tname-lt.h5
+$SRC_H5DUMP_TESTFILES/xml/tname-quot.h5
+$SRC_H5DUMP_TESTFILES/xml/tname-sp.h5
+$SRC_H5DUMP_TESTFILES/xml/tnodata.h5
+$SRC_H5DUMP_TESTFILES/xml/tobjref.h5
+$SRC_H5DUMP_TESTFILES/xml/topaque.h5
+$SRC_H5DUMP_TESTFILES/xml/tref.h5
+$SRC_H5DUMP_TESTFILES/xml/tref-escapes.h5
+$SRC_H5DUMP_TESTFILES/xml/tref-escapes-at.h5
+$SRC_H5DUMP_TESTFILES/xml/tstring.h5
+$SRC_H5DUMP_TESTFILES/xml/tstring-at.h5
+"
+
+LIST_HDF5_TEST_FILES="
 $SRC_H5DUMP_TESTFILES/tall.h5
 $SRC_H5DUMP_TESTFILES/tarray1.h5
 $SRC_H5DUMP_TESTFILES/tarray2.h5
@@ -70,43 +94,22 @@ $SRC_H5DUMP_TESTFILES/tarray3.h5
 $SRC_H5DUMP_TESTFILES/tarray6.h5
 $SRC_H5DUMP_TESTFILES/tarray7.h5
 $SRC_H5DUMP_TESTFILES/tattr.h5
-$SRC_H5DUMP_TESTFILES/tbitfields.h5
 $SRC_H5DUMP_TESTFILES/tcompound.h5
-$SRC_H5DUMP_TESTFILES/tcompound2.h5
 $SRC_H5DUMP_TESTFILES/tcompound_complex.h5
 $SRC_H5DUMP_TESTFILES/tdatareg.h5
 $SRC_H5DUMP_TESTFILES/tdset.h5
-$SRC_H5DUMP_TESTFILES/tdset2.h5
 $SRC_H5DUMP_TESTFILES/tempty.h5
-$SRC_H5DUMP_TESTFILES/tenum.h5
-$SRC_H5DUMP_TESTFILES/test35.nc
 $SRC_H5DUMP_TESTFILES/textlink.h5
 $SRC_H5DUMP_TESTFILES/tfpformat.h5
 $SRC_H5DUMP_TESTFILES/tgroup.h5
 $SRC_H5DUMP_TESTFILES/thlink.h5
 $SRC_H5DUMP_TESTFILES/tloop.h5
-$SRC_H5DUMP_TESTFILES/tloop2.h5
-$SRC_H5DUMP_TESTFILES/tmany.h5
-$SRC_H5DUMP_TESTFILES/tname-amp.h5
-$SRC_H5DUMP_TESTFILES/tname-apos.h5
-$SRC_H5DUMP_TESTFILES/tname-gt.h5
-$SRC_H5DUMP_TESTFILES/tname-lt.h5
-$SRC_H5DUMP_TESTFILES/tname-quot.h5
-$SRC_H5DUMP_TESTFILES/tname-sp.h5
 $SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.h5
 $SRC_H5DUMP_TESTFILES/tnestedcomp.h5
-$SRC_H5DUMP_TESTFILES/tnodata.h5
 $SRC_H5DUMP_TESTFILES/tnullspace.h5
-$SRC_H5DUMP_TESTFILES/tobjref.h5
-$SRC_H5DUMP_TESTFILES/topaque.h5
 $SRC_H5DUMP_TESTFILES/torderattr.h5
-$SRC_H5DUMP_TESTFILES/tref.h5
-$SRC_H5DUMP_TESTFILES/tref-escapes.h5
-$SRC_H5DUMP_TESTFILES/tref-escapes-at.h5
 $SRC_H5DUMP_TESTFILES/tsaf.h5
 $SRC_H5DUMP_TESTFILES/tslink.h5
-$SRC_H5DUMP_TESTFILES/tstring.h5
-$SRC_H5DUMP_TESTFILES/tstring-at.h5
 $SRC_H5DUMP_TESTFILES/tstr.h5
 $SRC_H5DUMP_TESTFILES/tstr2.h5
 $SRC_H5DUMP_TESTFILES/tudlink.h5
@@ -119,78 +122,78 @@ $SRC_H5DUMP_TESTFILES/tvlstr.h5
 "
 
 LIST_OTHER_TEST_FILES_XML="
-$SRC_H5DUMP_TESTFILES/tall.h5.xml
-$SRC_H5DUMP_TESTFILES/tall-2A.h5.xml
-$SRC_H5DUMP_TESTFILES/tarray1.h5.xml
-$SRC_H5DUMP_TESTFILES/tarray2.h5.xml
-$SRC_H5DUMP_TESTFILES/tarray3.h5.xml
-$SRC_H5DUMP_TESTFILES/tarray6.h5.xml
-$SRC_H5DUMP_TESTFILES/tarray7.h5.xml
-$SRC_H5DUMP_TESTFILES/tattr.h5.xml
-$SRC_H5DUMP_TESTFILES/tbitfields_be.h5.xml
-$SRC_H5DUMP_TESTFILES/tbitfields_le.h5.xml
-$SRC_H5DUMP_TESTFILES/tcompound_complex.h5.xml
-$SRC_H5DUMP_TESTFILES/tcompound.h5.xml
-$SRC_H5DUMP_TESTFILES/tcompound2.h5.xml
-$SRC_H5DUMP_TESTFILES/tdatareg.h5.xml
-$SRC_H5DUMP_TESTFILES/tdset.h5.xml
-$SRC_H5DUMP_TESTFILES/tdset2.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-dtd.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-dtd-2.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-dtd-uri.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-nons.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-nons-2.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-nons-uri.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-ns.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-ns-2.h5.xml
-$SRC_H5DUMP_TESTFILES/tenum.h5.xml
-$SRC_H5DUMP_TESTFILES/test35.nc.xml
-$SRC_H5DUMP_TESTFILES/textlink.h5.xml
-$SRC_H5DUMP_TESTFILES/tfpformat.h5.xml
-$SRC_H5DUMP_TESTFILES/tgroup.h5.xml
-$SRC_H5DUMP_TESTFILES/thlink.h5.xml
-$SRC_H5DUMP_TESTFILES/tloop.h5.xml
-$SRC_H5DUMP_TESTFILES/tloop2.h5.xml
-$SRC_H5DUMP_TESTFILES/tmany.h5.xml
-$SRC_H5DUMP_TESTFILES/tname-amp.h5.xml
-$SRC_H5DUMP_TESTFILES/tname-apos.h5.xml
-$SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.h5.xml
-$SRC_H5DUMP_TESTFILES/tname-gt.h5.xml
-$SRC_H5DUMP_TESTFILES/tname-lt.h5.xml
-$SRC_H5DUMP_TESTFILES/tname-quot.h5.xml
-$SRC_H5DUMP_TESTFILES/tname-sp.h5.xml
-$SRC_H5DUMP_TESTFILES/tnestedcomp.h5.xml
-$SRC_H5DUMP_TESTFILES/tnodata.h5.xml
-$SRC_H5DUMP_TESTFILES/tnullspace.h5.xml
-$SRC_H5DUMP_TESTFILES/tobjref.h5.xml
-$SRC_H5DUMP_TESTFILES/topaque.h5.xml
-$SRC_H5DUMP_TESTFILES/torderattr1.h5.xml
-$SRC_H5DUMP_TESTFILES/torderattr2.h5.xml
-$SRC_H5DUMP_TESTFILES/torderattr3.h5.xml
-$SRC_H5DUMP_TESTFILES/torderattr4.h5.xml
-$SRC_H5DUMP_TESTFILES/tref.h5.xml
-$SRC_H5DUMP_TESTFILES/tref-escapes.h5.xml
-$SRC_H5DUMP_TESTFILES/tref-escapes-at.h5.xml
-$SRC_H5DUMP_TESTFILES/tsaf.h5.xml
-$SRC_H5DUMP_TESTFILES/tslink.h5.xml
-$SRC_H5DUMP_TESTFILES/tstr.h5.xml
-$SRC_H5DUMP_TESTFILES/tstr2.h5.xml
-$SRC_H5DUMP_TESTFILES/tstring.h5.xml
-$SRC_H5DUMP_TESTFILES/tstring-at.h5.xml
-$SRC_H5DUMP_TESTFILES/tudlink.h5.xml
-$SRC_H5DUMP_TESTFILES/tvldtypes1.h5.xml
-$SRC_H5DUMP_TESTFILES/tvldtypes2.h5.xml
-$SRC_H5DUMP_TESTFILES/tvldtypes3.h5.xml
-$SRC_H5DUMP_TESTFILES/tvldtypes4.h5.xml
-$SRC_H5DUMP_TESTFILES/tvldtypes5.h5.xml
-$SRC_H5DUMP_TESTFILES/tvlstr.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tall.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tall-2A.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tarray1.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tarray2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tarray3.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tarray6.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tarray7.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tattr.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tbitfields_be.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tbitfields_le.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tcompound_complex.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tcompound.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tcompound2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tdatareg.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tdset.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tdset2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-dtd.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-dtd-2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-dtd-uri.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-nons.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-nons-2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-nons-uri.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-ns.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-ns-2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tenum.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/test35.nc.xml
+$SRC_H5DUMP_OUTFILES/xml/textlink.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tfpformat.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tgroup.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/thlink.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tloop.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tloop2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tmany.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tname-amp.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tname-apos.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tnamed_dtype_attr.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tname-gt.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tname-lt.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tname-quot.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tname-sp.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tnestedcomp.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tnodata.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tnullspace.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tobjref.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/topaque.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/torderattr1.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/torderattr2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/torderattr3.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/torderattr4.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tref.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tref-escapes.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tref-escapes-at.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tsaf.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tslink.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tstr.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tstr2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tstring.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tstring-at.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tudlink.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tvldtypes1.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tvldtypes2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tvldtypes3.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tvldtypes4.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tvldtypes5.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tvlstr.h5.xml
 "
 
 #
 # copy test files and expected output files from source dirs to test dir
 #
-COPY_TESTFILES="$LIST_HDF5_TEST_FILES_XML $LIST_OTHER_TEST_FILES_XML"
+COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_HDF5_TEST_FILES_XML $LIST_OTHER_TEST_FILES_XML"
 
 COPY_TESTFILES_TO_TESTDIR()
 {
diff --git a/tools/test/h5format_convert/CMakeTests.cmake b/tools/test/h5format_convert/CMakeTests.cmake
index 73cb2ee..3046521 100644
--- a/tools/test/h5format_convert/CMakeTests.cmake
+++ b/tools/test/h5format_convert/CMakeTests.cmake
@@ -79,15 +79,15 @@
   add_custom_target(h5fc-files ALL COMMENT "Copying files needed by h5fc tests")
 
   foreach (ddl_file ${HDF5_REFERENCE_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${ddl_file}" "${PROJECT_BINARY_DIR}/testfiles/${ddl_file}" "h5fc_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${ddl_file}" "${PROJECT_BINARY_DIR}/testfiles/${ddl_file}" "h5fc_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_ERR_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
   endforeach ()
   add_custom_target(h5fc_files ALL COMMENT "Copying files needed by h5fc tests" DEPENDS ${h5fc_files_list})
 
diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl b/tools/test/h5format_convert/expected/h5fc_d_file-d.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_d_file-d.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl b/tools/test/h5format_convert/expected/h5fc_d_file.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_d_file.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err b/tools/test/h5format_convert/expected/h5fc_d_file.ddl.err
index ceb0fe4..ceb0fe4 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err
+++ b/tools/test/h5format_convert/expected/h5fc_d_file.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_dname.ddl b/tools/test/h5format_convert/expected/h5fc_dname.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_dname.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_dname.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_dname.err b/tools/test/h5format_convert/expected/h5fc_dname.err
index 361d8a9..361d8a9 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_dname.err
+++ b/tools/test/h5format_convert/expected/h5fc_dname.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl
index f788913..f788913 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext1_f.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl
index 6564031..6564031 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext1_i.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl
index 746de2b..746de2b 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext1_s.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl
index 57781ec..57781ec 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext2_if.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl
index 8fd061d..8fd061d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext2_is.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl
index 435ed46..435ed46 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext2_sf.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl
index 57a78d3..57a78d3 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext3_isf.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_help.ddl b/tools/test/h5format_convert/expected/h5fc_help.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_help.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_help.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err b/tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err
index 39450c0..39450c0 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err
+++ b/tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err b/tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err
index 706ea9d..706ea9d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err
+++ b/tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_nooption.ddl b/tools/test/h5format_convert/expected/h5fc_nooption.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_nooption.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_nooption.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_all.ddl b/tools/test/h5format_convert/expected/h5fc_v_all.ddl
index c5e55c7..c5e55c7 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_all.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_all.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_bt1.ddl b/tools/test/h5format_convert/expected/h5fc_v_bt1.ddl
index 23f775d..23f775d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_bt1.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_bt1.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl b/tools/test/h5format_convert/expected/h5fc_v_err.ddl
index 066f2d5..066f2d5 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_err.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err b/tools/test/h5format_convert/expected/h5fc_v_err.ddl.err
index e72892d..e72892d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err
+++ b/tools/test/h5format_convert/expected/h5fc_v_err.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_n_1d.ddl b/tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl
index 1c6d7fb..1c6d7fb 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_n_1d.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_n_all.ddl b/tools/test/h5format_convert/expected/h5fc_v_n_all.ddl
index ad00d92..ad00d92 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_n_all.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_n_all.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl b/tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl
index e79b11a..e79b11a 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_non_chunked.ddl b/tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl
index 50575c0..50575c0 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_non_chunked.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl
index 45fa3fb..45fa3fb 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_f.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl
index 67a7116..67a7116 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_i.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl
index 7f67d9f..7f67d9f 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_s.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl
index 350d3ba..350d3ba 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_if.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl
index 6b2b2c3..6b2b2c3 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_is.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl
index 4a038e3..4a038e3 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl
index 602627f..602627f 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl
diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c
index 06d6088..7a31e58 100644
--- a/tools/test/h5format_convert/h5fc_gentest.c
+++ b/tools/test/h5format_convert/h5fc_gentest.c
@@ -136,7 +136,6 @@ gen_non(const char *fname)
      */
 
     /* Create dataspace */
-    max_dims[0] = 10;
     max_dims[0] = H5S_UNLIMITED;
     max_dims[1] = H5S_UNLIMITED;
     if ((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
diff --git a/tools/test/h5format_convert/testh5fc.sh.in b/tools/test/h5format_convert/testh5fc.sh.in
index cd2b801..4ba46cb 100644
--- a/tools/test/h5format_convert/testh5fc.sh.in
+++ b/tools/test/h5format_convert/testh5fc.sh.in
@@ -49,11 +49,10 @@ verbose=yes
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
@@ -61,6 +60,7 @@ SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5FORMCONV_TESTFILES="$SRC_TOOLS/test/h5format_convert/testfiles"
+SRC_H5FORMCONV_OUTFILES="$SRC_TOOLS/test/h5format_convert/expected"
 
 TESTDIR=./testfiles
 test -d $TESTDIR || mkdir $TESTDIR
@@ -103,39 +103,39 @@ $SRC_H5FORMCONV_TESTFILES/h5fc_err_level.h5
 "
 
 LIST_ERR_TEST_FILES="
-$SRC_H5FORMCONV_TESTFILES/h5fc_d_file.ddl.err
-$SRC_H5FORMCONV_TESTFILES/h5fc_dname.err
-$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistfile.ddl.err
-$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistdset_file.ddl.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_d_file.ddl.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_dname.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_nonexistfile.ddl.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_nonexistdset_file.ddl.err
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5FORMCONV_TESTFILES/h5fc_help.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_nooption.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_d_file.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_dname.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_non_chunked.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_bt1.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_ndata_bt1.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_all.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_n_1d.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_n_all.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_i.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_s.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_f.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_if.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_is.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_sf.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext3_isf.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_i.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_s.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_f.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_if.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_is.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_sf.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext3_isf.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_err.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_err.ddl.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_help.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_nooption.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_d_file.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_dname.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_non_chunked.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_bt1.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_ndata_bt1.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_all.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_n_1d.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_n_all.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_i.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_s.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_f.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_if.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_is.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_sf.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext3_isf.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_i.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_s.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_f.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_if.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_is.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_sf.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext3_isf.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_err.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_err.ddl.err
 "
 
 #
diff --git a/tools/test/h5import/CMakeTests.cmake b/tools/test/h5import/CMakeTests.cmake
index 7506116..c3bbd79 100644
--- a/tools/test/h5import/CMakeTests.cmake
+++ b/tools/test/h5import/CMakeTests.cmake
@@ -45,6 +45,8 @@
       dbinuin16.h5.txt
       dbinuin32.h5.txt
       dtxtstr.h5.txt
+  )
+  set (HDF5_REFERENCE_DDL_FILES
       tall_fp32.ddl
       tall_i32.ddl
       tintsattrs_u32.ddl
@@ -74,19 +76,23 @@
 
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
   foreach (conf_file ${HDF5_REFERENCE_CONF_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${conf_file}" "${PROJECT_BINARY_DIR}/testfiles/${conf_file}" "h5import_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${conf_file}" "${PROJECT_BINARY_DIR}/testfiles/${conf_file}" "h5import_files")
   endforeach ()
 
   foreach (txt_file ${HDF5_REFERENCE_TXT_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files")
+  endforeach ()
+
+  foreach (txt_file ${HDF5_REFERENCE_DDL_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_TOOLS_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
   endforeach ()
   add_custom_target(h5import_files ALL COMMENT "Copying files needed by h5import tests" DEPENDS ${h5import_files_list})
 
diff --git a/tools/test/h5import/h5importtestutil.sh.in b/tools/test/h5import/h5importtestutil.sh.in
index ba91ee5..65b899f 100644
--- a/tools/test/h5import/h5importtestutil.sh.in
+++ b/tools/test/h5import/h5importtestutil.sh.in
@@ -41,11 +41,10 @@ nerrors=0
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
@@ -82,8 +81,8 @@ $SRC_H5IMPORT_TESTFILES/txtuin16.h5
 $SRC_H5IMPORT_TESTFILES/txtuin32.h5
 $SRC_H5IMPORT_TESTFILES/txtstr.h5
 $SRC_H5IMPORT_TESTFILES/textpfe.h5
-$SRC_TOOLS_TESTFILES/tall.h5
-$SRC_TOOLS_TESTFILES/tintsattrs.h5
+$SRC_H5DUMP_TESTFILES/tall.h5
+$SRC_H5DUMP_TESTFILES/tintsattrs.h5
 "
 
 LIST_OTHER_TEST_FILES="
diff --git a/tools/test/h5jam/CMakeTests.cmake b/tools/test/h5jam/CMakeTests.cmake
index e19ec86..eb6070e 100644
--- a/tools/test/h5jam/CMakeTests.cmake
+++ b/tools/test/h5jam/CMakeTests.cmake
@@ -33,11 +33,11 @@
 
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files")
   endforeach ()
 
   foreach (txt_file ${HDF5_REFERENCE_TXT_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5jam_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5jam_files")
   endforeach ()
   add_custom_target(h5jam_files ALL COMMENT "Copying files needed by h5jam tests" DEPENDS ${h5jam_files_list})
 
diff --git a/tools/test/h5jam/testfiles/h5jam-help.txt b/tools/test/h5jam/expected/h5jam-help.txt
index ce97c22..ce97c22 100644
--- a/tools/test/h5jam/testfiles/h5jam-help.txt
+++ b/tools/test/h5jam/expected/h5jam-help.txt
diff --git a/tools/test/h5jam/testfiles/h5jam-ub-nohdf5.txt b/tools/test/h5jam/expected/h5jam-ub-nohdf5.txt
index 72c0b17..72c0b17 100644
--- a/tools/test/h5jam/testfiles/h5jam-ub-nohdf5.txt
+++ b/tools/test/h5jam/expected/h5jam-ub-nohdf5.txt
diff --git a/tools/test/h5jam/testfiles/h5unjam-help.txt b/tools/test/h5jam/expected/h5unjam-help.txt
index f0d92e9..f0d92e9 100644
--- a/tools/test/h5jam/testfiles/h5unjam-help.txt
+++ b/tools/test/h5jam/expected/h5unjam-help.txt
diff --git a/tools/test/h5jam/testfiles/u10.txt b/tools/test/h5jam/expected/u10.txt
index c76a964..c76a964 100644
--- a/tools/test/h5jam/testfiles/u10.txt
+++ b/tools/test/h5jam/expected/u10.txt
diff --git a/tools/test/h5jam/testfiles/u511.txt b/tools/test/h5jam/expected/u511.txt
index bff1736..bff1736 100644
--- a/tools/test/h5jam/testfiles/u511.txt
+++ b/tools/test/h5jam/expected/u511.txt
diff --git a/tools/test/h5jam/testfiles/u512.txt b/tools/test/h5jam/expected/u512.txt
index 33a36c9..33a36c9 100644
--- a/tools/test/h5jam/testfiles/u512.txt
+++ b/tools/test/h5jam/expected/u512.txt
diff --git a/tools/test/h5jam/testfiles/u513.txt b/tools/test/h5jam/expected/u513.txt
index 6b46ebf..6b46ebf 100644
--- a/tools/test/h5jam/testfiles/u513.txt
+++ b/tools/test/h5jam/expected/u513.txt
diff --git a/tools/test/h5jam/testh5jam.sh.in b/tools/test/h5jam/testh5jam.sh.in
index 805ce11..49598da 100644
--- a/tools/test/h5jam/testh5jam.sh.in
+++ b/tools/test/h5jam/testh5jam.sh.in
@@ -43,17 +43,17 @@ verbose=yes
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5JAM_OUTFILES="$SRC_TOOLS/test/h5jam/expected"
 
 TESTDIR=./testfiles
 test -d $TESTDIR || mkdir $TESTDIR
@@ -73,13 +73,13 @@ $SRC_H5JAM_TESTFILES/twithub.h5
 $SRC_H5JAM_TESTFILES/twithub513.h5
 "
 LIST_OTHER_TEST_FILES="
-$SRC_H5JAM_TESTFILES/u10.txt
-$SRC_H5JAM_TESTFILES/u511.txt
-$SRC_H5JAM_TESTFILES/u512.txt
-$SRC_H5JAM_TESTFILES/u513.txt
-$SRC_H5JAM_TESTFILES/h5jam-help.txt
-$SRC_H5JAM_TESTFILES/h5unjam-help.txt
-$SRC_H5JAM_TESTFILES/h5jam-ub-nohdf5.txt
+$SRC_H5JAM_OUTFILES/u10.txt
+$SRC_H5JAM_OUTFILES/u511.txt
+$SRC_H5JAM_OUTFILES/u512.txt
+$SRC_H5JAM_OUTFILES/u513.txt
+$SRC_H5JAM_OUTFILES/h5jam-help.txt
+$SRC_H5JAM_OUTFILES/h5unjam-help.txt
+$SRC_H5JAM_OUTFILES/h5jam-ub-nohdf5.txt
 "
 
 # Source in the output filter function definitions.
diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake
index 15f18b5..14a7e5d 100644
--- a/tools/test/h5ls/CMakeTests.cmake
+++ b/tools/test/h5ls/CMakeTests.cmake
@@ -19,112 +19,119 @@
   # --------------------------------------------------------------------
   # Copy all the test files from source directory to test directory
   # --------------------------------------------------------------------
+  set (LIST_HDF5_TESTLS_FILES
+      tdset_idx.h5
+  )
+
   set (LIST_HDF5_TEST_FILES
-      ${HDF5_TOOLS_DIR}/testfiles/tall.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattr2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdset.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tempty.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.h5
-      ${HDF5_TOOLS_DIR}/testfiles/thlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tloop.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tslink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tudfilter.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdset_idx.h5
+      tall.h5
+      tarray1.h5
+      tattr2.h5
+      tattrreg.h5
+      tcompound.h5
+      tdatareg.h5
+      tdset.h5
+      tempty.h5
+      textlink.h5
+      textlinksrc.h5
+      textlinktar.h5
+      tgroup.h5
+      tgrp_comments.h5
+      tgrpnullspace.h5
+      thlink.h5
+      tloop.h5
+      tnestedcomp.h5
+      tsaf.h5
+      tslink.h5
+      tsoftlinks.h5
+      tstr.h5
+      tudfilter.h5
+      tudlink.h5
+      tvldtypes1.h5
   )
 
   set (LIST_ERR_TEST_FILES
-      ${HDF5_TOOLS_DIR}/test/h5ls/errfiles/nosuchfile.err
-      ${HDF5_TOOLS_DIR}/test/h5ls/errfiles/textlinksrc-nodangle-1.err
-      ${HDF5_TOOLS_DIR}/test/h5ls/errfiles/tgroup-1.err
+      nosuchfile.err
+      textlinksrc-nodangle-1.err
+      tgroup-1.err
   )
 
   set (LIST_OTHER_TEST_FILES
-      ${HDF5_TOOLS_DIR}/testfiles/help-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/help-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/help-3.ls
-      ${HDF5_TOOLS_DIR}/testfiles/nosuchfile.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tall-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tall-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tattr2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg_le.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg_be.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tcomp-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tdataregbe.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tdataregle.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tdset-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tempty.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlink-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-3.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-4.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-5.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-6.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-7.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-1-old.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-2-old.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-3-old.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-6-old.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-7-old.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-3.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-4.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-5.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-nodangle-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-nodangle-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-nodangle-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/thlinks-nodangle-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup-3.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.ls
-      ${HDF5_TOOLS_DIR}/testfiles/thlink-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tloop-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tmultifile.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-3.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-4.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsaf.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tslink-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tstr-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tudfilter.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2le.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2be.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tdset_idx.ls
+      help-1.ls
+      help-2.ls
+      help-3.ls
+      nosuchfile.ls
+      tall-1.ls
+      tall-2.ls
+      tarray1.ls
+      tattr2.ls
+      tattrreg_le.ls
+      tattrreg_be.ls
+      tcomp-1.ls
+      tdataregbe.ls
+      tdataregle.ls
+      tdset-1.ls
+      tdset_idx.ls
+      tempty.ls
+      textlink-1.ls
+      textlinksrc-1.ls
+      textlinksrc-2.ls
+      textlinksrc-3.ls
+      textlinksrc-4.ls
+      textlinksrc-5.ls
+      textlinksrc-6.ls
+      textlinksrc-7.ls
+      textlinksrc-1-old.ls
+      textlinksrc-2-old.ls
+      textlinksrc-3-old.ls
+      textlinksrc-6-old.ls
+      textlinksrc-7-old.ls
+      textlinksrc-nodangle-1.ls
+      textlinksrc-nodangle-2.ls
+      tgroup.ls
+      tgroup-1.ls
+      tgroup-2.ls
+      tgroup-3.ls
+      tgrpnullspace.ls
+      tgrp_comments.ls
+      thlinks-nodangle-1.ls
+      thlink-1.ls
+      tloop-1.ls
+      tmultifile.ls
+      tnestcomp-1.ls
+      tnestcomp-2.ls
+      tnestcomp-3.ls
+      tnestcomp-4.ls
+      tsaf.ls
+      tslink-1.ls
+      tsoftlinks-1.ls
+      tsoftlinks-2.ls
+      tsoftlinks-3.ls
+      tsoftlinks-4.ls
+      tsoftlinks-5.ls
+      tsoftlinks-nodangle-1.ls
+      tstr-1.ls
+      tudfilter.ls
+      tudlink-1.ls
+      tvldtypes1.ls
+      tvldtypes2le.ls
+      tvldtypes2be.ls
   )
 
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 
   # copy the list of test files
-  foreach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
-    get_filename_component(fname "${listfiles}" NAME)
-    HDFTEST_COPY_FILE("${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5ls_files")
+  foreach (listlsfiles ${LIST_HDF5_TESTLS_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${listlsfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listlsfiles}" "h5ls_files")
+  endforeach ()
+  foreach (listfiles ${LIST_HDF5_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listfiles}" "h5ls_files")
+  endforeach ()
+  foreach (listothers ${LIST_OTHER_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/${listothers}" "h5ls_files")
   endforeach ()
-  foreach (listfiles ${LIST_ERR_TEST_FILES})
-    get_filename_component(fname "${listfiles}" NAME)
-    HDFTEST_COPY_FILE("${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5ls_files")
+  foreach (listerrfiles ${LIST_ERR_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${listerrfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listerrfiles}" "h5ls_files")
   endforeach ()
   add_custom_target(h5ls_files ALL COMMENT "Copying files needed by h5ls tests" DEPENDS ${h5ls_files_list})
 
diff --git a/tools/test/h5ls/CMakeTestsVDS.cmake b/tools/test/h5ls/CMakeTestsVDS.cmake
index 5ef21ab..3718f64 100644
--- a/tools/test/h5ls/CMakeTestsVDS.cmake
+++ b/tools/test/h5ls/CMakeTestsVDS.cmake
@@ -57,19 +57,20 @@
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 
   # copy the list of test files
-  foreach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
-    get_filename_component(fname "${listfiles}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5ls_vds_files")
+  foreach (listfiles ${LIST_HDF5_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/${listfiles}" "h5ls_vds_files")
+  endforeach ()
+
+  foreach (listothers ${LIST_OTHER_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/vds/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/vds/${listothers}" "h5ls_vds_files")
   endforeach ()
 
   foreach (listfiles ${LIST_HDF5_TEST_FILES})
-    get_filename_component(fname "${listfiles}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5ls_vds_files")
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${listfiles}" "h5ls_vds_files")
   endforeach ()
 
-  foreach (listfiles ${LIST_OTHER_TEST_FILES})
-    get_filename_component(fname "${listfiles}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5LS_SOURCE_DIR}/vds_prefix/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5ls_vds_files")
+  foreach (listothers ${LIST_OTHER_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/vds_prefix/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${listothers}" "h5ls_vds_files")
   endforeach ()
 
   add_custom_target(h5ls_vds_files ALL COMMENT "Copying files needed by h5ls_vds tests" DEPENDS ${h5ls_vds_files_list})
diff --git a/tools/testfiles/help-1.ls b/tools/test/h5ls/expected/help-1.ls
index 1cf733b..1cf733b 100644
--- a/tools/testfiles/help-1.ls
+++ b/tools/test/h5ls/expected/help-1.ls
diff --git a/tools/testfiles/help-2.ls b/tools/test/h5ls/expected/help-2.ls
index 1cf733b..1cf733b 100644
--- a/tools/testfiles/help-2.ls
+++ b/tools/test/h5ls/expected/help-2.ls
diff --git a/tools/testfiles/help-3.ls b/tools/test/h5ls/expected/help-3.ls
index 1cf733b..1cf733b 100644
--- a/tools/testfiles/help-3.ls
+++ b/tools/test/h5ls/expected/help-3.ls
diff --git a/tools/testfiles/nosuchfile.ls b/tools/test/h5ls/expected/nosuchfile.ls
index e69de29..e69de29 100644
--- a/tools/testfiles/nosuchfile.ls
+++ b/tools/test/h5ls/expected/nosuchfile.ls
diff --git a/tools/testfiles/tall-1.ls b/tools/test/h5ls/expected/tall-1.ls
index 91b89e6..91b89e6 100644
--- a/tools/testfiles/tall-1.ls
+++ b/tools/test/h5ls/expected/tall-1.ls
diff --git a/tools/testfiles/tall-2.ls b/tools/test/h5ls/expected/tall-2.ls
index eb6c3de..eb6c3de 100644
--- a/tools/testfiles/tall-2.ls
+++ b/tools/test/h5ls/expected/tall-2.ls
diff --git a/tools/testfiles/tarray1.ls b/tools/test/h5ls/expected/tarray1.ls
index e7cb9e1..e7cb9e1 100644
--- a/tools/testfiles/tarray1.ls
+++ b/tools/test/h5ls/expected/tarray1.ls
diff --git a/tools/testfiles/tattr2.ls b/tools/test/h5ls/expected/tattr2.ls
index f07f867..f07f867 100644
--- a/tools/testfiles/tattr2.ls
+++ b/tools/test/h5ls/expected/tattr2.ls
diff --git a/tools/testfiles/tattrreg_be.ls b/tools/test/h5ls/expected/tattrreg_be.ls
index b94d291..b94d291 100644
--- a/tools/testfiles/tattrreg_be.ls
+++ b/tools/test/h5ls/expected/tattrreg_be.ls
diff --git a/tools/testfiles/tattrreg_le.ls b/tools/test/h5ls/expected/tattrreg_le.ls
index 471c24c..471c24c 100644
--- a/tools/testfiles/tattrreg_le.ls
+++ b/tools/test/h5ls/expected/tattrreg_le.ls
diff --git a/tools/testfiles/tcomp-1.ls b/tools/test/h5ls/expected/tcomp-1.ls
index 38f4228..38f4228 100644
--- a/tools/testfiles/tcomp-1.ls
+++ b/tools/test/h5ls/expected/tcomp-1.ls
diff --git a/tools/testfiles/tdataregbe.ls b/tools/test/h5ls/expected/tdataregbe.ls
index ae5e629..ae5e629 100644
--- a/tools/testfiles/tdataregbe.ls
+++ b/tools/test/h5ls/expected/tdataregbe.ls
diff --git a/tools/testfiles/tdataregle.ls b/tools/test/h5ls/expected/tdataregle.ls
index 586b385..586b385 100644
--- a/tools/testfiles/tdataregle.ls
+++ b/tools/test/h5ls/expected/tdataregle.ls
diff --git a/tools/testfiles/tdset-1.ls b/tools/test/h5ls/expected/tdset-1.ls
index f214ba5..f214ba5 100644
--- a/tools/testfiles/tdset-1.ls
+++ b/tools/test/h5ls/expected/tdset-1.ls
diff --git a/tools/testfiles/tdset_idx.ls b/tools/test/h5ls/expected/tdset_idx.ls
index db59632..db59632 100644
--- a/tools/testfiles/tdset_idx.ls
+++ b/tools/test/h5ls/expected/tdset_idx.ls
diff --git a/tools/testfiles/tempty.ls b/tools/test/h5ls/expected/tempty.ls
index a9d1e07..a9d1e07 100644
--- a/tools/testfiles/tempty.ls
+++ b/tools/test/h5ls/expected/tempty.ls
diff --git a/tools/testfiles/textlink-1.ls b/tools/test/h5ls/expected/textlink-1.ls
index a49001f..a49001f 100644
--- a/tools/testfiles/textlink-1.ls
+++ b/tools/test/h5ls/expected/textlink-1.ls
diff --git a/tools/testfiles/textlinksrc-1-old.ls b/tools/test/h5ls/expected/textlinksrc-1-old.ls
index ef26cc4..ef26cc4 100644
--- a/tools/testfiles/textlinksrc-1-old.ls
+++ b/tools/test/h5ls/expected/textlinksrc-1-old.ls
diff --git a/tools/testfiles/textlinksrc-1.ls b/tools/test/h5ls/expected/textlinksrc-1.ls
index ef26cc4..ef26cc4 100644
--- a/tools/testfiles/textlinksrc-1.ls
+++ b/tools/test/h5ls/expected/textlinksrc-1.ls
diff --git a/tools/testfiles/textlinksrc-2-old.ls b/tools/test/h5ls/expected/textlinksrc-2-old.ls
index a3044dd..a3044dd 100644
--- a/tools/testfiles/textlinksrc-2-old.ls
+++ b/tools/test/h5ls/expected/textlinksrc-2-old.ls
diff --git a/tools/testfiles/textlinksrc-2.ls b/tools/test/h5ls/expected/textlinksrc-2.ls
index a3044dd..a3044dd 100644
--- a/tools/testfiles/textlinksrc-2.ls
+++ b/tools/test/h5ls/expected/textlinksrc-2.ls
diff --git a/tools/testfiles/textlinksrc-3-old.ls b/tools/test/h5ls/expected/textlinksrc-3-old.ls
index 75f3421..75f3421 100644
--- a/tools/testfiles/textlinksrc-3-old.ls
+++ b/tools/test/h5ls/expected/textlinksrc-3-old.ls
diff --git a/tools/testfiles/textlinksrc-3.ls b/tools/test/h5ls/expected/textlinksrc-3.ls
index 75f3421..75f3421 100644
--- a/tools/testfiles/textlinksrc-3.ls
+++ b/tools/test/h5ls/expected/textlinksrc-3.ls
diff --git a/tools/testfiles/textlinksrc-4.ls b/tools/test/h5ls/expected/textlinksrc-4.ls
index 449830f..449830f 100644
--- a/tools/testfiles/textlinksrc-4.ls
+++ b/tools/test/h5ls/expected/textlinksrc-4.ls
diff --git a/tools/testfiles/textlinksrc-5.ls b/tools/test/h5ls/expected/textlinksrc-5.ls
index 8cba586..8cba586 100644
--- a/tools/testfiles/textlinksrc-5.ls
+++ b/tools/test/h5ls/expected/textlinksrc-5.ls
diff --git a/tools/testfiles/textlinksrc-6-old.ls b/tools/test/h5ls/expected/textlinksrc-6-old.ls
index ae70721..ae70721 100644
--- a/tools/testfiles/textlinksrc-6-old.ls
+++ b/tools/test/h5ls/expected/textlinksrc-6-old.ls
diff --git a/tools/testfiles/textlinksrc-6.ls b/tools/test/h5ls/expected/textlinksrc-6.ls
index ae70721..ae70721 100644
--- a/tools/testfiles/textlinksrc-6.ls
+++ b/tools/test/h5ls/expected/textlinksrc-6.ls
diff --git a/tools/testfiles/textlinksrc-7-old.ls b/tools/test/h5ls/expected/textlinksrc-7-old.ls
index e9a5a03..e9a5a03 100644
--- a/tools/testfiles/textlinksrc-7-old.ls
+++ b/tools/test/h5ls/expected/textlinksrc-7-old.ls
diff --git a/tools/testfiles/textlinksrc-7.ls b/tools/test/h5ls/expected/textlinksrc-7.ls
index e9a5a03..e9a5a03 100644
--- a/tools/testfiles/textlinksrc-7.ls
+++ b/tools/test/h5ls/expected/textlinksrc-7.ls
diff --git a/tools/testfiles/textlinksrc-nodangle-1.ls b/tools/test/h5ls/expected/textlinksrc-nodangle-1.ls
index 1cf733b..1cf733b 100644
--- a/tools/testfiles/textlinksrc-nodangle-1.ls
+++ b/tools/test/h5ls/expected/textlinksrc-nodangle-1.ls
diff --git a/tools/testfiles/textlinksrc-nodangle-2.ls b/tools/test/h5ls/expected/textlinksrc-nodangle-2.ls
index ae70721..ae70721 100644
--- a/tools/testfiles/textlinksrc-nodangle-2.ls
+++ b/tools/test/h5ls/expected/textlinksrc-nodangle-2.ls
diff --git a/tools/testfiles/tgroup-1.ls b/tools/test/h5ls/expected/tgroup-1.ls
index 1cf733b..1cf733b 100644
--- a/tools/testfiles/tgroup-1.ls
+++ b/tools/test/h5ls/expected/tgroup-1.ls
diff --git a/tools/testfiles/tgroup-2.ls b/tools/test/h5ls/expected/tgroup-2.ls
index 464d4d7..464d4d7 100644
--- a/tools/testfiles/tgroup-2.ls
+++ b/tools/test/h5ls/expected/tgroup-2.ls
diff --git a/tools/testfiles/tgroup-3.ls b/tools/test/h5ls/expected/tgroup-3.ls
index 959415f..959415f 100644
--- a/tools/testfiles/tgroup-3.ls
+++ b/tools/test/h5ls/expected/tgroup-3.ls
diff --git a/tools/testfiles/tgroup.ls b/tools/test/h5ls/expected/tgroup.ls
index 549b166..549b166 100644
--- a/tools/testfiles/tgroup.ls
+++ b/tools/test/h5ls/expected/tgroup.ls
diff --git a/tools/testfiles/tgrp_comments.ls b/tools/test/h5ls/expected/tgrp_comments.ls
index c36a819..c36a819 100644
--- a/tools/testfiles/tgrp_comments.ls
+++ b/tools/test/h5ls/expected/tgrp_comments.ls
diff --git a/tools/testfiles/tgrpnullspace.ls b/tools/test/h5ls/expected/tgrpnullspace.ls
index 62689c0..62689c0 100644
--- a/tools/testfiles/tgrpnullspace.ls
+++ b/tools/test/h5ls/expected/tgrpnullspace.ls
diff --git a/tools/testfiles/thlink-1.ls b/tools/test/h5ls/expected/thlink-1.ls
index adcd38a..adcd38a 100644
--- a/tools/testfiles/thlink-1.ls
+++ b/tools/test/h5ls/expected/thlink-1.ls
diff --git a/tools/testfiles/thlinks-nodangle-1.ls b/tools/test/h5ls/expected/thlinks-nodangle-1.ls
index adcd38a..adcd38a 100644
--- a/tools/testfiles/thlinks-nodangle-1.ls
+++ b/tools/test/h5ls/expected/thlinks-nodangle-1.ls
diff --git a/tools/testfiles/tloop-1.ls b/tools/test/h5ls/expected/tloop-1.ls
index a68bd3b..a68bd3b 100644
--- a/tools/testfiles/tloop-1.ls
+++ b/tools/test/h5ls/expected/tloop-1.ls
diff --git a/tools/testfiles/tmultifile.ls b/tools/test/h5ls/expected/tmultifile.ls
index 3fee937..3fee937 100644
--- a/tools/testfiles/tmultifile.ls
+++ b/tools/test/h5ls/expected/tmultifile.ls
diff --git a/tools/testfiles/tnestcomp-1.ls b/tools/test/h5ls/expected/tnestcomp-1.ls
index c6342e1..c6342e1 100644
--- a/tools/testfiles/tnestcomp-1.ls
+++ b/tools/test/h5ls/expected/tnestcomp-1.ls
diff --git a/tools/testfiles/tnestcomp-2.ls b/tools/test/h5ls/expected/tnestcomp-2.ls
index 64be630..64be630 100644
--- a/tools/testfiles/tnestcomp-2.ls
+++ b/tools/test/h5ls/expected/tnestcomp-2.ls
diff --git a/tools/testfiles/tnestcomp-3.ls b/tools/test/h5ls/expected/tnestcomp-3.ls
index d9a6a1f..d9a6a1f 100644
--- a/tools/testfiles/tnestcomp-3.ls
+++ b/tools/test/h5ls/expected/tnestcomp-3.ls
diff --git a/tools/testfiles/tnestcomp-4.ls b/tools/test/h5ls/expected/tnestcomp-4.ls
index d937e86..d937e86 100644
--- a/tools/testfiles/tnestcomp-4.ls
+++ b/tools/test/h5ls/expected/tnestcomp-4.ls
diff --git a/tools/testfiles/tsaf.ls b/tools/test/h5ls/expected/tsaf.ls
index c62d6d0..c62d6d0 100644
--- a/tools/testfiles/tsaf.ls
+++ b/tools/test/h5ls/expected/tsaf.ls
diff --git a/tools/testfiles/tslink-1.ls b/tools/test/h5ls/expected/tslink-1.ls
index 7afc8a5..7afc8a5 100644
--- a/tools/testfiles/tslink-1.ls
+++ b/tools/test/h5ls/expected/tslink-1.ls
diff --git a/tools/testfiles/tsoftlinks-1.ls b/tools/test/h5ls/expected/tsoftlinks-1.ls
index d7d98a3..d7d98a3 100644
--- a/tools/testfiles/tsoftlinks-1.ls
+++ b/tools/test/h5ls/expected/tsoftlinks-1.ls
diff --git a/tools/testfiles/tsoftlinks-2.ls b/tools/test/h5ls/expected/tsoftlinks-2.ls
index 52c5265..52c5265 100644
--- a/tools/testfiles/tsoftlinks-2.ls
+++ b/tools/test/h5ls/expected/tsoftlinks-2.ls
diff --git a/tools/testfiles/tsoftlinks-3.ls b/tools/test/h5ls/expected/tsoftlinks-3.ls
index 6b958ac..6b958ac 100644
--- a/tools/testfiles/tsoftlinks-3.ls
+++ b/tools/test/h5ls/expected/tsoftlinks-3.ls
diff --git a/tools/testfiles/tsoftlinks-4.ls b/tools/test/h5ls/expected/tsoftlinks-4.ls
index 092d8a5..092d8a5 100644
--- a/tools/testfiles/tsoftlinks-4.ls
+++ b/tools/test/h5ls/expected/tsoftlinks-4.ls
diff --git a/tools/testfiles/tsoftlinks-5.ls b/tools/test/h5ls/expected/tsoftlinks-5.ls
index cc1f130..cc1f130 100644
--- a/tools/testfiles/tsoftlinks-5.ls
+++ b/tools/test/h5ls/expected/tsoftlinks-5.ls
diff --git a/tools/testfiles/tsoftlinks-nodangle-1.ls b/tools/test/h5ls/expected/tsoftlinks-nodangle-1.ls
index d7d98a3..d7d98a3 100644
--- a/tools/testfiles/tsoftlinks-nodangle-1.ls
+++ b/tools/test/h5ls/expected/tsoftlinks-nodangle-1.ls
diff --git a/tools/testfiles/tstr-1.ls b/tools/test/h5ls/expected/tstr-1.ls
index 5c68d1a..5c68d1a 100644
--- a/tools/testfiles/tstr-1.ls
+++ b/tools/test/h5ls/expected/tstr-1.ls
diff --git a/tools/testfiles/tudfilter.ls b/tools/test/h5ls/expected/tudfilter.ls
index 1db5fcf..1db5fcf 100644
--- a/tools/testfiles/tudfilter.ls
+++ b/tools/test/h5ls/expected/tudfilter.ls
diff --git a/tools/testfiles/tudlink-1.ls b/tools/test/h5ls/expected/tudlink-1.ls
index 487e4bc..487e4bc 100644
--- a/tools/testfiles/tudlink-1.ls
+++ b/tools/test/h5ls/expected/tudlink-1.ls
diff --git a/tools/testfiles/tvldtypes1.ls b/tools/test/h5ls/expected/tvldtypes1.ls
index 804459e..804459e 100644
--- a/tools/testfiles/tvldtypes1.ls
+++ b/tools/test/h5ls/expected/tvldtypes1.ls
diff --git a/tools/testfiles/tvldtypes2be.ls b/tools/test/h5ls/expected/tvldtypes2be.ls
index 2f7def3..2f7def3 100644
--- a/tools/testfiles/tvldtypes2be.ls
+++ b/tools/test/h5ls/expected/tvldtypes2be.ls
diff --git a/tools/testfiles/tvldtypes2le.ls b/tools/test/h5ls/expected/tvldtypes2le.ls
index f99ad18..f99ad18 100644
--- a/tools/testfiles/tvldtypes2le.ls
+++ b/tools/test/h5ls/expected/tvldtypes2le.ls
diff --git a/tools/testfiles/vds/tvds-1.ls b/tools/test/h5ls/expected/vds/tvds-1.ls
index 61c9e46..61c9e46 100644
--- a/tools/testfiles/vds/tvds-1.ls
+++ b/tools/test/h5ls/expected/vds/tvds-1.ls
diff --git a/tools/testfiles/vds/tvds-2.ls b/tools/test/h5ls/expected/vds/tvds-2.ls
index 49fe05f..49fe05f 100644
--- a/tools/testfiles/vds/tvds-2.ls
+++ b/tools/test/h5ls/expected/vds/tvds-2.ls
diff --git a/tools/testfiles/vds/tvds-3_1.ls b/tools/test/h5ls/expected/vds/tvds-3_1.ls
index fe24002..fe24002 100644
--- a/tools/testfiles/vds/tvds-3_1.ls
+++ b/tools/test/h5ls/expected/vds/tvds-3_1.ls
diff --git a/tools/testfiles/vds/tvds-3_2.ls b/tools/test/h5ls/expected/vds/tvds-3_2.ls
index a4ad84f..a4ad84f 100644
--- a/tools/testfiles/vds/tvds-3_2.ls
+++ b/tools/test/h5ls/expected/vds/tvds-3_2.ls
diff --git a/tools/testfiles/vds/tvds-4.ls b/tools/test/h5ls/expected/vds/tvds-4.ls
index 176529b..176529b 100644
--- a/tools/testfiles/vds/tvds-4.ls
+++ b/tools/test/h5ls/expected/vds/tvds-4.ls
diff --git a/tools/testfiles/vds/tvds-5.ls b/tools/test/h5ls/expected/vds/tvds-5.ls
index 5f98e84..5f98e84 100644
--- a/tools/testfiles/vds/tvds-5.ls
+++ b/tools/test/h5ls/expected/vds/tvds-5.ls
diff --git a/tools/test/h5ls/h5ls_plugin.sh.in b/tools/test/h5ls/h5ls_plugin.sh.in
index 02e0cf7..3408876 100644
--- a/tools/test/h5ls/h5ls_plugin.sh.in
+++ b/tools/test/h5ls/h5ls_plugin.sh.in
@@ -45,8 +45,9 @@ AWK='awk'
 SRC_TOOLS="$srcdir/../.."
 
 # testfiles source dirs for tools
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
+SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected"
 
 TESTDIR=./testplug
 test -d $TESTDIR || mkdir $TESTDIR
@@ -61,8 +62,8 @@ test -d $TESTDIR || mkdir $TESTDIR
 #       Comment '#' without space can be used.
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES="
-$SRC_TOOLS_TESTFILES/tudfilter.h5
-$SRC_TOOLS_TESTFILES/tudfilter.ls
+$SRC_H5DUMP_TESTFILES/tudfilter.h5
+$SRC_H5LS_OUTFILES/tudfilter.ls
 "
 
 # RUNSERIAL is used. Check if it can return exit code from executable correctly.
diff --git a/tools/testfiles/tdset_idx.h5 b/tools/test/h5ls/testfiles/tdset_idx.h5
index b31d5c3..b31d5c3 100644
--- a/tools/testfiles/tdset_idx.h5
+++ b/tools/test/h5ls/testfiles/tdset_idx.h5
diff --git a/tools/test/h5ls/testh5ls.sh.in b/tools/test/h5ls/testh5ls.sh.in
index 9b0e5cb..fc6daab 100644
--- a/tools/test/h5ls/testh5ls.sh.in
+++ b/tools/test/h5ls/testh5ls.sh.in
@@ -41,11 +41,10 @@ h5haveexitcode=yes      # default is yes
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
@@ -53,6 +52,7 @@ SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5LS_ERRFILES="$SRC_TOOLS/test/h5ls/errfiles"
+SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected"
 
 TESTDIR=./testfiles
 test -d $TESTDIR || mkdir $TESTDIR
@@ -67,29 +67,29 @@ test -d $TESTDIR || mkdir $TESTDIR
 #       Comment '#' without space can be used.
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES="
-$SRC_H5LS_TESTFILES/tall.h5
-$SRC_H5LS_TESTFILES/tarray1.h5
-$SRC_H5LS_TESTFILES/tattr2.h5
-$SRC_H5LS_TESTFILES/tattrreg.h5
-$SRC_H5LS_TESTFILES/tcompound.h5
-$SRC_H5LS_TESTFILES/tdatareg.h5
-$SRC_H5LS_TESTFILES/tdset.h5
-$SRC_H5LS_TESTFILES/tempty.h5
-$SRC_H5LS_TESTFILES/textlink.h5
-$SRC_H5LS_TESTFILES/textlinksrc.h5
-$SRC_H5LS_TESTFILES/textlinktar.h5
-$SRC_H5LS_TESTFILES/tgroup.h5
-$SRC_H5LS_TESTFILES/tgrp_comments.h5
-$SRC_H5LS_TESTFILES/tgrpnullspace.h5
-$SRC_H5LS_TESTFILES/thlink.h5
-$SRC_H5LS_TESTFILES/tloop.h5
-$SRC_H5LS_TESTFILES/tnestedcomp.h5
-$SRC_H5LS_TESTFILES/tsaf.h5
-$SRC_H5LS_TESTFILES/tslink.h5
-$SRC_H5LS_TESTFILES/tsoftlinks.h5
-$SRC_H5LS_TESTFILES/tstr.h5
-$SRC_H5LS_TESTFILES/tudlink.h5
-$SRC_H5LS_TESTFILES/tvldtypes1.h5
+$SRC_H5DUMP_TESTFILES/tall.h5
+$SRC_H5DUMP_TESTFILES/tarray1.h5
+$SRC_H5DUMP_TESTFILES/tattr2.h5
+$SRC_H5DUMP_TESTFILES/tattrreg.h5
+$SRC_H5DUMP_TESTFILES/tcompound.h5
+$SRC_H5DUMP_TESTFILES/tdatareg.h5
+$SRC_H5DUMP_TESTFILES/tdset.h5
+$SRC_H5DUMP_TESTFILES/tempty.h5
+$SRC_H5DUMP_TESTFILES/textlink.h5
+$SRC_H5DUMP_TESTFILES/textlinksrc.h5
+$SRC_H5DUMP_TESTFILES/textlinktar.h5
+$SRC_H5DUMP_TESTFILES/tgroup.h5
+$SRC_H5DUMP_TESTFILES/tgrp_comments.h5
+$SRC_H5DUMP_TESTFILES/tgrpnullspace.h5
+$SRC_H5DUMP_TESTFILES/thlink.h5
+$SRC_H5DUMP_TESTFILES/tloop.h5
+$SRC_H5DUMP_TESTFILES/tnestedcomp.h5
+$SRC_H5DUMP_TESTFILES/tsaf.h5
+$SRC_H5DUMP_TESTFILES/tslink.h5
+$SRC_H5DUMP_TESTFILES/tsoftlinks.h5
+$SRC_H5DUMP_TESTFILES/tstr.h5
+$SRC_H5DUMP_TESTFILES/tudlink.h5
+$SRC_H5DUMP_TESTFILES/tvldtypes1.h5
 $SRC_H5LS_TESTFILES/tdset_idx.h5
 "
 
@@ -100,64 +100,64 @@ $SRC_H5LS_ERRFILES/tgroup-1.err
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5LS_TESTFILES/help-1.ls
-$SRC_H5LS_TESTFILES/help-2.ls
-$SRC_H5LS_TESTFILES/help-3.ls
-$SRC_H5LS_TESTFILES/nosuchfile.ls
-$SRC_H5LS_TESTFILES/tall-1.ls
-$SRC_H5LS_TESTFILES/tall-2.ls
-$SRC_H5LS_TESTFILES/tarray1.ls
-$SRC_H5LS_TESTFILES/tattr2.ls
-$SRC_H5LS_TESTFILES/tattrreg_le.ls
-$SRC_H5LS_TESTFILES/tattrreg_be.ls
-$SRC_H5LS_TESTFILES/tcomp-1.ls
-$SRC_H5LS_TESTFILES/tdataregbe.ls
-$SRC_H5LS_TESTFILES/tdataregle.ls
-$SRC_H5LS_TESTFILES/tdset-1.ls
-$SRC_H5LS_TESTFILES/tempty.ls
-$SRC_H5LS_TESTFILES/textlink-1.ls
-$SRC_H5LS_TESTFILES/textlinksrc-1.ls
-$SRC_H5LS_TESTFILES/textlinksrc-2.ls
-$SRC_H5LS_TESTFILES/textlinksrc-3.ls
-$SRC_H5LS_TESTFILES/textlinksrc-4.ls
-$SRC_H5LS_TESTFILES/textlinksrc-5.ls
-$SRC_H5LS_TESTFILES/textlinksrc-6.ls
-$SRC_H5LS_TESTFILES/textlinksrc-7.ls
-$SRC_H5LS_TESTFILES/textlinksrc-1-old.ls
-$SRC_H5LS_TESTFILES/textlinksrc-2-old.ls
-$SRC_H5LS_TESTFILES/textlinksrc-3-old.ls
-$SRC_H5LS_TESTFILES/textlinksrc-6-old.ls
-$SRC_H5LS_TESTFILES/textlinksrc-7-old.ls
-$SRC_H5LS_TESTFILES/tsoftlinks-1.ls
-$SRC_H5LS_TESTFILES/tsoftlinks-2.ls
-$SRC_H5LS_TESTFILES/tsoftlinks-3.ls
-$SRC_H5LS_TESTFILES/tsoftlinks-4.ls
-$SRC_H5LS_TESTFILES/tsoftlinks-5.ls
-$SRC_H5LS_TESTFILES/textlinksrc-nodangle-1.ls
-$SRC_H5LS_TESTFILES/textlinksrc-nodangle-2.ls
-$SRC_H5LS_TESTFILES/tgrp_comments.ls
-$SRC_H5LS_TESTFILES/tsoftlinks-nodangle-1.ls
-$SRC_H5LS_TESTFILES/thlinks-nodangle-1.ls
-$SRC_H5LS_TESTFILES/tgroup.ls
-$SRC_H5LS_TESTFILES/tgroup-1.ls
-$SRC_H5LS_TESTFILES/tgroup-2.ls
-$SRC_H5LS_TESTFILES/tgroup-3.ls
-$SRC_H5LS_TESTFILES/tgrpnullspace.ls
-$SRC_H5LS_TESTFILES/thlink-1.ls
-$SRC_H5LS_TESTFILES/tloop-1.ls
-$SRC_H5LS_TESTFILES/tmultifile.ls
-$SRC_H5LS_TESTFILES/tnestcomp-1.ls
-$SRC_H5LS_TESTFILES/tnestcomp-2.ls
-$SRC_H5LS_TESTFILES/tnestcomp-3.ls
-$SRC_H5LS_TESTFILES/tnestcomp-4.ls
-$SRC_H5LS_TESTFILES/tsaf.ls
-$SRC_H5LS_TESTFILES/tslink-1.ls
-$SRC_H5LS_TESTFILES/tstr-1.ls
-$SRC_H5LS_TESTFILES/tudlink-1.ls
-$SRC_H5LS_TESTFILES/tvldtypes1.ls
-$SRC_H5LS_TESTFILES/tvldtypes2le.ls
-$SRC_H5LS_TESTFILES/tvldtypes2be.ls
-$SRC_H5LS_TESTFILES/tdset_idx.ls
+$SRC_H5LS_OUTFILES/help-1.ls
+$SRC_H5LS_OUTFILES/help-2.ls
+$SRC_H5LS_OUTFILES/help-3.ls
+$SRC_H5LS_OUTFILES/nosuchfile.ls
+$SRC_H5LS_OUTFILES/tall-1.ls
+$SRC_H5LS_OUTFILES/tall-2.ls
+$SRC_H5LS_OUTFILES/tarray1.ls
+$SRC_H5LS_OUTFILES/tattr2.ls
+$SRC_H5LS_OUTFILES/tattrreg_le.ls
+$SRC_H5LS_OUTFILES/tattrreg_be.ls
+$SRC_H5LS_OUTFILES/tcomp-1.ls
+$SRC_H5LS_OUTFILES/tdataregbe.ls
+$SRC_H5LS_OUTFILES/tdataregle.ls
+$SRC_H5LS_OUTFILES/tdset-1.ls
+$SRC_H5LS_OUTFILES/tempty.ls
+$SRC_H5LS_OUTFILES/textlink-1.ls
+$SRC_H5LS_OUTFILES/textlinksrc-1.ls
+$SRC_H5LS_OUTFILES/textlinksrc-2.ls
+$SRC_H5LS_OUTFILES/textlinksrc-3.ls
+$SRC_H5LS_OUTFILES/textlinksrc-4.ls
+$SRC_H5LS_OUTFILES/textlinksrc-5.ls
+$SRC_H5LS_OUTFILES/textlinksrc-6.ls
+$SRC_H5LS_OUTFILES/textlinksrc-7.ls
+$SRC_H5LS_OUTFILES/textlinksrc-1-old.ls
+$SRC_H5LS_OUTFILES/textlinksrc-2-old.ls
+$SRC_H5LS_OUTFILES/textlinksrc-3-old.ls
+$SRC_H5LS_OUTFILES/textlinksrc-6-old.ls
+$SRC_H5LS_OUTFILES/textlinksrc-7-old.ls
+$SRC_H5LS_OUTFILES/tsoftlinks-1.ls
+$SRC_H5LS_OUTFILES/tsoftlinks-2.ls
+$SRC_H5LS_OUTFILES/tsoftlinks-3.ls
+$SRC_H5LS_OUTFILES/tsoftlinks-4.ls
+$SRC_H5LS_OUTFILES/tsoftlinks-5.ls
+$SRC_H5LS_OUTFILES/textlinksrc-nodangle-1.ls
+$SRC_H5LS_OUTFILES/textlinksrc-nodangle-2.ls
+$SRC_H5LS_OUTFILES/tgrp_comments.ls
+$SRC_H5LS_OUTFILES/tsoftlinks-nodangle-1.ls
+$SRC_H5LS_OUTFILES/thlinks-nodangle-1.ls
+$SRC_H5LS_OUTFILES/tgroup.ls
+$SRC_H5LS_OUTFILES/tgroup-1.ls
+$SRC_H5LS_OUTFILES/tgroup-2.ls
+$SRC_H5LS_OUTFILES/tgroup-3.ls
+$SRC_H5LS_OUTFILES/tgrpnullspace.ls
+$SRC_H5LS_OUTFILES/thlink-1.ls
+$SRC_H5LS_OUTFILES/tloop-1.ls
+$SRC_H5LS_OUTFILES/tmultifile.ls
+$SRC_H5LS_OUTFILES/tnestcomp-1.ls
+$SRC_H5LS_OUTFILES/tnestcomp-2.ls
+$SRC_H5LS_OUTFILES/tnestcomp-3.ls
+$SRC_H5LS_OUTFILES/tnestcomp-4.ls
+$SRC_H5LS_OUTFILES/tsaf.ls
+$SRC_H5LS_OUTFILES/tslink-1.ls
+$SRC_H5LS_OUTFILES/tstr-1.ls
+$SRC_H5LS_OUTFILES/tudlink-1.ls
+$SRC_H5LS_OUTFILES/tvldtypes1.ls
+$SRC_H5LS_OUTFILES/tvldtypes2le.ls
+$SRC_H5LS_OUTFILES/tvldtypes2be.ls
+$SRC_H5LS_OUTFILES/tdset_idx.ls
 "
 
 
diff --git a/tools/test/h5ls/testh5lsvds.sh.in b/tools/test/h5ls/testh5lsvds.sh.in
index beba73f..2408ee2 100644
--- a/tools/test/h5ls/testh5lsvds.sh.in
+++ b/tools/test/h5ls/testh5lsvds.sh.in
@@ -38,17 +38,17 @@ h5haveexitcode=yes      # default is yes
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected"
 
 TEST_P_DIR=./testfiles
 TESTDIR=./testfiles/vds
@@ -65,38 +65,38 @@ test -d $TESTDIR || mkdir $TESTDIR
 #       Comment '#' without space can be used.
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES="
-$SRC_H5LS_TESTFILES/vds/1_a.h5
-$SRC_H5LS_TESTFILES/vds/1_b.h5
-$SRC_H5LS_TESTFILES/vds/1_c.h5
-$SRC_H5LS_TESTFILES/vds/1_d.h5
-$SRC_H5LS_TESTFILES/vds/1_e.h5
-$SRC_H5LS_TESTFILES/vds/1_f.h5
-$SRC_H5LS_TESTFILES/vds/1_vds.h5
-$SRC_H5LS_TESTFILES/vds/2_a.h5
-$SRC_H5LS_TESTFILES/vds/2_b.h5
-$SRC_H5LS_TESTFILES/vds/2_c.h5
-$SRC_H5LS_TESTFILES/vds/2_d.h5
-$SRC_H5LS_TESTFILES/vds/2_e.h5
-$SRC_H5LS_TESTFILES/vds/2_vds.h5
-$SRC_H5LS_TESTFILES/vds/3_1_vds.h5
-$SRC_H5LS_TESTFILES/vds/3_2_vds.h5
-$SRC_H5LS_TESTFILES/vds/4_0.h5
-$SRC_H5LS_TESTFILES/vds/4_1.h5
-$SRC_H5LS_TESTFILES/vds/4_2.h5
-$SRC_H5LS_TESTFILES/vds/4_vds.h5
-$SRC_H5LS_TESTFILES/vds/5_a.h5
-$SRC_H5LS_TESTFILES/vds/5_b.h5
-$SRC_H5LS_TESTFILES/vds/5_c.h5
-$SRC_H5LS_TESTFILES/vds/5_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/1_a.h5
+$SRC_H5DUMP_TESTFILES/vds/1_b.h5
+$SRC_H5DUMP_TESTFILES/vds/1_c.h5
+$SRC_H5DUMP_TESTFILES/vds/1_d.h5
+$SRC_H5DUMP_TESTFILES/vds/1_e.h5
+$SRC_H5DUMP_TESTFILES/vds/1_f.h5
+$SRC_H5DUMP_TESTFILES/vds/1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/2_a.h5
+$SRC_H5DUMP_TESTFILES/vds/2_b.h5
+$SRC_H5DUMP_TESTFILES/vds/2_c.h5
+$SRC_H5DUMP_TESTFILES/vds/2_d.h5
+$SRC_H5DUMP_TESTFILES/vds/2_e.h5
+$SRC_H5DUMP_TESTFILES/vds/2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/4_0.h5
+$SRC_H5DUMP_TESTFILES/vds/4_1.h5
+$SRC_H5DUMP_TESTFILES/vds/4_2.h5
+$SRC_H5DUMP_TESTFILES/vds/4_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/5_a.h5
+$SRC_H5DUMP_TESTFILES/vds/5_b.h5
+$SRC_H5DUMP_TESTFILES/vds/5_c.h5
+$SRC_H5DUMP_TESTFILES/vds/5_vds.h5
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5LS_TESTFILES/vds/tvds-1.ls
-$SRC_H5LS_TESTFILES/vds/tvds-2.ls
-$SRC_H5LS_TESTFILES/vds/tvds-3_1.ls
-$SRC_H5LS_TESTFILES/vds/tvds-3_2.ls
-$SRC_H5LS_TESTFILES/vds/tvds-4.ls
-$SRC_H5LS_TESTFILES/vds/tvds-5.ls
+$SRC_H5LS_OUTFILES/vds/tvds-1.ls
+$SRC_H5LS_OUTFILES/vds/tvds-2.ls
+$SRC_H5LS_OUTFILES/vds/tvds-3_1.ls
+$SRC_H5LS_OUTFILES/vds/tvds-3_2.ls
+$SRC_H5LS_OUTFILES/vds/tvds-4.ls
+$SRC_H5LS_OUTFILES/vds/tvds-5.ls
 "
 
 
diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake
index bd2cb9b..5c41254 100644
--- a/tools/test/h5repack/CMakeTests.cmake
+++ b/tools/test/h5repack/CMakeTests.cmake
@@ -19,203 +19,224 @@
   # --------------------------------------------------------------------
   # Copy all the HDF5 files from the source directory into the test directory
   # --------------------------------------------------------------------
-  set (LIST_HDF5_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/bounds_latest_latest.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_attr.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_attr_refs.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_deflate.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_early.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_ext.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le_ex.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fill.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fletcher.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_hlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex-1.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d_ex.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d_ex.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layouto.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout2.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout3.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_named_dtypes.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nested_8bit_enum.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nested_8bit_enum_deflated.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_CVE-2018-17432.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_CVE-2018-14460.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nbit.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_objs.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_refs.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_shuffle.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_soffset.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_szip.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-1.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-2.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-3.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex.h5
+  set (LIST_REPACK_TEST_FILES
+      bounds_latest_latest.h5
+      h5repack_attr.h5
+      h5repack_attr_refs.h5
+      h5repack_deflate.h5
+      h5repack_early.h5
+      h5repack_ext.h5
+      h5repack_f32le.h5
+      h5repack_f32le_ex-0.dat
+      h5repack_f32le_ex.h5
+      h5repack_fill.h5
+      h5repack_filters.h5
+      h5repack_fletcher.h5
+      h5repack_hlink.h5
+      h5repack_int32le_1d.h5
+      h5repack_int32le_1d_ex-0.dat
+      h5repack_int32le_1d_ex-1.dat
+      h5repack_int32le_1d_ex.h5
+      h5repack_int32le_2d.h5
+      h5repack_int32le_2d_ex-0.dat
+      h5repack_int32le_2d_ex.h5
+      h5repack_int32le_3d.h5
+      h5repack_int32le_3d_ex-0.dat
+      h5repack_int32le_3d_ex.h5
+      h5repack_layout.h5
+      h5repack_layouto.h5
+      h5repack_layout2.h5
+      h5repack_layout3.h5
+      h5repack_layout.UD.h5
+      h5repack_named_dtypes.h5
+      h5repack_nested_8bit_enum.h5
+      h5repack_nested_8bit_enum_deflated.h5
+      h5repack_CVE-2018-17432.h5
+      h5repack_CVE-2018-14460.h5
+      h5repack_nbit.h5
+      h5repack_objs.h5
+      h5repack_refs.h5
+      h5repack_shuffle.h5
+      h5repack_soffset.h5
+      h5repack_szip.h5
+      h5repack_uint8be.h5
+      h5repack_uint8be_ex-0.dat
+      h5repack_uint8be_ex-1.dat
+      h5repack_uint8be_ex-2.dat
+      h5repack_uint8be_ex-3.dat
+      h5repack_uint8be_ex.h5
       # fsm
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_aggr.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fsm_aggr_nopersist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fsm_aggr_persist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_none.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_paged_nopersist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_paged_persist.h5
-      # h5diff/testfile
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5
+      h5repack_aggr.h5
+      h5repack_fsm_aggr_nopersist.h5
+      h5repack_fsm_aggr_persist.h5
+      h5repack_none.h5
+      h5repack_paged_nopersist.h5
+      h5repack_paged_persist.h5
+  )
+  # h5diff/testfile
+  set (LIST_DIFF_TEST_FILES
+      h5diff_attr1.h5
+  )
+  # tools/testfiles/vds
+  set (LIST_VDS_TEST_FILES
+      1_a.h5
+      1_b.h5
+      1_c.h5
+      1_d.h5
+      1_e.h5
+      1_f.h5
+      1_vds.h5
+      2_a.h5
+      2_b.h5
+      2_c.h5
+      2_d.h5
+      2_e.h5
+      2_vds.h5
+      3_1_vds.h5
+      3_2_vds.h5
+      4_0.h5
+      4_1.h5
+      4_2.h5
+      4_vds.h5
+      5_a.h5
+      5_b.h5
+      5_c.h5
+      5_vds.h5
+  )
+  set (LIST_COPY_TEST_FILES
+      h5copy_extlinks_src.h5
+      h5copy_extlinks_trg.h5
+  )
+  set (LIST_HDF5_TEST_FILES
       # tools/testfiles for external links
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_trg.h5
+      tsoftlinks.h5
+      textlinkfar.h5
+      textlinksrc.h5
+      textlinktar.h5
+      textlink.h5
       # tools/testfiles
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00000.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00001.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00002.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00003.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00004.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00005.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00006.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00007.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00008.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00009.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00010.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr.h5
+      tfamily00000.h5
+      tfamily00001.h5
+      tfamily00002.h5
+      tfamily00003.h5
+      tfamily00004.h5
+      tfamily00005.h5
+      tfamily00006.h5
+      tfamily00007.h5
+      tfamily00008.h5
+      tfamily00009.h5
+      tfamily00010.h5
+      tordergr.h5
       # reference conversion files
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5
-      # tools/testfiles/vds
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_e.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_f.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_e.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/3_1_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/3_2_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_0.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5
+      tattrreg.h5
+      tdatareg.h5
       # tools/testfiles onion VFD files
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5.onion
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5.onion
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5.onion
+      tst_onion_dset_1d.h5
+      tst_onion_dset_1d.h5.onion
+      tst_onion_dset_ext.h5
+      tst_onion_dset_ext.h5.onion
+      tst_onion_objs.h5
+      tst_onion_objs.h5.onion
   )
 
   set (LIST_OTHER_TEST_FILES
-      h5repack-help.txt
       h5repack_ext.bin
       h5repack.info
       ublock.bin
   )
 
   set (LIST_TST_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5-gzip_verbose_filters
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_test.h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_version_test.h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_zero.h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_none.h5repack_layout.UD.h5
+      h5repack-help.txt
+      h5repack_filters.h5-gzip_verbose_filters.tst
+      h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+      plugin_test.h5repack_layout.h5.tst
+      plugin_version_test.h5repack_layout.h5.tst
+      plugin_zero.h5repack_layout.h5.tst
+      plugin_none.h5repack_layout.UD.h5.tst
       # tools/testfiles for external links
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-merge.tsoftlinks.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-merge.textlinkfar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-merge.textlinksrc.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-merge.textlinktar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-merge.textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5
+      tsoftlinks-merge.tsoftlinks.h5.tst
+      textlinkfar-merge.textlinkfar.h5.tst
+      textlinksrc-merge.textlinksrc.h5.tst
+      textlinktar-merge.textlinktar.h5.tst
+      textlink-merge.textlink.h5.tst
+      h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
   )
 
   set (LIST_DDL_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/crtorder.tordergr.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/deflate_limit.h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_test
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_version_test
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_zero
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5-plugin_none
+      crtorder.tordergr.h5.ddl
+      deflate_limit.h5repack_layout.h5.ddl
+      h5repack_layout.h5.ddl
+      h5repack_layout.h5-plugin_test.ddl
+      h5repack_layout.h5-plugin_version_test.ddl
+      h5repack_layout.h5-plugin_zero.ddl
+      h5repack_layout.UD.h5-plugin_none.ddl
       # fsm
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/STG.h5repack_none.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SPT.h5repack_aggr.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SP.h5repack_fsm_aggr_nopersist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/S.h5repack_fsm_aggr_persist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/GS.h5repack_paged_nopersist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SP.h5repack_paged_persist.h5
+      STG.h5repack_none.h5.ddl
+      SPT.h5repack_aggr.h5.ddl
+      SP.h5repack_fsm_aggr_nopersist.h5.ddl
+      S.h5repack_fsm_aggr_persist.h5.ddl
+      GS.h5repack_paged_nopersist.h5.ddl
+      SP.h5repack_paged_persist.h5.ddl
       # vds
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/2_vds.h5-vds_chunk3x6x9-v
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/3_1_vds.h5-vds_chunk2x5x8-v
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_compa-v
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_conti-v
+      1_vds.h5-vds_dset_chunk20x10x5-v.ddl
+      2_vds.h5-vds_chunk3x6x9-v.ddl
+      3_1_vds.h5-vds_chunk2x5x8-v.ddl
+      4_vds.h5-vds_compa-v.ddl
+      4_vds.h5-vds_conti-v.ddl
       # refs
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/attrregion.tattrreg.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/dataregion.tdatareg.h5
+      attrregion.tattrreg.h5.ddl
+      dataregion.tdatareg.h5.ddl
       # tools/testfiles for external links
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-base.textlinkfar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-base.textlinksrc.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-base.textlinktar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-base.textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-base.tsoftlinks.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-prune.textlinkfar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-prune.textlinksrc.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-prune.textlinktar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-prune.textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-prune.tsoftlinks.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-mergeprune.textlinkfar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-mergeprune.textlinksrc.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-mergeprune.textlinktar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-mergeprune.textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5
+      textlinkfar-base.textlinkfar.h5.ddl
+      textlinksrc-base.textlinksrc.h5.ddl
+      textlinktar-base.textlinktar.h5.ddl
+      textlink-base.textlink.h5.ddl
+      tsoftlinks-base.tsoftlinks.h5.ddl
+      h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
+      textlinkfar-prune.textlinkfar.h5.ddl
+      textlinksrc-prune.textlinksrc.h5.ddl
+      textlinktar-prune.textlinktar.h5.ddl
+      textlink-prune.textlink.h5.ddl
+      tsoftlinks-prune.tsoftlinks.h5.ddl
+      h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
+      textlinkfar-mergeprune.textlinkfar.h5.ddl
+      textlinksrc-mergeprune.textlinksrc.h5.ddl
+      textlinktar-mergeprune.textlinktar.h5.ddl
+      textlink-mergeprune.textlink.h5.ddl
+      tsoftlinks-mergeprune.tsoftlinks.h5.ddl
+      h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
   )
 
+  foreach (h5_file ${LIST_REPACK_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
+  foreach (h5_file ${LIST_COPY_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5copy/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
+  foreach (h5_file ${LIST_DIFF_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5diff/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
+  foreach (h5_file ${LIST_VDS_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
   foreach (h5_file ${LIST_HDF5_TEST_FILES})
-    get_filename_component(fname "${h5_file}" NAME)
-    HDFTEST_COPY_FILE("${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5repack_files")
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
   endforeach ()
 
   foreach (h5_file ${LIST_OTHER_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
   endforeach ()
 
   foreach (h5_file ${LIST_TST_TEST_FILES})
-    get_filename_component(fname "${h5_file}" NAME)
-    HDFTEST_COPY_FILE("${h5_file}.tst" "${PROJECT_BINARY_DIR}/testfiles/${fname}.tst" "h5repack_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
   endforeach ()
 
   foreach (h5_file ${LIST_DDL_TEST_FILES})
-    get_filename_component(fname "${h5_file}" NAME)
-    HDFTEST_COPY_FILE("${h5_file}.ddl" "${PROJECT_BINARY_DIR}/testfiles/${fname}.ddl" "h5repack_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
   endforeach ()
   add_custom_target(h5repack_files ALL COMMENT "Copying files needed by h5repack tests" DEPENDS ${h5repack_files_list})
 
diff --git a/tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl b/tools/test/h5repack/expected/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
index fab9494..fab9494 100644
--- a/tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
+++ b/tools/test/h5repack/expected/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
diff --git a/tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl b/tools/test/h5repack/expected/2_vds.h5-vds_chunk3x6x9-v.ddl
index 51df9dd..51df9dd 100644
--- a/tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl
+++ b/tools/test/h5repack/expected/2_vds.h5-vds_chunk3x6x9-v.ddl
diff --git a/tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl b/tools/test/h5repack/expected/3_1_vds.h5-vds_chunk2x5x8-v.ddl
index dcd172c..dcd172c 100644
--- a/tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
+++ b/tools/test/h5repack/expected/3_1_vds.h5-vds_chunk2x5x8-v.ddl
diff --git a/tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl b/tools/test/h5repack/expected/4_vds.h5-vds_compa-v.ddl
index 1e8927c..1e8927c 100644
--- a/tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl
+++ b/tools/test/h5repack/expected/4_vds.h5-vds_compa-v.ddl
diff --git a/tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl b/tools/test/h5repack/expected/4_vds.h5-vds_conti-v.ddl
index 54bf26c..54bf26c 100644
--- a/tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl
+++ b/tools/test/h5repack/expected/4_vds.h5-vds_conti-v.ddl
diff --git a/tools/test/h5repack/testfiles/GS.h5repack_paged_nopersist.h5.ddl b/tools/test/h5repack/expected/GS.h5repack_paged_nopersist.h5.ddl
index d8ca992..d8ca992 100644
--- a/tools/test/h5repack/testfiles/GS.h5repack_paged_nopersist.h5.ddl
+++ b/tools/test/h5repack/expected/GS.h5repack_paged_nopersist.h5.ddl
diff --git a/tools/test/h5repack/testfiles/S.h5repack_fsm_aggr_persist.h5.ddl b/tools/test/h5repack/expected/S.h5repack_fsm_aggr_persist.h5.ddl
index 87ccbc4..87ccbc4 100644
--- a/tools/test/h5repack/testfiles/S.h5repack_fsm_aggr_persist.h5.ddl
+++ b/tools/test/h5repack/expected/S.h5repack_fsm_aggr_persist.h5.ddl
diff --git a/tools/test/h5repack/testfiles/SP.h5repack_fsm_aggr_nopersist.h5.ddl b/tools/test/h5repack/expected/SP.h5repack_fsm_aggr_nopersist.h5.ddl
index e78c5e2..e78c5e2 100644
--- a/tools/test/h5repack/testfiles/SP.h5repack_fsm_aggr_nopersist.h5.ddl
+++ b/tools/test/h5repack/expected/SP.h5repack_fsm_aggr_nopersist.h5.ddl
diff --git a/tools/test/h5repack/testfiles/SP.h5repack_paged_persist.h5.ddl b/tools/test/h5repack/expected/SP.h5repack_paged_persist.h5.ddl
index 1084090..1084090 100644
--- a/tools/test/h5repack/testfiles/SP.h5repack_paged_persist.h5.ddl
+++ b/tools/test/h5repack/expected/SP.h5repack_paged_persist.h5.ddl
diff --git a/tools/test/h5repack/testfiles/SPT.h5repack_aggr.h5.ddl b/tools/test/h5repack/expected/SPT.h5repack_aggr.h5.ddl
index 3ecf9b1..3ecf9b1 100644
--- a/tools/test/h5repack/testfiles/SPT.h5repack_aggr.h5.ddl
+++ b/tools/test/h5repack/expected/SPT.h5repack_aggr.h5.ddl
diff --git a/tools/test/h5repack/testfiles/STG.h5repack_none.h5.ddl b/tools/test/h5repack/expected/STG.h5repack_none.h5.ddl
index 51cd7e5..51cd7e5 100644
--- a/tools/test/h5repack/testfiles/STG.h5repack_none.h5.ddl
+++ b/tools/test/h5repack/expected/STG.h5repack_none.h5.ddl
diff --git a/tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl b/tools/test/h5repack/expected/attrregion.tattrreg.h5.ddl
index 7cab02b..7cab02b 100644
--- a/tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl
+++ b/tools/test/h5repack/expected/attrregion.tattrreg.h5.ddl
diff --git a/tools/test/h5repack/testfiles/crtorder.tordergr.h5.ddl b/tools/test/h5repack/expected/crtorder.tordergr.h5.ddl
index 870d154..870d154 100644
--- a/tools/test/h5repack/testfiles/crtorder.tordergr.h5.ddl
+++ b/tools/test/h5repack/expected/crtorder.tordergr.h5.ddl
diff --git a/tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl b/tools/test/h5repack/expected/dataregion.tdatareg.h5.ddl
index bd31118..bd31118 100644
--- a/tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl
+++ b/tools/test/h5repack/expected/dataregion.tdatareg.h5.ddl
diff --git a/tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl b/tools/test/h5repack/expected/deflate_limit.h5repack_layout.h5.ddl
index 75f54fa..75f54fa 100644
--- a/tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
+++ b/tools/test/h5repack/expected/deflate_limit.h5repack_layout.h5.ddl
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
index ad8a320..ad8a320 100644
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
+++ b/tools/test/h5repack/expected/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst b/tools/test/h5repack/expected/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
index 52f215d..52f215d 100644
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
+++ b/tools/test/h5repack/expected/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
index ad8a320..ad8a320 100644
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
+++ b/tools/test/h5repack/expected/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
index b7d7bca..b7d7bca 100644
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
+++ b/tools/test/h5repack/expected/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack-help.txt b/tools/test/h5repack/expected/h5repack-help.txt
index b291a68..b291a68 100644
--- a/tools/test/h5repack/testfiles/h5repack-help.txt
+++ b/tools/test/h5repack/expected/h5repack-help.txt
diff --git a/tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst b/tools/test/h5repack/expected/h5repack_filters.h5-gzip_verbose_filters.tst
index cb12172..cb12172 100644
--- a/tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
+++ b/tools/test/h5repack/expected/h5repack_filters.h5-gzip_verbose_filters.tst
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl b/tools/test/h5repack/expected/h5repack_layout.UD.h5-plugin_none.ddl
index 66c4c69..66c4c69 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.UD.h5-plugin_none.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/expected/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
index 3d9f0c2..3d9f0c2 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+++ b/tools/test/h5repack/expected/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_test.ddl
index a8b4562..a8b4562 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_test.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_version_test.ddl
index d7aa1c3..d7aa1c3 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_version_test.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_zero.ddl
index e4ffaf1..e4ffaf1 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_zero.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5.ddl b/tools/test/h5repack/expected/h5repack_layout.h5.ddl
index 00c74f4..00c74f4 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.h5.ddl
diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_dset_1d.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_dset_1d.h5.ddl
index 06ecf1a..06ecf1a 100644
--- a/tools/test/h5repack/testfiles/onion.tst_onion_dset_1d.h5.ddl
+++ b/tools/test/h5repack/expected/onion.tst_onion_dset_1d.h5.ddl
diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_dset_ext.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_dset_ext.h5.ddl
index 39c1900..39c1900 100644
--- a/tools/test/h5repack/testfiles/onion.tst_onion_dset_ext.h5.ddl
+++ b/tools/test/h5repack/expected/onion.tst_onion_dset_ext.h5.ddl
diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_objs.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_objs.h5.ddl
index fa4ab4f..fa4ab4f 100644
--- a/tools/test/h5repack/testfiles/onion.tst_onion_objs.h5.ddl
+++ b/tools/test/h5repack/expected/onion.tst_onion_objs.h5.ddl
diff --git a/tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst b/tools/test/h5repack/expected/plugin_none.h5repack_layout.UD.h5.tst
index 30aa8ad..30aa8ad 100644
--- a/tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst
+++ b/tools/test/h5repack/expected/plugin_none.h5repack_layout.UD.h5.tst
diff --git a/tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_test.h5repack_layout.h5.tst
index 62ea1cc..62ea1cc 100644
--- a/tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst
+++ b/tools/test/h5repack/expected/plugin_test.h5repack_layout.h5.tst
diff --git a/tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_version_test.h5repack_layout.h5.tst
index f5c4736..f5c4736 100644
--- a/tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst
+++ b/tools/test/h5repack/expected/plugin_version_test.h5repack_layout.h5.tst
diff --git a/tools/test/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_zero.h5repack_layout.h5.tst
index 54c873c..54c873c 100644
--- a/tools/test/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst
+++ b/tools/test/h5repack/expected/plugin_zero.h5repack_layout.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlink-base.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-base.textlink.h5.ddl
index b87a17d..b87a17d 100644
--- a/tools/test/h5repack/testfiles/textlink-base.textlink.h5.ddl
+++ b/tools/test/h5repack/expected/textlink-base.textlink.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlink-merge.textlink.h5.tst b/tools/test/h5repack/expected/textlink-merge.textlink.h5.tst
index a7ff71d..a7ff71d 100644
--- a/tools/test/h5repack/testfiles/textlink-merge.textlink.h5.tst
+++ b/tools/test/h5repack/expected/textlink-merge.textlink.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlink-mergeprune.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-mergeprune.textlink.h5.ddl
index 7206ae9..7206ae9 100644
--- a/tools/test/h5repack/testfiles/textlink-mergeprune.textlink.h5.ddl
+++ b/tools/test/h5repack/expected/textlink-mergeprune.textlink.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlink-prune.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-prune.textlink.h5.ddl
index 83db344..83db344 100644
--- a/tools/test/h5repack/testfiles/textlink-prune.textlink.h5.ddl
+++ b/tools/test/h5repack/expected/textlink-prune.textlink.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinkfar-base.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-base.textlinkfar.h5.ddl
index a5eb497..a5eb497 100644
--- a/tools/test/h5repack/testfiles/textlinkfar-base.textlinkfar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinkfar-base.textlinkfar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinkfar-merge.textlinkfar.h5.tst b/tools/test/h5repack/expected/textlinkfar-merge.textlinkfar.h5.tst
index 6673d39..6673d39 100644
--- a/tools/test/h5repack/testfiles/textlinkfar-merge.textlinkfar.h5.tst
+++ b/tools/test/h5repack/expected/textlinkfar-merge.textlinkfar.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlinkfar-mergeprune.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-mergeprune.textlinkfar.h5.ddl
index 7ba3308..7ba3308 100644
--- a/tools/test/h5repack/testfiles/textlinkfar-mergeprune.textlinkfar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinkfar-mergeprune.textlinkfar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinkfar-prune.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-prune.textlinkfar.h5.ddl
index 30f8f1b..30f8f1b 100644
--- a/tools/test/h5repack/testfiles/textlinkfar-prune.textlinkfar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinkfar-prune.textlinkfar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinksrc-base.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-base.textlinksrc.h5.ddl
index 9a9a9aa..9a9a9aa 100644
--- a/tools/test/h5repack/testfiles/textlinksrc-base.textlinksrc.h5.ddl
+++ b/tools/test/h5repack/expected/textlinksrc-base.textlinksrc.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinksrc-merge.textlinksrc.h5.tst b/tools/test/h5repack/expected/textlinksrc-merge.textlinksrc.h5.tst
index d5a5902..d5a5902 100644
--- a/tools/test/h5repack/testfiles/textlinksrc-merge.textlinksrc.h5.tst
+++ b/tools/test/h5repack/expected/textlinksrc-merge.textlinksrc.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlinksrc-mergeprune.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-mergeprune.textlinksrc.h5.ddl
index 5b3c740..5b3c740 100644
--- a/tools/test/h5repack/testfiles/textlinksrc-mergeprune.textlinksrc.h5.ddl
+++ b/tools/test/h5repack/expected/textlinksrc-mergeprune.textlinksrc.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinksrc-prune.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-prune.textlinksrc.h5.ddl
index 65d35ef..65d35ef 100644
--- a/tools/test/h5repack/testfiles/textlinksrc-prune.textlinksrc.h5.ddl
+++ b/tools/test/h5repack/expected/textlinksrc-prune.textlinksrc.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinktar-base.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-base.textlinktar.h5.ddl
index 3f02ff2..3f02ff2 100644
--- a/tools/test/h5repack/testfiles/textlinktar-base.textlinktar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinktar-base.textlinktar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinktar-merge.textlinktar.h5.tst b/tools/test/h5repack/expected/textlinktar-merge.textlinktar.h5.tst
index ccf4f7b..ccf4f7b 100644
--- a/tools/test/h5repack/testfiles/textlinktar-merge.textlinktar.h5.tst
+++ b/tools/test/h5repack/expected/textlinktar-merge.textlinktar.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlinktar-mergeprune.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-mergeprune.textlinktar.h5.ddl
index c52e34d..c52e34d 100644
--- a/tools/test/h5repack/testfiles/textlinktar-mergeprune.textlinktar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinktar-mergeprune.textlinktar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinktar-prune.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-prune.textlinktar.h5.ddl
index 6787784..6787784 100644
--- a/tools/test/h5repack/testfiles/textlinktar-prune.textlinktar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinktar-prune.textlinktar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/tsoftlinks-base.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-base.tsoftlinks.h5.ddl
index b0cd32d..b0cd32d 100644
--- a/tools/test/h5repack/testfiles/tsoftlinks-base.tsoftlinks.h5.ddl
+++ b/tools/test/h5repack/expected/tsoftlinks-base.tsoftlinks.h5.ddl
diff --git a/tools/test/h5repack/testfiles/tsoftlinks-merge.tsoftlinks.h5.tst b/tools/test/h5repack/expected/tsoftlinks-merge.tsoftlinks.h5.tst
index 27c33d7..27c33d7 100644
--- a/tools/test/h5repack/testfiles/tsoftlinks-merge.tsoftlinks.h5.tst
+++ b/tools/test/h5repack/expected/tsoftlinks-merge.tsoftlinks.h5.tst
diff --git a/tools/test/h5repack/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
index fa4e12d..fa4e12d 100644
--- a/tools/test/h5repack/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
+++ b/tools/test/h5repack/expected/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
diff --git a/tools/test/h5repack/testfiles/tsoftlinks-prune.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-prune.tsoftlinks.h5.ddl
index de58ef2..de58ef2 100644
--- a/tools/test/h5repack/testfiles/tsoftlinks-prune.tsoftlinks.h5.ddl
+++ b/tools/test/h5repack/expected/tsoftlinks-prune.tsoftlinks.h5.ddl
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in
index 9b58965..f3b8d3e 100644
--- a/tools/test/h5repack/h5repack.sh.in
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -56,17 +56,17 @@ verbose=yes
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5REPACK_OUTFILES="$SRC_TOOLS/test/h5repack/expected"
 
 TESTDIR=./testpack
 test -d $TESTDIR || mkdir $TESTDIR
@@ -127,62 +127,62 @@ $SRC_H5DIFF_TESTFILES/h5diff_attr1.h5
 $SRC_H5REPACK_TESTFILES/h5repack_CVE-2018-17432.h5
 $SRC_H5REPACK_TESTFILES/h5repack_CVE-2018-14460.h5
 ########tools/testfiles#for#external#links########
-$SRC_TOOLS_TESTFILES/tsoftlinks.h5
-$SRC_TOOLS_TESTFILES/textlinkfar.h5
-$SRC_TOOLS_TESTFILES/textlinksrc.h5
-$SRC_TOOLS_TESTFILES/textlinktar.h5
-$SRC_TOOLS_TESTFILES/textlink.h5
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src.h5
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_trg.h5
+$SRC_H5DUMP_TESTFILES/tsoftlinks.h5
+$SRC_H5DUMP_TESTFILES/textlinkfar.h5
+$SRC_H5DUMP_TESTFILES/textlinksrc.h5
+$SRC_H5DUMP_TESTFILES/textlinktar.h5
+$SRC_H5DUMP_TESTFILES/textlink.h5
+$SRC_H5COPY_TESTFILES/h5copy_extlinks_src.h5
+$SRC_H5COPY_TESTFILES/h5copy_extlinks_trg.h5
 ########tools/testfiles########
-$SRC_TOOLS_TESTFILES/tfamily00000.h5
-$SRC_TOOLS_TESTFILES/tfamily00001.h5
-$SRC_TOOLS_TESTFILES/tfamily00002.h5
-$SRC_TOOLS_TESTFILES/tfamily00003.h5
-$SRC_TOOLS_TESTFILES/tfamily00004.h5
-$SRC_TOOLS_TESTFILES/tfamily00005.h5
-$SRC_TOOLS_TESTFILES/tfamily00006.h5
-$SRC_TOOLS_TESTFILES/tfamily00007.h5
-$SRC_TOOLS_TESTFILES/tfamily00008.h5
-$SRC_TOOLS_TESTFILES/tfamily00009.h5
-$SRC_TOOLS_TESTFILES/tfamily00010.h5
-$SRC_TOOLS_TESTFILES/tordergr.h5
+$SRC_H5DUMP_TESTFILES/tfamily00000.h5
+$SRC_H5DUMP_TESTFILES/tfamily00001.h5
+$SRC_H5DUMP_TESTFILES/tfamily00002.h5
+$SRC_H5DUMP_TESTFILES/tfamily00003.h5
+$SRC_H5DUMP_TESTFILES/tfamily00004.h5
+$SRC_H5DUMP_TESTFILES/tfamily00005.h5
+$SRC_H5DUMP_TESTFILES/tfamily00006.h5
+$SRC_H5DUMP_TESTFILES/tfamily00007.h5
+$SRC_H5DUMP_TESTFILES/tfamily00008.h5
+$SRC_H5DUMP_TESTFILES/tfamily00009.h5
+$SRC_H5DUMP_TESTFILES/tfamily00010.h5
+$SRC_H5DUMP_TESTFILES/tordergr.h5
 ########reference#conversion#files########
 ########tools/testfiles/vds########
-$SRC_TOOLS_TESTFILES/vds/1_a.h5
-$SRC_TOOLS_TESTFILES/vds/1_b.h5
-$SRC_TOOLS_TESTFILES/vds/1_c.h5
-$SRC_TOOLS_TESTFILES/vds/1_d.h5
-$SRC_TOOLS_TESTFILES/vds/1_e.h5
-$SRC_TOOLS_TESTFILES/vds/1_f.h5
-$SRC_TOOLS_TESTFILES/vds/1_vds.h5
-$SRC_TOOLS_TESTFILES/vds/2_a.h5
-$SRC_TOOLS_TESTFILES/vds/2_b.h5
-$SRC_TOOLS_TESTFILES/vds/2_c.h5
-$SRC_TOOLS_TESTFILES/vds/2_d.h5
-$SRC_TOOLS_TESTFILES/vds/2_e.h5
-$SRC_TOOLS_TESTFILES/vds/2_vds.h5
-$SRC_TOOLS_TESTFILES/vds/3_1_vds.h5
-$SRC_TOOLS_TESTFILES/vds/3_2_vds.h5
-$SRC_TOOLS_TESTFILES/vds/4_0.h5
-$SRC_TOOLS_TESTFILES/vds/4_1.h5
-$SRC_TOOLS_TESTFILES/vds/4_2.h5
-$SRC_TOOLS_TESTFILES/vds/4_vds.h5
-$SRC_TOOLS_TESTFILES/vds/5_a.h5
-$SRC_TOOLS_TESTFILES/vds/5_b.h5
-$SRC_TOOLS_TESTFILES/vds/5_c.h5
-$SRC_TOOLS_TESTFILES/vds/5_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/1_a.h5
+$SRC_H5DUMP_TESTFILES/vds/1_b.h5
+$SRC_H5DUMP_TESTFILES/vds/1_c.h5
+$SRC_H5DUMP_TESTFILES/vds/1_d.h5
+$SRC_H5DUMP_TESTFILES/vds/1_e.h5
+$SRC_H5DUMP_TESTFILES/vds/1_f.h5
+$SRC_H5DUMP_TESTFILES/vds/1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/2_a.h5
+$SRC_H5DUMP_TESTFILES/vds/2_b.h5
+$SRC_H5DUMP_TESTFILES/vds/2_c.h5
+$SRC_H5DUMP_TESTFILES/vds/2_d.h5
+$SRC_H5DUMP_TESTFILES/vds/2_e.h5
+$SRC_H5DUMP_TESTFILES/vds/2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/4_0.h5
+$SRC_H5DUMP_TESTFILES/vds/4_1.h5
+$SRC_H5DUMP_TESTFILES/vds/4_2.h5
+$SRC_H5DUMP_TESTFILES/vds/4_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/5_a.h5
+$SRC_H5DUMP_TESTFILES/vds/5_b.h5
+$SRC_H5DUMP_TESTFILES/vds/5_c.h5
+$SRC_H5DUMP_TESTFILES/vds/5_vds.h5
 ########tools/testfiles########
-$SRC_TOOLS_TESTFILES/tst_onion_dset_1d.h5
-$SRC_TOOLS_TESTFILES/tst_onion_dset_1d.h5.onion
-$SRC_TOOLS_TESTFILES/tst_onion_dset_ext.h5
-$SRC_TOOLS_TESTFILES/tst_onion_dset_ext.h5.onion
-$SRC_TOOLS_TESTFILES/tst_onion_objs.h5
-$SRC_TOOLS_TESTFILES/tst_onion_objs.h5.onion
+$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5
+$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5.onion
+$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.h5
+$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.h5.onion
+$SRC_H5DUMP_TESTFILES/tst_onion_objs.h5
+$SRC_H5DUMP_TESTFILES/tst_onion_objs.h5.onion
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5REPACK_TESTFILES/h5repack-help.txt
+$SRC_H5REPACK_OUTFILES/h5repack-help.txt
 $SRC_H5REPACK_TESTFILES/h5repack_ext.bin
 $SRC_H5REPACK_TESTFILES/ublock.bin
 $SRC_H5REPACK_TESTFILES/h5repack.info
@@ -197,66 +197,66 @@ $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-1.dat
 $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-2.dat
 $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-3.dat
 ###############
-$SRC_H5REPACK_TESTFILES/crtorder.tordergr.h5.ddl
-$SRC_H5REPACK_TESTFILES/deflate_limit.h5repack_layout.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_test.ddl
+$SRC_H5REPACK_OUTFILES/crtorder.tordergr.h5.ddl
+$SRC_H5REPACK_OUTFILES/deflate_limit.h5repack_layout.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_test.ddl
 ########fsm#files########
-$SRC_H5REPACK_TESTFILES/SP.h5repack_fsm_aggr_nopersist.h5.ddl
-$SRC_H5REPACK_TESTFILES/S.h5repack_fsm_aggr_persist.h5.ddl
-$SRC_H5REPACK_TESTFILES/STG.h5repack_none.h5.ddl
-$SRC_H5REPACK_TESTFILES/GS.h5repack_paged_nopersist.h5.ddl
-$SRC_H5REPACK_TESTFILES/SP.h5repack_paged_persist.h5.ddl
-$SRC_H5REPACK_TESTFILES/SPT.h5repack_aggr.h5.ddl
+$SRC_H5REPACK_OUTFILES/SP.h5repack_fsm_aggr_nopersist.h5.ddl
+$SRC_H5REPACK_OUTFILES/S.h5repack_fsm_aggr_persist.h5.ddl
+$SRC_H5REPACK_OUTFILES/STG.h5repack_none.h5.ddl
+$SRC_H5REPACK_OUTFILES/GS.h5repack_paged_nopersist.h5.ddl
+$SRC_H5REPACK_OUTFILES/SP.h5repack_paged_persist.h5.ddl
+$SRC_H5REPACK_OUTFILES/SPT.h5repack_aggr.h5.ddl
 ########vds#files########
-$SRC_H5REPACK_TESTFILES/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
-$SRC_H5REPACK_TESTFILES/2_vds.h5-vds_chunk3x6x9-v.ddl
-$SRC_H5REPACK_TESTFILES/3_1_vds.h5-vds_chunk2x5x8-v.ddl
-$SRC_H5REPACK_TESTFILES/4_vds.h5-vds_compa-v.ddl
-$SRC_H5REPACK_TESTFILES/4_vds.h5-vds_conti-v.ddl
+$SRC_H5REPACK_OUTFILES/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
+$SRC_H5REPACK_OUTFILES/2_vds.h5-vds_chunk3x6x9-v.ddl
+$SRC_H5REPACK_OUTFILES/3_1_vds.h5-vds_chunk2x5x8-v.ddl
+$SRC_H5REPACK_OUTFILES/4_vds.h5-vds_compa-v.ddl
+$SRC_H5REPACK_OUTFILES/4_vds.h5-vds_conti-v.ddl
 ########refs#files########
-$SRC_H5REPACK_TESTFILES/attrregion.tattrreg.h5.ddl
-$SRC_H5REPACK_TESTFILES/dataregion.tdatareg.h5.ddl
+$SRC_H5REPACK_OUTFILES/attrregion.tattrreg.h5.ddl
+$SRC_H5REPACK_OUTFILES/dataregion.tdatareg.h5.ddl
 ########external#links#files########
-$SRC_H5REPACK_TESTFILES/textlinkfar-base.textlinkfar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinksrc-base.textlinksrc.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinktar-base.textlinktar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlink-base.textlink.h5.ddl
-$SRC_H5REPACK_TESTFILES/tsoftlinks-base.tsoftlinks.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinkfar-merge.textlinkfar.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinksrc-merge.textlinksrc.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinktar-merge.textlinktar.h5.tst
-$SRC_H5REPACK_TESTFILES/textlink-merge.textlink.h5.tst
-$SRC_H5REPACK_TESTFILES/tsoftlinks-merge.tsoftlinks.h5.tst
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinkfar-prune.textlinkfar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinksrc-prune.textlinksrc.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinktar-prune.textlinktar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlink-prune.textlink.h5.ddl
-$SRC_H5REPACK_TESTFILES/tsoftlinks-prune.tsoftlinks.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinkfar-mergeprune.textlinkfar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinksrc-mergeprune.textlinksrc.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinktar-mergeprune.textlinktar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlink-mergeprune.textlink.h5.ddl
-$SRC_H5REPACK_TESTFILES/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinkfar-base.textlinkfar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinksrc-base.textlinksrc.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinktar-base.textlinktar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlink-base.textlink.h5.ddl
+$SRC_H5REPACK_OUTFILES/tsoftlinks-base.tsoftlinks.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinkfar-merge.textlinkfar.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinksrc-merge.textlinksrc.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinktar-merge.textlinktar.h5.tst
+$SRC_H5REPACK_OUTFILES/textlink-merge.textlink.h5.tst
+$SRC_H5REPACK_OUTFILES/tsoftlinks-merge.tsoftlinks.h5.tst
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinkfar-prune.textlinkfar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinksrc-prune.textlinksrc.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinktar-prune.textlinktar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlink-prune.textlink.h5.ddl
+$SRC_H5REPACK_OUTFILES/tsoftlinks-prune.tsoftlinks.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinkfar-mergeprune.textlinkfar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinksrc-mergeprune.textlinksrc.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinktar-mergeprune.textlinktar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlink-mergeprune.textlink.h5.ddl
+$SRC_H5REPACK_OUTFILES/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
 ########tst#files########
-$SRC_H5REPACK_TESTFILES/h5repack_filters.h5-gzip_verbose_filters.tst
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
-$SRC_H5REPACK_TESTFILES/plugin_test.h5repack_layout.h5.tst
+$SRC_H5REPACK_OUTFILES/h5repack_filters.h5-gzip_verbose_filters.tst
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+$SRC_H5REPACK_OUTFILES/plugin_test.h5repack_layout.h5.tst
 ########external#links#tst#files########
-$SRC_H5REPACK_TESTFILES/tsoftlinks-merge.tsoftlinks.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinkfar-merge.textlinkfar.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinksrc-merge.textlinksrc.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinktar-merge.textlinktar.h5.tst
-$SRC_H5REPACK_TESTFILES/textlink-merge.textlink.h5.tst
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
+$SRC_H5REPACK_OUTFILES/tsoftlinks-merge.tsoftlinks.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinkfar-merge.textlinkfar.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinksrc-merge.textlinksrc.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinktar-merge.textlinktar.h5.tst
+$SRC_H5REPACK_OUTFILES/textlink-merge.textlink.h5.tst
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
 ########onion#files########
-$SRC_H5REPACK_TESTFILES/onion.tst_onion_dset_1d.h5.ddl
-$SRC_H5REPACK_TESTFILES/onion.tst_onion_dset_ext.h5.ddl
-$SRC_H5REPACK_TESTFILES/onion.tst_onion_objs.h5.ddl
+$SRC_H5REPACK_OUTFILES/onion.tst_onion_dset_1d.h5.ddl
+$SRC_H5REPACK_OUTFILES/onion.tst_onion_dset_ext.h5.ddl
+$SRC_H5REPACK_OUTFILES/onion.tst_onion_objs.h5.ddl
 "
 
 #
diff --git a/tools/test/h5repack/h5repack_plugin.sh.in b/tools/test/h5repack/h5repack_plugin.sh.in
index bd7c3a1..43be1ee 100644
--- a/tools/test/h5repack/h5repack_plugin.sh.in
+++ b/tools/test/h5repack/h5repack_plugin.sh.in
@@ -47,6 +47,7 @@ SRC_TOOLS="$srcdir/../.."
 
 # testfiles source dirs for tools
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
+SRC_H5REPACK_OUTFILES="$SRC_TOOLS/test/h5repack/expected"
 
 TESTDIR=testplug
 test -d $TESTDIR || mkdir $TESTDIR
@@ -62,14 +63,14 @@ test -d $TESTDIR || mkdir $TESTDIR
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES="
 $SRC_H5REPACK_TESTFILES/h5repack_layout.h5
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_test.ddl
-$SRC_H5REPACK_TESTFILES/plugin_test.h5repack_layout.h5.tst
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_version_test.ddl
-$SRC_H5REPACK_TESTFILES/plugin_version_test.h5repack_layout.h5.tst
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_test.ddl
+$SRC_H5REPACK_OUTFILES/plugin_test.h5repack_layout.h5.tst
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_version_test.ddl
+$SRC_H5REPACK_OUTFILES/plugin_version_test.h5repack_layout.h5.tst
 "
 #$SRC_H5REPACK_TESTFILES/h5repack_layout.UD.h5
-#$SRC_H5REPACK_TESTFILES/h5repack_layout.UD.h5-plugin_none.ddl
-#$SRC_H5REPACK_TESTFILES/plugin_none.h5repack_layout.UD.h5.tst
+#$SRC_H5REPACK_OUTFILES/h5repack_layout.UD.h5-plugin_none.ddl
+#$SRC_H5REPACK_OUTFILES/plugin_none.h5repack_layout.UD.h5.tst
 #"
 
 #
diff --git a/tools/test/h5repack/h5repackgentest.c b/tools/test/h5repack/h5repackgentest.c
index 688ee69..8fbfab5 100644
--- a/tools/test/h5repack/h5repackgentest.c
+++ b/tools/test/h5repack/h5repackgentest.c
@@ -16,7 +16,7 @@
  * + h5repack_<NAME>.h5
  * + h5repack_<NAME>_ex.h5
  * + h5repack_<NAME>_ex-<N>.dat
- * ...where NAME idenfities the type, and N is a positive decimal number;
+ * ...where NAME identifies the type, and N is a positive decimal number;
  * multiple external files (*.dat) are allowed per file, but they must
  * follow the pattern and be in contiguous numerical sequence starting at 0.
  *
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5 b/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5
deleted file mode 100644
index 7b8621e..0000000
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5
+++ /dev/null
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5 b/tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5
deleted file mode 100644
index 3a0242d..0000000
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5
+++ /dev/null
diff --git a/tools/test/h5stat/CMakeTests.cmake b/tools/test/h5stat/CMakeTests.cmake
index 14bb5ea..9035eaf 100644
--- a/tools/test/h5stat/CMakeTests.cmake
+++ b/tools/test/h5stat/CMakeTests.cmake
@@ -75,15 +75,15 @@
   )
 
   foreach (ddl_file ${HDF5_REFERENCE_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${ddl_file}.ddl" "${PROJECT_BINARY_DIR}/${ddl_file}.ddl" "h5stat_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${ddl_file}.ddl" "${PROJECT_BINARY_DIR}/${ddl_file}.ddl" "h5stat_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_ERR_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${h5_file}.err" "${PROJECT_BINARY_DIR}/${h5_file}.err" "h5stat_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}.err" "${PROJECT_BINARY_DIR}/${h5_file}.err" "h5stat_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5stat_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5stat_files")
   endforeach ()
   add_custom_target(h5stat_files ALL COMMENT "Copying files needed by h5stat tests" DEPENDS ${h5stat_files_list})
 
@@ -160,7 +160,7 @@
   ADD_H5_TEST (h5stat_notexist 1 notexist.h5)
   ADD_H5_TEST (h5stat_nofile 1 '')
 
-# Test file with groups, compressed datasets, user-applied fileters, etc.
+# Test file with groups, compressed datasets, user-applied filters, etc.
 # h5stat_filters.h5 is a copy of ../../testfiles/tfilters.h5 as of release 1.8.0-alpha4
   ADD_H5_TEST (h5stat_filters 0 h5stat_filters.h5)
   ADD_H5_TEST (h5stat_filters-file 0 -f h5stat_filters.h5)
diff --git a/tools/test/h5stat/testfiles/h5stat_dims1.ddl b/tools/test/h5stat/expected/h5stat_dims1.ddl
index 07b2900..07b2900 100644
--- a/tools/test/h5stat/testfiles/h5stat_dims1.ddl
+++ b/tools/test/h5stat/expected/h5stat_dims1.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_dims2.ddl b/tools/test/h5stat/expected/h5stat_dims2.ddl
index dbccd05..dbccd05 100644
--- a/tools/test/h5stat/testfiles/h5stat_dims2.ddl
+++ b/tools/test/h5stat/expected/h5stat_dims2.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_err1_dims.err b/tools/test/h5stat/expected/h5stat_err1_dims.err
index 86d375b..86d375b 100644
--- a/tools/test/h5stat/testfiles/h5stat_err1_dims.err
+++ b/tools/test/h5stat/expected/h5stat_err1_dims.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err1_links.err b/tools/test/h5stat/expected/h5stat_err1_links.err
index d43207c..d43207c 100644
--- a/tools/test/h5stat/testfiles/h5stat_err1_links.err
+++ b/tools/test/h5stat/expected/h5stat_err1_links.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err1_numattrs.err b/tools/test/h5stat/expected/h5stat_err1_numattrs.err
index 01b6c18..01b6c18 100644
--- a/tools/test/h5stat/testfiles/h5stat_err1_numattrs.err
+++ b/tools/test/h5stat/expected/h5stat_err1_numattrs.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err2_numattrs.err b/tools/test/h5stat/expected/h5stat_err2_numattrs.err
index 01b6c18..01b6c18 100644
--- a/tools/test/h5stat/testfiles/h5stat_err2_numattrs.err
+++ b/tools/test/h5stat/expected/h5stat_err2_numattrs.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_fill.ddl b/tools/test/h5stat/expected/h5stat_err_old_fill.ddl
index 5cc1e32..5cc1e32 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_old_fill.ddl
+++ b/tools/test/h5stat/expected/h5stat_err_old_fill.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_fill.err b/tools/test/h5stat/expected/h5stat_err_old_fill.err
index 8b886d2..8b886d2 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_old_fill.err
+++ b/tools/test/h5stat/expected/h5stat_err_old_fill.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_layout.ddl b/tools/test/h5stat/expected/h5stat_err_old_layout.ddl
index 112190c..112190c 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_old_layout.ddl
+++ b/tools/test/h5stat/expected/h5stat_err_old_layout.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_layout.err b/tools/test/h5stat/expected/h5stat_err_old_layout.err
index 7aa2fa7..7aa2fa7 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_old_layout.err
+++ b/tools/test/h5stat/expected/h5stat_err_old_layout.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err_refcount.ddl b/tools/test/h5stat/expected/h5stat_err_refcount.ddl
index 41e533e..41e533e 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_refcount.ddl
+++ b/tools/test/h5stat/expected/h5stat_err_refcount.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_err_refcount.err b/tools/test/h5stat/expected/h5stat_err_refcount.err
index d176996..d176996 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_refcount.err
+++ b/tools/test/h5stat/expected/h5stat_err_refcount.err
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-F.ddl b/tools/test/h5stat/expected/h5stat_filters-F.ddl
index d44445b..d44445b 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-F.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-F.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-UD.ddl b/tools/test/h5stat/expected/h5stat_filters-UD.ddl
index 4efafd1..4efafd1 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-UD.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-UD.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-UT.ddl b/tools/test/h5stat/expected/h5stat_filters-UT.ddl
index d8de31f..d8de31f 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-UT.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-UT.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-d.ddl b/tools/test/h5stat/expected/h5stat_filters-d.ddl
index 6e6dd61..6e6dd61 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-d.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-d.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-dT.ddl b/tools/test/h5stat/expected/h5stat_filters-dT.ddl
index b14ca9f..b14ca9f 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-dT.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-dT.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-file.ddl b/tools/test/h5stat/expected/h5stat_filters-file.ddl
index 5f7eff9..5f7eff9 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-file.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-file.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-g.ddl b/tools/test/h5stat/expected/h5stat_filters-g.ddl
index 290c82a..290c82a 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-g.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-g.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters.ddl b/tools/test/h5stat/expected/h5stat_filters.ddl
index 9f9e146..9f9e146 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_help1.ddl b/tools/test/h5stat/expected/h5stat_help1.ddl
index 54d6a31..54d6a31 100644
--- a/tools/test/h5stat/testfiles/h5stat_help1.ddl
+++ b/tools/test/h5stat/expected/h5stat_help1.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_help2.ddl b/tools/test/h5stat/expected/h5stat_help2.ddl
index 54d6a31..54d6a31 100644
--- a/tools/test/h5stat/testfiles/h5stat_help2.ddl
+++ b/tools/test/h5stat/expected/h5stat_help2.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_idx.ddl b/tools/test/h5stat/expected/h5stat_idx.ddl
index 1b6ae0c..1b6ae0c 100644
--- a/tools/test/h5stat/testfiles/h5stat_idx.ddl
+++ b/tools/test/h5stat/expected/h5stat_idx.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links1.ddl b/tools/test/h5stat/expected/h5stat_links1.ddl
index c650f15..c650f15 100644
--- a/tools/test/h5stat/testfiles/h5stat_links1.ddl
+++ b/tools/test/h5stat/expected/h5stat_links1.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links2.ddl b/tools/test/h5stat/expected/h5stat_links2.ddl
index 9fc82cd..9fc82cd 100644
--- a/tools/test/h5stat/testfiles/h5stat_links2.ddl
+++ b/tools/test/h5stat/expected/h5stat_links2.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links3.ddl b/tools/test/h5stat/expected/h5stat_links3.ddl
index f80471a..f80471a 100644
--- a/tools/test/h5stat/testfiles/h5stat_links3.ddl
+++ b/tools/test/h5stat/expected/h5stat_links3.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links4.ddl b/tools/test/h5stat/expected/h5stat_links4.ddl
index 94feffd..94feffd 100644
--- a/tools/test/h5stat/testfiles/h5stat_links4.ddl
+++ b/tools/test/h5stat/expected/h5stat_links4.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links5.ddl b/tools/test/h5stat/expected/h5stat_links5.ddl
index 6f33bed..6f33bed 100644
--- a/tools/test/h5stat/testfiles/h5stat_links5.ddl
+++ b/tools/test/h5stat/expected/h5stat_links5.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat-UA.ddl b/tools/test/h5stat/expected/h5stat_newgrat-UA.ddl
index a5ee7e8..a5ee7e8 100644
--- a/tools/test/h5stat/testfiles/h5stat_newgrat-UA.ddl
+++ b/tools/test/h5stat/expected/h5stat_newgrat-UA.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat-UG.ddl b/tools/test/h5stat/expected/h5stat_newgrat-UG.ddl
index 41195ac..41195ac 100644
--- a/tools/test/h5stat/testfiles/h5stat_newgrat-UG.ddl
+++ b/tools/test/h5stat/expected/h5stat_newgrat-UG.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat.ddl b/tools/test/h5stat/expected/h5stat_newgrat.ddl
index 130fe2f..130fe2f 100644
--- a/tools/test/h5stat/testfiles/h5stat_newgrat.ddl
+++ b/tools/test/h5stat/expected/h5stat_newgrat.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_nofile.ddl b/tools/test/h5stat/expected/h5stat_nofile.ddl
index 54d6a31..54d6a31 100644
--- a/tools/test/h5stat/testfiles/h5stat_nofile.ddl
+++ b/tools/test/h5stat/expected/h5stat_nofile.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_nofile.err b/tools/test/h5stat/expected/h5stat_nofile.err
index 3b7e979..3b7e979 100644
--- a/tools/test/h5stat/testfiles/h5stat_nofile.err
+++ b/tools/test/h5stat/expected/h5stat_nofile.err
diff --git a/tools/test/h5stat/testfiles/h5stat_notexist.ddl b/tools/test/h5stat/expected/h5stat_notexist.ddl
index 7f71941..7f71941 100644
--- a/tools/test/h5stat/testfiles/h5stat_notexist.ddl
+++ b/tools/test/h5stat/expected/h5stat_notexist.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_notexist.err b/tools/test/h5stat/expected/h5stat_notexist.err
index c1d9e54..c1d9e54 100644
--- a/tools/test/h5stat/testfiles/h5stat_notexist.err
+++ b/tools/test/h5stat/expected/h5stat_notexist.err
diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs1.ddl b/tools/test/h5stat/expected/h5stat_numattrs1.ddl
index af53776..af53776 100644
--- a/tools/test/h5stat/testfiles/h5stat_numattrs1.ddl
+++ b/tools/test/h5stat/expected/h5stat_numattrs1.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs2.ddl b/tools/test/h5stat/expected/h5stat_numattrs2.ddl
index 638781b..638781b 100644
--- a/tools/test/h5stat/testfiles/h5stat_numattrs2.ddl
+++ b/tools/test/h5stat/expected/h5stat_numattrs2.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs3.ddl b/tools/test/h5stat/expected/h5stat_numattrs3.ddl
index de8d6a3..de8d6a3 100644
--- a/tools/test/h5stat/testfiles/h5stat_numattrs3.ddl
+++ b/tools/test/h5stat/expected/h5stat_numattrs3.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs4.ddl b/tools/test/h5stat/expected/h5stat_numattrs4.ddl
index 2b0122a..2b0122a 100644
--- a/tools/test/h5stat/testfiles/h5stat_numattrs4.ddl
+++ b/tools/test/h5stat/expected/h5stat_numattrs4.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_tsohm.ddl b/tools/test/h5stat/expected/h5stat_tsohm.ddl
index 9369950..9369950 100644
--- a/tools/test/h5stat/testfiles/h5stat_tsohm.ddl
+++ b/tools/test/h5stat/expected/h5stat_tsohm.ddl
diff --git a/tools/test/h5stat/testh5stat.sh.in b/tools/test/h5stat/testh5stat.sh.in
index 65e40c4..7ce0ad4 100644
--- a/tools/test/h5stat/testh5stat.sh.in
+++ b/tools/test/h5stat/testh5stat.sh.in
@@ -39,17 +39,17 @@ verbose=yes
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5STAT_OUTFILES="$SRC_TOOLS/test/h5stat/expected"
 
 TESTDIR=./testfiles
 test -d $TESTDIR || mkdir $TESTDIR
@@ -75,49 +75,49 @@ $SRC_H5STAT_TESTFILES/h5stat_threshold.h5
 "
 
 LIST_ERR_TEST_FILES="
-$SRC_H5STAT_TESTFILES/h5stat_err_refcount.err
-$SRC_H5STAT_TESTFILES/h5stat_err_old_layout.err
-$SRC_H5STAT_TESTFILES/h5stat_err_old_fill.err
-$SRC_H5STAT_TESTFILES/h5stat_err1_links.err
-$SRC_H5STAT_TESTFILES/h5stat_err1_dims.err
-$SRC_H5STAT_TESTFILES/h5stat_err1_numattrs.err
-$SRC_H5STAT_TESTFILES/h5stat_err2_numattrs.err
-$SRC_H5STAT_TESTFILES/h5stat_notexist.err
-$SRC_H5STAT_TESTFILES/h5stat_nofile.err
+$SRC_H5STAT_OUTFILES/h5stat_err_refcount.err
+$SRC_H5STAT_OUTFILES/h5stat_err_old_layout.err
+$SRC_H5STAT_OUTFILES/h5stat_err_old_fill.err
+$SRC_H5STAT_OUTFILES/h5stat_err1_links.err
+$SRC_H5STAT_OUTFILES/h5stat_err1_dims.err
+$SRC_H5STAT_OUTFILES/h5stat_err1_numattrs.err
+$SRC_H5STAT_OUTFILES/h5stat_err2_numattrs.err
+$SRC_H5STAT_OUTFILES/h5stat_notexist.err
+$SRC_H5STAT_OUTFILES/h5stat_nofile.err
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5STAT_TESTFILES/h5stat_err_refcount.ddl
-$SRC_H5STAT_TESTFILES/h5stat_err_old_layout.ddl
-$SRC_H5STAT_TESTFILES/h5stat_err_old_fill.ddl
-$SRC_H5STAT_TESTFILES/h5stat_help1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_help2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_notexist.ddl
-$SRC_H5STAT_TESTFILES/h5stat_nofile.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-file.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-F.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-d.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-g.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-dT.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-UD.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-UT.ddl
-$SRC_H5STAT_TESTFILES/h5stat_tsohm.ddl
-$SRC_H5STAT_TESTFILES/h5stat_newgrat.ddl
-$SRC_H5STAT_TESTFILES/h5stat_newgrat-UG.ddl
-$SRC_H5STAT_TESTFILES/h5stat_newgrat-UA.ddl
-$SRC_H5STAT_TESTFILES/h5stat_idx.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links3.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links4.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links5.ddl
-$SRC_H5STAT_TESTFILES/h5stat_dims1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_dims2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs3.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs4.ddl
+$SRC_H5STAT_OUTFILES/h5stat_err_refcount.ddl
+$SRC_H5STAT_OUTFILES/h5stat_err_old_layout.ddl
+$SRC_H5STAT_OUTFILES/h5stat_err_old_fill.ddl
+$SRC_H5STAT_OUTFILES/h5stat_help1.ddl
+$SRC_H5STAT_OUTFILES/h5stat_help2.ddl
+$SRC_H5STAT_OUTFILES/h5stat_notexist.ddl
+$SRC_H5STAT_OUTFILES/h5stat_nofile.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-file.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-F.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-d.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-g.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-dT.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-UD.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-UT.ddl
+$SRC_H5STAT_OUTFILES/h5stat_tsohm.ddl
+$SRC_H5STAT_OUTFILES/h5stat_newgrat.ddl
+$SRC_H5STAT_OUTFILES/h5stat_newgrat-UG.ddl
+$SRC_H5STAT_OUTFILES/h5stat_newgrat-UA.ddl
+$SRC_H5STAT_OUTFILES/h5stat_idx.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links1.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links2.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links3.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links4.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links5.ddl
+$SRC_H5STAT_OUTFILES/h5stat_dims1.ddl
+$SRC_H5STAT_OUTFILES/h5stat_dims2.ddl
+$SRC_H5STAT_OUTFILES/h5stat_numattrs1.ddl
+$SRC_H5STAT_OUTFILES/h5stat_numattrs2.ddl
+$SRC_H5STAT_OUTFILES/h5stat_numattrs3.ddl
+$SRC_H5STAT_OUTFILES/h5stat_numattrs4.ddl
 "
 
 #
@@ -256,7 +256,7 @@ TOOLTEST h5stat_help2.ddl --help
 TOOLTEST h5stat_notexist.ddl notexist.h5
 TOOLTEST h5stat_nofile.ddl ''
 
-# Test file with groups, compressed datasets, user-applied fileters, etc.
+# Test file with groups, compressed datasets, user-applied filters, etc.
 # h5stat_filters.h5 is a copy of ../../testfiles/tfilters.h5 as of release 1.8.0-alpha4
 TOOLTEST h5stat_filters.ddl h5stat_filters.h5
 TOOLTEST h5stat_filters-file.ddl  -f   h5stat_filters.h5
diff --git a/tools/test/misc/CMakeTestsClear.cmake b/tools/test/misc/CMakeTestsClear.cmake
index 5e307aa..2f3c62f 100644
--- a/tools/test/misc/CMakeTestsClear.cmake
+++ b/tools/test/misc/CMakeTestsClear.cmake
@@ -63,11 +63,14 @@
       h5clear_open_fail.err
   )
 
-  foreach (h5_file ${HDF5_TEST_FILES} ${HDF5_SEC2_TEST_FILES} ${HDF5_REFERENCE_TEST_FILES})
+  foreach (h5_file ${HDF5_TEST_FILES} ${HDF5_SEC2_TEST_FILES})
     HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files")
   endforeach ()
+  foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files")
+  endforeach ()
   foreach (h5_file ${HDF5_REFERENCE_ERR_FILES})
-    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files")
   endforeach ()
   # make second copy of h5clear_sec2.h5
   foreach (h5_file ${HDF5_SEC2_TEST_FILES})
@@ -99,6 +102,10 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_DIR}/runTest.cmake"
       )
+      if (last_test)
+        set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS ${last_test})
+      endif ()
+      set (last_test "H5CLEAR_CMP-${testname}")
     endif ()
   endmacro ()
 
@@ -117,6 +124,10 @@
               -D "TEST_ERRREF=${resultfile}.err"
               -P "${HDF_RESOURCES_DIR}/runTest.cmake"
       )
+      if (last_test)
+        set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS ${last_test})
+      endif ()
+      set (last_test "H5CLEAR_CMP-${testname}")
     endif ()
   endmacro ()
 
diff --git a/tools/test/misc/CMakeTestsMkgrp.cmake b/tools/test/misc/CMakeTestsMkgrp.cmake
index b4d1a56..9e4f739 100644
--- a/tools/test/misc/CMakeTestsMkgrp.cmake
+++ b/tools/test/misc/CMakeTestsMkgrp.cmake
@@ -40,10 +40,10 @@
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 
   foreach (h5_mkgrp_file ${HDF5_MKGRP_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_mkgrp_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_mkgrp_file}" "h5mkgrp_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_mkgrp_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_mkgrp_file}" "h5mkgrp_files")
   endforeach ()
 
-  HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/testfiles/h5mkgrp_help.txt" "${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_help.txt" "h5mkgrp_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/h5mkgrp_help.txt" "${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_help.txt" "h5mkgrp_files")
   add_custom_target(h5mkgrp_files ALL COMMENT "Copying files needed by h5mkgrp tests" DEPENDS ${h5mkgrp_files_list})
 
   configure_file (${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/testfiles/h5mkgrp_version.txt.in ${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_version.txt @ONLY)
diff --git a/tools/test/misc/CMakeTestsRepart.cmake b/tools/test/misc/CMakeTestsRepart.cmake
index 04c74ec..764778e 100644
--- a/tools/test/misc/CMakeTestsRepart.cmake
+++ b/tools/test/misc/CMakeTestsRepart.cmake
@@ -41,7 +41,7 @@
   )
 
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5repart_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5repart_files")
   endforeach ()
   add_custom_target(h5repart_files ALL COMMENT "Copying files needed by h5repart tests" DEPENDS ${h5repart_files_list})
 
diff --git a/tools/test/misc/testfiles/h5clear_equal_after_size.ddl b/tools/test/misc/expected/h5clear_equal_after_size.ddl
index 1b9a4e4..1b9a4e4 100644
--- a/tools/test/misc/testfiles/h5clear_equal_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_equal_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_equal_before_size.ddl b/tools/test/misc/expected/h5clear_equal_before_size.ddl
index 9beed42..9beed42 100644
--- a/tools/test/misc/testfiles/h5clear_equal_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_equal_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_greater_after_size.ddl b/tools/test/misc/expected/h5clear_greater_after_size.ddl
index 74c8f19..74c8f19 100644
--- a/tools/test/misc/testfiles/h5clear_greater_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_greater_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_greater_before_size.ddl b/tools/test/misc/expected/h5clear_greater_before_size.ddl
index 03b22fb..03b22fb 100644
--- a/tools/test/misc/testfiles/h5clear_greater_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_greater_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_less_after_size.ddl b/tools/test/misc/expected/h5clear_less_after_size.ddl
index bedf0d2..bedf0d2 100644
--- a/tools/test/misc/testfiles/h5clear_less_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_less_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_less_before_size.ddl b/tools/test/misc/expected/h5clear_less_before_size.ddl
index 50ba4c4..50ba4c4 100644
--- a/tools/test/misc/testfiles/h5clear_less_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_less_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_missing_file.ddl b/tools/test/misc/expected/h5clear_missing_file.ddl
index c7a2118..c7a2118 100644
--- a/tools/test/misc/testfiles/h5clear_missing_file.ddl
+++ b/tools/test/misc/expected/h5clear_missing_file.ddl
diff --git a/tools/test/misc/testfiles/h5clear_missing_file.err b/tools/test/misc/expected/h5clear_missing_file.err
index ea21b76..ea21b76 100644
--- a/tools/test/misc/testfiles/h5clear_missing_file.err
+++ b/tools/test/misc/expected/h5clear_missing_file.err
diff --git a/tools/test/misc/testfiles/h5clear_no_mdc_image.err b/tools/test/misc/expected/h5clear_no_mdc_image.err
index f5acd71..f5acd71 100644
--- a/tools/test/misc/testfiles/h5clear_no_mdc_image.err
+++ b/tools/test/misc/expected/h5clear_no_mdc_image.err
diff --git a/tools/test/misc/testfiles/h5clear_noclose_after_size.ddl b/tools/test/misc/expected/h5clear_noclose_after_size.ddl
index 7846b47..7846b47 100644
--- a/tools/test/misc/testfiles/h5clear_noclose_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_noclose_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_noclose_before_size.ddl b/tools/test/misc/expected/h5clear_noclose_before_size.ddl
index f294a6d..f294a6d 100644
--- a/tools/test/misc/testfiles/h5clear_noclose_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_noclose_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_open_fail.err b/tools/test/misc/expected/h5clear_open_fail.err
index 895ecd4..895ecd4 100644
--- a/tools/test/misc/testfiles/h5clear_open_fail.err
+++ b/tools/test/misc/expected/h5clear_open_fail.err
diff --git a/tools/test/misc/testfiles/h5clear_status_noclose_after_size.ddl b/tools/test/misc/expected/h5clear_status_noclose_after_size.ddl
index 7846b47..7846b47 100644
--- a/tools/test/misc/testfiles/h5clear_status_noclose_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_status_noclose_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_usage.ddl b/tools/test/misc/expected/h5clear_usage.ddl
index c7a2118..c7a2118 100644
--- a/tools/test/misc/testfiles/h5clear_usage.ddl
+++ b/tools/test/misc/expected/h5clear_usage.ddl
diff --git a/tools/test/misc/testfiles/h5clear_user_equal_after_size.ddl b/tools/test/misc/expected/h5clear_user_equal_after_size.ddl
index 028e134..028e134 100644
--- a/tools/test/misc/testfiles/h5clear_user_equal_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_user_equal_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_user_equal_before_size.ddl b/tools/test/misc/expected/h5clear_user_equal_before_size.ddl
index ef7c391..ef7c391 100644
--- a/tools/test/misc/testfiles/h5clear_user_equal_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_user_equal_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_user_greater_after_size.ddl b/tools/test/misc/expected/h5clear_user_greater_after_size.ddl
index 9d7de6f..9d7de6f 100644
--- a/tools/test/misc/testfiles/h5clear_user_greater_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_user_greater_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_user_greater_before_size.ddl b/tools/test/misc/expected/h5clear_user_greater_before_size.ddl
index c3fe625..c3fe625 100644
--- a/tools/test/misc/testfiles/h5clear_user_greater_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_user_greater_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_user_less_after_size.ddl b/tools/test/misc/expected/h5clear_user_less_after_size.ddl
index 02c0d2a..02c0d2a 100644
--- a/tools/test/misc/testfiles/h5clear_user_less_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_user_less_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_user_less_before_size.ddl b/tools/test/misc/expected/h5clear_user_less_before_size.ddl
index 0651c2b..0651c2b 100644
--- a/tools/test/misc/testfiles/h5clear_user_less_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_user_less_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5mkgrp_help.txt b/tools/test/misc/expected/h5mkgrp_help.txt
index d01fbee..d01fbee 100644
--- a/tools/test/misc/testfiles/h5mkgrp_help.txt
+++ b/tools/test/misc/expected/h5mkgrp_help.txt
diff --git a/tools/testfiles/h5mkgrp_nested_lp.ls b/tools/test/misc/expected/h5mkgrp_nested_lp.ls
index 1fe8ce8..1fe8ce8 100644
--- a/tools/testfiles/h5mkgrp_nested_lp.ls
+++ b/tools/test/misc/expected/h5mkgrp_nested_lp.ls
diff --git a/tools/testfiles/h5mkgrp_nested_mult_lp.ls b/tools/test/misc/expected/h5mkgrp_nested_mult_lp.ls
index 50380ec..50380ec 100644
--- a/tools/testfiles/h5mkgrp_nested_mult_lp.ls
+++ b/tools/test/misc/expected/h5mkgrp_nested_mult_lp.ls
diff --git a/tools/testfiles/h5mkgrp_nested_mult_p.ls b/tools/test/misc/expected/h5mkgrp_nested_mult_p.ls
index f2b3b4b..f2b3b4b 100644
--- a/tools/testfiles/h5mkgrp_nested_mult_p.ls
+++ b/tools/test/misc/expected/h5mkgrp_nested_mult_p.ls
diff --git a/tools/testfiles/h5mkgrp_nested_p.ls b/tools/test/misc/expected/h5mkgrp_nested_p.ls
index 3034dbb..3034dbb 100644
--- a/tools/testfiles/h5mkgrp_nested_p.ls
+++ b/tools/test/misc/expected/h5mkgrp_nested_p.ls
diff --git a/tools/testfiles/h5mkgrp_several.ls b/tools/test/misc/expected/h5mkgrp_several.ls
index 68a3f9c..68a3f9c 100644
--- a/tools/testfiles/h5mkgrp_several.ls
+++ b/tools/test/misc/expected/h5mkgrp_several.ls
diff --git a/tools/testfiles/h5mkgrp_several_l.ls b/tools/test/misc/expected/h5mkgrp_several_l.ls
index 5e1b4be..5e1b4be 100644
--- a/tools/testfiles/h5mkgrp_several_l.ls
+++ b/tools/test/misc/expected/h5mkgrp_several_l.ls
diff --git a/tools/testfiles/h5mkgrp_several_p.ls b/tools/test/misc/expected/h5mkgrp_several_p.ls
index 43f1ce5..43f1ce5 100644
--- a/tools/testfiles/h5mkgrp_several_p.ls
+++ b/tools/test/misc/expected/h5mkgrp_several_p.ls
diff --git a/tools/testfiles/h5mkgrp_several_v.ls b/tools/test/misc/expected/h5mkgrp_several_v.ls
index a6df87b..a6df87b 100644
--- a/tools/testfiles/h5mkgrp_several_v.ls
+++ b/tools/test/misc/expected/h5mkgrp_several_v.ls
diff --git a/tools/testfiles/h5mkgrp_single.ls b/tools/test/misc/expected/h5mkgrp_single.ls
index f2bd01c..f2bd01c 100644
--- a/tools/testfiles/h5mkgrp_single.ls
+++ b/tools/test/misc/expected/h5mkgrp_single.ls
diff --git a/tools/testfiles/h5mkgrp_single_l.ls b/tools/test/misc/expected/h5mkgrp_single_l.ls
index 1763a61..1763a61 100644
--- a/tools/testfiles/h5mkgrp_single_l.ls
+++ b/tools/test/misc/expected/h5mkgrp_single_l.ls
diff --git a/tools/testfiles/h5mkgrp_single_p.ls b/tools/test/misc/expected/h5mkgrp_single_p.ls
index e82dc31..e82dc31 100644
--- a/tools/testfiles/h5mkgrp_single_p.ls
+++ b/tools/test/misc/expected/h5mkgrp_single_p.ls
diff --git a/tools/testfiles/h5mkgrp_single_v.ls b/tools/test/misc/expected/h5mkgrp_single_v.ls
index 7360865..7360865 100644
--- a/tools/testfiles/h5mkgrp_single_v.ls
+++ b/tools/test/misc/expected/h5mkgrp_single_v.ls
diff --git a/tools/test/misc/h5clear_gentest.c b/tools/test/misc/h5clear_gentest.c
index dd4c88d..892e974 100644
--- a/tools/test/misc/h5clear_gentest.c
+++ b/tools/test/misc/h5clear_gentest.c
@@ -274,7 +274,7 @@ gen_enhance_files(bool user)
         }
 
         /* location of "end of file address" */
-        if (lseek(fd, (off_t)(28 + (user ? USERBLOCK : 0)), SEEK_SET) < 0)
+        if (lseek(fd, (HDoff_t)(28 + (user ? USERBLOCK : 0)), SEEK_SET) < 0)
             goto error;
 
         /* Write the bad eoa value to the file */
@@ -282,7 +282,7 @@ gen_enhance_files(bool user)
             goto error;
 
         /* location of "superblock checksum" */
-        if (lseek(fd, (off_t)(44 + (user ? USERBLOCK : 0)), SEEK_SET) < 0)
+        if (lseek(fd, (HDoff_t)(44 + (user ? USERBLOCK : 0)), SEEK_SET) < 0)
             goto error;
 
         /* Write the chksum value to the file */
diff --git a/tools/testfiles/family_file00000.h5 b/tools/test/misc/testfiles/family_file00000.h5
index 88f75ca..88f75ca 100644
--- a/tools/testfiles/family_file00000.h5
+++ b/tools/test/misc/testfiles/family_file00000.h5
diff --git a/tools/testfiles/family_file00001.h5 b/tools/test/misc/testfiles/family_file00001.h5
index 0da088e..0da088e 100644
--- a/tools/testfiles/family_file00001.h5
+++ b/tools/test/misc/testfiles/family_file00001.h5
diff --git a/tools/testfiles/family_file00002.h5 b/tools/test/misc/testfiles/family_file00002.h5
index c458a23..c458a23 100644
--- a/tools/testfiles/family_file00002.h5
+++ b/tools/test/misc/testfiles/family_file00002.h5
diff --git a/tools/testfiles/family_file00003.h5 b/tools/test/misc/testfiles/family_file00003.h5
index 7e98035..7e98035 100644
--- a/tools/testfiles/family_file00003.h5
+++ b/tools/test/misc/testfiles/family_file00003.h5
diff --git a/tools/testfiles/family_file00004.h5 b/tools/test/misc/testfiles/family_file00004.h5
index cf6f4905..cf6f4905 100644
--- a/tools/testfiles/family_file00004.h5
+++ b/tools/test/misc/testfiles/family_file00004.h5
diff --git a/tools/testfiles/family_file00005.h5 b/tools/test/misc/testfiles/family_file00005.h5
index 864564a..864564a 100644
--- a/tools/testfiles/family_file00005.h5
+++ b/tools/test/misc/testfiles/family_file00005.h5
diff --git a/tools/testfiles/family_file00006.h5 b/tools/test/misc/testfiles/family_file00006.h5
index 9cc2693..9cc2693 100644
--- a/tools/testfiles/family_file00006.h5
+++ b/tools/test/misc/testfiles/family_file00006.h5
diff --git a/tools/testfiles/family_file00007.h5 b/tools/test/misc/testfiles/family_file00007.h5
index a0f0043..a0f0043 100644
--- a/tools/testfiles/family_file00007.h5
+++ b/tools/test/misc/testfiles/family_file00007.h5
diff --git a/tools/testfiles/family_file00008.h5 b/tools/test/misc/testfiles/family_file00008.h5
index eec73e0..eec73e0 100644
--- a/tools/testfiles/family_file00008.h5
+++ b/tools/test/misc/testfiles/family_file00008.h5
diff --git a/tools/testfiles/family_file00009.h5 b/tools/test/misc/testfiles/family_file00009.h5
index b28cf90..b28cf90 100644
--- a/tools/testfiles/family_file00009.h5
+++ b/tools/test/misc/testfiles/family_file00009.h5
diff --git a/tools/testfiles/family_file00010.h5 b/tools/test/misc/testfiles/family_file00010.h5
index fe1a620..fe1a620 100644
--- a/tools/testfiles/family_file00010.h5
+++ b/tools/test/misc/testfiles/family_file00010.h5
diff --git a/tools/testfiles/family_file00011.h5 b/tools/test/misc/testfiles/family_file00011.h5
index 4e5d9e4..4e5d9e4 100644
--- a/tools/testfiles/family_file00011.h5
+++ b/tools/test/misc/testfiles/family_file00011.h5
diff --git a/tools/testfiles/family_file00012.h5 b/tools/test/misc/testfiles/family_file00012.h5
index c70b87e..c70b87e 100644
--- a/tools/testfiles/family_file00012.h5
+++ b/tools/test/misc/testfiles/family_file00012.h5
diff --git a/tools/testfiles/family_file00013.h5 b/tools/test/misc/testfiles/family_file00013.h5
index b181df8..b181df8 100644
--- a/tools/testfiles/family_file00013.h5
+++ b/tools/test/misc/testfiles/family_file00013.h5
diff --git a/tools/testfiles/family_file00014.h5 b/tools/test/misc/testfiles/family_file00014.h5
index 74867f1..74867f1 100644
--- a/tools/testfiles/family_file00014.h5
+++ b/tools/test/misc/testfiles/family_file00014.h5
diff --git a/tools/testfiles/family_file00015.h5 b/tools/test/misc/testfiles/family_file00015.h5
index de984c2..de984c2 100644
--- a/tools/testfiles/family_file00015.h5
+++ b/tools/test/misc/testfiles/family_file00015.h5
diff --git a/tools/testfiles/family_file00016.h5 b/tools/test/misc/testfiles/family_file00016.h5
index 810cf34..810cf34 100644
--- a/tools/testfiles/family_file00016.h5
+++ b/tools/test/misc/testfiles/family_file00016.h5
diff --git a/tools/testfiles/family_file00017.h5 b/tools/test/misc/testfiles/family_file00017.h5
index 9171ab9..9171ab9 100644
--- a/tools/testfiles/family_file00017.h5
+++ b/tools/test/misc/testfiles/family_file00017.h5
diff --git a/tools/test/misc/testh5clear.sh.in b/tools/test/misc/testh5clear.sh.in
index 018d1fd..b5bf5cc 100644
--- a/tools/test/misc/testh5clear.sh.in
+++ b/tools/test/misc/testh5clear.sh.in
@@ -40,9 +40,9 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
 SRC_H5CLEAR_TESTFILES="$SRC_TOOLS/test/misc/testfiles"
+SRC_H5CLEAR_OUTFILES="$SRC_TOOLS/test/misc/expected"
 
 TESTDIR=./testh5clear
 test -d $TESTDIR || mkdir -p $TESTDIR
@@ -61,25 +61,25 @@ test -d $TESTDIR || mkdir -p $TESTDIR
 # copy test files and expected output files from source dirs to test dir
 #
 COPY_TESTFILES="
-$SRC_H5CLEAR_TESTFILES/h5clear_open_fail.err
-$SRC_H5CLEAR_TESTFILES/h5clear_no_mdc_image.err
-$SRC_H5CLEAR_TESTFILES/h5clear_usage.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_missing_file.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_status_noclose_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_noclose_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_noclose_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_equal_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_equal_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_greater_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_greater_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_less_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_less_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_user_equal_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_user_equal_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_user_greater_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_user_greater_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_user_less_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_user_less_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_open_fail.err
+$SRC_H5CLEAR_OUTFILES/h5clear_no_mdc_image.err
+$SRC_H5CLEAR_OUTFILES/h5clear_usage.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_missing_file.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_status_noclose_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_noclose_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_noclose_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_equal_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_equal_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_greater_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_greater_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_less_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_less_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_user_equal_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_user_equal_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_user_greater_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_user_greater_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_user_less_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_user_less_after_size.ddl
 $SRC_H5CLEAR_TESTFILES/h5clear_sec2_v0.h5
 $SRC_H5CLEAR_TESTFILES/h5clear_sec2_v2.h5
 $SRC_H5CLEAR_TESTFILES/h5clear_sec2_v3.h5
diff --git a/tools/test/misc/testh5mkgrp.sh.in b/tools/test/misc/testh5mkgrp.sh.in
index d581fe1..676f6b0 100644
--- a/tools/test/misc/testh5mkgrp.sh.in
+++ b/tools/test/misc/testh5mkgrp.sh.in
@@ -39,9 +39,9 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
 SRC_H5MKGRP_TESTFILES="$SRC_TOOLS/test/misc/testfiles"
+SRC_H5MKGRP_OUTFILES="$SRC_TOOLS/test/misc/expected"
 
 TESTDIR=./testgrp
 test -d $TESTDIR || mkdir -p $TESTDIR
@@ -60,19 +60,19 @@ test -d $TESTDIR || mkdir -p $TESTDIR
 # copy test files and expected output files from source dirs to test dir
 #
 COPY_TESTFILES="
-$SRC_H5MKGRP_TESTFILES/h5mkgrp_help.txt
-$SRC_TOOLS_TESTFILES/h5mkgrp_single.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_single_v.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_single_p.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_single_l.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_several.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_several_v.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_several_p.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_several_l.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_nested_p.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_nested_lp.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_nested_mult_p.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_nested_mult_lp.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_help.txt
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_single.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_single_v.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_single_p.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_single_l.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_several.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_several_v.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_several_p.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_several_l.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_p.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_lp.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_mult_p.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_mult_lp.ls
 "
 
 COPY_TESTFILES_TO_TESTDIR()
diff --git a/tools/test/misc/testh5repart.sh.in b/tools/test/misc/testh5repart.sh.in
index b0d52f6..addd0db 100644
--- a/tools/test/misc/testh5repart.sh.in
+++ b/tools/test/misc/testh5repart.sh.in
@@ -38,7 +38,7 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
+SRC_H5REPART_TESTFILES="$SRC_TOOLS/test/misc/testfiles"
 
 TESTDIR=./testrepart
 test -d $TESTDIR || mkdir -p $TESTDIR
@@ -47,24 +47,24 @@ test -d $TESTDIR || mkdir -p $TESTDIR
 # copy test files and expected output files from source dirs to test dir
 #
 COPY_TESTFILES="
-$SRC_TOOLS_TESTFILES/family_file00000.h5
-$SRC_TOOLS_TESTFILES/family_file00001.h5
-$SRC_TOOLS_TESTFILES/family_file00002.h5
-$SRC_TOOLS_TESTFILES/family_file00003.h5
-$SRC_TOOLS_TESTFILES/family_file00004.h5
-$SRC_TOOLS_TESTFILES/family_file00005.h5
-$SRC_TOOLS_TESTFILES/family_file00006.h5
-$SRC_TOOLS_TESTFILES/family_file00007.h5
-$SRC_TOOLS_TESTFILES/family_file00008.h5
-$SRC_TOOLS_TESTFILES/family_file00009.h5
-$SRC_TOOLS_TESTFILES/family_file00010.h5
-$SRC_TOOLS_TESTFILES/family_file00011.h5
-$SRC_TOOLS_TESTFILES/family_file00012.h5
-$SRC_TOOLS_TESTFILES/family_file00013.h5
-$SRC_TOOLS_TESTFILES/family_file00014.h5
-$SRC_TOOLS_TESTFILES/family_file00015.h5
-$SRC_TOOLS_TESTFILES/family_file00016.h5
-$SRC_TOOLS_TESTFILES/family_file00017.h5
+$SRC_H5REPART_TESTFILES/family_file00000.h5
+$SRC_H5REPART_TESTFILES/family_file00001.h5
+$SRC_H5REPART_TESTFILES/family_file00002.h5
+$SRC_H5REPART_TESTFILES/family_file00003.h5
+$SRC_H5REPART_TESTFILES/family_file00004.h5
+$SRC_H5REPART_TESTFILES/family_file00005.h5
+$SRC_H5REPART_TESTFILES/family_file00006.h5
+$SRC_H5REPART_TESTFILES/family_file00007.h5
+$SRC_H5REPART_TESTFILES/family_file00008.h5
+$SRC_H5REPART_TESTFILES/family_file00009.h5
+$SRC_H5REPART_TESTFILES/family_file00010.h5
+$SRC_H5REPART_TESTFILES/family_file00011.h5
+$SRC_H5REPART_TESTFILES/family_file00012.h5
+$SRC_H5REPART_TESTFILES/family_file00013.h5
+$SRC_H5REPART_TESTFILES/family_file00014.h5
+$SRC_H5REPART_TESTFILES/family_file00015.h5
+$SRC_H5REPART_TESTFILES/family_file00016.h5
+$SRC_H5REPART_TESTFILES/family_file00017.h5
 "
 
 COPY_TESTFILES_TO_TESTDIR()
@@ -100,7 +100,7 @@ CLEAN_TESTFILES_AND_TESTDIR()
     # skip rm if srcdir is same as destdir
     # this occurs when build/test performed in source dir and
     # make cp fail
-    SDIR=$SRC_TOOLS_TESTFILES
+    SDIR=$SRC_H5REPART_TESTFILES
     INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
     INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
     if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake
index acfe169..2dea619 100644
--- a/tools/test/perform/CMakeTests.cmake
+++ b/tools/test/perform/CMakeTests.cmake
@@ -16,7 +16,7 @@
 ##############################################################################
 ##############################################################################
 
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfilters.h5" "${PROJECT_BINARY_DIR}/tfilters.h5" "zip_perf_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfilters.h5" "${PROJECT_BINARY_DIR}/tfilters.h5" "zip_perf_files")
 add_custom_target(zip_perf_files ALL COMMENT "Copying files needed by zip_perf tests" DEPENDS ${zip_perf_list})
 
 #-----------------------------------------------------------------------------
diff --git a/tools/test/perform/iopipe.c b/tools/test/perform/iopipe.c
index a0dd294..b5190fa 100644
--- a/tools/test/perform/iopipe.c
+++ b/tools/test/perform/iopipe.c
@@ -123,7 +123,7 @@ main(void)
     unsigned                       u;
     herr_t H5_ATTR_NDEBUG_UNUSED   status;
     hssize_t H5_ATTR_NDEBUG_UNUSED n;
-    off_t H5_ATTR_NDEBUG_UNUSED    offset;
+    HDoff_t H5_ATTR_NDEBUG_UNUSED  offset;
     hsize_t                        start[2];
     hsize_t                        count[2];
 
@@ -207,7 +207,7 @@ main(void)
     for (u = 0; u < nwrite; u++) {
         putc(PROGRESS, stderr);
         fflush(stderr);
-        offset = HDlseek(fd, (off_t)0, SEEK_SET);
+        offset = HDlseek(fd, 0, SEEK_SET);
         assert(0 == offset);
         n = HDwrite(fd, the_data, (size_t)(size[0] * size[1]));
         assert(n >= 0 && (size_t)n == (size[0] * size[1]));
@@ -257,7 +257,7 @@ main(void)
     for (u = 0; u < nread; u++) {
         putc(PROGRESS, stderr);
         fflush(stderr);
-        offset = HDlseek(fd, (off_t)0, SEEK_SET);
+        offset = HDlseek(fd, 0, SEEK_SET);
         assert(0 == offset);
         n = HDread(fd, the_data, (size_t)(size[0] * size[1]));
         assert(n >= 0 && (size_t)n == (size[0] * size[1]));
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index 85c41a1..063c165 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -100,7 +100,7 @@ error(const char *fmt, ...)
 static void
 cleanup(void)
 {
-    if (!HDgetenv(HDF5_NOCLEANUP))
+    if (!getenv(HDF5_NOCLEANUP))
         HDunlink(filename);
     free(filename);
 }
@@ -197,7 +197,7 @@ static void
 get_unique_name(void)
 {
     const char *prefix = NULL;
-    const char *env    = HDgetenv("HDF5_PREFIX");
+    const char *env    = getenv("HDF5_PREFIX");
 
     if (env)
         prefix = env;
diff --git a/utils/mirror_vfd/mirror_writer.c b/utils/mirror_vfd/mirror_writer.c
index 28f7e1f..a5a1d27 100644
--- a/utils/mirror_vfd/mirror_writer.c
+++ b/utils/mirror_vfd/mirror_writer.c
@@ -57,7 +57,7 @@
  *      guard against commands from the wrong entity.
  *
  * xmit_count (uint32_t)
- *      Record of trasmissions received from the Driver. While the transmission
+ *      Record of transmissions received from the Driver. While the transmission
  *      protocol should be trustworthy, this serves as an additional guard.
  *      Starts a 0 and should be incremented for each one-way transmission.
  *
@@ -728,7 +728,7 @@ do_write(struct mirror_session *session, const unsigned char *xmit_buf)
     addr = (haddr_t)xmit_write.offset;
     type = (H5FD_mem_t)xmit_write.type;
 
-    /* Allocate the buffer once -- re-use between loops.
+    /* Allocate the buffer once -- reuse between loops.
      */
     buf = (char *)malloc(sizeof(char) * H5FD_MIRROR_DATA_BUFFER_MAX);
     if (NULL == buf) {
diff --git a/utils/subfiling_vfd/h5fuse.sh.in b/utils/subfiling_vfd/h5fuse.sh.in
index 2085033..c6d715f 100755
--- a/utils/subfiling_vfd/h5fuse.sh.in
+++ b/utils/subfiling_vfd/h5fuse.sh.in
@@ -20,7 +20,7 @@ NC='\033[0m' # No Color
 ############################################################
 # Usage                                                    #
 ############################################################
-function usage() {
+function usage {
    echo ""
    # Display usage
    echo "Purpose: Combine subfiles into a single HDF5 file. Requires the subfiling
@@ -37,7 +37,7 @@ function usage() {
    echo ""
 }
 
-function gen_mpi() {
+function gen_mpi {
 
 # Program to determine MPI rank and size if being run in parallel (-p).
 
diff --git a/utils/test/swmr_check_compat_vfd.c b/utils/test/swmr_check_compat_vfd.c
index 765ebd9..b5cfb1b 100644
--- a/utils/test/swmr_check_compat_vfd.c
+++ b/utils/test/swmr_check_compat_vfd.c
@@ -42,7 +42,7 @@ main(void)
 {
     char *driver = NULL;
 
-    driver = HDgetenv(HDF5_DRIVER);
+    driver = getenv(HDF5_DRIVER);
 
     if (H5FD__supports_swmr_test(driver))
         return EXIT_SUCCESS;
diff --git a/utils/tools/h5dwalk/h5dwalk.1 b/utils/tools/h5dwalk/h5dwalk.1
deleted file mode 100644
index eb0e5e8..0000000
--- a/utils/tools/h5dwalk/h5dwalk.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.TH "h5dwalk" 1
-.SH NAME
-h5dwalk \- Provides a means of extending HDF5 tools by using parallelism on groups of files.
-.SH SYNOPSIS
-h5dwalk [OPTIONS] -T h5tool [H5TOOL_options...] 
-.SH DESCRIPTION
-h5dwalk utilizes the mpiFileUtils library to invoke a selected HDF5 tool on a collection of files.  The mpiFileUtils library provides the facilities to walk directory trees and provide a selection of files contained therein.  This selection can be filtered in various ways.  At present, h5dwalk filters the original file selection to include only HDF5 formatted files.  The resulting collection or collections can be utilized as the file inputs to the selected h5tool.
-.SH OPTIONS
-.TP
-.B \-h   
-or  
-.B \-\-help
-Print a usage message and exit. 
-.TP
-.B \-i   
-or  
-.B \-\-input filename
-Read command input from a file.  Not yet implemented.
-.TP
-.B \-o   
-or  
-.B \-\-output filename
-Captures the hdf5 tool output into a named file. 
-.TP
-.B \-l   
-or  
-.B \-\-log [file]
-Captures hdf5 tool output into a individual log files. If an optional file (directory) is specified, then output from all tool instances will be written in the given file directory.  Without the optional filename, each tool instance output will be captured in a new log file whose name is associated with the hdf5 tool that was run and is written in the current working directory.
-.TP
-.B \-E   
-or  
-.B \-\-error [file]
-Show all HDF5 error reporting. Behavior is similar to --log, i.e. errors can either be logged in a single named file or in individual tool specific files. Not yet implemented.
-.TP
-.B \-T   
-or  
-.B \-\-tool hdf5_tool
-Specifies the hdf5 tool that should be invoked for each file in a collection of files.  The collection consists of individual HDF5 files found by walking a specified directory tree which is used in place of the normal tool filename argument.  The '-T' option should appear on the command line just prior to the HDF5 tool argument options.
-.TP
-.SH "SEE ALSO"
-\&\fIh5dump\fR\|(1), \fIh5diff\fR\|(1), \fIh5repart\fR\|(1), \fIh5diff\fR\|(1),
-\&\fIh5import\fR\|(1), \fIgif2h5\fR\|(1), \fIh52gif\fR\|(1), \fIh5perf\fR\|(1)
diff --git a/utils/tools/h5dwalk/h5dwalk.c b/utils/tools/h5dwalk/h5dwalk.c
index 1f440e0..b510f3e 100644
--- a/utils/tools/h5dwalk/h5dwalk.c
+++ b/utils/tools/h5dwalk/h5dwalk.c
@@ -1350,7 +1350,7 @@ main(int argc, char *argv[])
     sg_mpi_rank = rank;
 
 #if 0
-	env_var = HDgetenv("HDF5_H5DWALK_PRINT_CMDLINE");
+	env_var = getenv("HDF5_H5DWALK_PRINT_CMDLINE");
     if (env_var) {
 		int enable = atoi(env_var);
 		if (enable) {
diff --git a/utils/tools/test/h5dwalk/testh5dwalk.sh.in b/utils/tools/test/h5dwalk/testh5dwalk.sh.in
index 4f6dbde..a123f8d 100644
--- a/utils/tools/test/h5dwalk/testh5dwalk.sh.in
+++ b/utils/tools/test/h5dwalk/testh5dwalk.sh.in
@@ -57,11 +57,10 @@ export LD_LIBRARY_PATH=@LL_PATH@
 
 # source dirs
 SRC_TOOLS="$TOP_DIR/tools/test"
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/h5repack/testfiles"