60 files changed, 65 insertions, 68 deletions

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/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/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 e7e9ec9..862b9a3 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -1894,9 +1894,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;
     }
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/test/testfiles/tnullspace.h5 b/test/testfiles/tnullspace.h5
new file mode 100644
index 0000000..b5dac5d
--- /dev/null
+++ 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