Merge branch 'develop' into parallel_vds_develop

31 files changed, 1221 insertions, 453 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 69afb85..0d67485 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -374,6 +374,7 @@ set (H5_CHECK_TESTS
     atomic_reader
     links_env
     filenotclosed
+    del_many_dense_attrs
     flushrefresh
 )
 
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 9816543..ba72e3a 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -171,6 +171,7 @@ set (HDF5_REFERENCE_TEST_FILES
     le_data.h5
     le_extlink1.h5
     le_extlink2.h5
+    memleak_H5O_dtype_decode_helper_H5Odtype.h5
     mergemsg.h5
     multi_file_v16-r.h5
     multi_file_v16-s.h5
@@ -520,6 +521,7 @@ set (test_CLEANFILES
     flushrefresh_VERIFICATION_CHECKPOINT2
     flushrefresh_VERIFICATION_DONE
     filenotclosed.h5
+    del_many_dense_attrs.h5
     atomic_data
     accum_swmr_big.h5
     ohdr_swmr.h5
@@ -585,10 +587,10 @@ foreach (test ${H5_TESTS})
   endif ()
 endforeach ()
 
-set_tests_properties (H5TEST-fheap PROPERTIES TIMEOUT 1800)
-set_tests_properties (H5TEST-big PROPERTIES TIMEOUT 1800)
-set_tests_properties (H5TEST-btree2 PROPERTIES TIMEOUT 1800)
-set_tests_properties (H5TEST-objcopy PROPERTIES TIMEOUT 1800)
+set_tests_properties (H5TEST-fheap PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
+set_tests_properties (H5TEST-big PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
+set_tests_properties (H5TEST-btree2 PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
+set_tests_properties (H5TEST-objcopy PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
 
 if (BUILD_SHARED_LIBS)
   # Remove any output file left over from previous test run
@@ -627,10 +629,10 @@ if (BUILD_SHARED_LIBS)
     endif ()
   endforeach ()
 
-  set_tests_properties (H5TEST-shared-fheap PROPERTIES TIMEOUT 1800)
-  set_tests_properties (H5TEST-shared-big PROPERTIES TIMEOUT 1800)
-  set_tests_properties (H5TEST-shared-btree2 PROPERTIES TIMEOUT 1800)
-  set_tests_properties (H5TEST-shared-objcopy PROPERTIES TIMEOUT 1800)
+  set_tests_properties (H5TEST-shared-fheap PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
+  set_tests_properties (H5TEST-shared-big PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
+  set_tests_properties (H5TEST-shared-btree2 PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
+  set_tests_properties (H5TEST-shared-objcopy PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
 endif ()
 
 #-- Adding test for cache
@@ -662,7 +664,7 @@ if (NOT CYGWIN)
       ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}"
       WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
   )
-  set_tests_properties (H5TEST-cache PROPERTIES TIMEOUT 1800)
+  set_tests_properties (H5TEST-cache PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
 endif ()
 
 #-- Adding test for cache_image
@@ -712,7 +714,7 @@ if (BUILD_SHARED_LIBS)
         ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST-shared;HDF5TestExpress=${HDF_TEST_EXPRESS}"
         WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST-shared
     )
-    set_tests_properties (H5TEST-shared-cache PROPERTIES TIMEOUT 1800)
+    set_tests_properties (H5TEST-shared-cache PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
   endif ()
 endif ()
 
@@ -796,6 +798,7 @@ set_tests_properties (H5TEST-tcheck_version-release PROPERTIES
 #    atomic_reader
 #    links_env
 #    filenotclosed
+#    del_many_dense_attrs
 #    flushrefresh
 ##############################################################################
 # autotools script tests
@@ -803,7 +806,7 @@ set_tests_properties (H5TEST-tcheck_version-release PROPERTIES
 # NOT CONVERTED accum_swmr_reader is used by accum.c.
 # NOT CONVERTED atomic_writer and atomic_reader are standalone programs.
 # links_env is used by testlinks_env.sh
-# filenotclosed is used by test_filenotclosed.sh
+# filenotclosed and del_many_dense_attrs are used by testabort_fail.sh
 # NOT CONVERTED flushrefresh is used by testflushrefresh.sh.
 # NOT CONVERTED use_append_chunk, use_append_mchunks and use_disable_mdc_flushes are used by test_usecases.sh
 # NOT CONVERTED swmr_* files (besides swmr.c) are used by testswmr.sh.
@@ -830,6 +833,23 @@ set_tests_properties (H5TEST-filenotclosed PROPERTIES
     WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
 )
 
+#-- Adding test for del_many_dense_attrs
+add_test (
+    NAME H5TEST-clear-del_many_dense_attrs-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove
+        del_many_dense_attrs.h5
+    WORKING_DIRECTORY
+        ${HDF5_TEST_BINARY_DIR}/H5TEST
+)
+set_tests_properties (H5TEST-clear-del_many_dense_attrs-objects PROPERTIES FIXTURES_SETUP  del_many_dense_attrs_clear_objects)
+add_test (NAME H5TEST-del_many_dense_attrs COMMAND $<TARGET_FILE:del_many_dense_attrs>)
+set_tests_properties (H5TEST-del_many_dense_attrs PROPERTIES
+    FIXTURES_REQUIRED del_many_dense_attrs_clear_objects
+    ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
+    WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
+)
+
 #-- Adding test for err_compat
 if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
   add_test (NAME H5TEST-clear-err_compat-objects
diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake
index be02110..9f03c40 100644
--- a/test/CMakeVFDTests.cmake
+++ b/test/CMakeVFDTests.cmake
@@ -263,17 +263,17 @@ endif ()
     set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES DEPENDS VFD-${vfdname}-flush1)
     set_tests_properties (VFD-${vfdname}-flush1 PROPERTIES TIMEOUT 10)
     set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES TIMEOUT 10)
-    set_tests_properties (VFD-${vfdname}-istore PROPERTIES TIMEOUT 1800)
+    set_tests_properties (VFD-${vfdname}-istore PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
     if (NOT CYGWIN)
-      set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT 1800)
+      set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
     endif ()
     if (BUILD_SHARED_LIBS)
       set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES DEPENDS VFD-${vfdname}-flush1-shared)
       set_tests_properties (VFD-${vfdname}-flush1-shared PROPERTIES TIMEOUT 10)
       set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES TIMEOUT 10)
-      set_tests_properties (VFD-${vfdname}-istore-shared PROPERTIES TIMEOUT 1800)
+      set_tests_properties (VFD-${vfdname}-istore-shared PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
       if (NOT CYGWIN AND NOT WIN32)
-        set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT 1800)
+        set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
       endif ()
     endif ()
     if (HDF5_TEST_FHEAP_VFD)
@@ -288,7 +288,7 @@ endif ()
               -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
       )
       set_tests_properties (VFD-${vfdname}-fheap PROPERTIES
-          TIMEOUT 1800
+          TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
           ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname};HDF5TestExpress=${HDF_TEST_EXPRESS}"
           WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}
       )
@@ -304,7 +304,7 @@ endif ()
                 -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
         )
         set_tests_properties (VFD-${vfdname}-fheap-shared PROPERTIES
-            TIMEOUT 1800
+            TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
             ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}-shared;HDF5TestExpress=${HDF_TEST_EXPRESS}"
             WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}-shared
         )
diff --git a/test/CMakeVOLTests.cmake b/test/CMakeVOLTests.cmake
index 39fa2a6..fdd7ba0 100644
--- a/test/CMakeVOLTests.cmake
+++ b/test/CMakeVOLTests.cmake
@@ -262,17 +262,17 @@ endif ()
     set_tests_properties (VOL-${volname}-flush2 PROPERTIES DEPENDS VOL-${volname}-flush1)
     set_tests_properties (VOL-${volname}-flush1 PROPERTIES TIMEOUT 10)
     set_tests_properties (VOL-${volname}-flush2 PROPERTIES TIMEOUT 10)
-    set_tests_properties (VOL-${volname}-istore PROPERTIES TIMEOUT 1800)
+    set_tests_properties (VOL-${volname}-istore PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
     if (NOT CYGWIN)
-      set_tests_properties (VOL-${volname}-cache PROPERTIES TIMEOUT 1800)
+      set_tests_properties (VOL-${volname}-cache PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
     endif ()
     if (BUILD_SHARED_LIBS)
       set_tests_properties (VOL-${volname}-flush2-shared PROPERTIES DEPENDS VOL-${volname}-flush1-shared)
       set_tests_properties (VOL-${volname}-flush1-shared PROPERTIES TIMEOUT 10)
       set_tests_properties (VOL-${volname}-flush2-shared PROPERTIES TIMEOUT 10)
-      set_tests_properties (VOL-${volname}-istore-shared PROPERTIES TIMEOUT 1800)
+      set_tests_properties (VOL-${volname}-istore-shared PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
       if (NOT CYGWIN AND NOT WIN32)
-        set_tests_properties (VOL-${volname}-cache-shared PROPERTIES TIMEOUT 1800)
+        set_tests_properties (VOL-${volname}-cache-shared PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
       endif ()
     endif ()
     if (HDF5_TEST_FHEAP_VOL)
@@ -287,7 +287,7 @@ endif ()
               -P "${HDF_RESOURCES_DIR}/volTest.cmake"
       )
       set_tests_properties (VOL-${volname}-fheap PROPERTIES
-          TIMEOUT 1800
+          TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
           ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname};HDF5TestExpress=${HDF_TEST_EXPRESS}"
           WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname}
       )
@@ -303,7 +303,7 @@ endif ()
                 -P "${HDF_RESOURCES_DIR}/volTest.cmake"
         )
         set_tests_properties (VOL-${volname}-fheap-shared PROPERTIES
-            TIMEOUT 1800
+            TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
             ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname}-shared;HDF5TestExpress=${HDF_TEST_EXPRESS}"
             WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname}-shared
         )
diff --git a/test/Makefile.am b/test/Makefile.am
index 1a232ab..88dc542 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -29,12 +29,13 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_builddir)/src
 #       testflushrefresh.sh: flushrefresh
 #       testswmr.sh: swmr*
 #       testvdsswmr.sh: vds_swmr*
-#       test_filenotclosed.sh: filenotclosed.c
+#       testabort_fail.sh: filenotclosed.c and del_many_dense_attrs.c
 #       test_filter_plugin.sh: filter_plugin.c
 #       test_usecases.sh: use_append_chunk, use_append_mchunks, use_disable_mdc_flushes
-TEST_SCRIPT = testerror.sh testlibinfo.sh testcheck_version.sh testlinks_env.sh test_filenotclosed.sh\
-    testswmr.sh testvdsswmr.sh testflushrefresh.sh test_usecases.sh
-SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) links_env$(EXEEXT) filenotclosed$(EXEEXT) \
+TEST_SCRIPT = testerror.sh testlibinfo.sh testcheck_version.sh testlinks_env.sh \
+    testswmr.sh testvdsswmr.sh testflushrefresh.sh test_usecases.sh testabort_fail.sh
+SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) links_env$(EXEEXT) \
+    filenotclosed$(EXEEXT) del_many_dense_attrs$(EXEEXT) \
     flushrefresh$(EXEEXT) use_append_chunk$(EXEEXT) use_append_mchunks$(EXEEXT) use_disable_mdc_flushes$(EXEEXT) \
     swmr_generator$(EXEEXT) swmr_reader$(EXEEXT) swmr_writer$(EXEEXT) \
     swmr_remove_reader$(EXEEXT) swmr_remove_writer$(EXEEXT) swmr_addrem_writer$(EXEEXT) \
@@ -68,7 +69,7 @@ TEST_PROG= testhdf5 \
 # accum_swmr_reader is used by accum.c.
 # atomic_writer and atomic_reader are standalone programs.
 # links_env is used by testlinks_env.sh
-# filenotclosed is used by test_filenotclosed.sh
+# filenotclosed and del_many_dense_attrs are used by testabort_fail.sh
 # flushrefresh is used by testflushrefresh.sh.
 # use_append_chunk, use_append_mchunks and use_disable_mdc_flushes are used by test_usecases.sh
 # swmr_* files (besides swmr.c) are used by testswmr.sh.
@@ -78,7 +79,8 @@ TEST_PROG= testhdf5 \
 # and this lets automake keep all its test programs in one place.
 check_PROGRAMS=$(TEST_PROG) error_test err_compat tcheck_version \
     testmeta accum_swmr_reader atomic_writer atomic_reader \
-    links_env filenotclosed flushrefresh use_append_chunk use_append_mchunks use_disable_mdc_flushes \
+    links_env filenotclosed del_many_dense_attrs flushrefresh \
+    use_append_chunk use_append_mchunks use_disable_mdc_flushes \
     swmr_generator swmr_start_write swmr_reader swmr_writer swmr_remove_reader \
     swmr_remove_writer swmr_addrem_writer swmr_sparse_reader swmr_sparse_writer \
     swmr_check_compat_vfd vds_swmr_gen vds_swmr_reader vds_swmr_writer
@@ -221,7 +223,7 @@ use_disable_mdc_flushes_SOURCES=use_disable_mdc_flushes.c
 
 # Temporary files.
 DISTCLEANFILES=testerror.sh testlibinfo.sh testcheck_version.sh testlinks_env.sh test_filter_plugin.sh \
-    testswmr.sh testvdsswmr.sh test_usecases.sh testflushrefresh.sh test_filenotclosed.sh \
+    testswmr.sh testvdsswmr.sh test_usecases.sh testflushrefresh.sh testabort_fail.sh \
 	test_vol_plugin.sh
 
 include $(top_srcdir)/config/conclude.am
diff --git a/test/ShellTests.cmake b/test/ShellTests.cmake
index 58dc85d..98f3daf 100644
--- a/test/ShellTests.cmake
+++ b/test/ShellTests.cmake
@@ -171,6 +171,7 @@ if (UNIX)
     #    atomic_writer
     #    atomic_reader
     #    filenotclosed
+    #    del_many_dense_attrs
     #    flushrefresh
     ##############################################################################
     # autotools script tests
@@ -178,7 +179,7 @@ if (UNIX)
     # NOT CONVERTED accum_swmr_reader is used by accum.c.
     # NOT CONVERTED atomic_writer and atomic_reader are standalone programs.
     # links_env is used by testlinks_env.sh
-    # filenotclosed is used by test_filenotclosed.sh
+    # filenotclosed and del_many_dense_attrs are used by testabort_fail.sh
     # NOT CONVERTED flushrefresh is used by testflushrefresh.sh.
     # NOT CONVERTED use_append_chunk, use_append_mchunks and use_disable_mdc_flushes are used by test_usecases.sh
     # NOT CONVERTED swmr_* files (besides swmr.c) are used by testswmr.sh.
diff --git a/test/accum.c b/test/accum.c
index 87628d8..7af353c 100644
--- a/test/accum.c
+++ b/test/accum.c
@@ -26,10 +26,13 @@
 #include "H5VLprivate.h"        /* Virtual Object Layer                     */
 
 /* Filename */
-#define FILENAME "accum.h5"
+/* (The file names are the same as the define in accum_swmr_reader.c) */
+const char *FILENAME[] = {
+    "accum",
+    "accum_swmr_big",
+    NULL
+};
 
-/* The file name is the same as the define in accum_swmr_reader.c */
-#define SWMR_FILENAME "accum_swmr_big.h5"
 /* The reader forked by test_swmr_write_big() */
 #define SWMR_READER "accum_swmr_reader"
 
@@ -92,6 +95,7 @@ main(void)
     hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
     hid_t fid = -1;
     hid_t fapl = -1;			/* File access property list */
+    char  filename[1024];
     H5F_t * f = NULL;           /* File for all tests */
 
 
@@ -99,15 +103,13 @@ main(void)
     puts("Testing the metadata accumulator");
 
     /* File access property list */
+    h5_reset();
     if((fapl = h5_fileaccess()) < 0)
         FAIL_STACK_ERROR
+    h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
 
     /* Create a test file */
-    if((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
-
-    /* Closing and remove the file */
-    if(H5Pclose(fapl) < 0)
-        FAIL_STACK_ERROR
+    if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Push API context */
     if(H5CX_push() < 0) FAIL_STACK_ERROR
@@ -143,7 +145,6 @@ main(void)
 
     /* End of test code, close and delete file */
     if(H5Fclose(fid) < 0) TEST_ERROR
-    HDremove(FILENAME);
 
     /* This test uses a different file */
     nerrors += test_swmr_write_big(TRUE);
@@ -152,6 +153,7 @@ main(void)
     if(nerrors)
         goto error;
     puts("All metadata accumulator tests passed.");
+    h5_cleanup(FILENAME, fapl);
 
     return 0;
 
@@ -1828,6 +1830,7 @@ test_swmr_write_big(hbool_t newest_format)
     hid_t fid = -1;			    /* File ID */
     hid_t fapl = -1;			/* File access property list */
     H5F_t *rf = NULL;			/* File pointer */
+    char  filename[1024];
     uint8_t *wbuf2 = NULL, *rbuf = NULL;      /* Buffers for reading & writing */
     uint8_t wbuf[1024];			/* Buffer for reading & writing */
     unsigned u;                 /* Local index variable */
@@ -1865,17 +1868,18 @@ test_swmr_write_big(hbool_t newest_format)
     /* File access property list */
     if((fapl = h5_fileaccess()) < 0)
         FAIL_STACK_ERROR
+    h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
 
     /* Both cases will result in v3 superblock and version 2 object header for SWMR */
     if(newest_format) { /* latest format */
         if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
             FAIL_STACK_ERROR
 
-	if((fid = H5Fcreate(SWMR_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+	if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
 	    FAIL_STACK_ERROR
     }
     else { /* non-latest-format */
-        if((fid = H5Fcreate(SWMR_FILENAME, H5F_ACC_TRUNC|H5F_ACC_SWMR_WRITE, H5P_DEFAULT, fapl)) < 0)
+        if((fid = H5Fcreate(filename, H5F_ACC_TRUNC|H5F_ACC_SWMR_WRITE, H5P_DEFAULT, fapl)) < 0)
             FAIL_STACK_ERROR
     } /* end if */
 
@@ -1884,7 +1888,7 @@ test_swmr_write_big(hbool_t newest_format)
         FAIL_STACK_ERROR
 
     /* Open the file with SWMR_WRITE */
-    if((fid = H5Fopen(SWMR_FILENAME, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl)) < 0)
+    if((fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl)) < 0)
         FAIL_STACK_ERROR
 
     /* Push API context */
@@ -1979,20 +1983,19 @@ test_swmr_write_big(hbool_t newest_format)
         /* Flush the accumulator */
         if(accum_reset(rf) < 0)
             FAIL_STACK_ERROR;
-        /* Close the property list */
-        if(H5Pclose(fapl) < 0) 
-            FAIL_STACK_ERROR;
 
         /* Close and remove the file */
         if(H5Fclose(fid) < 0) 
             FAIL_STACK_ERROR;
 
+        /* Close the property list */
+        if(H5Pclose(fapl) < 0) 
+            FAIL_STACK_ERROR;
+
         /* Pop API context */
         if(api_ctx_pushed && H5CX_pop() < 0) FAIL_STACK_ERROR
         api_ctx_pushed = FALSE;
 
-        HDremove(SWMR_FILENAME);
-
         /* Release memory */
         if(wbuf2)
             HDfree(wbuf2);
@@ -2004,12 +2007,11 @@ test_swmr_write_big(hbool_t newest_format)
 
 error:
     /* Closing and remove the file */
-    H5Pclose(fapl);
     H5Fclose(fid);
 
     if(api_ctx_pushed) H5CX_pop();
 
-    HDremove(SWMR_FILENAME);
+    H5Pclose(fapl);
 
     /* Release memory */
     if(wbuf2)
diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c
index 16e0ddc..ac48a13 100644
--- a/test/accum_swmr_reader.c
+++ b/test/accum_swmr_reader.c
@@ -23,7 +23,12 @@
 #include "H5VLprivate.h"        /* Virtual Object Layer                     */
 
 /* Filename: this is the same as the define in accum.c used by test_swmr_write_big() */
-#define SWMR_FILENAME "accum_swmr_big.h5"
+const char *FILENAME[] = {
+    "accum",
+    "accum_swmr_big",
+    NULL
+};
+
 
 
 /*-------------------------------------------------------------------------
@@ -47,6 +52,7 @@ main(void)
     hid_t fid = -1;	        /* File ID */
     hid_t fapl = -1;        /* file access property list ID */
     H5F_t *f = NULL;	    /* File pointer */
+    char  filename[1024];
     unsigned u;		        /* Local index variable */
     uint8_t rbuf[1024];	    /* Buffer for reading */
     uint8_t buf[1024];	    /* Buffer for holding the expected data */
@@ -68,10 +74,11 @@ main(void)
 
     if((fapl = h5_fileaccess()) < 0)
         FAIL_STACK_ERROR
+    h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
 
     /* Open the file with SWMR_READ */
-    if((fid = H5Fopen(SWMR_FILENAME, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0)
-	    FAIL_STACK_ERROR
+    if((fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0)
+        FAIL_STACK_ERROR
 
     /* Push API context */
     if(H5CX_push() < 0) FAIL_STACK_ERROR
@@ -79,21 +86,21 @@ main(void)
 
     /* Get H5F_t * to internal file structure */
     if(NULL == (f = (H5F_t *)H5VL_object(fid))) 
-	    FAIL_STACK_ERROR
+        FAIL_STACK_ERROR
 
     /* Should read in [1024, 2024] with buf data */
     if(H5F_block_read(f, H5FD_MEM_DEFAULT, (haddr_t)1024, (size_t)1024, rbuf) < 0)
-	    FAIL_STACK_ERROR;
+        FAIL_STACK_ERROR;
 
     /* Verify the data read is correct */
     if(HDmemcmp(buf, rbuf, (size_t)1024) != 0) 
-	    TEST_ERROR;
+        TEST_ERROR;
 
     /* CLose the file */
     if(H5Pclose(fapl) < 0)
-	    FAIL_STACK_ERROR;
+        FAIL_STACK_ERROR;
     if(H5Fclose(fid) < 0)
-	    FAIL_STACK_ERROR;
+        FAIL_STACK_ERROR;
 
     /* Pop API context */
     if(api_ctx_pushed && H5CX_pop() < 0) FAIL_STACK_ERROR
diff --git a/test/cache_image.c b/test/cache_image.c
index 10e9a8a..ee49502 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -40,27 +40,27 @@ static void attempt_swmr_open_hdf5_file(hbool_t create_file,
 static void verify_datasets(hid_t file_id, int min_dset, int max_dset);
 
 /* local test function declarations */
-static unsigned check_cache_image_ctl_flow_1(void);
-static unsigned check_cache_image_ctl_flow_2(void);
-static unsigned check_cache_image_ctl_flow_3(void);
-static unsigned check_cache_image_ctl_flow_4(void);
-static unsigned check_cache_image_ctl_flow_5(void);
-static unsigned check_cache_image_ctl_flow_6(void);
-
-static unsigned cache_image_smoke_check_1(void);
-static unsigned cache_image_smoke_check_2(void);
-static unsigned cache_image_smoke_check_3(void);
-static unsigned cache_image_smoke_check_4(void);
-static unsigned cache_image_smoke_check_5(void);
-static unsigned cache_image_smoke_check_6(void);
-
-static unsigned cache_image_api_error_check_1(void);
-static unsigned cache_image_api_error_check_2(void);
-static unsigned cache_image_api_error_check_3(void);
-static unsigned cache_image_api_error_check_4(void);
-
-static unsigned get_free_sections_test(void);
-static unsigned evict_on_close_test(void);
+static unsigned check_cache_image_ctl_flow_1(hbool_t single_file_vfd);
+static unsigned check_cache_image_ctl_flow_2(hbool_t single_file_vfd);
+static unsigned check_cache_image_ctl_flow_3(hbool_t single_file_vfd);
+static unsigned check_cache_image_ctl_flow_4(hbool_t single_file_vfd);
+static unsigned check_cache_image_ctl_flow_5(hbool_t single_file_vfd);
+static unsigned check_cache_image_ctl_flow_6(hbool_t single_file_vfd);
+
+static unsigned cache_image_smoke_check_1(hbool_t single_file_vfd);
+static unsigned cache_image_smoke_check_2(hbool_t single_file_vfd);
+static unsigned cache_image_smoke_check_3(hbool_t single_file_vfd);
+static unsigned cache_image_smoke_check_4(hbool_t single_file_vfd);
+static unsigned cache_image_smoke_check_5(hbool_t single_file_vfd);
+static unsigned cache_image_smoke_check_6(hbool_t single_file_vfd);
+
+static unsigned cache_image_api_error_check_1(hbool_t single_file_vfd);
+static unsigned cache_image_api_error_check_2(hbool_t single_file_vfd);
+static unsigned cache_image_api_error_check_3(hbool_t single_file_vfd);
+static unsigned cache_image_api_error_check_4(hbool_t single_file_vfd);
+
+static unsigned get_free_sections_test(hbool_t single_file_vfd);
+static unsigned evict_on_close_test(hbool_t single_file_vfd);
 
 
 /****************************************************************************/
@@ -713,6 +713,9 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected,
                 file_id = H5Fopen(hdf_file_name, H5F_ACC_RDWR, fapl_id);
         }
 
+        /* tidy up */
+        H5Pclose(fapl_id);
+
         if ( file_id < 0 ) {
 
             pass = FALSE;
@@ -1329,7 +1332,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset)
  */
 
 static unsigned
-check_cache_image_ctl_flow_1(void)
+check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
 {
     const char * fcn_name = "check_cache_image_ctl_flow_1()";
     char filename[512];
@@ -1341,6 +1344,13 @@ check_cache_image_ctl_flow_1(void)
 
     TESTING("metadata cache image control flow test 1");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -1608,7 +1618,7 @@ check_cache_image_ctl_flow_1(void)
  */
 
 static unsigned
-check_cache_image_ctl_flow_2(void)
+check_cache_image_ctl_flow_2(hbool_t single_file_vfd)
 {
     const char * fcn_name = "check_cache_image_ctl_flow_2()";
     char filename[512];
@@ -1620,6 +1630,13 @@ check_cache_image_ctl_flow_2(void)
 
     TESTING("metadata cache image control flow test 2");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -1871,7 +1888,7 @@ check_cache_image_ctl_flow_2(void)
  */
 
 static unsigned
-check_cache_image_ctl_flow_3(void)
+check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
 {
     const char * fcn_name = "check_cache_image_ctl_flow_3()";
     char filename[512];
@@ -1883,6 +1900,13 @@ check_cache_image_ctl_flow_3(void)
 
     TESTING("metadata cache image control flow test 3");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) /* 0 */
@@ -2242,7 +2266,7 @@ check_cache_image_ctl_flow_3(void)
  */
 
 static unsigned
-check_cache_image_ctl_flow_4(void)
+check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
 {
     const char * fcn_name = "check_cache_image_ctl_flow_4()";
     char filename[512];
@@ -2254,6 +2278,13 @@ check_cache_image_ctl_flow_4(void)
 
     TESTING("metadata cache image control flow test 4");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) /* 0 */
@@ -2573,7 +2604,7 @@ check_cache_image_ctl_flow_4(void)
  */
 
 static unsigned
-check_cache_image_ctl_flow_5(void)
+check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
 {
     const char * fcn_name = "check_cache_image_ctl_flow_5()";
     char filename[512];
@@ -2585,6 +2616,13 @@ check_cache_image_ctl_flow_5(void)
 
     TESTING("metadata cache image control flow test 5");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) /* 0 */
@@ -2854,7 +2892,7 @@ check_cache_image_ctl_flow_5(void)
  */
 
 static unsigned
-check_cache_image_ctl_flow_6(void)
+check_cache_image_ctl_flow_6(hbool_t single_file_vfd)
 {
     const char * fcn_name = "check_cache_image_ctl_flow_6()";
     char filename[512];
@@ -2866,6 +2904,13 @@ check_cache_image_ctl_flow_6(void)
 
     TESTING("metadata cache image control flow test 6");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) /* 0 */
@@ -3139,7 +3184,7 @@ check_cache_image_ctl_flow_6(void)
  */
 
 static unsigned
-cache_image_smoke_check_1(void)
+cache_image_smoke_check_1(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_smoke_check_1()";
     char filename[512];
@@ -3151,6 +3196,13 @@ cache_image_smoke_check_1(void)
 
     TESTING("metadata cache image smoke check 1");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -3562,7 +3614,7 @@ cache_image_smoke_check_1(void)
  */
 
 static unsigned
-cache_image_smoke_check_2(void)
+cache_image_smoke_check_2(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_smoke_check_2()";
     char filename[512];
@@ -3574,6 +3626,13 @@ cache_image_smoke_check_2(void)
 
     TESTING("metadata cache image smoke check 2");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -3863,7 +3922,7 @@ cache_image_smoke_check_2(void)
  */
 
 static unsigned
-cache_image_smoke_check_3(void)
+cache_image_smoke_check_3(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_smoke_check_3()";
     char filename[512];
@@ -3875,6 +3934,13 @@ cache_image_smoke_check_3(void)
 
     TESTING("metadata cache image smoke check 3");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -4248,7 +4314,7 @@ cache_image_smoke_check_3(void)
  */
 
 static unsigned
-cache_image_smoke_check_4(void)
+cache_image_smoke_check_4(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_smoke_check_4()";
     char filename[512];
@@ -4262,6 +4328,13 @@ cache_image_smoke_check_4(void)
 
     TESTING("metadata cache image smoke check 4");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -4650,10 +4723,10 @@ cache_image_smoke_check_4(void)
  *-------------------------------------------------------------------------
  */
 
-#define MAX_NUM_GROUPS 128
+#define MAX_NUM_GROUPS 64
 
 static unsigned
-cache_image_smoke_check_5(void)
+cache_image_smoke_check_5(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_smoke_check_5()";
     char filename[512];
@@ -4670,6 +4743,13 @@ cache_image_smoke_check_5(void)
 
     TESTING("metadata cache image smoke check 5");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -4679,12 +4759,16 @@ cache_image_smoke_check_5(void)
     /* setup the file name */
     if ( pass ) {
 
-        if ( h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename))
+        hid_t fapl_id = h5_fileaccess();
+
+        if ( h5_fixname(FILENAMES[0], fapl_id, filename, sizeof(filename))
             == NULL ) {
 
             pass = FALSE;
             failure_mssg = "h5_fixname() failed.\n";
         }
+
+        H5Pclose(fapl_id);
     }
 
     if ( show_progress ) 
@@ -5168,7 +5252,7 @@ cache_image_smoke_check_5(void)
  */
 
 static unsigned
-cache_image_smoke_check_6(void)
+cache_image_smoke_check_6(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_smoke_check_6()";
     char filename[512];
@@ -5183,6 +5267,13 @@ cache_image_smoke_check_6(void)
 
     TESTING("metadata cache image smoke check 6");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -5578,7 +5669,7 @@ cache_image_smoke_check_6(void)
  */
 
 static unsigned
-cache_image_api_error_check_1(void)
+cache_image_api_error_check_1(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_api_error_check_1()";
     char filename[512];
@@ -5590,6 +5681,13 @@ cache_image_api_error_check_1(void)
 
     TESTING("metadata cache image api error check 1");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -5954,7 +6052,7 @@ cache_image_api_error_check_1(void)
  */
 
 static unsigned
-cache_image_api_error_check_2(void)
+cache_image_api_error_check_2(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_api_error_check_2()";
     char filename[512];
@@ -5966,6 +6064,13 @@ cache_image_api_error_check_2(void)
 
     TESTING("metadata cache image api error check 2");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -6365,7 +6470,7 @@ cache_image_api_error_check_2(void)
  */
 
 static unsigned
-cache_image_api_error_check_3(void)
+cache_image_api_error_check_3(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_api_error_check_3()";
     char filename[512];
@@ -6377,6 +6482,13 @@ cache_image_api_error_check_3(void)
 
     TESTING("metadata cache image api error check 3");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -6649,7 +6761,7 @@ cache_image_api_error_check_3(void)
  */
 
 static unsigned
-cache_image_api_error_check_4(void)
+cache_image_api_error_check_4(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_api_error_check_4()";
     char filename[512];
@@ -6663,6 +6775,13 @@ cache_image_api_error_check_4(void)
 
     TESTING("metadata cache image api error check 4");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -7238,7 +7357,7 @@ cache_image_api_error_check_4(void)
  *-------------------------------------------------------------------------
  */
 static unsigned
-get_free_sections_test(void)
+get_free_sections_test(hbool_t single_file_vfd)
 {
     const char * fcn_name = "get_free_sections_test()";
     char filename[512];
@@ -7251,6 +7370,13 @@ get_free_sections_test(void)
 
     TESTING("Cache image / H5Fget_free_sections() interaction");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -7710,7 +7836,7 @@ get_free_sections_test(void)
  *-------------------------------------------------------------------------
  */
 static unsigned
-evict_on_close_test(void)
+evict_on_close_test(hbool_t single_file_vfd)
 {
 #ifndef H5_HAVE_PARALLEL
     const char * fcn_name = "evict_on_close_test()";
@@ -7731,6 +7857,13 @@ evict_on_close_test(void)
     return 0;
 #else
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -8041,9 +8174,16 @@ evict_on_close_test(void)
 int
 main(void)
 {
+    const char  *env_h5_drvr;   /* File driver value from environment */
+    hbool_t single_file_vfd;    /* Whether VFD used stores data in a single file */
     unsigned nerrs = 0;
     int express_test;
 
+    /* Get the VFD to use */
+    env_h5_drvr = HDgetenv("HDF5_DRIVER");
+    if(env_h5_drvr == NULL)
+        env_h5_drvr = "nomatch";
+
     H5open();
 
     express_test = GetTestExpress();
@@ -8053,27 +8193,30 @@ main(void)
     printf("        express_test = %d\n", express_test);
     printf("=========================================\n");
 
-    nerrs += check_cache_image_ctl_flow_1();
-    nerrs += check_cache_image_ctl_flow_2();
-    nerrs += check_cache_image_ctl_flow_3();
-    nerrs += check_cache_image_ctl_flow_4();
-    nerrs += check_cache_image_ctl_flow_5();
-    nerrs += check_cache_image_ctl_flow_6();
-
-    nerrs += cache_image_smoke_check_1();
-    nerrs += cache_image_smoke_check_2();
-    nerrs += cache_image_smoke_check_3();
-    nerrs += cache_image_smoke_check_4();
-    nerrs += cache_image_smoke_check_5();
-    nerrs += cache_image_smoke_check_6();
-
-    nerrs += cache_image_api_error_check_1();
-    nerrs += cache_image_api_error_check_2();
-    nerrs += cache_image_api_error_check_3();
-    nerrs += cache_image_api_error_check_4();
-
-    nerrs += get_free_sections_test();
-    nerrs += evict_on_close_test();
+    /* Check for VFD which stores data in multiple files */
+    single_file_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family"));
+
+    nerrs += check_cache_image_ctl_flow_1(single_file_vfd);
+    nerrs += check_cache_image_ctl_flow_2(single_file_vfd);
+    nerrs += check_cache_image_ctl_flow_3(single_file_vfd);
+    nerrs += check_cache_image_ctl_flow_4(single_file_vfd);
+    nerrs += check_cache_image_ctl_flow_5(single_file_vfd);
+    nerrs += check_cache_image_ctl_flow_6(single_file_vfd);
+
+    nerrs += cache_image_smoke_check_1(single_file_vfd);
+    nerrs += cache_image_smoke_check_2(single_file_vfd);
+    nerrs += cache_image_smoke_check_3(single_file_vfd);
+    nerrs += cache_image_smoke_check_4(single_file_vfd);
+    nerrs += cache_image_smoke_check_5(single_file_vfd);
+    nerrs += cache_image_smoke_check_6(single_file_vfd);
+
+    nerrs += cache_image_api_error_check_1(single_file_vfd);
+    nerrs += cache_image_api_error_check_2(single_file_vfd);
+    nerrs += cache_image_api_error_check_3(single_file_vfd);
+    nerrs += cache_image_api_error_check_4(single_file_vfd);
+
+    nerrs += get_free_sections_test(single_file_vfd);
+    nerrs += evict_on_close_test(single_file_vfd);
 
     return(nerrs > 0);
 
diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index 752dd27..b91f013 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -448,7 +448,7 @@ check_file_creation_tags(hid_t fcpl_id, int type)
     TESTING("tag application during file creation");
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file with provided fcpl_t */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, fapl)) < 0 ) TEST_ERROR;
@@ -539,7 +539,7 @@ check_file_open_tags(hid_t fcpl, int type)
     /* ===== */
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file with provided fcpl_t */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl)) < 0 ) TEST_ERROR;
@@ -652,7 +652,7 @@ check_group_creation_tags(void)
     /* ===== */
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file with provided fcpl_t */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
@@ -751,7 +751,7 @@ check_multi_group_creation_tags(void)
     TESTING("tag application during multiple group creation");
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Set latest version of library */
     if ( H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0 ) TEST_ERROR;
@@ -881,7 +881,7 @@ check_link_iteration_tags(void)
     TESTING("tag application during iteration over links in a group");
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* =========== */
     /* Create File */
@@ -1000,7 +1000,7 @@ check_dense_attribute_tags(void)
     TESTING("tag application during dense attribute manipulation");
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
     if ( H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0 ) TEST_ERROR;
 
     /* Create Dcpl */
@@ -1184,7 +1184,7 @@ check_group_open_tags(void)
     /* ===== */
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file with provided fcpl_t */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
@@ -1295,7 +1295,7 @@ check_attribute_creation_tags(hid_t fcpl, int type)
     /* ===== */
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file with provided fcpl_t */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl)) < 0 ) TEST_ERROR;
@@ -1429,7 +1429,7 @@ check_attribute_open_tags(hid_t fcpl, int type)
     /* ===== */
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file with provided fcpl_t */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl)) < 0 ) TEST_ERROR;
@@ -1576,7 +1576,7 @@ check_attribute_rename_tags(hid_t fcpl, int type)
     if ( (NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int)))) ) TEST_ERROR;
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file with provided fcpl_t */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl)) < 0 ) TEST_ERROR;
@@ -1761,7 +1761,7 @@ check_attribute_delete_tags(hid_t fcpl, int type)
     if ( (NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int)))) ) TEST_ERROR;
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file with provided fcpl_t */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl)) < 0 ) TEST_ERROR;
@@ -1917,7 +1917,7 @@ check_dataset_creation_tags(hid_t fcpl, int type)
     /* ===== */
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl)) < 0 ) TEST_ERROR;
 
@@ -2051,7 +2051,7 @@ check_dataset_creation_earlyalloc_tags(hid_t fcpl, int type)
     /* ===== */
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl)) < 0 ) TEST_ERROR;
 
@@ -2187,7 +2187,7 @@ check_dataset_open_tags(void)
     /* ========= */
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create file */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
@@ -2318,7 +2318,7 @@ check_dataset_write_tags(void)
     if ( (NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int)))) ) TEST_ERROR;
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create file */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
@@ -2457,7 +2457,7 @@ check_attribute_write_tags(hid_t fcpl, int type)
     if ( (NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int)))) ) TEST_ERROR;
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file with provided fcpl_t */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl)) < 0 ) TEST_ERROR;
@@ -2613,7 +2613,7 @@ check_dataset_read_tags(void)
     if ( (NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int)))) ) TEST_ERROR;
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create file */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
@@ -2751,7 +2751,7 @@ check_dataset_size_retrieval(void)
     if ( (NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int)))) ) TEST_ERROR;
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create file */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
@@ -2890,7 +2890,7 @@ check_dataset_extend_tags(void)
     if ( (NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int)))) ) TEST_ERROR;
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create file */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
@@ -3017,7 +3017,7 @@ check_object_info_tags(void)
     /* ===== */
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
@@ -3126,7 +3126,7 @@ check_object_copy_tags(void)
     /* ===== */
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
@@ -3257,7 +3257,7 @@ check_link_removal_tags(hid_t fcpl, int type)
     if ( (NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int)))) ) TEST_ERROR;
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create file */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl)) < 0 ) TEST_ERROR;
@@ -3416,7 +3416,7 @@ check_link_getname_tags(void)
     if ( (NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int)))) ) TEST_ERROR;
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create file */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
@@ -3553,7 +3553,7 @@ check_external_link_creation_tags(void)
     /* ===== */
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
@@ -3660,7 +3660,7 @@ check_external_link_open_tags(void)
     /* ===== */
 
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
@@ -3671,8 +3671,6 @@ check_external_link_open_tags(void)
     /* Create a second file */
     if ( (fid2 = H5Fcreate(FILENAME2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
 
-    if ( H5Pclose(fapl) < 0 ) TEST_ERROR;
-
     /* determine tag value of root group's object header */
     if ( get_object_header_tag(fid2, &root2_tag) < 0 ) TEST_ERROR;
 
@@ -3688,7 +3686,9 @@ check_external_link_open_tags(void)
 
     /* Close and Reopen the file */
     if ( H5Fclose(fid) < 0 ) TEST_ERROR;
-    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, fapl)) < 0 ) TEST_ERROR;
+
+    if ( H5Pclose(fapl) < 0 ) TEST_ERROR;
 
     /* Evict as much as we can from the cache so we can track full tag path */
     if ( evict_entries(fid) < 0 ) TEST_ERROR;
@@ -3787,7 +3787,7 @@ check_invalid_tag_application(void)
     
 #if H5C_DO_TAGGING_SANITY_CHECKS
     /* Create Fapl */
-    if ( (fapl = h5_fileaccess()) < 0 ) TEST_ERROR;
+    if ( (fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0 ) TEST_ERROR;
 
     /* Create a test file */
     if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index b011bc2..a8baeac 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -2070,7 +2070,7 @@ test_ooo_order(char *filename, hid_t fapl_id)
     /* Close and reopen the file */
     if(H5Tclose(dtype)) TEST_ERROR
     if(H5Fclose(file)) TEST_ERROR
-    if((file = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) TEST_ERROR
+    if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl_id)) < 0) TEST_ERROR
 
     /* Open the type */
     if((dtype_tmp = H5Topen2(file, "dtype", H5P_DEFAULT)) < 0) TEST_ERROR
@@ -2123,7 +2123,7 @@ test_ooo_order(char *filename, hid_t fapl_id)
     if(H5Tclose(dtype_tmp)) TEST_ERROR
     if(H5Tclose(dtype)) TEST_ERROR
     if(H5Fclose(file)) TEST_ERROR
-    if((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
+    if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl_id)) < 0) TEST_ERROR
 
     /* Open the type, and verify status */
     if((dtype_tmp = H5Topen2(file, "dtype2", H5P_DEFAULT)) < 0) TEST_ERROR
diff --git a/test/cork.c b/test/cork.c
index dceaf5a..240be77 100644
--- a/test/cork.c
+++ b/test/cork.c
@@ -286,19 +286,19 @@ static unsigned
 verify_obj_dset_cork(hbool_t swmr)
 {
     /* Variable Declarations */
-    hid_t fid = -1;     /* File ID */
+    hid_t fid = -1;             /* File ID */
     hid_t fapl = -1;            /* File access property list */
     hid_t aid = -1;             /* Attribute ID */
     hid_t sid = -1, sid2 = -1;  /* Dataspace IDs */
     hid_t did = -1, did2 = -1;  /* Dataset IDs */
     hid_t oid = -1;             /* Object ID */
-    hid_t dcpl2;            /* Dataset creation property list */
+    hid_t dcpl2;                /* Dataset creation property list */
     int i = 0;                  /* Local index variable */
-    hsize_t dim[1] = {100}; /* Dataset dimension size */
+    hsize_t dim[1] = {100};     /* Dataset dimension size */
     hsize_t chunk_dim[1] = {7}; /* Dataset chunk dimension size */
     H5O_info_t oinfo, oinfo2;   /* Object metadata information */
     char attrname[500];         /* Name of attribute */
-    unsigned flags;     /* File access flags */
+    unsigned flags;             /* File access flags */
 
     if(swmr) {
         TESTING("cork status for dataset objects with attributes (SWMR)");
@@ -341,7 +341,7 @@ verify_obj_dset_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Attach and write to an attribute to the dataset: DSET */
-    if((aid = H5Acreate2(did, ATTR, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((aid = H5Acreate2(did, ATTR, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
         TEST_ERROR
 
     /* Verify cork status of the dataset: DSET */
@@ -380,11 +380,11 @@ verify_obj_dset_cork(hbool_t swmr)
         TEST_ERROR
 
     /* Attach 8 attributes to the dataset */
-    for(i = 0;i < 8; i++) {
-        sprintf(attrname, "attr %d", i);
-        if((aid = H5Acreate2(did2, attrname, H5T_NATIVE_UINT, sid2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    for(i = 0; i < 8; i++) {
+        HDsprintf(attrname, "attr %d", i);
+        if((aid = H5Acreate2(did2, attrname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             TEST_ERROR
-        if(H5Awrite(aid, H5T_NATIVE_UINT, &i) < 0)
+        if(H5Awrite(aid, H5T_NATIVE_INT, &i) < 0)
             TEST_ERROR
         if(H5Aclose(aid) < 0)
             TEST_ERROR
diff --git a/test/del_many_dense_attrs.c b/test/del_many_dense_attrs.c
new file mode 100644
index 0000000..d88045c
--- /dev/null
+++ b/test/del_many_dense_attrs.c
@@ -0,0 +1,203 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Purpose:	Test to verify that the infinite loop closing library/abort failure
+ *          is fixed when the application creates and removes dense attributes 
+ *          (See HDFFV-10659).
+ */
+
+
+#include "h5test.h"
+
+/* The test file name */
+const char *FILENAME[] = {
+    "del_many_dense_attrs", 
+    NULL
+};
+
+#define ATTR_COUNT  64          /* The number of attributes */
+
+/*-------------------------------------------------------------------------
+ * Function:    catch_signal
+ *
+ * Purpose:     The signal handler to catch the SIGABRT signal.
+ *
+ * Return:      No return
+ *
+ * Programmer:  Vailin Choi
+ *
+ *-------------------------------------------------------------------------
+ */
+static void catch_signal(int H5_ATTR_UNUSED signo)
+{
+    HDexit(1);
+} /* catch_signal() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	main
+ *
+ * Purpose:	Test to verify that the infinite loop closing library/abort failure
+ *          is fixed when the application creates and removes dense attributes 
+ *          (See HDFFV-10659).
+ *
+ * Return:	Success:	exit(EXIT_SUCCESS)
+ *		    Failure:	exit(EXIT_FAILURE)
+ *
+ * Programmer:  Vailin Choi; Dec 2018
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+main(void)
+{
+    hid_t fid = -1;             /* HDF5 File ID                 */
+    hid_t gid = -1;             /* Group ID                     */
+    hid_t sid = -1;             /* Dataspace ID                 */
+    hid_t aid = -1;             /* Attribute ID                 */
+    hid_t tid = -1;             /* Datatype ID                  */
+    hid_t fapl = -1;            /* File access property lists   */
+    hid_t gcpl = -1;            /* Group creation property list */
+    char aname[50];             /* Name of attribute            */
+    char *basename="attr";      /* Name prefix for attribute    */
+    char filename[100];         /* File name                    */
+    int i;                      /* Local index variable         */
+
+    /* Testing setup */
+    h5_reset();
+
+    /* To exit from the file for SIGABRT signal */
+    if(HDsignal(SIGABRT, catch_signal) == SIG_ERR)
+       TEST_ERROR
+
+    fapl = h5_fileaccess();
+    h5_fixname(FILENAME[0], fapl, filename, sizeof(filename));
+
+    /* Set to latest format */
+    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+        TEST_ERROR
+
+    /* Create the file  */
+    if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        TEST_ERROR
+
+    /* Close the file */
+    if(H5Fclose(fid) < 0)
+        TEST_ERROR
+
+     /* Re-open the file */
+    if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
+        TEST_ERROR
+
+    /* Create the group creation property list */
+    if((gcpl = H5Pcreate(H5P_GROUP_CREATE)) < 0)
+        TEST_ERROR
+
+    /* Set to use dense storage for all attributes on the group */
+    if(H5Pset_attr_phase_change(gcpl, 0, 0) < 0)
+        TEST_ERROR
+
+    /* Create the group in the file */
+    if((gid = H5Gcreate2(fid, "group", H5P_DEFAULT, gcpl, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+
+    /* Create dataspace */
+    if((sid = H5Screate(H5S_SCALAR)) < 0)
+        TEST_ERROR
+
+    /* Get a copy of the datatype */
+    if((tid = H5Tcopy(H5T_NATIVE_FLOAT)) < 0)
+        TEST_ERROR
+
+    /* Create attributes in the group */
+    for(i = ATTR_COUNT; i >= 0; i--) {
+        /* Set up the attribute name */
+        HDsprintf(aname, "%s%d", basename, i);
+
+        /* Create the attribute */
+        if((aid = H5Acreate2(gid, aname, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            TEST_ERROR
+
+        /* Write to the attribute */
+        if(H5Awrite(aid, tid, &i) < 0)
+            TEST_ERROR
+
+        /* Close the attribute */
+        if(H5Aclose(aid) < 0)
+            TEST_ERROR
+    }
+    
+    /* Close the datatype */
+    if(H5Tclose(tid) < 0)
+       TEST_ERROR
+
+    /* Close the dataspace */
+    if(H5Sclose(sid) < 0)
+        TEST_ERROR
+
+    /* Close the group */
+    if(H5Gclose(gid) < 0)
+        TEST_ERROR
+
+    /* Close the group creation property list */
+    if(H5Pclose(gcpl) < 0)
+        TEST_ERROR
+
+    /* Close the file */
+    if(H5Fclose(fid) < 0)
+        TEST_ERROR
+
+    /* Re-open the file */
+    if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
+        TEST_ERROR
+
+    /* Open the group */
+    if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0)
+        TEST_ERROR
+
+    /* Delete the attributes */
+    for (i = 0; i <= ATTR_COUNT; i++) {
+        /* Set up the attribute name */
+        HDsprintf(aname, "%s%d", basename, i);
+
+        /* Delete the attribute */
+        if(H5Adelete(gid, aname) < 0)
+            TEST_ERROR
+    } /* end for */
+
+    /* Close the group */
+    if(H5Gclose(gid) < 0)
+        TEST_ERROR
+
+    /* Close the file */
+    if(H5Fclose(fid) < 0)
+        TEST_ERROR
+
+    h5_cleanup(FILENAME, fapl);
+
+    return(EXIT_SUCCESS);
+
+error:
+    H5E_BEGIN_TRY {
+        H5Gclose(gid);
+        H5Sclose(sid);
+        H5Tclose(tid);
+        H5Aclose(aid);
+        H5Fclose(fid);
+        H5Pclose(gcpl);
+        H5Pclose(fapl);
+    } H5E_END_TRY
+
+    return EXIT_FAILURE;
+}
diff --git a/test/direct_chunk.c b/test/direct_chunk.c
index 2ef38ea..2edfe64 100644
--- a/test/direct_chunk.c
+++ b/test/direct_chunk.c
@@ -1910,10 +1910,10 @@ test_read_unallocated_chunk (hid_t file)
         goto error;
 
     /* Write a single chunk to intialize the chunk storage */
-    HDmemset(&chunk_dims, 0, sizeof(chunk_dims));
+    HDmemset(direct_buf, 0, CHUNK_NX * CHUNK_NY * sizeof(int));
     offset[0] = 0; offset[1] = 0;
 
-    if(H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, chunk_nbytes, &chunk_dims) < 0)
+    if(H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, chunk_nbytes, direct_buf) < 0)
         goto error;
 
     /* Attempt to read each chunk in the dataset. Chunks are not allocated,
diff --git a/test/dsets.c b/test/dsets.c
index e63878c..5de9cfa 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -13072,15 +13072,13 @@ test_object_header_minimization_dcpl(void)
     /*********/
 
     if(NULL == h5_fixname(OHMIN_FILENAME_A, H5P_DEFAULT, filename, sizeof(filename)))
-        FAIL_PUTS_ERROR("unable to prepare filename")
+        TEST_ERROR
 
     file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (0 > file_id)
-        FAIL_PUTS_ERROR("unable to create test file\n");
+    if (0 > file_id) TEST_ERROR
 
     dcpl_id = H5Pcreate(H5P_DATASET_CREATE);
-    if (0 > dcpl_id)
-        FAIL_PUTS_ERROR("unable to create DCPL\n");
+    if (0 > dcpl_id) TEST_ERROR
 
     /*********/
     /* TESTS */
@@ -13088,28 +13086,23 @@ test_object_header_minimization_dcpl(void)
 
     /* default value (not set explicitly)
      */
-    if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL)
-        FAIL_PUTS_ERROR("unable to get minimize value\n");
+    if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL) TEST_ERROR
     if (FALSE != minimize)
-        FAIL_PUTS_ERROR("Expected FALSE default but was not!\n");
+        TEST_ERROR
 
     /* FALSE-set value
      */
-    if (H5Pset_dset_no_attrs_hint(dcpl_id, FALSE) == FAIL)
-        FAIL_PUTS_ERROR("unable to set minimize value to FALSE\n");
-    if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL)
-        FAIL_PUTS_ERROR("unable to get minimize value\n");
+    if (H5Pset_dset_no_attrs_hint(dcpl_id, FALSE) == FAIL) TEST_ERROR
+    if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL) TEST_ERROR
     if (FALSE != minimize)
-        FAIL_PUTS_ERROR("Expected FALSE default but was not!\n");
+        TEST_ERROR
 
     /* TRUE-set value
      */
-    if (H5Pset_dset_no_attrs_hint(dcpl_id, TRUE) == FAIL)
-        FAIL_PUTS_ERROR("unable to set minimize value to TRUE\n");
-    if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL)
-        FAIL_PUTS_ERROR("unable to get minimize value\n");
+    if (H5Pset_dset_no_attrs_hint(dcpl_id, TRUE) == FAIL) TEST_ERROR
+    if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL) TEST_ERROR
     if (TRUE != minimize)
-        FAIL_PUTS_ERROR("Expected TRUE default but was not!\n");
+        TEST_ERROR
 
     /* error cases
      */
@@ -13117,35 +13110,35 @@ test_object_header_minimization_dcpl(void)
         ret = H5Pget_dset_no_attrs_hint(-1, &minimize);
     } H5E_END_TRY;
     if (ret == SUCCEED)
-        FAIL_PUTS_ERROR("Invalid DCPL ID should fail\n");
+        TEST_ERROR /* Invalid DCPL ID should fail */
 
     H5E_BEGIN_TRY {
         ret = H5Pset_dset_no_attrs_hint(-1, FALSE);
     } H5E_END_TRY;
     if (ret == SUCCEED)
-        FAIL_PUTS_ERROR("Invalid DCPL ID should fail\n");
+        TEST_ERROR /* Invalid DCPL ID should fail */
 
     H5E_BEGIN_TRY {
         ret = H5Pset_dset_no_attrs_hint(-1, TRUE);
     } H5E_END_TRY;
     if (ret == SUCCEED)
-        FAIL_PUTS_ERROR("Invalid DCPL ID should fail\n");
+        TEST_ERROR /* Invalid DCPL ID should fail */
 
     H5E_BEGIN_TRY {
         ret = H5Pget_dset_no_attrs_hint(dcpl_id, NULL);
     } H5E_END_TRY;
     if (ret == SUCCEED)
-        FAIL_PUTS_ERROR("NULL out pointer should fail\n");
+        TEST_ERROR /* NULL out pointer should fail */
 
     /************/
     /* TEARDOWN */
     /************/
 
     if (H5Fclose(file_id) == FAIL)
-        FAIL_PUTS_ERROR("can't close FILE");
+        TEST_ERROR
 
     if (H5Pclose(dcpl_id) == FAIL)
-        FAIL_PUTS_ERROR("unable to close DCPL\n");
+        TEST_ERROR
 
     PASSED();
     return SUCCEED;
diff --git a/test/dt_arith.c b/test/dt_arith.c
index c7f2986..2729ba1 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -4883,7 +4883,24 @@ run_fp_tests(const char *name)
 #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0
     nerrors += test_conv_flt_1(name, TEST_DENORM, H5T_NATIVE_FLOAT, H5T_NATIVE_LDOUBLE);
     nerrors += test_conv_flt_1(name, TEST_DENORM, H5T_NATIVE_DOUBLE, H5T_NATIVE_LDOUBLE);
+#ifndef H5_DISABLE_SOME_LDOUBLE_CONV
     nerrors += test_conv_flt_1(name, TEST_DENORM, H5T_NATIVE_LDOUBLE, H5T_NATIVE_FLOAT);
+#else
+    {
+        char		str[256];		/*string		*/
+
+        HDsnprintf(str, sizeof(str), "Testing %s denormalized %s -> %s conversions",
+                name, "long double", "float");
+        printf("%-70s", str);
+        SKIPPED();
+#if H5_SIZEOF_LONG_DOUBLE!=0
+        HDputs("    Test skipped due to the conversion problem on IBM ppc64le cpu.");
+#else
+        HDputs("    Test skipped due to disabled long double.");
+#endif
+    }
+#endif
+
     nerrors += test_conv_flt_1(name, TEST_DENORM, H5T_NATIVE_LDOUBLE, H5T_NATIVE_DOUBLE);
 #endif
 
@@ -4893,8 +4910,24 @@ run_fp_tests(const char *name)
 #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0
     nerrors += test_conv_flt_1(name, TEST_SPECIAL, H5T_NATIVE_FLOAT, H5T_NATIVE_LDOUBLE);
     nerrors += test_conv_flt_1(name, TEST_SPECIAL, H5T_NATIVE_DOUBLE, H5T_NATIVE_LDOUBLE);
+#ifndef H5_DISABLE_SOME_LDOUBLE_CONV
     nerrors += test_conv_flt_1(name, TEST_SPECIAL, H5T_NATIVE_LDOUBLE, H5T_NATIVE_FLOAT);
     nerrors += test_conv_flt_1(name, TEST_SPECIAL, H5T_NATIVE_LDOUBLE, H5T_NATIVE_DOUBLE);
+#else
+    {
+        char		str[256];		/*string		*/
+
+        HDsnprintf(str, sizeof(str), "Testing %s special %s -> %s conversions",
+                name, "long double", "float or double");
+        printf("%-70s", str);
+        SKIPPED();
+#if H5_SIZEOF_LONG_DOUBLE!=0
+        HDputs("    Test skipped due to the conversion problem on IBM ppc64le cpu.");
+#else
+        HDputs("    Test skipped due to disabled long double.");
+#endif
+    }
+#endif
 #endif
 
 done:
@@ -4963,7 +4996,7 @@ run_int_fp_conv(const char *name)
     nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_INT, H5T_NATIVE_LDOUBLE);
     nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_UINT, H5T_NATIVE_LDOUBLE);
 #if H5_SIZEOF_LONG!=H5_SIZEOF_INT
-#ifndef H5_LONG_TO_LDOUBLE_SPECIAL
+#if !defined(H5_LONG_TO_LDOUBLE_SPECIAL) && !defined(H5_DISABLE_SOME_LDOUBLE_CONV)
     nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_LONG, H5T_NATIVE_LDOUBLE);
     nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_ULONG, H5T_NATIVE_LDOUBLE);
 #else
@@ -5077,16 +5110,46 @@ run_fp_int_conv(const char *name)
 #endif
 
 #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE
-        nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_SCHAR);
-        nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UCHAR);
-        nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_SHORT);
-        nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_USHORT);
-        nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_INT);
-        nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UINT);
+        if(test_values != TEST_SPECIAL) {
+	    nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_SCHAR);
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UCHAR);
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_SHORT);
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_USHORT);
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_INT);
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UINT);
+        } else {
+#ifndef H5_DISABLE_SOME_LDOUBLE_CONV
+	    nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_SCHAR);
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UCHAR);
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_SHORT);
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_USHORT);
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_INT);
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_UINT);
+#else
+            char		str[256];		/*string		*/
+
+            HDsnprintf(str, sizeof(str), "Testing %s special %s -> %s conversions",
+                name, "long double", "signed and unsigned char, short, int, long");
+            printf("%-70s", str);
+            SKIPPED();
+#if H5_SIZEOF_LONG_DOUBLE!=0
+            HDputs("    Test skipped due to the conversion problem on IBM ppc64le cpu.");
+#else
+            HDputs("    Test skipped due to disabled long double.");
+#endif
+#endif
+        }
 #if H5_SIZEOF_LONG!=H5_SIZEOF_INT && H5_SIZEOF_LONG_DOUBLE!=0
 #ifndef H5_LDOUBLE_TO_LONG_SPECIAL
-        nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_LONG);
-        nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_ULONG);
+        if(test_values != TEST_SPECIAL && test_values != TEST_NORMAL) {
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_LONG);
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_ULONG);
+        } else {
+#ifndef H5_DISABLE_SOME_LDOUBLE_CONV
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_LONG);
+            nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_ULONG);
+#endif
+        }
 #else
         {
             char		str[256];		/*string		*/
diff --git a/test/efc.c b/test/efc.c
index d63ef34..b427884 100644
--- a/test/efc.c
+++ b/test/efc.c
@@ -20,6 +20,7 @@
 #include "H5Fpkg.h"
 #include "H5CXprivate.h"        /* API Contexts                         */
 #include "H5Iprivate.h"
+#include "H5Pprivate.h"         /* Property lists                       */
 
 const char *FILENAME[] = {
     "efc0",
@@ -2896,6 +2897,8 @@ int
 main(void)
 {
     unsigned nerrors = 0;        /* track errors */
+    H5P_genplist_t *plist;      /* Property list pointer for FAPL */
+    H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info        */
     hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
 
     /* Test Setup */
@@ -2917,6 +2920,15 @@ main(void)
     if(H5CX_push() < 0) FAIL_STACK_ERROR
     api_ctx_pushed = TRUE;
 
+    /* Get the VOL info from the fapl */
+    plist = (H5P_genplist_t *)H5I_object(fapl_id);
+    H5P_peek(plist, H5F_ACS_VOL_CONN_NAME, &connector_prop);
+
+    /* Stash a copy of the "top-level" connector property, before any pass-through
+     *  connectors modify or unwrap it.
+     */
+    H5CX_set_vol_connector_prop(&connector_prop);
+
     /* Test Functions */
     nerrors += test_single();
     nerrors += test_graph_nocycle();
diff --git a/test/gen_bogus.c b/test/gen_bogus.c
index ec29eb9..237b024 100644
--- a/test/gen_bogus.c
+++ b/test/gen_bogus.c
@@ -89,6 +89,14 @@ generate_datasets(hid_t loc_id, unsigned bogus_id)
     if((did = H5Dcreate2(loc_id, "Dataset4", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
     if(H5Dclose(did) < 0) goto error;
 
+    /* Set "shareable" message flag for bogus message */
+    bogus_flags = H5O_MSG_FLAG_SHAREABLE;
+    if(H5Pset(dcpl, H5O_BOGUS_MSG_FLAGS_NAME, &bogus_flags) < 0) goto error;
+
+    /* Create fourth dataset, with "shareable" message flag */
+    if((did = H5Dcreate2(loc_id, "Dataset5", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
+    if(H5Dclose(did) < 0) goto error;
+
     /* Close dataset creation property list */
     if(H5Pclose(dcpl) < 0) goto error;
 
diff --git a/test/h5test.c b/test/h5test.c
index 32638e6..dfa6a31 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -803,6 +803,50 @@ error:
 
 
 /*-------------------------------------------------------------------------
+ * Function:    h5_fileaccess_flags
+ *
+ * Purpose:     Returns a file access template which is the default template
+ *              but with a file driver, VOL connector, or libver bound set
+ *              according to a constant or environment variable
+ *
+ * Return:      Success:    A file access property list
+ *              Failure:    H5I_INVALID_HID
+ *
+ * Programmer:  Robb Matzke
+ *              Thursday, November 19, 1998
+ *
+ *-------------------------------------------------------------------------
+ */
+hid_t
+h5_fileaccess_flags(unsigned flags)
+{
+    hid_t       fapl_id = H5I_INVALID_HID;
+
+    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+        goto error;
+
+    /* Attempt to set up a file driver first */
+    if((flags & H5_FILEACCESS_VFD) && h5_get_vfd_fapl(fapl_id) < 0)
+        goto error;
+
+    /* Next, try to set up a VOL connector */
+    if((flags & H5_FILEACCESS_VOL) && h5_get_vol_fapl(fapl_id) < 0)
+        goto error;
+ 
+    /* Finally, check for libver bounds */
+    if((flags & H5_FILEACCESS_LIBVER) && h5_get_libver_fapl(fapl_id) < 0)
+        goto error;
+ 
+    return fapl_id;
+
+error:
+    if(fapl_id != H5I_INVALID_HID)
+        H5Pclose(fapl_id);
+    return H5I_INVALID_HID;
+} /* end h5_fileaccess_flags() */
+
+
+/*-------------------------------------------------------------------------
  * Function:    h5_get_vfd_fapl
  *
  * Purpose:     Sets the file driver for a FAPL according to the value specified
@@ -1894,6 +1938,42 @@ static herr_t dummy_vfd_read(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UN
 static herr_t dummy_vfd_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size, const void *buf);
 static herr_t dummy_vfd_write(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED fapl_id, haddr_t H5_ATTR_UNUSED addr, size_t H5_ATTR_UNUSED size, const void H5_ATTR_UNUSED *buf) { return FAIL; }
 
+/* Dummy VFD with the minimum parameters to make a VFD that can be registered */
+static const H5FD_class_t H5FD_dummy_g = {
+    "dummy",                    /* name         */
+    1,                          /* maxaddr      */
+    H5F_CLOSE_WEAK,             /* fc_degree    */
+    NULL,                       /* terminate    */
+    NULL,                       /* sb_size      */
+    NULL,                       /* sb_encode    */
+    NULL,                       /* sb_decode    */
+    0,                          /* fapl_size    */
+    NULL,                       /* fapl_get     */
+    NULL,                       /* fapl_copy    */
+    NULL,                       /* fapl_free    */
+    0,                          /* dxpl_size    */
+    NULL,                       /* dxpl_copy    */
+    NULL,                       /* dxpl_free    */
+    dummy_vfd_open,             /* open         */
+    dummy_vfd_close,            /* close        */
+    NULL,                       /* cmp          */
+    NULL,                       /* query        */
+    NULL,                       /* get_type_map */
+    NULL,                       /* alloc        */
+    NULL,                       /* free         */
+    dummy_vfd_get_eoa,          /* get_eoa      */
+    dummy_vfd_set_eoa,          /* set_eoa      */
+    dummy_vfd_get_eof,          /* get_eof      */
+    NULL,                       /* get_handle   */
+    dummy_vfd_read,             /* read         */
+    dummy_vfd_write,            /* write        */
+    NULL,                       /* flush        */
+    NULL,                       /* truncate     */
+    NULL,                       /* lock         */
+    NULL,                       /* unlock       */
+    H5FD_FLMAP_DICHOTOMY	/* fl_map       */
+};
+
 
 /*-------------------------------------------------------------------------
  * Function:    h5_get_dummy_vfd_class()
@@ -1921,21 +2001,11 @@ h5_get_dummy_vfd_class(void)
     H5FD_class_t *vfd_class = NULL;     /* Dummy VFD that will be returned */
 
     /* Create the class and initialize everything to zero/NULL */
-    if(NULL == (vfd_class = (H5FD_class_t *)HDcalloc((size_t)1, sizeof(H5FD_class_t))))
+    if(NULL == (vfd_class = (H5FD_class_t *)HDmalloc(sizeof(H5FD_class_t))))
         TEST_ERROR;
 
-    /* Fill in the minimum parameters to make a VFD that
-     * can be registered.
-     */
-    vfd_class->name = "dummy";
-    vfd_class->maxaddr = 1;
-    vfd_class->open = dummy_vfd_open;
-    vfd_class->close = dummy_vfd_close;
-    vfd_class->get_eoa = dummy_vfd_get_eoa;
-    vfd_class->set_eoa = dummy_vfd_set_eoa;
-    vfd_class->get_eof = dummy_vfd_get_eof;
-    vfd_class->read = dummy_vfd_read;
-    vfd_class->write = dummy_vfd_write;
+    /* Copy the dummy VFD */
+    HDmemcpy(vfd_class, &H5FD_dummy_g, sizeof(H5FD_class_t));
 
     return vfd_class;
 
diff --git a/test/h5test.h b/test/h5test.h
index c72f389..66a7863 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -102,7 +102,7 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
  * the H5_FAILED() macro is invoked automatically when an API function fails.
  */
 #define TESTING(WHAT)  {printf("Testing %-62s",WHAT); fflush(stdout);}
-#define TESTING_2(WHAT)  {printf(" Testing %-62s",WHAT); fflush(stdout);}
+#define TESTING_2(WHAT)  {printf("  Testing %-60s",WHAT); fflush(stdout);}
 #define PASSED()  {puts(" PASSED");fflush(stdout);}
 #define H5_FAILED()  {puts("*FAILED*");fflush(stdout);}
 #define H5_WARNING()  {puts("*WARNING*");fflush(stdout);}
@@ -121,6 +121,11 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
 #define ALARM_ON  TestAlarmOn()
 #define ALARM_OFF  HDalarm(0)
 
+/* Flags for h5_fileaccess_flags() */
+#define H5_FILEACCESS_VFD       0x01
+#define H5_FILEACCESS_VOL       0x02
+#define H5_FILEACCESS_LIBVER    0x04
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -132,6 +137,7 @@ H5TEST_DLL char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, s
 H5TEST_DLL char *h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t size);
 H5TEST_DLL char *h5_fixname_printf(const char *base_name, hid_t fapl, char *fullname, size_t size);
 H5TEST_DLL hid_t h5_fileaccess(void);
+H5TEST_DLL hid_t h5_fileaccess_flags(unsigned flags);
 H5TEST_DLL void h5_no_hwconv(void);
 H5TEST_DLL const char *h5_rmprefix(const char *filename);
 H5TEST_DLL void h5_reset(void);
diff --git a/test/links.c b/test/links.c
index b09ddb1..520f784 100644
--- a/test/links.c
+++ b/test/links.c
@@ -8823,6 +8823,12 @@ ud_link_errors(hid_t fapl, hbool_t new_format)
             TEST_ERROR
     } H5E_END_TRY
 
+    /* Try to create a link with H5Lcreate_ud that has a NULL udata pointer, but a non-zero udata_size value */
+    H5E_BEGIN_TRY {
+        if(H5Lcreate_ud(fid, "/ud_link", (H5L_type_t)UD_CBFAIL_TYPE, NULL, 1, H5P_DEFAULT, H5P_DEFAULT) >= 0)
+            TEST_ERROR
+    } H5E_END_TRY;
+
     /* Create a user-defined link to the group. */
     strcpy(group_name, "/group");
     if(H5Lcreate_ud(fid, "/ud_link", (H5L_type_t)UD_CBFAIL_TYPE, &group_name, HDstrlen(group_name) + 1, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
diff --git a/test/memleak_H5O_dtype_decode_helper_H5Odtype.h5 b/test/memleak_H5O_dtype_decode_helper_H5Odtype.h5
new file mode 100644
index 0000000..b5980b7
--- /dev/null
+++ b/test/memleak_H5O_dtype_decode_helper_H5Odtype.h5
diff --git a/test/objcopy.c b/test/objcopy.c
index 6ee2f72..eb4927f 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -7871,7 +7871,7 @@ test_copy_old_layout(hid_t fcpl_dst, hid_t fapl, hbool_t test_open)
     addr_reset();
 
     /* Setup */
-    if((src_fapl = h5_fileaccess()) < 0) TEST_ERROR
+    if((src_fapl = h5_fileaccess_flags(H5_FILEACCESS_VOL | H5_FILEACCESS_LIBVER)) < 0) TEST_ERROR
 
     /* open source file (read-only) */
     if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, src_fapl)) < 0) TEST_ERROR
diff --git a/test/ohdr.c b/test/ohdr.c
index 042a81b..85554a5 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -521,6 +521,16 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
 
     PASSED();
 
+    TESTING("object with unknown header message & 'shareable' flag set");
+
+    /* Open the dataset with the unknown header message, adn "shareable" flag */
+    if((did = H5Dopen2(loc_bogus, "Dataset5", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if(H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
+
+    PASSED();
+
     TESTING("object in r/o file with unknown header message & 'fail if unknown and open for write' flag set");
 
     /* Open the dataset with the unknown header message, and "fail if unknown and open for write" flag */
@@ -753,7 +763,7 @@ put_attribute(hid_t loc_id, const char *attrname, const void *attrvalue, hid_t d
 {   
     if((*attribute_id) < 0) {
         hid_t id = -1;
-        id = H5Acreate(loc_id, attrname, datatype_id, dataspace_id, H5P_DEFAULT, H5P_DEFAULT);
+        id = H5Acreate2(loc_id, attrname, datatype_id, dataspace_id, H5P_DEFAULT, H5P_DEFAULT);
         if(id < 0) 
             return FAIL;
         *attribute_id = id;
@@ -770,7 +780,7 @@ count_attributes(hid_t dset_id)
 {   
     H5O_info_t info;
     
-    if(H5Oget_info(dset_id, &info, H5O_INFO_ALL) < 0)
+    if(H5Oget_info2(dset_id, &info, H5O_INFO_ALL) < 0)
         return -1;
     else
         return (int)info.num_attrs; /* should never exceed int bounds */
@@ -850,7 +860,7 @@ test_minimized_dset_ohdr_attribute_addition(hid_t fapl_id)
      * SETUP *
      *********/
 
-    if(h5_fixname(FILENAME[1], H5P_DEFAULT, filename, sizeof(filename)) == NULL)
+    if(h5_fixname(FILENAME[1], fapl_id, filename, sizeof(filename)) == NULL)
         TEST_ERROR
 
     dspace_id = H5Screate_simple(1, array_10, NULL);
@@ -879,10 +889,10 @@ test_minimized_dset_ohdr_attribute_addition(hid_t fapl_id)
     } H5E_END_TRY;
     if(count != -1) TEST_ERROR
 
-    dset_id = H5Dcreate(file_id, "dataset", int_type_id, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    dset_id = H5Dcreate2(file_id, "dataset", int_type_id, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if(dset_id < 0) TEST_ERROR
 
-    mindset_id  = H5Dcreate(file_id, "mindataset", int_type_id, dspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
+    mindset_id  = H5Dcreate2(file_id, "mindataset", int_type_id, dspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
     if(mindset_id < 0) TEST_ERROR
 
     /********************
@@ -1081,10 +1091,10 @@ test_minimized_dset_ohdr_size_comparisons(hid_t fapl_id)
      * SETUP *
      *********/
 
-    if(h5_fixname(FILENAME[1], H5P_DEFAULT, filename_a, sizeof(filename_a)) == NULL)
+    if(h5_fixname(FILENAME[1], fapl_id, filename_a, sizeof(filename_a)) == NULL)
         TEST_ERROR
 
-    if(h5_fixname(FILENAME[2], H5P_DEFAULT, filename_b, sizeof(filename_b)) == NULL)
+    if(h5_fixname(FILENAME[2], fapl_id, filename_b, sizeof(filename_b)) == NULL)
         TEST_ERROR
 
     for (compact = 0; compact < 2; compact++) { /* 0 or 1 */
@@ -1121,13 +1131,13 @@ test_minimized_dset_ohdr_size_comparisons(hid_t fapl_id)
         file_f_id = H5Fcreate(filename_a, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
         if(file_f_id < 0) TEST_ERROR
 
-        dset_f_x_id = H5Dcreate(file_f_id, "default", int_type_id, dspace_id, H5P_DEFAULT, dcpl_default, H5P_DEFAULT);
+        dset_f_x_id = H5Dcreate2(file_f_id, "default", int_type_id, dspace_id, H5P_DEFAULT, dcpl_default, H5P_DEFAULT);
         if(dset_f_x_id < 0) TEST_ERROR
 
-        dset_f_N_id = H5Dcreate(file_f_id, "dsetNOT", int_type_id, dspace_id, H5P_DEFAULT, dcpl_dontmin, H5P_DEFAULT);
+        dset_f_N_id = H5Dcreate2(file_f_id, "dsetNOT", int_type_id, dspace_id, H5P_DEFAULT, dcpl_dontmin, H5P_DEFAULT);
         if(dset_f_N_id < 0) TEST_ERROR
 
-        dset_f_Y_id = H5Dcreate(file_f_id, "dsetMIN", int_type_id, dspace_id, H5P_DEFAULT, dcpl_minimize, H5P_DEFAULT);
+        dset_f_Y_id = H5Dcreate2(file_f_id, "dsetMIN", int_type_id, dspace_id, H5P_DEFAULT, dcpl_minimize, H5P_DEFAULT);
         if(dset_f_x_id < 0) TEST_ERROR
 
         file_F_id = H5Fcreate(filename_b, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
@@ -1135,13 +1145,13 @@ test_minimized_dset_ohdr_size_comparisons(hid_t fapl_id)
         ret = H5Fset_dset_no_attrs_hint(file_F_id, TRUE);
         if(ret < 0) TEST_ERROR
 
-        dset_F_x_id = H5Dcreate(file_F_id, "default", int_type_id, dspace_id, H5P_DEFAULT, dcpl_default, H5P_DEFAULT);
+        dset_F_x_id = H5Dcreate2(file_F_id, "default", int_type_id, dspace_id, H5P_DEFAULT, dcpl_default, H5P_DEFAULT);
         if(dset_F_x_id < 0) TEST_ERROR
 
-        dset_F_N_id = H5Dcreate(file_F_id, "dsetNOT", int_type_id, dspace_id, H5P_DEFAULT, dcpl_dontmin, H5P_DEFAULT);
+        dset_F_N_id = H5Dcreate2(file_F_id, "dsetNOT", int_type_id, dspace_id, H5P_DEFAULT, dcpl_dontmin, H5P_DEFAULT);
         if(dset_F_N_id < 0) TEST_ERROR
 
-        dset_F_Y_id = H5Dcreate(file_F_id, "dsetMIN", int_type_id, dspace_id, H5P_DEFAULT, dcpl_minimize, H5P_DEFAULT);
+        dset_F_Y_id = H5Dcreate2(file_F_id, "dsetMIN", int_type_id, dspace_id, H5P_DEFAULT, dcpl_minimize, H5P_DEFAULT);
         if(dset_F_Y_id < 0) TEST_ERROR
 
         /*********
@@ -1244,7 +1254,7 @@ test_minimized_dset_ohdr_with_filter(hid_t fapl_id)
      * SETUP *
      *********/
 
-    if(h5_fixname(FILENAME[1], H5P_DEFAULT, filename, sizeof(filename)) == NULL)
+    if(h5_fixname(FILENAME[1], fapl_id, filename, sizeof(filename)) == NULL)
         TEST_ERROR
 
     dcpl_mx_id = H5Pcreate(H5P_DATASET_CREATE);
@@ -1276,16 +1286,16 @@ test_minimized_dset_ohdr_with_filter(hid_t fapl_id)
     file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
     if(file_id < 0) TEST_ERROR
 
-    dset_xx_id = H5Dcreate(file_id, "xx", dtype_id, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    dset_xx_id = H5Dcreate2(file_id, "xx", dtype_id, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if(dset_xx_id < 0) TEST_ERROR
 
-    dset_mx_id = H5Dcreate(file_id, "Mx", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mx_id, H5P_DEFAULT);
+    dset_mx_id = H5Dcreate2(file_id, "Mx", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mx_id, H5P_DEFAULT);
     if(dset_mx_id < 0) TEST_ERROR
 
-    dset_xZ_id = H5Dcreate(file_id, "xZ", dtype_id, dspace_id, H5P_DEFAULT, dcpl_xZ_id, H5P_DEFAULT);
+    dset_xZ_id = H5Dcreate2(file_id, "xZ", dtype_id, dspace_id, H5P_DEFAULT, dcpl_xZ_id, H5P_DEFAULT);
     if(dset_xZ_id < 0) TEST_ERROR
 
-    dset_mZ_id = H5Dcreate(file_id, "MZ", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mZ_id, H5P_DEFAULT);
+    dset_mZ_id = H5Dcreate2(file_id, "MZ", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mZ_id, H5P_DEFAULT);
     if(dset_mZ_id < 0) TEST_ERROR
 
     /*********
@@ -1383,7 +1393,7 @@ test_minimized_dset_ohdr_modification_times(hid_t _fapl_id)
      * SETUP *
      *********/
 
-    if(h5_fixname(FILENAME[1], H5P_DEFAULT, filename, sizeof(filename)) == NULL)
+    if(h5_fixname(FILENAME[1], _fapl_id, filename, sizeof(filename)) == NULL)
         TEST_ERROR
 
     dcpl_mx_id = H5Pcreate(H5P_DATASET_CREATE);
@@ -1426,8 +1436,6 @@ test_minimized_dset_ohdr_modification_times(hid_t _fapl_id)
         if(fapl_id < 0) TEST_ERROR
 
         if(cases[i].oh_version > 1) {
-            fapl_id = H5Pcreate(H5P_FILE_ACCESS);
-            if(fapl_id < 0) TEST_ERROR
             ret = H5Pset_libver_bounds(fapl_id, H5F_LIBVER_V18, H5F_LIBVER_V110);
             if(ret < 0) TEST_ERROR
         }
@@ -1435,18 +1443,18 @@ test_minimized_dset_ohdr_modification_times(hid_t _fapl_id)
         file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
         if(file_id < 0) TEST_ERROR
 
-        dset_xx_id = H5Dcreate( file_id, "xx", dtype_id, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+        dset_xx_id = H5Dcreate2( file_id, "xx", dtype_id, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         if(dset_xx_id < 0) TEST_ERROR
 
-        dset_mx_id = H5Dcreate(file_id, "mx", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mx_id, H5P_DEFAULT);
+        dset_mx_id = H5Dcreate2(file_id, "mx", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mx_id, H5P_DEFAULT);
         if(dset_mx_id < 0) TEST_ERROR
 
-        dset_xT_id = H5Dcreate(file_id, "xT", dtype_id, dspace_id, H5P_DEFAULT, dcpl_xT_id, H5P_DEFAULT);
+        dset_xT_id = H5Dcreate2(file_id, "xT", dtype_id, dspace_id, H5P_DEFAULT, dcpl_xT_id, H5P_DEFAULT);
         if(dset_xT_id < 0) TEST_ERROR
-        dset_mT_id = H5Dcreate(file_id, "mT", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mT_id, H5P_DEFAULT);
+        dset_mT_id = H5Dcreate2(file_id, "mT", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mT_id, H5P_DEFAULT);
         if(dset_mT_id < 0) TEST_ERROR
 
-        dset_mN_id = H5Dcreate(file_id, "mN", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mN_id, H5P_DEFAULT);
+        dset_mN_id = H5Dcreate2(file_id, "mN", dtype_id, dspace_id, H5P_DEFAULT, dcpl_mN_id, H5P_DEFAULT);
         if(dset_mN_id < 0) TEST_ERROR
 
         /* ----- *
@@ -1534,7 +1542,10 @@ test_minimized_dset_ohdr_fillvalue_backwards_compatability(hid_t _fapl_id)
 
     TESTING("minimized dset object headers with fill values and different libver support");
 
-    if(h5_fixname(FILENAME[1], H5P_DEFAULT, filename, sizeof(filename)) == NULL)
+    fapl_id = H5Pcopy(_fapl_id);
+    if(fapl_id < 0) TEST_ERROR
+
+    if(h5_fixname(FILENAME[1], fapl_id, filename, sizeof(filename)) == NULL)
         TEST_ERROR
 
     dspace_id = H5Screate_simple(1, extents, extents);
@@ -1552,16 +1563,13 @@ test_minimized_dset_ohdr_fillvalue_backwards_compatability(hid_t _fapl_id)
     ret = H5Pset_fill_value(dcpl_id, dtype_id, fill);
     if(ret == FAIL) TEST_ERROR;
 
-    fapl_id = H5Pcopy(_fapl_id);
-    if(fapl_id < 0) TEST_ERROR
-
     ret = H5Pset_libver_bounds(fapl_id, H5F_LIBVER_EARLIEST, H5F_LIBVER_LATEST);
     if(ret == FAIL) TEST_ERROR;
 
     file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
     if(file_id < 0) TEST_ERROR
 
-    dset_0_id = H5Dcreate(file_id, "fullrange", dtype_id, dspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
+    dset_0_id = H5Dcreate2(file_id, "fullrange", dtype_id, dspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
     if(dset_0_id < 0) TEST_ERROR
 
     /* Close file and re-open with different libver bounds.
@@ -1576,7 +1584,7 @@ test_minimized_dset_ohdr_fillvalue_backwards_compatability(hid_t _fapl_id)
     file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id);
     if(file_id < 0) TEST_ERROR
 
-    dset_1_id = H5Dcreate(file_id, "upperrange", dtype_id, dspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
+    dset_1_id = H5Dcreate2(file_id, "upperrange", dtype_id, dspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
     if(dset_1_id < 0) TEST_ERROR
 
     /* re-open "fullrange" dataset
@@ -1678,6 +1686,8 @@ main(void)
     hid_t fapl = -1;
     hid_t file = -1;
     H5F_t *f = NULL;
+    const char  *env_h5_drvr;   /* File driver value from environment */
+    hbool_t single_file_vfd;    /* Whether VFD used stores data in a single file */
     char  filename[1024];
     H5O_hdr_info_t hdr_info;  /* Object info */
     H5O_loc_t      oh_loc;    /* Object header locations */
@@ -1688,6 +1698,14 @@ main(void)
     hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
     herr_t ret;               /* Generic return value */
 
+    /* Get the VFD to use */
+    env_h5_drvr = HDgetenv("HDF5_DRIVER");
+    if(env_h5_drvr == NULL)
+        env_h5_drvr = "nomatch";
+
+    /* Check for VFD which stores data in multiple files */
+    single_file_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family"));
+
     /* Reset library */
     h5_reset();
     fapl = h5_fileaccess();
@@ -1906,11 +1924,23 @@ main(void)
          * and the various "fail/mark if unknown" object header message flags
          */
         HDputs("Accessing objects with unknown header messages: H5O_BOGUS_VALID_ID");
-        if(test_unknown(H5O_BOGUS_VALID_ID, filename, fapl) < 0)
-            TEST_ERROR
+        if(single_file_vfd) {
+            if(test_unknown(H5O_BOGUS_VALID_ID, filename, fapl) < 0)
+                TEST_ERROR
+        } /* end if */
+        else {
+            SKIPPED();
+            HDputs("    Unknown header message test not supported with the current VFD.");
+        } /* end else */
         HDputs("Accessing objects with unknown header messages: H5O_BOGUS_INVALID_ID");
-        if(test_unknown(H5O_BOGUS_INVALID_ID, filename, fapl) < 0)
-            TEST_ERROR
+        if(single_file_vfd) {
+            if(test_unknown(H5O_BOGUS_INVALID_ID, filename, fapl) < 0)
+                TEST_ERROR
+        } /* end if */
+        else {
+            SKIPPED();
+            HDputs("    Unknown header message test not supported with the current VFD.");
+        } /* end else */
 
         /* Test object header creation metadata cache issues */
         if(test_ohdr_cache(filename, fapl) < 0)
diff --git a/test/tattr.c b/test/tattr.c
index c1167c6..454ea71 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -150,6 +150,8 @@ float attr_data5=-5.123F;        /* Test data for 5th attribute */
 #define INVALID_RENAME_TEST_ATTR_NAME "InvalidRenameTestAttr"
 #define INVALID_RENAME_TEST_NEW_ATTR_NAME "InvalidRenameTestNewAttr"
 
+/* Used by test_attr_get_name_invalid_buf() */
+#define GET_NAME_INVALID_BUF_TEST_ATTR_NAME "InvalidNameBufferTestAttr"
 
 /* Attribute iteration struct */
 typedef struct {
@@ -6138,6 +6140,60 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl)
 }
 
 
+/***************************************************************
+**
+**  test_attr_get_name_invalid_buf(): A test to ensure that
+**      passing a NULL buffer to H5Aget_name(_by_idx) when
+**      the 'size' parameter is non-zero doesn't cause bad
+**      behavior.
+**
+****************************************************************/
+static void
+test_attr_get_name_invalid_buf(hid_t fcpl, hid_t fapl)
+{
+    ssize_t err_ret = -1;
+    hid_t   fid;
+    hid_t   attr;
+    hid_t   sid;
+
+    /* Create dataspace for attribute */
+    sid = H5Screate(H5S_SCALAR);
+    CHECK(sid, FAIL, "H5Screate");
+
+    /* Create file */
+    fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl);
+    CHECK(fid, FAIL, "H5Fcreate");
+
+    /* Create attribute */
+    attr = H5Acreate2(fid, GET_NAME_INVALID_BUF_TEST_ATTR_NAME, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK(attr, FAIL, "H5Acreate2");
+
+    H5E_BEGIN_TRY {
+        err_ret = H5Aget_name(attr, 1, NULL);
+    } H5E_END_TRY;
+
+    VERIFY(err_ret, FAIL, "H5Aget_name");
+
+    H5E_BEGIN_TRY {
+        err_ret = H5Aget_name_by_idx(fid, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 1, H5P_DEFAULT);
+    } H5E_END_TRY;
+
+    VERIFY(err_ret, FAIL, "H5Aget_name_by_idx");
+
+    /* Close dataspace */
+    err_ret = H5Sclose(sid);
+    CHECK(err_ret, FAIL, "H5Sclose");
+
+    /* Close attribute */
+    err_ret = H5Aclose(attr);
+    CHECK(err_ret, FAIL, "H5Aclose");
+
+    /* Close file */
+    err_ret = H5Fclose(fid);
+    CHECK(err_ret, FAIL, "H5Fclose");
+}
+
+
 /****************************************************************
 **
 **  test_attr_delete_by_idx(): Test basic H5A (attribute) code.
@@ -11176,6 +11232,7 @@ test_attr(void)
                 test_attr_many(new_format, my_fcpl, my_fapl);               /* Test storing lots of attributes */
                 test_attr_info_null_info_pointer(my_fcpl, my_fapl); /* Test passing a NULL attribute info pointer to H5Aget_info(_by_name/_by_idx) */
                 test_attr_rename_invalid_name(my_fcpl, my_fapl); /* Test passing a NULL or empty attribute name to H5Arename(_by_name) */
+                test_attr_get_name_invalid_buf(my_fcpl, my_fapl); /* Test passing NULL buffer to H5Aget_name(_by_idx) */
 
                 /* New attribute API routine tests
                  */
diff --git a/test/tbogus.h5 b/test/tbogus.h5
index 91ab76f..efcbd79 100644
--- a/test/tbogus.h5
+++ b/test/tbogus.h5
diff --git a/test/test_filenotclosed.sh.in b/test/testabort_fail.sh.in
index 0b43c5b..925d8a4 100644
--- a/test/test_filenotclosed.sh.in
+++ b/test/testabort_fail.sh.in
@@ -13,6 +13,9 @@
 #
 # Test to verify that the assertion/abort failure is fixed when the application
 # does not close the file. (See HDFFV-10160)
+#
+# Test to verify that the infinite loop closing library/abort failure is fixed 
+# when the application creates and removes dense attributes (See HDFFV-10659)
 
 srcdir=@srcdir@
 
@@ -20,22 +23,44 @@ nerrors=0
 
 ##############################################################################
 ##############################################################################
-###			  T H E   T E S T                                              ###
+###			  T H E   T E S T S                                            ###
 ##############################################################################
 ##############################################################################
-
+#
+#
 echo "Testing file not closed assertion/abort failure"
 TEST_NAME=filenotclosed     # The test name
-TEST_BIN=`pwd`/$TEST_NAME 	# The path of the test binary
+TEST_BIN=`pwd`/$TEST_NAME   # The path of the test binary
 #
 # Run the test
-#$RUNSERIAL $TEST_BIN >/dev/null 2>&1 
-$RUNSERIAL $TEST_BIN 2>&1 
+$RUNSERIAL $TEST_BIN >/dev/null 2>&1 
 exitcode=$?
 if [ $exitcode -eq 0 ]; then
     echo "Test PASSED"
 else
+    echo "Test FAILED"
  	nerrors="`expr $nerrors + 1`"
-	echo "***Error encountered***"
 fi
-exit $nerrors
+#
+#
+echo "Testing infinite loop closing library/abort failure"
+TEST_NAME=del_many_dense_attrs  # The test name
+TEST_BIN=`pwd`/$TEST_NAME 	    # The path of the test binary
+# Run the test
+$RUNSERIAL $TEST_BIN >/dev/null 2>&1 
+exitcode=$?
+if [ $exitcode -eq 0 ]; then
+    echo "Test PASSED"
+else
+    echo "Test FAILED"
+ 	nerrors="`expr $nerrors + 1`"
+fi
+#
+#
+if test $nerrors -eq 0 ; then
+    echo "All tests for abort failure passed."
+    exit 0
+else
+    echo "Tests for abort failure failed with $nerrors errors."
+    exit 1
+fi
diff --git a/test/tfile.c b/test/tfile.c
index 5338c32..c5e913c 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -1595,16 +1595,18 @@ test_file_perm2(void)
 **
 *****************************************************************/
 static void
-test_file_is_accessible(void)
+test_file_is_accessible(const char *env_h5_drvr)
 {
     hid_t    fid;               /* File opened with read-write permission */
     hid_t    fcpl_id;           /* File creation property list */
     hid_t    fapl = -1;         /* File access property list */
     int      fd;                /* POSIX file descriptor */
+    char filename[FILENAME_LEN]; /* Filename to use */
     ssize_t  nbytes;            /* Number of bytes written */
     unsigned u;                 /* Local index variable */
     unsigned char buf[1024];    /* Buffer of data to write */
     htri_t   status;            /* Whether a file is an HDF5 file */
+    hbool_t  single_file_vfd;   /* Whether VFD used is a single file */
     herr_t   ret;
 
     /* Output message about test being performed */
@@ -1613,9 +1615,10 @@ test_file_is_accessible(void)
     /* Get FAPL */
     fapl = h5_fileaccess();
     CHECK(fapl, FAIL, "H5Pcreate");
+    h5_fixname(FILE1, fapl, filename, sizeof filename);
 
     /* Create a file */
-    fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
+    fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
     CHECK(fid, FAIL, "H5Fcreate");
 
     /* Close file */
@@ -1623,53 +1626,60 @@ test_file_is_accessible(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Verify that the file is an HDF5 file */
-    status = H5Fis_accessible(FILE1, fapl);
+    status = H5Fis_accessible(filename, fapl);
     VERIFY(status, TRUE, "H5Fis_accessible");
 
 
-    /* Create a file creation property list with a non-default user block size */
-    fcpl_id = H5Pcreate(H5P_FILE_CREATE);
-    CHECK(fcpl_id, FAIL, "H5Pcreate");
+    /* This test is not currently working for the family VFD */
+    if(0 != HDstrcmp(env_h5_drvr, "family")) {
+        /* Create a file creation property list with a non-default user block size */
+        fcpl_id = H5Pcreate(H5P_FILE_CREATE);
+        CHECK(fcpl_id, FAIL, "H5Pcreate");
 
-    ret = H5Pset_userblock(fcpl_id, (hsize_t)2048);
-    CHECK(ret, FAIL, "H5Pset_userblock");
+        ret = H5Pset_userblock(fcpl_id, (hsize_t)2048);
+        CHECK(ret, FAIL, "H5Pset_userblock");
 
-    /* Create file with non-default user block */
-    fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl_id, fapl);
-    CHECK(fid, FAIL, "H5Fcreate");
+        /* Create file with non-default user block */
+        fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, fapl);
+        CHECK(fid, FAIL, "H5Fcreate");
 
-    /* Release file-creation property list */
-    ret = H5Pclose(fcpl_id);
-    CHECK(ret, FAIL, "H5Pclose");
+        /* Release file-creation property list */
+        ret = H5Pclose(fcpl_id);
+        CHECK(ret, FAIL, "H5Pclose");
 
-    /* Close file */
-    ret = H5Fclose(fid);
-    CHECK(ret, FAIL, "H5Fclose");
+        /* Close file */
+        ret = H5Fclose(fid);
+        CHECK(ret, FAIL, "H5Fclose");
 
-    /* Verify that the file is an HDF5 file */
-    status = H5Fis_accessible(FILE1, fapl);
-    VERIFY(status, TRUE, "H5Fis_accessible");
+        /* Verify that the file is an HDF5 file */
+        status = H5Fis_accessible(filename, fapl);
+        VERIFY(status, TRUE, "H5Fis_accessible");
+    } /* end if */
 
 
-    /* Create non-HDF5 file and check it */
-    fd = HDopen(FILE1, O_RDWR|O_CREAT|O_TRUNC, H5_POSIX_CREATE_MODE_RW);
-    CHECK(fd, FAIL, "HDopen");
+    /* This test only works for VFDs with a single file */
+    single_file_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family"));
+    if(single_file_vfd) {
+        /* Create non-HDF5 file and check it */
+        fd = HDopen(filename, O_RDWR|O_CREAT|O_TRUNC, H5_POSIX_CREATE_MODE_RW);
+        CHECK(fd, FAIL, "HDopen");
 
-    /* Initialize information to write */
-    for (u=0; u<1024; u++)
-        buf[u]=(unsigned char)u;
+        /* Initialize information to write */
+        for (u=0; u<1024; u++)
+            buf[u]=(unsigned char)u;
 
-    /* Write some information */
-    nbytes = HDwrite(fd, buf, (size_t)1024);
-    VERIFY(nbytes, 1024, "HDwrite");
+        /* Write some information */
+        nbytes = HDwrite(fd, buf, (size_t)1024);
+        VERIFY(nbytes, 1024, "HDwrite");
 
-    /* Close the file */
-    ret = HDclose(fd);
-    CHECK(ret, FAIL, "HDclose");
+        /* Close the file */
+        ret = HDclose(fd);
+        CHECK(ret, FAIL, "HDclose");
 
-    /* Verify that the file is not an HDF5 file */
-    status = H5Fis_accessible(FILE1, fapl);
-    VERIFY(status, FALSE, "H5Fis_accessible");
+        /* Verify that the file is not an HDF5 file */
+        status = H5Fis_accessible(filename, fapl);
+        VERIFY(status, FALSE, "H5Fis_accessible");
+    } /* end if */
 
     /* Close property list */
     ret = H5Pclose(fapl);
@@ -1693,6 +1703,7 @@ test_file_ishdf5(void)
     hid_t    fcpl;      /* File creation property list */
     hid_t    fapl = -1; /* File access property list */
     int      fd;        /* File Descriptor */
+    char filename[FILENAME_LEN]; /* Filename to use */
     ssize_t  nbytes;    /* Number of bytes written */
     unsigned u;         /* Local index variable */
     unsigned char buf[1024];    /* Buffer of data to write */
@@ -1705,9 +1716,10 @@ test_file_ishdf5(void)
     /* Get FAPL */
     fapl = h5_fileaccess();
     CHECK(fapl, FAIL, "H5Pcreate");
+    h5_fixname(FILE1, fapl, filename, sizeof filename);
 
     /* Create a file */
-    file = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
+    file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
     CHECK(file, FAIL, "H5Fcreate");
 
     /* Close file */
@@ -1715,7 +1727,7 @@ test_file_ishdf5(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Verify that the file is an HDF5 file */
-    status = H5Fis_hdf5(FILE1);
+    status = H5Fis_hdf5(filename);
     VERIFY(status, TRUE, "H5Fis_hdf5");
 
 
@@ -1727,7 +1739,7 @@ test_file_ishdf5(void)
     CHECK(ret, FAIL, "H5Pset_userblock");
 
     /* Create file with non-default user block */
-    file = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
+    file = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
     CHECK(file, FAIL, "H5Fcreate");
 
     /* Release file-creation property list */
@@ -1739,12 +1751,12 @@ test_file_ishdf5(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Verify that the file is an HDF5 file */
-    status = H5Fis_hdf5(FILE1);
+    status = H5Fis_hdf5(filename);
     VERIFY(status, TRUE, "H5Fis_hdf5");
 
 
     /* Create non-HDF5 file and check it */
-    fd = HDopen(FILE1, O_RDWR|O_CREAT|O_TRUNC, H5_POSIX_CREATE_MODE_RW);
+    fd = HDopen(filename, O_RDWR|O_CREAT|O_TRUNC, H5_POSIX_CREATE_MODE_RW);
     CHECK(fd, FAIL, "HDopen");
 
     /* Initialize information to write */
@@ -1760,7 +1772,7 @@ test_file_ishdf5(void)
     CHECK(ret, FAIL, "HDclose");
 
     /* Verify that the file is not an HDF5 file */
-    status = H5Fis_hdf5(FILE1);
+    status = H5Fis_hdf5(filename);
     VERIFY(status, FALSE, "H5Fis_hdf5");
 
     /* Close property list */
@@ -2247,6 +2259,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
     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 */
+    char filename[FILENAME_LEN];    /* Filename to use */
     const char* data[] = {"String 1", "String 2", "String 3", "String 4", "String 5"};    /* Input Data */
     const char* e_data[] = {"String 1", "String 2", "String 3", "String 4", "String 5", "String 6", "String 7"};    /* Input Data */
     char* buffer[5];                /* Output buffer */
@@ -2263,9 +2276,10 @@ test_file_double_file_dataset_open(hbool_t new_format)
         ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
         CHECK(ret, FAIL, "H5Pset_libver_bounds");
     } /* end if */
+    h5_fixname(FILE1, fapl, filename, sizeof filename);
 
     /* Create the test file */
-    fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
+    fid1 = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
     CHECK(fid1, FAIL, "H5Fcreate");
 
     /* Create a chunked dataset with fixed array indexing */
@@ -2347,8 +2361,6 @@ test_file_double_file_dataset_open(hbool_t new_format)
     CHECK(ret, FAIL, "H5Sclose");
     ret = H5Pclose(dcpl);
     CHECK(ret, FAIL, "H5Pclose");
-    ret = H5Pclose(fapl);
-    CHECK(ret, FAIL, "H5Pclose");
     ret = H5Fclose(fid1);
     CHECK(ret, FAIL, "H5Fclose");
 
@@ -2357,7 +2369,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
      */
 
     /* First file open */
-    fid1 = H5Fopen(FILE1, H5F_ACC_RDWR, H5P_DEFAULT);
+    fid1 = H5Fopen(filename, H5F_ACC_RDWR, fapl);
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* First file's dataset open */
@@ -2372,7 +2384,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Second file open */
-    fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, H5P_DEFAULT);
+    fid2 = H5Fopen(filename, H5F_ACC_RDWR, fapl);
     CHECK(fid2, FAIL, "H5Fopen");
 
     /* Second file's dataset open */
@@ -2413,11 +2425,11 @@ test_file_double_file_dataset_open(hbool_t new_format)
      */
 
     /* First file open */
-    fid1 = H5Fopen(FILE1, H5F_ACC_RDONLY, H5P_DEFAULT);
+    fid1 = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* Second file open */
-    fid2 = H5Fopen(FILE1, H5F_ACC_RDONLY, H5P_DEFAULT);
+    fid2 = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
     CHECK(fid2, FAIL, "H5Fopen");
 
     /* Second file's dataset open */
@@ -2478,7 +2490,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
      */
 
     /* First file open */
-    fid1 = H5Fopen(FILE1, H5F_ACC_RDONLY, H5P_DEFAULT);
+    fid1 = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* First file's dataset open */
@@ -2490,7 +2502,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
     CHECK(size, 0, "H5Dget_storage_size");
 
     /* Second file open */
-    fid2 = H5Fopen(FILE1, H5F_ACC_RDONLY, H5P_DEFAULT);
+    fid2 = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
     CHECK(fid2, FAIL, "H5Fopen");
 
     /* Second file's dataset open */
@@ -2523,7 +2535,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
      *     from second call to H5Dset_extent->...H5D__earray_idx_remove->H5EA_get...H5EA__iblock_protect...H5AC_protect
      */
     /* First file open */
-    fid1 = H5Fopen(FILE1, H5F_ACC_RDWR, H5P_DEFAULT);
+    fid1 = H5Fopen(filename, H5F_ACC_RDWR, fapl);
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* First file's dataset open */
@@ -2542,7 +2554,7 @@ test_file_double_file_dataset_open(hbool_t new_format)
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Second file open */
-    fid2 = H5Fopen(FILE1, H5F_ACC_RDWR, H5P_DEFAULT);
+    fid2 = H5Fopen(filename, H5F_ACC_RDWR, fapl);
     CHECK(fid2, FAIL, "H5Fopen");
 
     /* Second file's dataset open */
@@ -2573,6 +2585,9 @@ test_file_double_file_dataset_open(hbool_t new_format)
     ret = H5Tclose(tid1);
     CHECK(ret, FAIL, "H5Tclose");
 
+    /* Close FAPL */
+    ret = H5Pclose(fapl);
+    CHECK(ret, FAIL, "H5Pclose");
 } /* end test_file_double_dataset_open() */
 
 /****************************************************************
@@ -7500,6 +7515,7 @@ test_deprec(void)
 void
 test_file(void)
 {
+    hbool_t  single_file_vfd;   /* Whether VFD used is a single file */
     const char  *env_h5_drvr;         /* File Driver value from environment */
 
     /* Output message about test being performed */
@@ -7509,6 +7525,7 @@ test_file(void)
     env_h5_drvr = HDgetenv("HDF5_DRIVER");
     if(env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
+    single_file_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family"));
 
     test_file_create();                         /* Test file creation(also creation templates)*/
     test_file_open();                           /* Test file opening */
@@ -7518,7 +7535,7 @@ test_file(void)
     test_get_obj_ids();                         /* Test H5Fget_obj_ids for Jira Issue 8528 */
     test_file_perm();                           /* Test file access permissions */
     test_file_perm2();                          /* Test file access permission again */
-    test_file_is_accessible();                  /* Test detecting HDF5 files correctly */
+    test_file_is_accessible(env_h5_drvr);       /* Test detecting HDF5 files correctly */
     test_file_open_dot();                       /* Test opening objects with "." for a name */
     test_file_open_overlap();                   /* Test opening files in an overlapping manner */
     test_file_getname();                        /* Test basic H5Fget_name() functionality */
@@ -7554,7 +7571,10 @@ test_file(void)
     test_incr_filesize();                       /* Test H5Fincrement_filesize() and H5Fget_eoa() */
     test_min_dset_ohdr();                       /* Test datset object header minimization */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-    test_file_ishdf5();                         /* Test detecting HDF5 files correctly */
+    if(single_file_vfd)
+        test_file_ishdf5();                         /* Test detecting HDF5 files correctly */
+    else
+        MESSAGE(5, ("Skipping testing detection of HDF5 Files (using deprecated H5Fis_hdf5() call for non-single file VFDs)\n"));
     test_deprec();                              /* Test deprecated routines */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 } /* test_file() */
diff --git a/test/titerate.c b/test/titerate.c
index de652a7..87ddfb8 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -20,6 +20,7 @@
 *************************************************************/
 
 #include "testhdf5.h"
+#include "H5srcdir.h"
 
 #define DATAFILE   "titerate.h5"
 
@@ -53,6 +54,17 @@ typedef struct {
     iter_enum command;      /* The type of return value */
 } iter_info;
 
+/* Definition for test_corrupted_attnamelen */
+#define CORRUPTED_ATNAMELEN_FILE   "memleak_H5O_dtype_decode_helper_H5Odtype.h5"
+#define DSET_NAME   "image"
+typedef struct searched_err_t {
+    char message[256];
+    bool found;
+} searched_err_t;
+
+/* Call back function for test_corrupted_attnamelen */
+static int find_err_msg_cb(unsigned n, const H5E_error2_t *err_desc, void *_client_data);
+
 /* Local functions */
 int iter_strcmp(const void *s1, const void *s2);
 int iter_strcmp2(const void *s1, const void *s2);
@@ -915,6 +927,92 @@ static void test_links(hid_t fapl)
     CHECK(ret, FAIL, "H5Fclose");
 } /* test_links() */
 
+/*-------------------------------------------------------------------------
+ * Function:    find_err_msg_cb
+ *
+ * Purpose:     Callback function to find the given error message.
+ *              Helper function for test_corrupted_attnamelen().
+ *
+ * Return:      H5_ITER_STOP when the message is found
+ *              H5_ITER_CONT, otherwise
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+find_err_msg_cb(unsigned n, const H5E_error2_t *err_desc, void *_client_data)
+{
+    int status = H5_ITER_CONT;
+    searched_err_t *searched_err = (searched_err_t *)_client_data;
+
+    if (searched_err == NULL)
+        return -1;
+    
+    /* If the searched error message is found, stop the iteration */
+    if (err_desc->desc != NULL && strcmp(err_desc->desc, searched_err->message) == 0)
+    {
+        searched_err->found = true;
+        status = H5_ITER_STOP;
+    }
+    return status;
+} /* end find_err_msg_cb() */
+
+/**************************************************************************
+**
+**  test_corrupted_attnamelen(): Test the fix for the JIRA issue HDFFV-10588,
+**                      where corrupted attribute's name length can be
+**                      detected and invalid read can be avoided.
+**
+**************************************************************************/
+static void test_corrupted_attnamelen(void)
+{
+    hid_t          fid = -1;            /* File ID */
+    hid_t          did = -1;            /* Dataset ID */
+    searched_err_t err_caught;          /* Data to be passed to callback func */
+    int            err_status;          /* Status returned by H5Aiterate2 */
+    herr_t         ret;                 /* Return value */
+    const char *testfile = H5_get_srcdir_filename(CORRUPTED_ATNAMELEN_FILE); /* Corrected test file name */
+
+    const char *err_message = "attribute name has different length than stored length";
+                        /* the error message produced when the failure occurs */
+
+    /* Output message about test being performed */
+    MESSAGE(5, ("Testing the Handling of Corrupted Attribute's Name Length\n"));
+
+    fid = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT);
+    CHECK(fid, FAIL, "H5Fopen");
+
+    /* Open the dataset */
+    did = H5Dopen2(fid, DSET_NAME, H5P_DEFAULT);
+    CHECK(did, FAIL, "H5Dopen2");
+
+    /* Call H5Aiterate2 to trigger the failure in HDFFV-10588.  Failure should
+       occur in the decoding stage, so some arguments are not needed. */
+    err_status = H5Aiterate2(did, H5_INDEX_NAME, H5_ITER_INC, NULL, NULL, NULL);
+
+    /* Make sure the intended error was caught */
+    if(err_status == -1)
+    {
+        /* Initialize client data */
+        HDstrcpy(err_caught.message, err_message);
+        err_caught.found = false;
+
+        /* Look for the correct error message */
+        ret = H5Ewalk2(H5E_DEFAULT, H5E_WALK_UPWARD, find_err_msg_cb, &err_caught);
+        CHECK(ret, FAIL, "H5Ewalk2");
+
+        /* Fail if the indicated message is not found */
+        CHECK(err_caught.found, false, "test_corrupted_attnamelen: Expected error not found");
+    }
+
+    /* Close the dataset and file */
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    ret = H5Fclose(fid);
+    CHECK(ret, FAIL, "H5Fclose");
+
+} /* test_corrupted_attnamelen() */
+
 /****************************************************************
 **
 **  test_iterate(): Main iteration testing routine.
@@ -951,6 +1049,9 @@ test_iterate(void)
         test_links(new_format ? fapl2 : fapl);              /* Test soft and hard link iteration */
     } /* end for */
 
+    /* Test the fix for issue HDFFV-10588 */
+    test_corrupted_attnamelen();
+
     /* Close FAPLs */
     ret = H5Pclose(fapl);
     CHECK(ret, FAIL, "H5Pclose");
diff --git a/test/tselect.c b/test/tselect.c
index 3c93e7a..bcc2a5b 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -1308,14 +1308,8 @@ test_select_hyper_contig(hid_t dset_type, hid_t xfer_plist)
     CHECK(ret, FAIL, "H5Dread");
 
     /* Compare data read with data written out */
-    if(HDmemcmp(rbuf, wbuf, sizeof(uint16_t) * 30 * 12)) {
+    if(HDmemcmp(rbuf, wbuf, sizeof(uint16_t) * 30 * 12))
         TestErrPrintf("hyperslab values don't match! Line=%d\n",__LINE__);
-#ifdef QAK
-        for(i=0, tbuf=wbuf; i<12; i++)
-            for(j=0; j<30; j++)
-                printf("i=%d, j=%d, *wbuf=%u, *rbuf=%u\n",i,j,(unsigned)*(wbuf+i*30+j),(unsigned)*(rbuf+i*30+j));
-#endif /* QAK */
-    } /* end if */
 
     /* Close memory dataspace */
     ret = H5Sclose(sid2);
@@ -1432,14 +1426,8 @@ test_select_hyper_contig2(hid_t dset_type, hid_t xfer_plist)
     CHECK(ret, FAIL, "H5Dread");
 
     /* Compare data read with data written out */
-    if(HDmemcmp(rbuf,wbuf,sizeof(uint16_t)*2*SPACE8_DIM3*SPACE8_DIM2*SPACE8_DIM1)) {
+    if(HDmemcmp(rbuf,wbuf,sizeof(uint16_t)*2*SPACE8_DIM3*SPACE8_DIM2*SPACE8_DIM1))
         TestErrPrintf("Error: hyperslab values don't match!\n");
-#ifdef QAK
-        for(i=0, tbuf=wbuf; i<12; i++)
-            for(j=0; j<30; j++)
-                printf("i=%d, j=%d, *wbuf=%u, *rbuf=%u\n",i,j,(unsigned)*(wbuf+i*30+j),(unsigned)*(rbuf+i*30+j));
-#endif /* QAK */
-    } /* end if */
 
     /* Close memory dataspace */
     ret = H5Sclose(sid2);
@@ -3743,15 +3731,8 @@ test_select_hyper_copy(void)
     CHECK(ret, FAIL, "H5Dread");
 
     /* Compare data read with data written out */
-    if(HDmemcmp(rbuf,rbuf2,sizeof(uint16_t)*SPACE3_DIM1*SPACE3_DIM2)) {
+    if(HDmemcmp(rbuf,rbuf2,sizeof(uint16_t)*SPACE3_DIM1*SPACE3_DIM2))
         TestErrPrintf("hyperslab values don't match! Line=%d\n",__LINE__);
-#ifdef QAK
-        for(i=0; i<SPACE3_DIM1; i++)
-            for(j=0; j<SPACE3_DIM2; j++)
-                if((unsigned)*(rbuf+i*SPACE3_DIM2+j)!=(unsigned)*(rbuf2+i*SPACE3_DIM2+j))
-                    printf("i=%d, j=%d, *rbuf=%u, *rbuf2=%u\n",i,j,(unsigned)*(rbuf+i*SPACE3_DIM2+j),(unsigned)*(rbuf2+i*SPACE3_DIM2+j));
-#endif /* QAK */
-    } /* end if */
 
     /* Close memory dataspace */
     ret = H5Sclose(sid2);
@@ -5220,7 +5201,7 @@ test_select_hyper_union_3d(void)
     tmp2_space = H5Scombine_select(sid2,H5S_SELECT_OR,tmp_space);
     CHECK(tmp2_space, FAIL, "H5Scombin_select");
 
-    npoints = H5Sget_select_npoints(tmp2_space);
+    npoints = (hsize_t)H5Sget_select_npoints(tmp2_space);
     VERIFY(npoints, 15*26, "H5Sget_select_npoints");
 
     /* Create a dataset */
@@ -5902,37 +5883,20 @@ test_select_hyper_union_random_5d(hid_t read_plist)
     CHECK(sid2, FAIL, "H5Screate_simple");
 
     /* Get initial random # seed */
-    seed=(unsigned)time(NULL)+(unsigned)clock();
+    seed = (unsigned)HDtime(NULL) + (unsigned)HDclock();
 
     /* Crunch through a bunch of random hyperslab reads from the file dataset */
     for(test_num=0; test_num<NRAND_HYPER; test_num++) {
         /* Save random # seed for later use */
         /* (Used in case of errors, to regenerate the hyperslab sequence) */
-#ifndef QAK
-        seed+=(unsigned)clock();
-#else /* QAK */
-        seed=987909620;
-#endif /* QAK */
+        seed += (unsigned)HDclock();
         HDsrandom(seed);
 
-#ifdef QAK
-printf("test_num=%d, seed=%u\n",test_num,seed);
-#endif /* QAK */
-#ifndef QAK
         for(i=0; i<NHYPERSLABS; i++) {
-#else /* QAK */
-        for(i=0; i<2; i++) {
-#endif /* QAK */
-#ifdef QAK
-printf("hyperslab=%d\n",i);
-#endif /* QAK */
             /* Select random hyperslab location & size for selection */
             for(j=0; j<SPACE5_RANK; j++) {
                 start[j] = ((hsize_t)HDrandom() % dims1[j]);
                 count[j] = (((hsize_t)HDrandom() % (dims1[j] - start[j])) + 1);
-#ifdef QAK
-printf("start[%d]=%d, count[%d]=%d (end[%d]=%d)\n",j,(int)start[j],j,(int)count[j],j,(int)(start[j]+count[j]-1));
-#endif /* QAK */
             } /* end for */
 
             /* Select hyperslab */
@@ -5953,41 +5917,9 @@ printf("start[%d]=%d, count[%d]=%d (end[%d]=%d)\n",j,(int)start[j],j,(int)count[
         npoints2 = H5Sget_select_npoints(sid2);
         VERIFY(npoints, npoints2, "H5Sget_select_npoints");
 
-#ifdef QAK
-printf("random I/O, before H5Dread(), npoints=%lu\n",(unsigned long)npoints);
-{
-    hsize_t blocks[128][2][SPACE5_RANK];
-    hssize_t nblocks;
-    int k;
-
-    nblocks=H5Sget_select_hyper_nblocks(sid1);
-    printf("nblocks=%d\n",(int)nblocks);
-    H5Sget_select_hyper_blocklist(sid1,0,nblocks,blocks);
-    for(j=0; j<nblocks; j++) {
-        printf("Block #%d, start = {",j);
-        for(k=0; k<SPACE5_RANK; k++) {
-            printf("%d",blocks[j][0][k]);
-            if(k<(SPACE5_RANK-1))
-                printf(", ");
-            else
-                printf("}, end = {");
-        } /* end for */
-        for(k=0; k<SPACE5_RANK; k++) {
-            printf("%d",blocks[j][1][k]);
-            if(k<(SPACE5_RANK-1))
-                printf(", ");
-            else
-                printf("}\n");
-        } /* end for */
-    } /* end for */
-}
-#endif /* QAK */
         /* Read selection from disk */
         ret=H5Dread(dataset,H5T_NATIVE_INT,sid2,sid1,read_plist,rbuf);
         CHECK(ret, FAIL, "H5Dread");
-#ifdef QAK
-printf("random I/O, after H5Dread()\n");
-#endif /* QAK */
 
         /* Compare data read with data written out */
         tbuf=rbuf;
diff --git a/test/vol.c b/test/vol.c
index b70c0ca..c55874a 100644
--- a/test/vol.c
+++ b/test/vol.c
@@ -20,8 +20,12 @@
 
 #include "h5test.h"
 
+/* Filename */
+const char *FILENAME[] = {
+    "native_vol_test",
+    NULL
+};
 
-#define NATIVE_VOL_TEST_FILENAME        "native_vol_test"
 #define NATIVE_VOL_TEST_GROUP_NAME      "test_group"
 #define NATIVE_VOL_TEST_DATASET_NAME    "test_dataset"
 #define NATIVE_VOL_TEST_ATTRIBUTE_NAME  "test_dataset"
@@ -237,7 +241,7 @@ error:
  *-------------------------------------------------------------------------
  */
 static herr_t
-test_basic_file_operation(void)
+test_basic_file_operation(const char *env_h5_drvr)
 {
     hid_t fid           = H5I_INVALID_HID;
     hid_t fid_reopen    = H5I_INVALID_HID;
@@ -245,6 +249,7 @@ test_basic_file_operation(void)
     hid_t fapl_id2      = H5I_INVALID_HID;
     hid_t fcpl_id       = H5I_INVALID_HID;
 
+    char            filename[1024];
     ssize_t         obj_count;
     hid_t           obj_id_list[1];
     hsize_t         file_size;
@@ -257,6 +262,7 @@ test_basic_file_operation(void)
 
     /* Retrieve the file access property for testing */
     fapl_id = h5_fileaccess();
+    h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
 
     /* Set the file close degree to a non-default value, to make the H5Pequal
      *  work out.  This is kinda odd, but the library's current behavior with
@@ -273,7 +279,7 @@ test_basic_file_operation(void)
         FAIL_STACK_ERROR
 
     /* H5Fcreate */
-    if ((fid = H5Fcreate(NATIVE_VOL_TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
         TEST_ERROR;
 
     /* H5Fget_obj_count */
@@ -290,13 +296,16 @@ test_basic_file_operation(void)
     if ((obj_count = H5Fget_obj_ids((hid_t)H5F_OBJ_ALL, H5F_OBJ_DATASET, 2, obj_id_list)) < 0)
         TEST_ERROR;
 
-    /* H5Fget_access_plist */
-    if ((fapl_id2 = H5Fget_access_plist(fid)) < 0)
-        TEST_ERROR;
-    if (H5Pequal(fapl_id, fapl_id2) != TRUE)
-        TEST_ERROR;
-    if (H5Pclose(fapl_id2) < 0)
-        TEST_ERROR;
+    /* Can't compare VFD properties for split / multi / family VFDs */
+    if((hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family"))) {
+        /* H5Fget_access_plist */
+        if ((fapl_id2 = H5Fget_access_plist(fid)) < 0)
+            TEST_ERROR;
+        if (H5Pequal(fapl_id, fapl_id2) != TRUE)
+            TEST_ERROR;
+        if (H5Pclose(fapl_id2) < 0)
+            TEST_ERROR;
+    } /* end if */
 
     /* H5Fget_create_plist */
     if ((fcpl_id = H5Fget_create_plist(fid)) < 0)
@@ -308,9 +317,12 @@ test_basic_file_operation(void)
     if (H5Fget_filesize(fid, &file_size) < 0)
         TEST_ERROR;
 
-    /* H5Fget_vfd_handle */
-    if (H5Fget_vfd_handle(fid, H5P_DEFAULT, &os_file_handle) < 0)
-        TEST_ERROR;
+    /* Can't retrieve VFD handle for split / multi / family VFDs */
+    if((hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family"))) {
+        /* H5Fget_vfd_handle */
+        if (H5Fget_vfd_handle(fid, H5P_DEFAULT, &os_file_handle) < 0)
+            TEST_ERROR;
+    } /* end if */
 
     /* H5Fget_intent */
     if (H5Fget_intent(fid, &intent) < 0)
@@ -337,43 +349,49 @@ test_basic_file_operation(void)
         TEST_ERROR;
 
     /* H5Fis_accessible */
-    if (H5Fis_accessible(NATIVE_VOL_TEST_FILENAME, fapl_id) < 0)
+    if (H5Fis_accessible(filename, fapl_id) < 0)
         TEST_ERROR;
 
     /* H5Fopen */
-    if ((fid = H5Fopen(NATIVE_VOL_TEST_FILENAME, H5F_ACC_RDWR, fapl_id)) < 0)
+    if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl_id)) < 0)
         TEST_ERROR;
 
-    /* H5Fget_access_plist */
-    if ((fapl_id2 = H5Fget_access_plist(fid)) < 0)
-        TEST_ERROR;
-    if (H5Pequal(fapl_id, fapl_id2) != TRUE)
-        TEST_ERROR;
-    if (H5Pclose(fapl_id2) < 0)
-        TEST_ERROR;
+    /* Can't compare VFD properties for split / multi / family VFDs */
+    if((hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family"))) {
+        /* H5Fget_access_plist */
+        if((fapl_id2 = H5Fget_access_plist(fid)) < 0)
+            TEST_ERROR;
+        if(H5Pequal(fapl_id, fapl_id2) != TRUE)
+            TEST_ERROR;
+        if(H5Pclose(fapl_id2) < 0)
+            TEST_ERROR;
+    } /* end if */
 
     if ((fid_reopen = H5Freopen(fid)) < 0)
         TEST_ERROR;
 
-    /* H5Fget_access_plist */
-    if ((fapl_id2 = H5Fget_access_plist(fid_reopen)) < 0)
-        TEST_ERROR;
-    if (H5Pequal(fapl_id, fapl_id2) != TRUE)
-        TEST_ERROR;
-    if (H5Pclose(fapl_id2) < 0)
-        TEST_ERROR;
+    /* Can't compare VFD properties for split / multi / family VFDs */
+    if((hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family"))) {
+        /* H5Fget_access_plist */
+        if((fapl_id2 = H5Fget_access_plist(fid_reopen)) < 0)
+            TEST_ERROR;
+        if(H5Pequal(fapl_id, fapl_id2) != TRUE)
+            TEST_ERROR;
+        if(H5Pclose(fapl_id2) < 0)
+            TEST_ERROR;
+    } /* end if */
 
     if (H5Fclose(fid) < 0)
         TEST_ERROR;
     if (H5Fclose(fid_reopen) < 0)
         TEST_ERROR;
 
+    h5_delete_test_file(FILENAME[0], fapl_id);
+
     /* H5Pclose */
     if (H5Pclose(fapl_id) < 0)
         TEST_ERROR;
 
-    HDremove(NATIVE_VOL_TEST_FILENAME);
-
     PASSED();
     return SUCCEED;
 
@@ -404,14 +422,20 @@ static herr_t
 test_basic_group_operation(void)
 {
     hid_t fid = H5I_INVALID_HID;
+    hid_t fapl_id = H5I_INVALID_HID;
     hid_t gid = H5I_INVALID_HID;
     hid_t gid_a = H5I_INVALID_HID;
     hid_t gcpl_id = H5I_INVALID_HID;
+    char filename[1024];
     H5G_info_t info;
 
     TESTING("Basic VOL group operations");
 
-    if ((fid = H5Fcreate(NATIVE_VOL_TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    /* Retrieve the file access property for testing */
+    fapl_id = h5_fileaccess();
+    h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
+
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
         TEST_ERROR;
 
     /* H5Gcreate */
@@ -465,7 +489,11 @@ test_basic_group_operation(void)
     if (H5Fclose(fid) < 0)
         TEST_ERROR;
 
-    HDremove(NATIVE_VOL_TEST_FILENAME);
+    h5_delete_test_file(FILENAME[0], fapl_id);
+
+    /* H5Pclose */
+    if (H5Pclose(fapl_id) < 0)
+        TEST_ERROR;
 
     PASSED();
     return SUCCEED;
@@ -474,6 +502,7 @@ error:
     H5E_BEGIN_TRY {
         H5Fclose(fid);
         H5Gclose(gid);
+        H5Pclose(fapl_id);
         H5Pclose(gcpl_id);
     } H5E_END_TRY;
 
@@ -495,6 +524,7 @@ static herr_t
 test_basic_dataset_operation(void)
 {
     hid_t fid       = H5I_INVALID_HID;
+    hid_t fapl_id   = H5I_INVALID_HID;
     hid_t dcpl_id   = H5I_INVALID_HID;
     hid_t dapl_id   = H5I_INVALID_HID;
     hid_t did       = H5I_INVALID_HID;
@@ -502,6 +532,8 @@ test_basic_dataset_operation(void)
     hid_t sid       = H5I_INVALID_HID;
     hid_t tid       = H5I_INVALID_HID;
 
+    char filename[1024];
+
     hsize_t curr_dims   = 0;
     hsize_t max_dims    = H5S_UNLIMITED;
 
@@ -516,7 +548,11 @@ test_basic_dataset_operation(void)
 
     TESTING("Basic VOL dataset operations");
 
-    if ((fid = H5Fcreate(NATIVE_VOL_TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    /* Retrieve the file access property for testing */
+    fapl_id = h5_fileaccess();
+    h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
+
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
         TEST_ERROR;
     for (i = 0; i < N_ELEMENTS; i++) {
         in_buf[i] = i;
@@ -630,7 +666,11 @@ test_basic_dataset_operation(void)
     if (H5Fclose(fid) < 0)
         TEST_ERROR;
 
-    HDremove(NATIVE_VOL_TEST_FILENAME);
+    h5_delete_test_file(FILENAME[0], fapl_id);
+
+    /* H5Pclose */
+    if (H5Pclose(fapl_id) < 0)
+        TEST_ERROR;
 
     PASSED();
     return SUCCEED;
@@ -642,6 +682,7 @@ error:
         H5Dclose(did_a);
         H5Sclose(sid);
         H5Tclose(tid);
+        H5Pclose(fapl_id);
         H5Pclose(dapl_id);
         H5Pclose(dcpl_id);
     } H5E_END_TRY;
@@ -664,11 +705,14 @@ static herr_t
 test_basic_attribute_operation(void)
 {
     hid_t fid       = H5I_INVALID_HID;
+    hid_t fapl_id   = H5I_INVALID_HID;
     hid_t gid       = H5I_INVALID_HID;
     hid_t aid       = H5I_INVALID_HID;
     hid_t aid_name  = H5I_INVALID_HID;
     hid_t sid       = H5I_INVALID_HID;
 
+    char    filename[1024];
+
     hsize_t dims    = 1;
 
     int     data_in     = 42;
@@ -676,7 +720,11 @@ test_basic_attribute_operation(void)
 
     TESTING("Basic VOL attribute operations");
 
-    if ((fid = H5Fcreate(NATIVE_VOL_TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    /* Retrieve the file access property for testing */
+    fapl_id = h5_fileaccess();
+    h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
+
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
         TEST_ERROR;
     if ((gid = H5Gcreate2(fid, NATIVE_VOL_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR;
@@ -730,7 +778,11 @@ test_basic_attribute_operation(void)
     if (H5Fclose(fid) < 0)
         TEST_ERROR;
 
-    HDremove(NATIVE_VOL_TEST_FILENAME);
+    h5_delete_test_file(FILENAME[0], fapl_id);
+
+    /* H5Pclose */
+    if (H5Pclose(fapl_id) < 0)
+        TEST_ERROR;
 
     PASSED();
     return SUCCEED;
@@ -738,6 +790,7 @@ test_basic_attribute_operation(void)
 error:
     H5E_BEGIN_TRY {
         H5Fclose(fid);
+        H5Pclose(fapl_id);
         H5Gclose(gid);
         H5Sclose(sid);
         H5Aclose(aid);
@@ -762,14 +815,20 @@ static herr_t
 test_basic_object_operation(void)
 {
     hid_t fid       = H5I_INVALID_HID;
+    hid_t fapl_id   = H5I_INVALID_HID;
     hid_t gid       = H5I_INVALID_HID;
     hid_t oid       = H5I_INVALID_HID;
 
+    char filename[1024];
     H5O_info_t object_info;
 
     TESTING("Basic VOL object operations");
 
-    if ((fid = H5Fcreate(NATIVE_VOL_TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    /* Retrieve the file access property for testing */
+    fapl_id = h5_fileaccess();
+    h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
+
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
         TEST_ERROR;
     if ((gid = H5Gcreate2(fid, NATIVE_VOL_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR;
@@ -797,7 +856,12 @@ test_basic_object_operation(void)
     if (H5Gclose(gid) < 0)
         TEST_ERROR;
 
-    HDremove(NATIVE_VOL_TEST_FILENAME);
+    h5_delete_test_file(FILENAME[0], fapl_id);
+
+    /* H5Pclose */
+    if (H5Pclose(fapl_id) < 0)
+        TEST_ERROR;
+
 
     PASSED();
     return SUCCEED;
@@ -805,6 +869,7 @@ test_basic_object_operation(void)
 error:
     H5E_BEGIN_TRY {
         H5Fclose(fid);
+        H5Pclose(fapl_id);
         H5Gclose(gid);
     } H5E_END_TRY;
 
@@ -827,10 +892,16 @@ test_basic_link_operation(void)
 {
     hid_t fid       = H5I_INVALID_HID;
     hid_t gid       = H5I_INVALID_HID;
+    hid_t fapl_id   = H5I_INVALID_HID;
+    char filename[1024];
 
     TESTING("Basic VOL link operations");
 
-    if ((fid = H5Fcreate(NATIVE_VOL_TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    /* Retrieve the file access property for testing */
+    fapl_id = h5_fileaccess();
+    h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
+
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
         TEST_ERROR;
     if ((gid = H5Gcreate2(fid, NATIVE_VOL_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR;
@@ -862,7 +933,12 @@ test_basic_link_operation(void)
     if (H5Gclose(gid) < 0)
         TEST_ERROR;
 
-    HDremove(NATIVE_VOL_TEST_FILENAME);
+    h5_delete_test_file(FILENAME[0], fapl_id);
+
+    /* H5Pclose */
+    if (H5Pclose(fapl_id) < 0)
+        TEST_ERROR;
+
 
     PASSED();
     return SUCCEED;
@@ -871,6 +947,7 @@ error:
     H5E_BEGIN_TRY {
         H5Fclose(fid);
         H5Fclose(gid);
+        H5Pclose(fapl_id);
     } H5E_END_TRY;
 
     return FAIL;
@@ -891,13 +968,19 @@ static herr_t
 test_basic_datatype_operation(void)
 {
     hid_t fid       = H5I_INVALID_HID;
+    hid_t fapl_id   = H5I_INVALID_HID;
     hid_t tid       = H5I_INVALID_HID;
     hid_t tid_anon  = H5I_INVALID_HID;
     hid_t tcpl_id   = H5I_INVALID_HID;
+    char filename[1024];
 
     TESTING("Basic VOL datatype operations");
 
-    if ((fid = H5Fcreate(NATIVE_VOL_TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    /* Retrieve the file access property for testing */
+    fapl_id = h5_fileaccess();
+    h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
+
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
         TEST_ERROR;
     if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)
         TEST_ERROR;
@@ -941,7 +1024,11 @@ test_basic_datatype_operation(void)
     if (H5Fclose(fid) < 0)
         TEST_ERROR;
 
-    HDremove(NATIVE_VOL_TEST_FILENAME);
+    h5_delete_test_file(FILENAME[0], fapl_id);
+
+    /* H5Pclose */
+    if (H5Pclose(fapl_id) < 0)
+        TEST_ERROR;
 
     PASSED();
     return SUCCEED;
@@ -950,6 +1037,7 @@ error:
     H5E_BEGIN_TRY {
         H5Pclose(tcpl_id);
         H5Fclose(fid);
+        H5Pclose(fapl_id);
         H5Tclose(tid);
         H5Tclose(tid_anon);
     } H5E_END_TRY;
@@ -958,34 +1046,6 @@ error:
 
 } /* end test_basic_datatype_operation() */
 
-#if 0
-
-/*-------------------------------------------------------------------------
- * Function:    test_echo_vol_operation()
- *
- * Purpose:     Uses the echo VOL connector to test basic VOL operations
- *              via the H5VL public API.
- *
- * Return:      SUCCEED/FAIL
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-test_echo_vol_operation(void)
-{
-    char name[25];
-
-    TESTING("Echo VOL operations");
-
-    PASSED();
-    return SUCCEED;
-
-error:
-    return FAIL;
-
-} /* end test_basic_vol_operation() */
-#endif
-
 
 /*-------------------------------------------------------------------------
  * Function:    main
@@ -999,15 +1059,21 @@ error:
 int
 main(void)
 {
+    const char  *env_h5_drvr;   /* File driver value from environment */
     int nerrors = 0;
 
+    /* Get the VFD to use */
+    env_h5_drvr = HDgetenv("HDF5_DRIVER");
+    if(env_h5_drvr == NULL)
+        env_h5_drvr = "nomatch";
+
     h5_reset();
 
     HDputs("Testing basic Virtual Object Layer (VOL) functionality.");
 
     nerrors += test_vol_registration() < 0          ? 1 : 0;
     nerrors += test_native_vol_init() < 0           ? 1 : 0;
-    nerrors += test_basic_file_operation() < 0      ? 1 : 0;
+    nerrors += test_basic_file_operation(env_h5_drvr) < 0 ? 1 : 0;
     nerrors += test_basic_group_operation() < 0     ? 1 : 0;
     nerrors += test_basic_dataset_operation() < 0   ? 1 : 0;
     nerrors += test_basic_attribute_operation() < 0 ? 1 : 0;