Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_hyperslab_updates

35 files changed, 2897 insertions, 828 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11c9b53..ce91052 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -281,7 +281,7 @@ if (H5_TOOLS_SOVERS_EXISTS)
   math (EXPR H5_TOOLS_SOVERS_MAJOR ${H5_TOOLS_SOVERS_INTERFACE}-${H5_TOOLS_SOVERS_RELEASE})
   message (STATUS "SOVERSION_TOOLS: ${H5_TOOLS_SOVERS_MAJOR}.${H5_TOOLS_SOVERS_RELEASE}.${H5_TOOLS_SOVERS_MINOR}")
 endif ()
-string (REGEX REPLACE ".*LT_CXX_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_CXX_SOVERS_EXISTS ${_lt_vers_am_contents})
+string (REGEX MATCH ".*LT_CXX_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_CXX_SOVERS_EXISTS ${_lt_vers_am_contents})
 if (H5_CXX_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_CXX_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_CXX_SOVERS_INTERFACE ${_lt_vers_am_contents})
@@ -292,7 +292,7 @@ if (H5_CXX_SOVERS_EXISTS)
   math (EXPR H5_CXX_SOVERS_MAJOR ${H5_CXX_SOVERS_INTERFACE}-${H5_CXX_SOVERS_RELEASE})
   message (STATUS "SOVERSION_CXX: ${H5_CXX_SOVERS_MAJOR}.${H5_CXX_SOVERS_RELEASE}.${H5_CXX_SOVERS_MINOR}")
 endif ()
-string (REGEX REPLACE ".*LT_F_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_F_SOVERS_EXISTS ${_lt_vers_am_contents})
+string (REGEX MATCH ".*LT_F_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_F_SOVERS_EXISTS ${_lt_vers_am_contents})
 if (H5_F_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_F_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_F_SOVERS_INTERFACE ${_lt_vers_am_contents})
@@ -303,7 +303,7 @@ if (H5_F_SOVERS_EXISTS)
   math (EXPR H5_F_SOVERS_MAJOR ${H5_F_SOVERS_INTERFACE}-${H5_F_SOVERS_RELEASE})
   message (STATUS "SOVERSION_F: ${H5_F_SOVERS_MAJOR}.${H5_F_SOVERS_RELEASE}.${H5_F_SOVERS_MINOR}")
 endif ()
-string (REGEX REPLACE ".*LT_HL_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_HL_SOVERS_EXISTS ${_lt_vers_am_contents})
+string (REGEX MATCH ".*LT_HL_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_HL_SOVERS_EXISTS ${_lt_vers_am_contents})
 if (H5_HL_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_HL_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_HL_SOVERS_INTERFACE ${_lt_vers_am_contents})
@@ -314,7 +314,7 @@ if (H5_HL_SOVERS_EXISTS)
   math (EXPR H5_HL_SOVERS_MAJOR ${H5_HL_SOVERS_INTERFACE}-${H5_HL_SOVERS_RELEASE})
   message (STATUS "SOVERSION_HL: ${H5_HL_SOVERS_MAJOR}.${H5_HL_SOVERS_RELEASE}.${H5_HL_SOVERS_MINOR}")
 endif ()
-string (REGEX REPLACE ".*LT_HL_CXX_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_HL_CXX_SOVERS_EXISTS ${_lt_vers_am_contents})
+string (REGEX MATCH ".*LT_HL_CXX_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_HL_CXX_SOVERS_EXISTS ${_lt_vers_am_contents})
 if (H5_HL_CXX_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_HL_CXX_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_HL_CXX_SOVERS_INTERFACE ${_lt_vers_am_contents})
@@ -325,7 +325,7 @@ if (H5_HL_CXX_SOVERS_EXISTS)
   math (EXPR H5_HL_CXX_SOVERS_MAJOR ${H5_HL_CXX_SOVERS_INTERFACE}-${H5_HL_CXX_SOVERS_RELEASE})
   message (STATUS "SOVERSION_HL_CXX: ${H5_HL_CXX_SOVERS_MAJOR}.${H5_HL_CXX_SOVERS_RELEASE}.${H5_HL_CXX_SOVERS_MINOR}")
 endif ()
-string (REGEX REPLACE ".*LT_HL_F_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_HL_F_SOVERS_EXISTS ${_lt_vers_am_contents})
+string (REGEX MATCH ".*LT_HL_F_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_HL_F_SOVERS_EXISTS ${_lt_vers_am_contents})
 if (H5_HL_F_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_HL_F_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_HL_F_SOVERS_INTERFACE ${_lt_vers_am_contents})
@@ -336,7 +336,7 @@ if (H5_HL_F_SOVERS_EXISTS)
   math (EXPR H5_HL_F_SOVERS_MAJOR ${H5_HL_F_SOVERS_INTERFACE}-${H5_HL_F_SOVERS_RELEASE})
   message (STATUS "SOVERSION_HL_F: ${H5_HL_F_SOVERS_MAJOR}.${H5_HL_F_SOVERS_RELEASE}.${H5_HL_F_SOVERS_MINOR}")
 endif ()
-string (REGEX REPLACE ".*LT_JAVA_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_JAVA_SOVERS_EXISTS ${_lt_vers_am_contents})
+string (REGEX MATCH ".*LT_JAVA_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_JAVA_SOVERS_EXISTS ${_lt_vers_am_contents})
 if(H5_JAVA_SOVERS_EXISTS)
   string (REGEX REPLACE ".*LT_JAVA_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
       "\\1" H5_JAVA_SOVERS_INTERFACE ${_lt_vers_am_contents})
diff --git a/COPYING b/COPYING
index 2166ced..51cb4e6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,13 +1,12 @@
-
 Copyright Notice and License Terms for 
 HDF5 (Hierarchical Data Format 5) Software Library and Utilities
 -----------------------------------------------------------------------------
 
 HDF5 (Hierarchical Data Format 5) Software Library and Utilities
-Copyright 2006-2016 by The HDF Group.
+Copyright (c) 2006, The HDF Group. 
 
 NCSA HDF5 (Hierarchical Data Format 5) Software Library and Utilities
-Copyright 1998-2006 by the Board of Trustees of the University of Illinois.
+Copyright (c) 1998-2006, The Board of Trustees of the University of Illinois. 
 
 All rights reserved.
 
@@ -47,13 +46,21 @@ advised of the possibility of such damage.
 -----------------------------------------------------------------------------
 -----------------------------------------------------------------------------
 
+Limited portions of HDF5 were developed by Lawrence Berkeley National 
+Laboratory (LBNL). LBNL's Copyright Notice and Licensing Terms can be
+found here: COPYING_LBNL_HDF5 file in this directory or at 
+http://support.hdfgroup.org/ftp/HDF5/releases/COPYING_LBNL_HDF5. 
+
+-----------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+
 Contributors:   National Center for Supercomputing Applications (NCSA) at 
 the University of Illinois, Fortner Software, Unidata Program Center (netCDF), 
 The Independent JPEG Group (JPEG), Jean-loup Gailly and Mark Adler (gzip), 
 and Digital Equipment Corporation (DEC).
 
 -----------------------------------------------------------------------------
-
+ 
 Portions of HDF5 were developed with support from the Lawrence Berkeley 
 National Laboratory (LBNL) and the United States Department of Energy 
 under Prime Contract No. DE-AC02-05CH11231.
diff --git a/COPYING_LBNL_HDF5 b/COPYING_LBNL_HDF5
new file mode 100644
index 0000000..16fba5d
--- /dev/null
+++ b/COPYING_LBNL_HDF5
@@ -0,0 +1,49 @@
+Copyright Notice and License Terms for
+HDF5 (Hierarchical Data Format 5) Software Library and Utilities
+-----------------------------------------------------------------------------
+
+HDF5 (Hierarchical Data Format 5)
+Copyright (c) 2016, The Regents of the University of California, through 
+Lawrence Berkeley National Laboratory (subject to receipt of any required 
+approvals from the U.S. Dept. of Energy).
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+   this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions, and the following disclaimer in the documentation 
+   and/or materials provided with the distribution.
+
+3. Neither the name of the University of California, Lawrence Berkeley 
+National Laboratory, U.S. Dept. of Energy nor the names of its contributors 
+may be used to endorse or promote products derived from this software without 
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+THE POSSIBILITY OF SUCH DAMAGE.
+
+You are under no obligation whatsoever to provide any bug fixes, patches, 
+or upgrades to the features, functionality or performance of the source 
+code ("Enhancements") to anyone; however, if you choose to make your 
+Enhancements available either publicly, or directly to Lawrence Berkeley 
+National Laboratory, without imposing a separate written license agreement 
+for such Enhancements, then you hereby grant the following license: 
+a non-exclusive, royalty-free perpetual license to install, use, modify, 
+prepare derivative works, incorporate into other computer software, 
+distribute, and sublicense such enhancements or derivative works thereof, 
+in binary and source code form.
+
diff --git a/MANIFEST b/MANIFEST
index 3d252eb..b312cab 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -26,6 +26,7 @@
 ./.h5chkright.ini      _DO_NOT_DISTRIBUTE_
 ./ACKNOWLEDGMENTS
 ./COPYING
+./COPYING_LBNL_HDF5
 ./MANIFEST
 ./Makefile.dist
 ./Makefile.am
@@ -800,6 +801,7 @@
 ./src/H5PBprivate.h
 ./src/H5PL.c
 ./src/H5PLmodule.h
+./src/H5PLpkg.h
 ./src/H5PLprivate.h
 ./src/H5PLpublic.h
 ./src/H5PLextern.h
diff --git a/config/cmake/FindJNI.cmake b/config/cmake/FindJNI.cmake
index baab2ea..c82d308 100644
--- a/config/cmake/FindJNI.cmake
+++ b/config/cmake/FindJNI.cmake
@@ -137,7 +137,6 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
   /usr/lib/java/jre/lib/{libarch}
   /usr/lib64/java/jre/lib/{libarch}
   /usr/lib/jvm/jre/lib/{libarch}
-  /usr/lib64/jvm/jre/lib/{libarch}
   /usr/local/lib/java/jre/lib/{libarch}
   /usr/local/share/java/jre/lib/{libarch}
   /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
@@ -152,6 +151,9 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
   /usr/lib/jvm/default-java/jre/lib/{libarch}
   /usr/lib/jvm/default-java/jre/lib
   /usr/lib/jvm/default-java/lib
+  # Arch Linux specific paths for default JVM
+  /usr/lib/jvm/default/jre/lib/{libarch}
+  /usr/lib/jvm/default/lib/{libarch}
   # Ubuntu specific paths for default JVM
   /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
   /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
@@ -197,14 +199,11 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
   /usr/lib64/java/include
   /usr/local/lib/java/include
   /usr/lib/jvm/java/include
-  /usr/lib64/jvm/java/include
   /usr/lib/jvm/java-6-sun/include
   /usr/lib/jvm/java-1.5.0-sun/include
   /usr/lib/jvm/java-6-sun-1.6.0.00/include       # can this one be removed according to #8821 ? Alex
   /usr/lib/jvm/java-6-openjdk/include
   /usr/lib/jvm/java-7-openjdk/include
-  /usr/lib/jvm/java-7-openjdk-i386/include
-  /usr/lib/jvm/java-7-openjdk-amd64/include
   /usr/lib64/jvm/java-7-openjdk/include
   /usr/lib64/jvm/java-7-openjdk-amd64/include
   /usr/lib/jvm/java-8-openjdk-{libarch}/include  # ubuntu 15.10
@@ -216,6 +215,8 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
   /opt/sun-jdk-1.5.0.04/include
   # Debian specific path for default JVM
   /usr/lib/jvm/default-java/include
+  # Arch specific path for default JVM
+  /usr/lib/jvm/default/include
   # OpenBSD specific path for default JVM
   /usr/local/jdk-1.7.0/include
   /usr/local/jdk-1.6.0/include
diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c
index 97dca7a..f37b2b4 100644
--- a/hl/tools/h5watch/h5watch.c
+++ b/hl/tools/h5watch/h5watch.c
@@ -43,6 +43,7 @@ static int g_display_width = 80;	    /* output width in characters */
 static hbool_t g_simple_output = FALSE;     /* make output more machine-readable */
 static unsigned g_retry = DEFAULT_RETRY;    /* # of times to try opening the file if somehow file is unstable */
 static hbool_t g_display_hex = FALSE;	    /* display data in hexadecimal format : LATER */
+static hbool_t g_user_interrupt = FALSE;    /* Flag to indicate that user interrupted execution */
 
 static herr_t doprint(hid_t did, hsize_t *start, hsize_t *block, int rank);
 static herr_t slicendump(hid_t did, hsize_t *prev_dims, hsize_t *cur_dims,
@@ -337,7 +338,8 @@ monitor_dataset(hid_t fid, char *dsetname)
 	goto done;
     }
 
-    while(1) {
+    /* Loop until an error occurs or the user interrupts execution */
+    while(!g_user_interrupt) {
 
 	/* Refreshes the dataset */
 	if(H5Drefresh(did) < 0) {
@@ -798,9 +800,8 @@ parse_command_line(int argc, const char *argv[])
  */
 static void catch_signal(int H5_ATTR_UNUSED signo)
 {
-    /* Exit from h5watch */
-    leave(EXIT_SUCCESS);
-
+    /* Set the flag to get out of the main loop */
+    g_user_interrupt = TRUE;
 } /* catch_signal() */
 
 
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index a1099d8..0c11846 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -7202,6 +7202,88 @@ public class H5 implements java.io.Serializable {
      **/
     public synchronized static native int H5PLget_loading_state() throws HDF5LibraryException;
 
+    /**
+     * H5PLappend inserts the plugin path at the end of the table.
+     *
+     * @param plugin_path
+     *            IN: Path for location of filter plugin libraries.
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     **/
+    public synchronized static native void H5PLappend(String plugin_path) throws HDF5LibraryException;
+
+    /**
+     * H5PLprepend inserts the plugin path at the beginning of the table.
+     *
+     * @param plugin_path
+     *            IN: Path for location of filter plugin libraries.
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     **/
+    public synchronized static native void H5PLprepend(String plugin_path) throws HDF5LibraryException;
+
+    /**
+     * H5PLreplace replaces the plugin path at the specified index.
+     *
+     * @param plugin_path
+     *            IN: Path for location of filter plugin libraries.
+     * @param index
+     *            IN: The table index (0-based).
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     **/
+    public synchronized static native void H5PLreplace(String plugin_path, int index) throws HDF5LibraryException;
+
+    /**
+     * H5PLinsert inserts the plugin path at the specified index.
+     *
+     * @param plugin_path
+     *            IN: Path for location of filter plugin libraries.
+     * @param index
+     *            IN: The table index (0-based).
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     **/
+    public synchronized static native void H5PLinsert(String plugin_path, int index) throws HDF5LibraryException;
+
+    /**
+     * H5PLremove removes the plugin path at the specified index.
+     *
+     * @param index
+     *            IN: The table index (0-based).
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     **/
+    public synchronized static native void H5PLremove(int index) throws HDF5LibraryException;
+
+    /**
+     * H5PLget retrieves the plugin path at the specified index.
+     *
+     * @param index
+     *            IN: The table index (0-based).
+     *
+     * @return the current path at the index in plugin path table
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     **/
+    public synchronized static native String H5PLget(int index) throws HDF5LibraryException;
+
+    /**
+     * H5PLsize retrieves the size of the current list of plugin paths.
+     *
+     * @return the current number of paths in the plugin path table
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     **/
+    public synchronized static native int H5PLsize() throws HDF5LibraryException;
+
     // ////////////////////////////////////////////////////////////
     // //
     // H5R: HDF5 1.8 Reference API Functions //
diff --git a/java/src/jni/h5plImp.c b/java/src/jni/h5plImp.c
index 59de3cf..34d6f8b 100644
--- a/java/src/jni/h5plImp.c
+++ b/java/src/jni/h5plImp.c
@@ -61,6 +61,167 @@ Java_hdf_hdf5lib_H5_H5PLget_1loading_1state
     return (jint)plugin_type;
 } /* end Java_hdf_hdf5lib_H5_H5PLget_1loading_1state */
 
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLappend
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5PLappend
+  (JNIEnv *env, jclass clss, jobjectArray plugin_path)
+{
+    char *aName;
+    herr_t retVal = -1;
+
+    PIN_JAVA_STRING(plugin_path, aName);
+    if (aName != NULL) {
+        retVal = H5PLappend(aName);
+
+        UNPIN_JAVA_STRING(plugin_path, aName);
+
+        if (retVal < 0)
+            h5libraryError(env);
+    }
+} /* end Java_hdf_hdf5lib_H5_H5PLappend */
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLprepend
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5PLprepend
+  (JNIEnv *env, jclass clss, jobjectArray plugin_path)
+{
+    char *aName;
+    herr_t retVal = -1;
+
+    PIN_JAVA_STRING(plugin_path, aName);
+    if (aName != NULL) {
+        retVal = H5PLprepend(aName);
+
+        UNPIN_JAVA_STRING(plugin_path, aName);
+
+        if (retVal < 0)
+            h5libraryError(env);
+    }
+} /* end Java_hdf_hdf5lib_H5_H5PLprepend */
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLreplace
+ * Signature: (Ljava/lang/String;I)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5PLreplace
+  (JNIEnv *env, jclass clss, jobjectArray plugin_path, jint index)
+{
+    char *aName;
+    herr_t retVal = -1;
+
+    PIN_JAVA_STRING(plugin_path, aName);
+    if (aName != NULL) {
+        retVal = H5PLreplace(aName, index);
+
+        UNPIN_JAVA_STRING(plugin_path, aName);
+
+        if (retVal < 0)
+            h5libraryError(env);
+    }
+} /* end Java_hdf_hdf5lib_H5_H5PLreplace */
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLinsert
+ * Signature: (Ljava/lang/String;I)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5PLinsert
+  (JNIEnv *env, jclass clss, jobjectArray plugin_path, jint index)
+{
+    char *aName;
+    herr_t retVal = -1;
+
+    PIN_JAVA_STRING(plugin_path, aName);
+    if (aName != NULL) {
+        retVal = H5PLinsert(aName, index);
+
+        UNPIN_JAVA_STRING(plugin_path, aName);
+
+        if (retVal < 0)
+            h5libraryError(env);
+    }
+} /* end Java_hdf_hdf5lib_H5_H5PLinsert */
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLremove
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5PLremove
+  (JNIEnv *env, jclass clss, jint index)
+{
+    if (H5PLremove(index) < 0)
+      h5libraryError(env);
+} /* end Java_hdf_hdf5lib_H5_H5PLremove */
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLget
+ * Signature: (I)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL
+Java_hdf_hdf5lib_H5_H5PLget
+  (JNIEnv *env, jclass clss, jint index)
+{
+    char *aName;
+    jstring  str = NULL;
+    ssize_t  buf_size;
+
+    /* get the length of the name */
+    buf_size = H5PLget(index, NULL, 0);
+
+    if (buf_size <= 0) {
+        h5badArgument(env, "H5PLget:  buf_size <= 0");
+    } /* end if */
+    else {
+        buf_size++; /* add extra space for the null terminator */
+        aName = (char*)HDmalloc(sizeof(char) * (size_t)buf_size);
+        if (aName == NULL) {
+            h5outOfMemory(env, "H5PLget:  malloc failed");
+        } /* end if */
+        else {
+            buf_size = H5PLget(index, aName, (size_t)buf_size);
+            if (buf_size < 0) {
+                h5libraryError(env);
+            } /* end if */
+            else {
+                str = ENVPTR->NewStringUTF(ENVPAR aName);
+            }
+            HDfree(aName);
+        }
+    }
+    return str;
+} /* end Java_hdf_hdf5lib_H5_H5PLget */
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLsize
+ * Signature: (V)I
+ */
+JNIEXPORT jint JNICALL
+Java_hdf_hdf5lib_H5_H5PLsize
+  (JNIEnv *env, jclass clss)
+{
+    int retVal = -1;
+
+    retVal = H5PLsize();
+    if (retVal < 0)
+        h5libraryError(env);
+
+    return (jint)retVal;
+} /* end Java_hdf_hdf5lib_H5_H5PLsize */
+
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5plImp.h b/java/src/jni/h5plImp.h
index d0507a8..5326a94 100644
--- a/java/src/jni/h5plImp.h
+++ b/java/src/jni/h5plImp.h
@@ -41,6 +41,69 @@ JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_H5_H5PLget_1loading_1state
   (JNIEnv *, jclass);
 
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLappend
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5PLappend
+  (JNIEnv *, jclass, jobjectArray);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLprepend
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5PLprepend
+  (JNIEnv *, jclass, jobjectArray);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLreplace
+ * Signature: (Ljava/lang/String;I)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5PLreplace
+  (JNIEnv *, jclass, jobjectArray, jint);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLinsert
+ * Signature: (Ljava/lang/String;I)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5PLinsert
+  (JNIEnv *, jclass, jobjectArray, jint);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLremove
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5PLremove
+  (JNIEnv *, jclass, jint);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLget
+ * Signature: (I)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL
+Java_hdf_hdf5lib_H5_H5PLget
+  (JNIEnv *, jclass, jint);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5PLsize
+ * Signature: (V)I
+ */
+JNIEXPORT jint JNICALL
+Java_hdf_hdf5lib_H5_H5PLsize
+  (JNIEnv *, jclass);
+
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/test/JUnit-interface.txt b/java/test/JUnit-interface.txt
index cae8cef..ab2f3b1 100644
--- a/java/test/JUnit-interface.txt
+++ b/java/test/JUnit-interface.txt
@@ -633,13 +633,14 @@ JUnit version 4.11
 .testH5Ocomment_clear
 .testH5Ocopy_cur_not_exists
 .TestH5PLplugins
+.TestH5PLpaths
 .testH5Zfilter_avail
 .testH5Zunregister_predefined
 .testH5Zget_filter_info
 
 Time:  XXXX
 
-OK (637 tests)
+OK (638 tests)
 
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Fopen(): can't set access and transfer property lists
diff --git a/java/test/TestH5PL.java b/java/test/TestH5PL.java
index 9f1876c..759db5f 100644
--- a/java/test/TestH5PL.java
+++ b/java/test/TestH5PL.java
@@ -69,6 +69,36 @@ public class TestH5PL {
         }
     }
 
+    @Test
+    public void TestH5PLpaths() {
+        try {
+            int original_entries = H5.H5PLsize();
+            H5.H5PLappend("path_one");
+            int plugin_entries = H5.H5PLsize();
+            assertTrue("H5.H5PLsize: "+plugin_entries, (original_entries+1) == plugin_entries);
+            H5.H5PLprepend("path_two");
+            plugin_entries = H5.H5PLsize();
+            assertTrue("H5.H5PLsize: "+plugin_entries, (original_entries+2) == plugin_entries);
+            H5.H5PLinsert("path_three", original_entries);
+            plugin_entries = H5.H5PLsize();
+            assertTrue("H5.H5PLsize: "+plugin_entries, (original_entries+3) == plugin_entries);
+            String first_path = H5.H5PLget(original_entries);
+            assertTrue("First path was : "+first_path + " ",first_path.compareToIgnoreCase("path_three")==0);
+            H5.H5PLreplace("path_four", original_entries);
+            first_path = H5.H5PLget(original_entries);
+            assertTrue("First path changed to : "+first_path + " ",first_path.compareToIgnoreCase("path_four")==0);
+            H5.H5PLremove(original_entries);
+            first_path = H5.H5PLget(original_entries);
+            assertTrue("First path now : "+first_path + " ",first_path.compareToIgnoreCase("path_two")==0);
+            plugin_entries = H5.H5PLsize();
+            assertTrue("H5.H5PLsize: "+plugin_entries, (original_entries+2) == plugin_entries);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("TestH5PLpaths " + err);
+        }
+    }
+
     @Ignore
     public void TestH5PLdlopen() {
         long file_id = -1;
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 22accd3..be8cec8 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -77,11 +77,15 @@ New Features
       The page buffering layer in the HDF5 library absorbs small accesses to
       the file system.  Each page in memory corresponds to a page allocated in
       the file.  Access to the file system is then performed as a single page
-      or multiple of pages, if they are contiguous.  This ensures that small 
+      or multiple of pages, if they are contiguous.  This ensures that small
       accesses to the file system are avoided while providing another caching
       layer for improved I/O performance.  This feature works in conjunction
       with the paged aggregation feature.
 
+    - Filter plugin API added to access the table of paths to search for a
+      library. Java interface expanded with wrappers for the new functions.
+      (HDFFV-10143 ADB 2017/04/04)
+
     Parallel Library:
     -----------------
     -
@@ -139,7 +143,7 @@ Bug Fixes since HDF5-1.10.0-patch1 release
       (HDFFV-9940 VC 2016/07/03, 2016/07/06)
 
     - (a) Throw an error instead of assertion when v1 btree level hits the 1 byte limit.
-      (b) Modifications to better handle error recovery when conversion by 
+      (b) Modifications to better handle error recovery when conversion by
           h5format_convert fails.
       (HDFFV-9434 VC 2016/05/29)
 
@@ -172,6 +176,13 @@ Bug Fixes since HDF5-1.10.0-patch1 release
     - h5repack now correctly parses the command line filter options.
       (HDFFV-10046 ADB 2017/01/24)
 
+    - h5diff correctly indicates error when it cannot read data due
+      to an unavailable filter plugin.
+      (HDFFV-9994 ADB 2017/01/18)
+
+    - h5repack allows the --enable-error-stack option on the command line.
+      (HDFFV-775 ADB 2016/08/08)
+
     High-Level APIs:
     ------
     -
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9321bbd..e2acd30 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -520,6 +520,7 @@ set (H5PL_SOURCES
 
 set (H5PL_HDRS
     ${HDF5_SRC_DIR}/H5PLextern.h
+    ${HDF5_SRC_DIR}/H5PLpkg.h
     ${HDF5_SRC_DIR}/H5PLpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5PL" "${H5PL_HDRS}" "${H5PL_SOURCES}" )
diff --git a/src/H5Cdbg.c b/src/H5Cdbg.c
index a955eaf..85f25b3 100644
--- a/src/H5Cdbg.c
+++ b/src/H5Cdbg.c
@@ -30,12 +30,16 @@
 
 #include "H5Cmodule.h"          /* This source code file is part of the H5C module */
 
+#define H5AC_FRIEND
+
+
+
 
 /***********/
 /* Headers */
 /***********/
 #include "H5private.h"      /* Generic Functions            */
-#include "H5ACprivate.h"    /* Metadata Cache               */
+#include "H5ACpkg.h"        /* Metadata Cache               */
 #include "H5Cpkg.h"         /* Cache                        */
 #include "H5Eprivate.h"     /* Error Handling               */
 
@@ -340,6 +344,107 @@ H5C_dump_cache_skip_list(H5C_t * cache_ptr, char * calling_fcn)
 
 
 /*-------------------------------------------------------------------------
+ * Function:    H5C_dump_coll_write_list
+ *
+ * Purpose:     Debugging routine that prints a summary of the contents of 
+ *		the collective write skip list used by the metadata cache 
+ *              in the parallel case to maintain a list of entries to write 
+ *              collectively at a sync point.
+ *
+ * Return:      Non-negative on success/Negative on failure
+ *
+ * Programmer:  John Mainzer
+ *              4/1/17
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifdef H5_HAVE_PARALLEL
+#ifndef NDEBUG
+herr_t
+H5C_dump_coll_write_list(H5C_t * cache_ptr, char * calling_fcn)
+{
+    herr_t              ret_value = SUCCEED;   /* Return value */
+    int                 i;
+    int                 list_len;
+    H5AC_aux_t *        aux_ptr = NULL;
+    H5C_cache_entry_t * entry_ptr = NULL;
+    H5SL_node_t *       node_ptr = NULL;
+
+    FUNC_ENTER_NOAPI_NOERR
+
+    HDassert(cache_ptr != NULL);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+    HDassert(cache_ptr->aux_ptr);
+
+    aux_ptr = (H5AC_aux_t *)cache_ptr->aux_ptr;
+
+    HDassert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC);
+
+    HDassert(calling_fcn != NULL);
+
+    list_len = (int)H5SL_count(cache_ptr->coll_write_list);
+
+    HDfprintf(stdout, "\n\nDumping MDC coll write list from %d:%s.\n", 
+              aux_ptr->mpi_rank, calling_fcn);
+    HDfprintf(stdout, "	slist len = %u.\n", cache_ptr->slist_len);
+
+    if ( list_len > 0 ) {
+
+        /* scan the collective write list generating the desired output */
+        HDfprintf(stdout,
+                  "Num:    Addr:               Len: Prot/Pind: Dirty: Type:\n");
+
+        i = 0;
+
+        node_ptr = H5SL_first(cache_ptr->coll_write_list);
+
+        if ( node_ptr != NULL )
+
+            entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
+
+        else
+
+            entry_ptr = NULL;
+
+        while ( entry_ptr != NULL ) {
+
+            HDassert(entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
+
+            HDfprintf(stdout,
+               "%s%d       0x%016llx  %4lld    %d/%d       %d    %s\n",
+               cache_ptr->prefix, i,
+               (long long)(entry_ptr->addr),
+               (long long)(entry_ptr->size),
+               (int)(entry_ptr->is_protected),
+               (int)(entry_ptr->is_pinned),
+               (int)(entry_ptr->is_dirty),
+               entry_ptr->type->name);
+
+            node_ptr = H5SL_next(node_ptr);
+
+            if ( node_ptr != NULL )
+
+                entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
+
+            else
+
+                entry_ptr = NULL;
+
+            i++;
+
+        } /* end while */
+    } /* end if */
+
+    HDfprintf(stdout, "\n\n");
+
+    FUNC_LEAVE_NOAPI(ret_value)
+
+} /* H5C_dump_coll_write_list() */
+#endif /* NDEBUG */
+#endif /* H5_HAVE_PARALLEL */
+
+
+/*-------------------------------------------------------------------------
  * Function:    H5C_set_prefix
  *
  * Purpose:     Set the values of the prefix field of H5C_t.  This
@@ -738,9 +843,10 @@ H5C_stats(H5C_t * cache_ptr,
               (long long)(cache_ptr->index_scan_restarts));
 
     HDfprintf(stdout,
-	      "%s  cache image creations/loads/size   = %d / %d / %Hu\n",
+	    "%s  cache image creations/reads/loads/size = %d / %d /%d / %Hu\n",
               cache_ptr->prefix,
               cache_ptr->images_created,
+              cache_ptr->images_read,
               cache_ptr->images_loaded,
               cache_ptr->last_image_size);
 
@@ -993,6 +1099,7 @@ H5C_stats__reset(H5C_t H5_ATTR_UNUSED * cache_ptr)
     cache_ptr->index_scan_restarts              = 0;
 
     cache_ptr->images_created           = 0;
+    cache_ptr->images_read              = 0;
     cache_ptr->images_loaded            = 0;
     cache_ptr->last_image_size          = (hsize_t)0;
 
diff --git a/src/H5Cimage.c b/src/H5Cimage.c
index fc58dac..d60ee05 100644
--- a/src/H5Cimage.c
+++ b/src/H5Cimage.c
@@ -122,7 +122,7 @@ static H5C_cache_entry_t *H5C__reconstruct_cache_entry(const H5F_t *f,
     H5C_t *cache_ptr, const uint8_t **buf);
 static herr_t H5C__write_cache_image_superblock_msg(H5F_t *f, hid_t dxpl_id, 
     hbool_t create);
-static herr_t H5C__read_cache_image(H5F_t * f, hid_t dxpl_id, const H5C_t *cache_ptr);
+static herr_t H5C__read_cache_image(H5F_t * f, hid_t dxpl_id, H5C_t *cache_ptr);
 static herr_t H5C__write_cache_image(H5F_t *f, hid_t dxpl_id, const H5C_t *cache_ptr);
 static herr_t H5C__construct_cache_image_buffer(H5F_t *f, H5C_t *cache_ptr);
 static herr_t H5C__free_image_entries_array(H5C_t *cache_ptr);
@@ -1035,7 +1035,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C__read_cache_image(H5F_t *f, hid_t dxpl_id, const H5C_t *cache_ptr)
+H5C__read_cache_image(H5F_t *f, hid_t dxpl_id, H5C_t *cache_ptr)
 {
     herr_t              ret_value = SUCCEED;    /* Return value */
 
@@ -1053,31 +1053,53 @@ H5C__read_cache_image(H5F_t *f, hid_t dxpl_id, const H5C_t *cache_ptr)
     H5AC_aux_t *aux_ptr = (H5AC_aux_t *)cache_ptr->aux_ptr;
     int mpi_result;
 
-    if((NULL == aux_ptr) || (aux_ptr->mpi_rank == 0)) {
-	HDassert((NULL == aux_ptr) || (aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC));
+    if ( ( NULL == aux_ptr ) || ( aux_ptr->mpi_rank == 0 ) ) {
+
+	HDassert((NULL == aux_ptr) || 
+                 (aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC));
 #endif /* H5_HAVE_PARALLEL */
 
 	/* Read the buffer (if serial access, or rank 0 of parallel access) */
-        if(H5F_block_read(f, H5FD_MEM_SUPER, cache_ptr->image_addr, cache_ptr->image_len, dxpl_id, cache_ptr->image_buffer) < 0)
-            HGOTO_ERROR(H5E_CACHE, H5E_READERROR, FAIL, "Can't read metadata cache image block")
+        if ( H5F_block_read(f, H5FD_MEM_SUPER, cache_ptr->image_addr, 
+                            cache_ptr->image_len, dxpl_id, 
+                            cache_ptr->image_buffer) < 0)
+
+            HGOTO_ERROR(H5E_CACHE, H5E_READERROR, FAIL, \
+                        "Can't read metadata cache image block")
+
+        H5C__UPDATE_STATS_FOR_CACHE_IMAGE_READ(cache_ptr)
 
 #ifdef H5_HAVE_PARALLEL
-	if(aux_ptr) {
+	if ( aux_ptr ) {
+
 	    /* Broadcast cache image */
-            if(MPI_SUCCESS != (mpi_result = MPI_Bcast(cache_ptr->image_buffer, (int)cache_ptr->image_len, MPI_BYTE, 0, aux_ptr->mpi_comm)))
+            if ( MPI_SUCCESS != 
+                 (mpi_result = MPI_Bcast(cache_ptr->image_buffer, 
+                                         (int)cache_ptr->image_len, MPI_BYTE, 
+                                         0, aux_ptr->mpi_comm)) )
+
                 HMPI_GOTO_ERROR(FAIL, "MPI_Bcast failed", mpi_result)
+
         } /* end if */
     } /* end if */
-    else if(aux_ptr) {
+    else if ( aux_ptr ) {
+
         /* Retrieve the contents of the metadata cache image from process 0 */
-        if(MPI_SUCCESS != (mpi_result = MPI_Bcast(cache_ptr->image_buffer, (int)cache_ptr->image_len, MPI_BYTE, 0, aux_ptr->mpi_comm)))
-            HMPI_GOTO_ERROR(FAIL, "can't receive cache image MPI_Bcast", mpi_result)
+        if ( MPI_SUCCESS != 
+             (mpi_result = MPI_Bcast(cache_ptr->image_buffer, 
+                                     (int)cache_ptr->image_len, MPI_BYTE, 
+                                     0, aux_ptr->mpi_comm)) )
+
+            HMPI_GOTO_ERROR(FAIL, "can't receive cache image MPI_Bcast", \
+                            mpi_result)
     } /* end else-if */
 } /* end block */
 #endif /* H5_HAVE_PARALLEL */
 
 done:
+
     FUNC_LEAVE_NOAPI(ret_value)
+
 } /* H5C__read_cache_image() */
 
 
@@ -3203,26 +3225,31 @@ H5C__reconstruct_cache_contents(H5F_t *f, hid_t dxpl_id, H5C_t *cache_ptr)
 
         i = -1;
         entry_ptr = cache_ptr->LRU_head_ptr;
+
         while(entry_ptr != NULL) {
-	    HDassert(entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
+
+            HDassert(entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
             HDassert(entry_ptr->type != NULL);
 
-	    if(entry_ptr->prefetched) {
-	        HDassert(i <= entry_ptr->lru_rank);
-	        HDassert((entry_ptr->lru_rank <= 2) || 
-                         (entry_ptr->lru_rank == i + 1) ||
-                         (entry_ptr->lru_rank == i + 2));
+            if ( entry_ptr->prefetched ) {
 
-	        if((entry_ptr->lru_rank <= 2) && (entry_ptr->lru_rank == i + 2))
-		    lru_rank_holes++;
+                HDassert(entry_ptr->lru_rank != 0);
+                HDassert((entry_ptr->lru_rank == -1) ||
+                         (entry_ptr->lru_rank > i));
 
-	        i = entry_ptr->lru_rank;
-	    } /* end if */
+                if ( ( entry_ptr->lru_rank > 1 ) && 
+                     ( entry_ptr->lru_rank > i + 1 ) )
+
+                    lru_rank_holes += entry_ptr->lru_rank - (i + 1);
+
+                i = entry_ptr->lru_rank;
+
+            } /* end if */
 
-	    entry_ptr = entry_ptr->next;
+            entry_ptr = entry_ptr->next;
         } /* end while */
 
-	/* Holes of size 1 appear in the LRU ranking due to epoch 
+	/* Holes in the sequences of LRU ranks can appear due to epoch 
          * markers.  They are left in to allow re-insertion of the
          * epoch markers on reconstruction of the cache -- thus 
          * the following sanity check will have to be revised when
diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c
index 06ce714..0d1a3ff 100644
--- a/src/H5Cmpio.c
+++ b/src/H5Cmpio.c
@@ -950,12 +950,15 @@ H5C__collective_write(H5F_t *f, hid_t dxpl_id)
 
     /* Get original transfer mode */
     if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, \
+                    "not a data transfer property list")
+
     if(H5P_get(plist, H5D_XFER_IO_XFER_MODE_NAME, &orig_xfer_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI-I/O property")
 
     /* Get number of entries in collective write list */
     count = (int)H5SL_count(cache_ptr->coll_write_list);
+
     if(count > 0) {
         H5FD_mpio_xfer_t    xfer_mode = H5FD_MPIO_COLLECTIVE;
         H5SL_node_t         *node;
@@ -964,21 +967,34 @@ H5C__collective_write(H5F_t *f, hid_t dxpl_id)
         int                 i;
 
         if(H5P_set(plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI-I/O property")
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, \
+                        "can't set MPI-I/O property")
 
         /* Allocate arrays */
-        if(NULL == (length_array = (int *)H5MM_malloc((size_t)count * sizeof(int))))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "memory allocation failed for collective write table length array")
-        if(NULL == (buf_array = (MPI_Aint *)H5MM_malloc((size_t)count * sizeof(MPI_Aint))))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "memory allocation failed for collective buf table length array")
-        if(NULL == (offset_array = (MPI_Aint *)H5MM_malloc((size_t)count * sizeof(MPI_Aint))))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "memory allocation failed for collective offset table length array")
+        if ( NULL == (length_array = 
+                      (int *)H5MM_malloc((size_t)count * sizeof(int))) )
+
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, \
+            "memory allocation failed for collective write table length array")
+
+        if ( NULL == (buf_array = 
+                 (MPI_Aint *)H5MM_malloc((size_t)count * sizeof(MPI_Aint))) )
+
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, \
+              "memory allocation failed for collective buf table length array")
+
+        if(NULL == (offset_array = 
+                    (MPI_Aint *)H5MM_malloc((size_t)count * sizeof(MPI_Aint))) )
+
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, \
+            "memory allocation failed for collective offset table length array")
 
         /* Fill arrays */
         node = H5SL_first(cache_ptr->coll_write_list);
         HDassert(node);
         if(NULL == (entry_ptr = (H5C_cache_entry_t *)H5SL_item(node)))
-            HGOTO_ERROR(H5E_CACHE, H5E_NOTFOUND, FAIL, "can't retrieve skip list item")
+            HGOTO_ERROR(H5E_CACHE, H5E_NOTFOUND, FAIL, \
+                        "can't retrieve skip list item")
 
         /* Set up initial array position & buffer base address */
         length_array[0] = (int)entry_ptr->size;
@@ -989,8 +1005,10 @@ H5C__collective_write(H5F_t *f, hid_t dxpl_id)
         node = H5SL_next(node);
         i = 1;
         while(node) {
+
             if(NULL == (entry_ptr = (H5C_cache_entry_t *)H5SL_item(node)))
-                HGOTO_ERROR(H5E_CACHE, H5E_NOTFOUND, FAIL, "can't retrieve skip list item")
+                HGOTO_ERROR(H5E_CACHE, H5E_NOTFOUND, FAIL, \
+                            "can't retrieve skip list item")
 
             /* Set up array position */
             length_array[i] = (int)entry_ptr->size;
@@ -1003,48 +1021,85 @@ H5C__collective_write(H5F_t *f, hid_t dxpl_id)
         } /* end while */
 
         /* Create memory MPI type */
-        if(MPI_SUCCESS != (mpi_code = MPI_Type_create_hindexed(count, length_array, buf_array, MPI_BYTE, &btype)))
+        if(MPI_SUCCESS != (mpi_code = 
+                           MPI_Type_create_hindexed(count, length_array, 
+                                                    buf_array, MPI_BYTE, 
+                                                    &btype)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_hindexed failed", mpi_code)
+
         btype_created = TRUE;
+
         if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&btype)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code)
 
         /* Create file MPI type */
-        if(MPI_SUCCESS != (mpi_code = MPI_Type_create_hindexed(count, length_array, offset_array, MPI_BYTE, &ftype)))
+        if(MPI_SUCCESS != (mpi_code = 
+                           MPI_Type_create_hindexed(count, length_array, 
+                                                    offset_array, MPI_BYTE, 
+                                                    &ftype)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Type_create_hindexed failed", mpi_code)
+
         ftype_created = TRUE;
+
         if(MPI_SUCCESS != (mpi_code = MPI_Type_commit(&ftype)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code)
 
         /* Pass buf type, file type to the file driver */
         if(H5FD_mpi_setup_collective(dxpl_id, &btype, &ftype) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI-I/O properties")
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, \
+                        "can't set MPI-I/O properties")
 
         /* Write data */
-        if(H5F_block_write(f, H5FD_MEM_DEFAULT, (haddr_t)0, (size_t)1, dxpl_id, base_buf) < 0)
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to write entries collectively")
+        if(H5F_block_write(f, H5FD_MEM_DEFAULT, (haddr_t)0, 
+                           (size_t)1, dxpl_id, base_buf) < 0)
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
+                        "unable to write entries collectively")
+
     } /* end if */
     else {
         MPI_Status mpi_stat;
-        MPI_File mpi_fh_p;
+        MPI_File *mpi_fh_p;
         MPI_File mpi_fh;
+        MPI_Info *info_p;
+        MPI_Info info;
 
         if(H5F_get_mpi_handle(f, (MPI_File **)&mpi_fh_p) < 0)
-            HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get mpi file handle")
+            HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, \
+                        "can't get mpi file handle")
+
         mpi_fh = *(MPI_File*)mpi_fh_p;
 
-        /* just to match up with the 1st MPI_File_set_view from H5FD_mpio_write() */
-        if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(mpi_fh, (MPI_Offset)0, MPI_BYTE, MPI_BYTE, "native", MPI_INFO_NULL)))
+        if (H5F_get_mpi_info(f, &info_p) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, \
+                        "can't get mpi file info")
+
+        info = *info_p;
+
+        /* just to match up with the 1st MPI_File_set_view from 
+         * H5FD_mpio_write() 
+         */
+        if(MPI_SUCCESS != (mpi_code = 
+                           MPI_File_set_view(mpi_fh, (MPI_Offset)0, MPI_BYTE, 
+                                             MPI_BYTE, "native", 
+                                             info)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
 
         /* just to match up with MPI_File_write_at_all from H5FD_mpio_write() */
         HDmemset(&mpi_stat, 0, sizeof(MPI_Status));
-        if(MPI_SUCCESS != (mpi_code = MPI_File_write_at_all(mpi_fh, (MPI_Offset)0, NULL, 0, MPI_BYTE, &mpi_stat)))
+        if(MPI_SUCCESS != (mpi_code = 
+                           MPI_File_write_at_all(mpi_fh, (MPI_Offset)0, 
+                                                 NULL, 0, MPI_BYTE, &mpi_stat)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at_all failed", mpi_code)
 
-        /* just to match up with the 2nd MPI_File_set_view (reset) in H5FD_mpio_write() */
-        if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(mpi_fh, (MPI_Offset)0, MPI_BYTE, MPI_BYTE, "native", MPI_INFO_NULL)))
+        /* just to match up with the 2nd MPI_File_set_view (reset) in 
+         * H5FD_mpio_write() 
+         */
+        if(MPI_SUCCESS != (mpi_code = 
+                           MPI_File_set_view(mpi_fh, (MPI_Offset)0, MPI_BYTE, 
+                                             MPI_BYTE, "native", 
+                                             info)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
+
     } /* end else */
 
 done:
@@ -1063,7 +1118,8 @@ done:
     if(orig_xfer_mode != H5FD_MPIO_COLLECTIVE) {
         HDassert(plist);
         if(H5P_set(plist, H5D_XFER_IO_XFER_MODE_NAME, &orig_xfer_mode) < 0)
-            HDONE_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI-I/O property")
+            HDONE_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, \
+                        "can't set MPI-I/O property")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value);
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h
index 69e8145..90a84c4 100644
--- a/src/H5Cpkg.h
+++ b/src/H5Cpkg.h
@@ -686,6 +686,13 @@ if ( ( ( ( (head_ptr) == NULL ) || ( (tail_ptr) == NULL ) ) &&             \
     (cache_ptr)->images_created++;                          \
 }
 
+#define H5C__UPDATE_STATS_FOR_CACHE_IMAGE_READ(cache_ptr)  \
+{                                                          \
+    /* make sure image len is still good */                \
+    HDassert((cache_ptr)->image_len > 0);                  \
+    (cache_ptr)->images_read++;                            \
+}
+
 #define H5C__UPDATE_STATS_FOR_CACHE_IMAGE_LOAD(cache_ptr)  \
 {                                                          \
     /* make sure image len is still good */                \
@@ -931,6 +938,7 @@ if ( ( ( ( (head_ptr) == NULL ) || ( (tail_ptr) == NULL ) ) &&             \
 #define H5C__UPDATE_STATS_FOR_LRU_SCAN_RESTART(cache_ptr)
 #define H5C__UPDATE_STATS_FOR_INDEX_SCAN_RESTART(cache_ptr)
 #define H5C__UPDATE_STATS_FOR_CACHE_IMAGE_CREATE(cache_ptr)
+#define H5C__UPDATE_STATS_FOR_CACHE_IMAGE_READ(cache_ptr)
 #define H5C__UPDATE_STATS_FOR_CACHE_IMAGE_LOAD(cache_ptr)
 #define H5C__UPDATE_STATS_FOR_PREFETCH(cache_ptr, dirty)
 #define H5C__UPDATE_STATS_FOR_PREFETCH_HIT(cache_ptr)
@@ -4549,6 +4557,18 @@ typedef struct H5C_tag_info_t {
  *		Further, since cache images are only created at file 
  *		close, this field should only be set at that time.
  *
+ * images_read: Integer field containing the number of cache images 
+ *              read from file.  Note that reading an image is different
+ *              from loading it -- reading the image means just that,
+ *              while loading the image refers to decoding it and loading
+ *              it into the metadata cache.
+ *
+ *              In the serial case, image_read should always equal 
+ *              images_loaded.  However, in the parallel case, the 
+ *              image should only be read by process 0.  All other 
+ *              processes should receive the cache image via a broadcast
+ *              from process 0.
+ *
  * images_loaded:  Integer field containing the number of cache images
  *		loaded since the last time statistics were reset.
  *
@@ -4864,6 +4884,7 @@ struct H5C_t {
 
     /* Fields for tracking cache image operations */
     int32_t			images_created;
+    int32_t			images_read;
     int32_t			images_loaded;
     hsize_t			last_image_size;
 
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index bdfb23e..5c5a666 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -2340,9 +2340,12 @@ H5_DLL herr_t H5C_dump_cache_LRU(H5C_t *cache_ptr, const char *cache_name);
 H5_DLL hbool_t H5C_get_serialization_in_progress(const H5C_t *cache_ptr);
 H5_DLL hbool_t H5C_cache_is_clean(const H5C_t *cache_ptr, H5C_ring_t inner_ring);
 H5_DLL herr_t H5C_dump_cache_skip_list(H5C_t *cache_ptr, char *calling_fcn);
+#ifdef H5_HAVE_PARALLEL
+H5_DLL herr_t H5C_dump_coll_write_list(H5C_t * cache_ptr, char * calling_fcn);
+#endif /* H5_HAVE_PARALLEL */
 H5_DLL herr_t H5C_get_entry_ptr_from_addr(H5C_t *cache_ptr, haddr_t addr,
     void **entry_ptr_ptr);
-H5_DLL herr_t H5C_flush_dependency_exists(H5C_t *cache_ptr, haddr_t parent_addr, 
+H5_DLL herr_t H5C_flush_dependency_exists(H5C_t *cache_ptr, haddr_t parent_addr,
     haddr_t child_addr, hbool_t *fd_exists_ptr);
 H5_DLL herr_t H5C_verify_entry_type(H5C_t *cache_ptr, haddr_t addr,
     const H5C_class_t *expected_type, hbool_t *in_cache_ptr,
diff --git a/src/H5Ctag.c b/src/H5Ctag.c
index a9bcca1..0170ce9 100644
--- a/src/H5Ctag.c
+++ b/src/H5Ctag.c
@@ -58,8 +58,18 @@
 typedef struct {
     H5F_t * f;                          /* File pointer for evicting entry */
     hid_t dxpl_id;                      /* DXPL for evicting entry */
-    hbool_t evicted_entries_last_pass;  /* Flag to indicate that an entry was evicted when iterating over cache */
-    hbool_t pinned_entries_need_evicted;        /* Flag to indicate that a pinned entry was attempted to be evicted */
+    hbool_t evicted_entries_last_pass;  /* Flag to indicate that an entry 
+                                         * was evicted when iterating over 
+                                         * cache 
+                                         */
+    hbool_t pinned_entries_need_evicted;/* Flag to indicate that a pinned 
+                                         * entry was attempted to be evicted 
+                                         */
+    hbool_t skipped_pf_dirty_entries;   /* Flag indicating that one or more 
+                                         * entries marked prefetched_dirty
+                                         * were encountered and not 
+                                         * evicted.
+                                         */
 } H5C_tag_iter_evict_ctx_t;
 
 /* Typedef for tagged entry iterator callback context - expunge tag type metadata */
@@ -470,7 +480,9 @@ H5C__evict_tagged_entries_cb(H5C_cache_entry_t *entry, void *_ctx)
         if(H5C__flush_single_entry(ctx->f, ctx->dxpl_id, entry, H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG | H5C__DEL_FROM_SLIST_ON_DESTROY_FLAG) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, H5_ITER_ERROR, "Entry eviction failed.")
         ctx->evicted_entries_last_pass = TRUE;
-    } /* end else */
+    } else {
+        ctx->skipped_pf_dirty_entries = TRUE;
+    }
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -516,6 +528,7 @@ H5C_evict_tagged_entries(H5F_t * f, hid_t dxpl_id, haddr_t tag, hbool_t match_gl
         /* Reset pinned/evicted tracking flags */
         ctx.pinned_entries_need_evicted = FALSE;
         ctx.evicted_entries_last_pass = FALSE;
+        ctx.skipped_pf_dirty_entries = FALSE;
 
         /* Iterate through entries in the cache */
         if(H5C__iter_tagged_entries(cache, tag, match_global, H5C__evict_tagged_entries_cb, &ctx) < 0)
@@ -524,8 +537,32 @@ H5C_evict_tagged_entries(H5F_t * f, hid_t dxpl_id, haddr_t tag, hbool_t match_gl
         /* Keep doing this until we have stopped evicted entries */
     } while(TRUE == ctx.evicted_entries_last_pass);
 
-    /* Fail if we have finished evicting entries and pinned entries still need evicted */
-    if(ctx.pinned_entries_need_evicted)
+    /* In most cases, fail if we have finished evicting entries and pinned 
+     * entries still need evicted 
+     *
+     * However, things can get strange if the file was opened R/O and 
+     * the file contains a cache image and the cache image contains dirty 
+     * entries.  
+     *
+     * Since the file was opened read only, dirty entries in the cache 
+     * image were marked as clean when they were inserted into the metadata
+     * cache.  This is necessary, as if they are marked dirty, the metadata
+     * cache will attempt to write them on file close, which is frowned 
+     * upon when the file is opened R/O.
+     *
+     * On the other hand, such entries (marked prefetched_dirty) must not 
+     * be evicted, as should the cache be asked to re-load them, the cache
+     * will attempt to read them from the file, and at best load an outdated
+     * version.
+     * 
+     * To avoid this, H5C__evict_tagged_entries_cb has been modified to 
+     * skip such entries.  However, by doing so, it may prevent pinned 
+     * entries from becoming unpinned.
+     *
+     * Thus we must ignore ctx.pinned_entries_need_evicted if 
+     * ctx.skipped_pf_dirty_entries is TRUE.
+     */
+    if((!ctx.skipped_pf_dirty_entries) && (ctx.pinned_entries_need_evicted))
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "Pinned entries still need evicted?!")
 
 done:
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 4999f39..7ab9658 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -6056,9 +6056,9 @@ H5D__chunk_stats(const H5D_t *dset, hbool_t headers)
 #endif
 
     if (headers) {
-        if (rdcc->nhits>0 || rdcc->nmisses>0) {
-            miss_rate = 100.0 * rdcc->nmisses /
-                    (rdcc->nhits + rdcc->nmisses);
+        if (rdcc->stats.nhits>0 || rdcc->stats.nmisses>0) {
+            miss_rate = 100.0 * rdcc->stats.nmisses /
+                    (rdcc->stats.nhits + rdcc->stats.nmisses);
         } else {
             miss_rate = 0.0;
         }
@@ -6069,8 +6069,8 @@ H5D__chunk_stats(const H5D_t *dset, hbool_t headers)
         }
 
         fprintf(H5DEBUG(AC), "   %-18s %8u %8u %7s %8d+%-9ld\n",
-            "raw data chunks", rdcc->nhits, rdcc->nmisses, ascii,
-            rdcc->ninits, (long)(rdcc->nflushes)-(long)(rdcc->ninits));
+            "raw data chunks", rdcc->stats.nhits, rdcc->stats.nmisses, ascii,
+            rdcc->stats.ninits, (long)(rdcc->stats.nflushes)-(long)(rdcc->stats.ninits));
     }
 
 done:
diff --git a/src/H5FDmpi.c b/src/H5FDmpi.c
index fdc4eca..bf4e03a 100644
--- a/src/H5FDmpi.c
+++ b/src/H5FDmpi.c
@@ -148,6 +148,45 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5FD_get_mpi_info
+ *
+ * Purpose:	Retrieves the file's mpi info
+ *
+ * Return:	Success:	SUCCEED
+ *
+ *		Failure:	Negative
+ *
+ * Programmer:	John Mainzer
+ *              4/4/17
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5FD_get_mpi_info(H5FD_t *file, void** mpi_info)
+{
+    const H5FD_class_mpi_t *cls;
+    herr_t  ret_value = SUCCEED;
+
+    FUNC_ENTER_NOAPI_NOINIT
+
+    HDassert(file);
+    cls = (const H5FD_class_mpi_t *)(file->cls);
+    HDassert(cls);
+    HDassert(cls->get_mpi_info);    /* All MPI drivers must implement this */
+
+    /* Dispatch to driver */
+    if ((ret_value=(cls->get_mpi_info)(file, mpi_info)) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTGET, MPI_COMM_NULL, \
+                    "driver get_mpi_info request failed")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_get_mpi_info() */
+
+
+/*-------------------------------------------------------------------------
  * Function:    H5FD_mpi_MPIOff_to_haddr
  *
  * Purpose:     Convert an MPI_Offset value to haddr_t.
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index a3a404f..9417d46 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -95,6 +95,7 @@ static herr_t H5FD_mpio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
 static int H5FD_mpio_mpi_rank(const H5FD_t *_file);
 static int H5FD_mpio_mpi_size(const H5FD_t *_file);
 static MPI_Comm H5FD_mpio_communicator(const H5FD_t *_file);
+static herr_t  H5FD_mpio_get_info(H5FD_t *_file, void** mpi_info);
 
 /* The MPIO file driver information */
 static const H5FD_class_mpi_t H5FD_mpio_g = {
@@ -134,7 +135,8 @@ static const H5FD_class_mpi_t H5FD_mpio_g = {
     },  /* End of superclass information */
     H5FD_mpio_mpi_rank,                         /*get_rank              */
     H5FD_mpio_mpi_size,                         /*get_size              */
-    H5FD_mpio_communicator                      /*get_comm              */
+    H5FD_mpio_communicator,                     /*get_comm              */
+    H5FD_mpio_get_info                          /*get_info              */
 };
 
 #ifdef H5FDmpio_DEBUG
@@ -1308,6 +1310,39 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:       H5FD_mpio_get_info
+ *
+ * Purpose:        Returns the file info of MPIO file driver.
+ *
+ * Returns:        Non-negative if succeed or negative if fails.
+ *
+ * Programmer:     John Mainzer
+ *                 April 4, 2017
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+*/
+static herr_t
+H5FD_mpio_get_info(H5FD_t *_file, void** mpi_info)
+{
+    H5FD_mpio_t         *file = (H5FD_mpio_t *)_file;
+    herr_t              ret_value = SUCCEED;
+
+    FUNC_ENTER_NOAPI_NOINIT
+
+    if(!mpi_info)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "mpi info not valid")
+
+    *mpi_info = &(file->info);
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+
+} /* H5FD_mpio_get_info() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5FD_mpio_read
  *
  * Purpose:	Reads SIZE bytes of data from FILE beginning at address ADDR
diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h
index c64ec30..fb7c43c 100644
--- a/src/H5FDprivate.h
+++ b/src/H5FDprivate.h
@@ -53,6 +53,7 @@ typedef struct H5FD_class_mpi_t {
     int  (*get_rank)(const H5FD_t *file);     /* Get the MPI rank of a process */
     int  (*get_size)(const H5FD_t *file);     /* Get the MPI size of a communicator */
     MPI_Comm (*get_comm)(const H5FD_t *file); /* Get the communicator for a file */
+    herr_t (*get_mpi_info)(H5FD_t *file, void** mpi_info); /* get MPI_Info for a file */
 } H5FD_class_mpi_t;
 #endif
 
@@ -202,6 +203,7 @@ H5_DLL herr_t H5FD_get_mpio_atomicity(H5FD_t *file, hbool_t *flag);
 H5_DLL int H5FD_mpi_get_rank(const H5FD_t *file);
 H5_DLL int H5FD_mpi_get_size(const H5FD_t *file);
 H5_DLL MPI_Comm H5FD_mpi_get_comm(const H5FD_t *_file);
+H5_DLL herr_t H5FD_get_mpi_info(H5FD_t *file, void** file_info);
 #endif /* H5_HAVE_PARALLEL */
 
 #endif /* !_H5FDprivate_H */
diff --git a/src/H5Fmpi.c b/src/H5Fmpi.c
index 5434aa5..60593a8 100644
--- a/src/H5Fmpi.c
+++ b/src/H5Fmpi.c
@@ -356,5 +356,31 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_mpi_retrieve_comm */
 
+/*-------------------------------------------------------------------------
+ * Function:    H5F_get_mpi_info
+ *
+ * Purpose:     Retrieves MPI File info.
+ *
+ * Return:      Success:        The size (positive)
+ *              Failure:        Negative
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5F_get_mpi_info(const H5F_t *f, MPI_Info **f_info)
+{
+    herr_t ret_value = SUCCEED;
+
+    FUNC_ENTER_NOAPI(FAIL)
+
+    HDassert(f && f->shared);
+
+    /* Dispatch to driver */
+    if ((ret_value = H5FD_get_mpi_info(f->shared->lf, (void **)f_info)) < 0)
+        HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get mpi file info")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5F_get_mpi_info() */
 #endif /* H5_HAVE_PARALLEL */
 
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 886063a..8ef353a 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -852,6 +852,7 @@ H5_DLL int H5F_mpi_get_rank(const H5F_t *f);
 H5_DLL MPI_Comm H5F_mpi_get_comm(const H5F_t *f);
 H5_DLL int H5F_mpi_get_size(const H5F_t *f);
 H5_DLL herr_t H5F_mpi_retrieve_comm(hid_t loc_id, hid_t acspl_id, MPI_Comm *mpi_comm);
+H5_DLL herr_t H5F_get_mpi_info(const H5F_t *f, MPI_Info **f_info);
 #endif /* H5_HAVE_PARALLEL */
 
 /* External file cache routines */
diff --git a/src/H5L.c b/src/H5L.c
index b5c6240..ecdf8a2 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -2351,9 +2351,11 @@ H5L_delete_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t *lnk,
     if(name == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
 
-    /* Check for removing '.' */
+    /* Check for non-existent (NULL) link.
+     * Note that this can also occur when attempting to remove '.'
+     */
     if(lnk == NULL)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "can't delete self")
+        HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "callback link pointer is NULL (specified link may be '.' or not exist)")
 
     /* Remove the link from the group */
     if(H5G_obj_remove(grp_loc->oloc, grp_loc->path->full_path_r, name, udata->dxpl_id) < 0)
diff --git a/src/H5PL.c b/src/H5PL.c
index 1f7bb2a..bfa3ace 100644
--- a/src/H5PL.c
+++ b/src/H5PL.c
@@ -25,15 +25,33 @@
 #include "H5private.h"      /* Generic Functions            */
 #include "H5Eprivate.h"     /* Error handling               */
 #include "H5MMprivate.h"    /* Memory management            */
-#include "H5PLprivate.h"    /* Plugin                       */
+#include "H5PLpkg.h"        /* Plugin                       */
 #include "H5Zprivate.h"     /* Filter pipeline              */
 
 
 /****************/
 /* Local Macros */
 /****************/
-
-#define H5PL_MAX_PATH_NUM       16
+#ifdef H5_HAVE_WIN32_API
+#define H5PL_EXPAND_ENV_VAR {                                                            \
+        long bufCharCount;                                                               \
+        char *tempbuf;                                                                   \
+        if(NULL == (tempbuf = (char *)H5MM_malloc(H5PL_EXPAND_BUFFER_SIZE)))             \
+            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for expanded path")                          \
+        if((bufCharCount = ExpandEnvironmentStringsA(dl_path, tempbuf, H5PL_EXPAND_BUFFER_SIZE)) > H5PL_EXPAND_BUFFER_SIZE) { \
+            tempbuf = (char *)H5MM_xfree(tempbuf);                                       \
+            HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "expanded path is too long")      \
+        }                                                                                \
+        if(bufCharCount == 0) {                                                          \
+            tempbuf = (char *)H5MM_xfree(tempbuf);                                       \
+            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "failed to expand path")          \
+        }                                                                                \
+        dl_path = (char *)H5MM_xfree(dl_path);                                           \
+        dl_path = tempbuf;                                                               \
+ }
+#else
+#define H5PL_EXPAND_ENV_VAR
+#endif /* H5_HAVE_WIN32_API */
 
 /****************************/
 /* Macros for supporting
@@ -390,6 +408,244 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function: H5PLappend
+ *
+ * Purpose: Insert a plugin path at the end of the list.
+ *
+ * Return: Non-negative or success.
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5PLappend(const char* plugin_path)
+{
+    herr_t ret_value = SUCCEED; /* Return value */
+    char        *dl_path = NULL;
+
+    FUNC_ENTER_API(FAIL)
+    if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
+    if(NULL == plugin_path)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
+    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
+
+    H5PL_EXPAND_ENV_VAR
+
+    H5PL_path_table_g[H5PL_num_paths_g] = dl_path;
+    H5PL_num_paths_g++;
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5PLappend() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5PLprepend
+ *
+ * Purpose: Insert a plugin path at the beginning of the list.
+ *
+ * Return: Non-negative or success.
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5PLprepend(const char* plugin_path)
+{
+    herr_t ret_value = SUCCEED; /* Return value */
+    char        *dl_path = NULL;
+    unsigned int plindex;
+
+    FUNC_ENTER_API(FAIL)
+    if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
+    if(NULL == plugin_path)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
+    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
+
+    H5PL_EXPAND_ENV_VAR
+
+    for (plindex = (unsigned int)H5PL_num_paths_g; plindex > 0; plindex--)
+        H5PL_path_table_g[plindex] = H5PL_path_table_g[plindex - 1];
+    H5PL_path_table_g[0] = dl_path;
+    H5PL_num_paths_g++;
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5PLprepend() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5PLreplace
+ *
+ * Purpose: Replace the path at the specified index.
+ *
+ * Return: Non-negative or success.
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5PLreplace(const char* plugin_path, unsigned int index)
+{
+    herr_t ret_value = SUCCEED; /* Return value */
+    char        *dl_path = NULL;
+
+    FUNC_ENTER_API(FAIL)
+    if(NULL == plugin_path)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
+    if(index >= H5PL_MAX_PATH_NUM)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "index path out of bounds for table")
+    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
+
+    H5PL_EXPAND_ENV_VAR
+
+    if(H5PL_path_table_g[index])
+        H5PL_path_table_g[index] = (char *)H5MM_xfree(H5PL_path_table_g[index]);
+    H5PL_path_table_g[index] = dl_path;
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5PLreplace() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5PLinsert
+ *
+ * Purpose: Insert a plugin path at the specified index, moving other paths after the index.
+ *
+ * Return: Non-negative or success.
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5PLinsert(const char* plugin_path, unsigned int index)
+{
+    herr_t ret_value = SUCCEED; /* Return value */
+    char        *dl_path = NULL;
+    unsigned int plindex;
+
+    FUNC_ENTER_API(FAIL)
+    if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
+    if(NULL == plugin_path)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
+    if(index >= H5PL_MAX_PATH_NUM)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "index path out of bounds for table")
+    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
+
+    H5PL_EXPAND_ENV_VAR
+
+    for(plindex = (unsigned int)H5PL_num_paths_g; plindex > index; plindex--)
+        H5PL_path_table_g[plindex] = H5PL_path_table_g[plindex - 1];
+    H5PL_path_table_g[index] = dl_path;
+    H5PL_num_paths_g++;
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5PLinsert() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5PLremove
+ *
+ * Purpose: Remove the plugin path at the specifed index and compacting the list.
+ *
+ * Return: Non-negative or success.
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5PLremove(unsigned int index)
+{
+    herr_t ret_value = SUCCEED; /* Return value */
+    unsigned int plindex;
+
+    FUNC_ENTER_API(FAIL)
+    if(H5PL_num_paths_g == 0)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "no directories in table")
+    if(index >= H5PL_MAX_PATH_NUM)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "index path out of bounds for table")
+    if(NULL == H5PL_path_table_g[index])
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no directory path at index")
+    H5PL_path_table_g[index] = (char *)H5MM_xfree(H5PL_path_table_g[index]);
+
+    H5PL_num_paths_g--;
+    for(plindex = index; plindex < (unsigned int)H5PL_num_paths_g; plindex++)
+        H5PL_path_table_g[plindex] = H5PL_path_table_g[plindex + 1];
+    H5PL_path_table_g[H5PL_num_paths_g] = NULL;
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5PLremove() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5PLget
+ *
+ * Purpose: Query the plugin path at the specified index.
+ *
+ * Return: Success: The length of path.
+ *
+ *  If `pathname' is non-NULL then write up to `size' bytes into that
+ *  buffer and always return the length of the pathname.
+ *  Otherwise `size' is ignored and the function does not store the pathname,
+ *  just returning the number of characters required to store the pathname.
+ *  If an error occurs then the buffer pointed to by `pathname' (NULL or non-NULL)
+ *  is unchanged and the function returns a negative value.
+ *  If a zero is returned for the name's length, then there is no pathname
+ *  associated with the index.
+ *
+ *-------------------------------------------------------------------------
+ */
+ssize_t
+H5PLget(unsigned int index, char *pathname/*out*/, size_t size)
+{
+    ssize_t      ret_value = 0;    /* Return value */
+    ssize_t      len = 0;      /* Length of pathname */
+    char        *dl_path = NULL;
+
+    FUNC_ENTER_API(FAIL)
+    if(H5PL_num_paths_g == 0)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "no directories in table")
+    if(index >= H5PL_MAX_PATH_NUM)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "index path out of bounds for table")
+    if(NULL == (dl_path = H5PL_path_table_g[index]))
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no directory path at index")
+    len = HDstrlen(dl_path);
+    if(pathname) {
+        HDstrncpy(pathname, dl_path, MIN((size_t)(len + 1), size));
+        if((size_t)len >= size)
+            pathname[size - 1] = '\0';
+    } /* end if */
+
+    /* Set return value */
+    ret_value = len;
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5PLget() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5PLsize
+ *
+ * Purpose: Query the size of the current list of plugin paths.
+ *
+ * Return: Non-negative or success.
+ *
+ *-------------------------------------------------------------------------
+ */
+unsigned int
+H5PLsize(void)
+{
+    return (unsigned int)H5PL_num_paths_g;
+} /* end H5PLsize() */
+
+
+/*-------------------------------------------------------------------------
  * Function:    H5PL__init_path_table
  *
  * Purpose:     Initialize the path table.
@@ -422,25 +678,7 @@ H5PL__init_path_table(void)
     if(NULL == dl_path)
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
 
-#ifdef H5_HAVE_WIN32_API
-    else { /* Expand windows env var*/
-        long bufCharCount;
-        char *tempbuf;
-        if(NULL == (tempbuf = (char *)H5MM_malloc(H5PL_EXPAND_BUFFER_SIZE)))
-            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for expanded path")
-        if((bufCharCount = ExpandEnvironmentStrings(dl_path, tempbuf, H5PL_EXPAND_BUFFER_SIZE)) > H5PL_EXPAND_BUFFER_SIZE) {
-            tempbuf = (char *)H5MM_xfree(tempbuf);
-            HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "expanded path is too long")
-        }
-        if(bufCharCount == 0) {
-            tempbuf = (char *)H5MM_xfree(tempbuf);
-            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "failed to expand path")
-        }
-        dl_path = (char *)H5MM_xfree(dl_path);
-        dl_path = H5MM_strdup(tempbuf);
-        tempbuf = (char *)H5MM_xfree(tempbuf);
-    }
-#endif /* H5_HAVE_WIN32_API */
+    H5PL_EXPAND_ENV_VAR
 
     /* Put paths in the path table.  They are separated by ":" */
     dir = HDstrtok(dl_path, H5PL_PATH_SEPARATOR);
diff --git a/src/H5PLpkg.h b/src/H5PLpkg.h
new file mode 100644
index 0000000..5cf3096
--- /dev/null
+++ b/src/H5PLpkg.h
@@ -0,0 +1,50 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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 files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+ * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#if !(defined H5PL_FRIEND || defined H5PL_MODULE)
+#error "Do not include this file outside the H5PL package!"
+#endif
+
+#ifndef _H5PLpkg_H
+#define _H5PLpkg_H
+
+/* Include private header file */
+#include "H5PLprivate.h"          /* Filter functions                */
+
+/* Other private headers needed by this file */
+
+/**************************/
+/* Package Private Macros */
+/**************************/
+
+#define H5PL_MAX_PATH_NUM       16
+
+
+/****************************/
+/* Package Private Typedefs */
+/****************************/
+
+
+/*****************************/
+/* Package Private Variables */
+/*****************************/
+
+
+/******************************/
+/* Package Private Prototypes */
+/******************************/
+
+#endif /* _H5PLpkg_H */
+
diff --git a/src/H5PLpublic.h b/src/H5PLpublic.h
index 0528945..5e4dcae 100644
--- a/src/H5PLpublic.h
+++ b/src/H5PLpublic.h
@@ -44,6 +44,13 @@ extern "C" {
 /* plugin state */
 H5_DLL herr_t H5PLset_loading_state(unsigned int plugin_type);
 H5_DLL herr_t H5PLget_loading_state(unsigned int* plugin_type/*out*/);
+H5_DLL herr_t H5PLappend(const char* plugin_path);
+H5_DLL herr_t H5PLprepend(const char* plugin_path);
+H5_DLL herr_t H5PLreplace(const char* plugin_path, unsigned int index);
+H5_DLL herr_t H5PLinsert(const char* plugin_path, unsigned int index);
+H5_DLL herr_t H5PLremove(unsigned int index);
+H5_DLL ssize_t H5PLget(unsigned int index, char *pathname/*out*/, size_t size);
+H5_DLL unsigned int H5PLsize(void);
 
 #ifdef __cplusplus
 }
diff --git a/test/cache_image.c b/test/cache_image.c
index f49f7b3..dfbd02e 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -35,7 +35,7 @@ static void create_datasets(hid_t file_id, int min_dset, int max_dset);
 static void delete_datasets(hid_t file_id, int min_dset, int max_dset);
 static void open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected,
     hbool_t read_only, hbool_t set_mdci_fapl, hbool_t config_fsm,
-    const char *hdf_file_name, unsigned cache_image_flags, 
+    hbool_t set_eoc, const char *hdf_file_name, unsigned cache_image_flags, 
     hid_t *file_id_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr);
 static void attempt_swmr_open_hdf5_file(hbool_t create_file,
     hbool_t set_mdci_fapl, const char *hdf_file_name);
@@ -62,6 +62,7 @@ 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);
 
 
 /****************************************************************************/
@@ -535,7 +536,7 @@ delete_datasets(hid_t file_id, int min_dset, int max_dset)
 static void
 open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected,
     hbool_t read_only, hbool_t set_mdci_fapl, hbool_t config_fsm,
-    const char *hdf_file_name, unsigned cache_image_flags,
+    hbool_t set_eoc, const char *hdf_file_name, unsigned cache_image_flags,
     hid_t *file_id_ptr, H5F_t ** file_ptr_ptr, H5C_t ** cache_ptr_ptr)
 {
     const char * fcn_name = "open_hdf5_file()";
@@ -601,7 +602,8 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected,
     /* call H5Pset_libver_bounds() on the fapl_id */
     if ( pass ) {
 
-        if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0 ) {
+        if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+                                  H5F_LIBVER_LATEST) < 0 ) {
 
             pass = FALSE;
             failure_mssg = "H5Pset_libver_bounds() failed.\n";
@@ -667,7 +669,8 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected,
     }
 
     if ( ( pass ) && ( config_fsm ) ) {
-        if(H5Pset_file_space_strategy(fcpl_id, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0) {
+        if(H5Pset_file_space_strategy(fcpl_id, H5F_FSPACE_STRATEGY_PAGE, 
+                                      TRUE, (hsize_t)1) < 0) {
             pass = FALSE;
             failure_mssg = "H5Pset_file_space_strategy() failed.";
         }
@@ -675,6 +678,18 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected,
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
+    /* set evict on close if indicated */
+    if ( ( pass ) && ( set_eoc ) ) {
+
+        if ( H5Pset_evict_on_close(fapl_id, TRUE) < 0 ) {
+
+            pass = FALSE;
+            failure_mssg = "H5Pset_evict_on_close() failed.";
+        }
+    }
+
+    if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+
     /* open the file */
     if ( pass ) {
 
@@ -682,10 +697,12 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected,
 
 	    if ( fcpl_id != -1 )
 
-                file_id = H5Fcreate(hdf_file_name, H5F_ACC_TRUNC, fcpl_id, fapl_id);
+                file_id = H5Fcreate(hdf_file_name, H5F_ACC_TRUNC, 
+                                    fcpl_id, fapl_id);
 	    else
 
-		file_id = H5Fcreate(hdf_file_name, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
+		file_id = H5Fcreate(hdf_file_name, H5F_ACC_TRUNC, 
+                                    H5P_DEFAULT, fapl_id);
 
         } else {
 
@@ -1362,6 +1379,7 @@ check_cache_image_ctl_flow_1(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__GEN_MDCI_SBE_MESG,
                        /* file_id_ptr        */ &file_id,
@@ -1415,6 +1433,7 @@ check_cache_image_ctl_flow_1(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -1476,6 +1495,7 @@ check_cache_image_ctl_flow_1(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -1637,6 +1657,7 @@ check_cache_image_ctl_flow_2(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__GEN_MDCI_SBE_MESG,
                        /* file_id_ptr        */ &file_id,
@@ -1679,6 +1700,7 @@ check_cache_image_ctl_flow_2(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -1718,6 +1740,7 @@ check_cache_image_ctl_flow_2(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -1894,6 +1917,7 @@ check_cache_image_ctl_flow_3(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -1935,6 +1959,7 @@ check_cache_image_ctl_flow_3(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__GEN_MDCI_SBE_MESG,
                        /* file_id_ptr        */ &file_id,
@@ -1988,6 +2013,7 @@ check_cache_image_ctl_flow_3(void)
                        /* read_only          */ TRUE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -2041,6 +2067,7 @@ check_cache_image_ctl_flow_3(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -2091,6 +2118,7 @@ check_cache_image_ctl_flow_3(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -2260,6 +2288,7 @@ check_cache_image_ctl_flow_4(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -2301,6 +2330,7 @@ check_cache_image_ctl_flow_4(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__GEN_MDCI_SBE_MESG,
                        /* file_id_ptr        */ &file_id,
@@ -2343,6 +2373,7 @@ check_cache_image_ctl_flow_4(void)
                        /* read_only          */ TRUE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -2385,6 +2416,7 @@ check_cache_image_ctl_flow_4(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -2424,6 +2456,7 @@ check_cache_image_ctl_flow_4(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -2589,6 +2622,7 @@ check_cache_image_ctl_flow_5(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__GEN_MDCI_SBE_MESG,
                        /* file_id_ptr        */ &file_id,
@@ -2648,6 +2682,7 @@ check_cache_image_ctl_flow_5(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__GEN_MDCI_SBE_MESG,
                        /* file_id_ptr        */ &file_id,
@@ -2700,6 +2735,7 @@ check_cache_image_ctl_flow_5(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -2867,6 +2903,7 @@ check_cache_image_ctl_flow_6(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__GEN_MDCI_SBE_MESG,
                        /* file_id_ptr        */ &file_id,
@@ -2915,6 +2952,7 @@ check_cache_image_ctl_flow_6(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__GEN_MDCI_SBE_MESG,
                        /* file_id_ptr        */ &file_id,
@@ -2957,6 +2995,7 @@ check_cache_image_ctl_flow_6(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -3149,6 +3188,7 @@ cache_image_smoke_check_1(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -3215,6 +3255,7 @@ cache_image_smoke_check_1(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -3280,6 +3321,7 @@ cache_image_smoke_check_1(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -3346,6 +3388,7 @@ cache_image_smoke_check_1(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -3388,6 +3431,7 @@ cache_image_smoke_check_1(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -3567,6 +3611,7 @@ cache_image_smoke_check_2(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ TRUE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -3630,6 +3675,7 @@ cache_image_smoke_check_2(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -3675,6 +3721,7 @@ cache_image_smoke_check_2(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -3865,6 +3912,7 @@ cache_image_smoke_check_3(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ TRUE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -3927,6 +3975,7 @@ cache_image_smoke_check_3(void)
                        /* read_only          */ TRUE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -3992,6 +4041,7 @@ cache_image_smoke_check_3(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -4055,6 +4105,7 @@ cache_image_smoke_check_3(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -4248,6 +4299,7 @@ cache_image_smoke_check_4(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ TRUE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -4312,6 +4364,7 @@ cache_image_smoke_check_4(void)
                            /* read_only          */ FALSE,
                            /* set_mdci_fapl      */ TRUE,
 		           /* config_fsm         */ FALSE,
+		           /* set_eoc            */ FALSE,
                            /* hdf_file_name      */ filename,
                            /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                            /* file_id_ptr        */ &file_id,
@@ -4379,6 +4432,7 @@ cache_image_smoke_check_4(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -4442,6 +4496,7 @@ cache_image_smoke_check_4(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -4493,7 +4548,6 @@ cache_image_smoke_check_4(void)
 
     if ( show_progress ) 
         HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
- 
 
     /* 13) Delete the file */
 
@@ -4653,6 +4707,7 @@ cache_image_smoke_check_5(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ TRUE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -4742,6 +4797,7 @@ cache_image_smoke_check_5(void)
                            /* read_only          */ FALSE,
                            /* set_mdci_fapl      */ TRUE,
 		           /* config_fsm         */ FALSE,
+		           /* set_eoc            */ FALSE,
                            /* hdf_file_name      */ filename,
                            /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                            /* file_id_ptr        */ &file_id,
@@ -4842,6 +4898,7 @@ cache_image_smoke_check_5(void)
                        /* read_only          */ TRUE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -4893,6 +4950,7 @@ cache_image_smoke_check_5(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -4953,6 +5011,7 @@ cache_image_smoke_check_5(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -5161,6 +5220,7 @@ cache_image_smoke_check_6(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ TRUE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -5225,6 +5285,7 @@ cache_image_smoke_check_6(void)
                            /* read_only          */ FALSE,
                            /* set_mdci_fapl      */ TRUE,
 		           /* config_fsm         */ FALSE,
+		           /* set_eoc            */ FALSE,
                            /* hdf_file_name      */ filename,
                            /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                            /* file_id_ptr        */ &file_id,
@@ -5303,6 +5364,7 @@ cache_image_smoke_check_6(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -5362,6 +5424,7 @@ cache_image_smoke_check_6(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -5559,6 +5622,7 @@ cache_image_api_error_check_1(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ TRUE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -5619,6 +5683,7 @@ cache_image_api_error_check_1(void)
                        /* read_only          */ TRUE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -5681,6 +5746,7 @@ cache_image_api_error_check_1(void)
                        /* read_only          */ TRUE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -5744,6 +5810,7 @@ cache_image_api_error_check_1(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -5931,6 +5998,7 @@ cache_image_api_error_check_2(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ TRUE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -5991,6 +6059,7 @@ cache_image_api_error_check_2(void)
                        /* read_only          */ TRUE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -6053,6 +6122,7 @@ cache_image_api_error_check_2(void)
                        /* read_only          */ TRUE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ 0,
                        /* file_id_ptr        */ &file_id,
@@ -6116,6 +6186,7 @@ cache_image_api_error_check_2(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -6177,6 +6248,7 @@ cache_image_api_error_check_2(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -6337,6 +6409,7 @@ cache_image_api_error_check_3(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ TRUE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -6422,6 +6495,7 @@ cache_image_api_error_check_3(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ TRUE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -6743,6 +6817,7 @@ cache_image_api_error_check_4(void)
                        /* read_only          */ TRUE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -6997,6 +7072,7 @@ cache_image_api_error_check_4(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -7209,6 +7285,7 @@ get_free_sections_test(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ TRUE,
 		       /* config_fsm         */ TRUE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -7274,6 +7351,7 @@ get_free_sections_test(void)
                        /* read_only          */ TRUE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -7398,6 +7476,7 @@ get_free_sections_test(void)
                        /* read_only          */ FALSE,
                        /* set_mdci_fapl      */ FALSE,
 		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
                        /* hdf_file_name      */ filename,
                        /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
                        /* file_id_ptr        */ &file_id,
@@ -7566,6 +7645,379 @@ get_free_sections_test(void)
 
 
 /*-------------------------------------------------------------------------
+ * Function:    evict_on_close_test()
+ *
+ * Purpose:     If a file containing a cache image which in turn 
+ *              contains dirty entries is opened R/O, the metadata 
+ *              cache must refuse to evict the dirty entries, as 
+ *              it will not be able to reload them from file.  This
+ *              is a bit tricky, as the dirty entries must marked as
+ *              clean in the metadata cache so that the MDC will not 
+ *              attempt to flush then on file close.
+ *
+ *              The objective of this test is to verify that the 
+ *              metadata will not evict dirty entries in the above
+ *              context when the file is opened with the evict on close
+ *              FAPL entry.
+ *
+ *              Do this by creating a HDF5 file with a cache image 
+ *              containing dirty metadata.  
+ *
+ *              Then close the file, re-open it R/O, and scan its 
+ *              contents twice.  If evict on close succeeds in evicting
+ *              the dirty metadata, the second scan will fail, as valid 
+ *              versions of the dirty metadata will not be available.
+ *
+ *              To make the test more useful, enable persistant free 
+ *              space managers.
+ *
+ *		The test is set up as follows:
+ *
+ *		 1) Create a HDF5 file without a cache image requested
+ *                  and persistant free space managers enabled.  
+ *
+ *		 2) Create some data sets and verify them.
+ *
+ *               3) Close the file.
+ *
+ *               4) Open the file R/W, and with cache image requested.
+ *
+ *               5) Verify the datasets created in 2) above.  This will
+ *                  force their (clean) metadata into the metadata cache,
+ *                  and hence into the cache image.
+ *
+ *               6) Create some more datasets.
+ *
+ *               7) Close the file.
+ *
+ *               8) Open the file R/O and with evict on close enabled.
+ *
+ *               9) Verify all datasets twice.
+ *
+ *              10) Close the file.
+ *
+ *              11) Open the file R/W and with evict on close enabled.
+ *
+ *              12) Verify all datasets twice.
+ *
+ *              13) Close the file.
+ *
+ *              14) Discard the file.
+ *
+ * Return:      void
+ *
+ * Programmer:  John Mainzer
+ *              3/23/17
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+evict_on_close_test(void)
+{
+    const char * fcn_name = "evict_on_close_test()";
+    char filename[512];
+    hbool_t show_progress = FALSE;
+    hbool_t verbose = FALSE;
+    hid_t file_id = -1;
+    H5F_t *file_ptr = NULL;
+    H5C_t *cache_ptr = NULL;
+    int cp = 0;
+
+    TESTING("Cache image / evict on close interaction");
+
+    pass = TRUE;
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+
+    /* setup the file name */
+    if ( pass ) {
+
+        if ( h5_fixname(FILENAMES[0], H5P_DEFAULT, filename, sizeof(filename))
+            == NULL ) {
+
+            pass = FALSE;
+            failure_mssg = "h5_fixname() failed.\n";
+        }
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+
+    /* 1) Create a HDF5 file without a cache image requested
+     *    and persistant free space managers enabled.  
+     */
+    if ( pass ) {
+
+        open_hdf5_file(/* create_file        */ TRUE,
+                       /* mdci_sbem_expected */ FALSE,
+                       /* read_only          */ FALSE,
+                       /* set_mdci_fapl      */ FALSE,
+		       /* config_fsm         */ TRUE,
+		       /* set_eoc            */ FALSE,
+                       /* hdf_file_name      */ filename,
+                       /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
+                       /* file_id_ptr        */ &file_id,
+                       /* file_ptr_ptr       */ &file_ptr,
+                       /* cache_ptr_ptr      */ &cache_ptr);
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+
+    /* 2) Create some data sets and verify them.  */
+
+    if ( pass ) {
+
+        create_datasets(file_id, 1, 10);
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+    if ( pass ) {
+
+        verify_datasets(file_id, 1, 10);
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+ 
+    /* 3) Close the file. */
+
+    if ( pass ) {
+
+        if ( H5Fclose(file_id) < 0  ) {
+
+            pass = FALSE;
+            failure_mssg = "H5Fclose() failed (1).\n";
+
+        }
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+ 
+    /* 4) Open the file R/W, and with cache image requested. */
+
+    if ( pass ) {
+
+        open_hdf5_file(/* create_file        */ FALSE,
+                       /* mdci_sbem_expected */ FALSE,
+                       /* read_only          */ FALSE,
+                       /* set_mdci_fapl      */ TRUE,
+		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ FALSE,
+                       /* hdf_file_name      */ filename,
+                       /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
+                       /* file_id_ptr        */ &file_id,
+                       /* file_ptr_ptr       */ &file_ptr,
+                       /* cache_ptr_ptr      */ &cache_ptr);
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+
+    /* 5) Verify the datasets created in 2) above.  This will
+     *    force their (clean) metadata into the metadata cache,
+     *    and hence into the cache image.
+     */
+
+    if ( pass ) {
+
+        verify_datasets(file_id, 1, 10);
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+ 
+    /* 6) Create some more datasets and verify them */
+
+    if ( pass ) {
+
+        create_datasets(file_id, 11, 20);
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+    if ( pass ) {
+
+        verify_datasets(file_id, 11, 20);
+    }
+
+    if ( verbose ) {
+
+        HDassert(cache_ptr);
+        HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
+
+        HDfprintf(stdout, "index size / index dirty size = %lld / %lld\n", 
+                  (long long)(cache_ptr->index_size),
+                  (long long)(cache_ptr->dirty_index_size));
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+ 
+    /* 7) Close the file. */
+
+    if ( pass ) {
+
+        if ( H5Fclose(file_id) < 0  ) {
+
+            pass = FALSE;
+            failure_mssg = "H5Fclose() failed (2).\n";
+        }
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+ 
+    /* 8) Open the file R/O and with evict on close enabled. */
+
+    if ( pass ) {
+
+        open_hdf5_file(/* create_file        */ FALSE,
+                       /* mdci_sbem_expected */ TRUE,
+                       /* read_only          */ TRUE,
+                       /* set_mdci_fapl      */ FALSE,
+		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ TRUE,
+                       /* hdf_file_name      */ filename,
+                       /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
+                       /* file_id_ptr        */ &file_id,
+                       /* file_ptr_ptr       */ &file_ptr,
+                       /* cache_ptr_ptr      */ &cache_ptr);
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s*: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+
+    /* 9) Verify all datasets twice */
+
+    if ( pass ) {
+
+        verify_datasets(file_id, 1, 20);
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+    if ( pass ) {
+
+        verify_datasets(file_id, 1, 20);
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+
+    /* 10) Close the file. */
+
+    if ( pass ) {
+
+        if ( H5Fclose(file_id) < 0  ) {
+
+            pass = FALSE;
+            failure_mssg = "H5Fclose() failed (3).\n";
+        }
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+ 
+    /* 11) Open the file R/w and with evict on close enabled. */
+
+    if ( pass ) {
+
+        open_hdf5_file(/* create_file        */ FALSE,
+                       /* mdci_sbem_expected */ TRUE,
+                       /* read_only          */ FALSE,
+                       /* set_mdci_fapl      */ FALSE,
+		       /* config_fsm         */ FALSE,
+		       /* set_eoc            */ TRUE,
+                       /* hdf_file_name      */ filename,
+                       /* cache_image_flags  */ H5C_CI__ALL_FLAGS,
+                       /* file_id_ptr        */ &file_id,
+                       /* file_ptr_ptr       */ &file_ptr,
+                       /* cache_ptr_ptr      */ &cache_ptr);
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s*: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+
+    /* 12) Verify all datasets twice */
+
+    if ( pass ) {
+
+        verify_datasets(file_id, 1, 20);
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+    if ( pass ) {
+
+        verify_datasets(file_id, 1, 20);
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+
+    /* 13) Close the file. */
+
+    if ( pass ) {
+
+        if ( H5Fclose(file_id) < 0  ) {
+
+            pass = FALSE;
+            failure_mssg = "H5Fclose() failed (3).\n";
+        }
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+
+    /* 14) Discard the file. */
+
+    if ( pass ) {
+
+        if ( HDremove(filename) < 0 ) {
+
+            pass = FALSE;
+            failure_mssg = "HDremove() failed.\n";
+        }
+    }
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+    if ( pass ) { PASSED(); } else { H5_FAILED(); }
+
+    if ( ! pass )
+        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
+                  FUNC, failure_mssg);
+
+    return !pass;
+
+} /* evict_on_close_test() */
+
+
+/*-------------------------------------------------------------------------
  * Function:    main
  *
  * Purpose:     Run tests on the cache code contained in H5C.c
@@ -7614,6 +8066,7 @@ main(void)
     nerrs += cache_image_api_error_check_4();
 
     nerrs += get_free_sections_test();
+    nerrs += evict_on_close_test();
 
     return(nerrs > 0);
 
diff --git a/test/fheap.c b/test/fheap.c
index f08c0f8..77de4a8 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -81,6 +81,10 @@
 #define DBLOCK_SIZE(fh, r) H5HF_get_dblock_size_test(fh, r)     /* Size of a direct block in a given row */
 #define DBLOCK_FREE(fh, r) H5HF_get_dblock_free_test(fh, r)     /* Free space in a direct block of a given row */
 
+/* The number of settings for testing: page buffering, file space strategy and persisting free-space */
+#define NUM_PB_FS                   6
+#define PAGE_BUFFER_PAGE_SIZE       4096 
+
 const char *FILENAME[] = {
     "fheap",
     NULL
@@ -16367,21 +16371,31 @@ main(void)
     fheap_test_param_t tparam;          /* Testing parameters */
     H5HF_create_t small_cparam;         /* Creation parameters for "small" heap */
     H5HF_create_t large_cparam;         /* Creation parameters for "large" heap */
-    hid_t	fapl = -1;              /* File access property list for data files */
-    hid_t	fcpl = -1;              /* File creation property list for data files */
-    hid_t	fcpl2 = -1;             /* File creation property list for data files */
+    hid_t	fapl = -1, def_fapl = -1;   /* File access property list for data files */
+    hid_t	pb_fapl = -1;               /* File access property list for data files */
+    hid_t	fcpl = -1, def_fcpl = -1;   /* File creation property list for data files */
     fheap_test_type_t curr_test;        /* Current test being worked on */
-    unsigned    u;                      /* Local index variable */
+    unsigned    u, v;                   /* Local index variable */
     unsigned	nerrors = 0;            /* Cumulative error count */
-    int		ExpressMode;            /* Express testing level */
+    unsigned num_pb_fs = 1;             /* The number of settings to test for page buffering and file space handling */
+    int	ExpressMode;                    /* Express testing level */
 
     /* Reset library */
     h5_reset();
 
-    fapl = h5_fileaccess();
+    def_fapl = h5_fileaccess();
     ExpressMode = GetTestExpress();
+
+    /* 
+     * Caution when turning on ExpressMode 0:
+     *   It will activate testing with different combinations of
+     *       page buffering and file space strategy and the
+     *       running time will be long.
+     */
     if(ExpressMode > 1)
-	printf("***Express test mode on.  Some tests may be skipped\n");
+        printf("***Express test mode on.  Some tests may be skipped\n");
+    else if(ExpressMode == 0)
+        num_pb_fs = NUM_PB_FS;
 
     /* Initialize heap creation parameters */
     init_small_cparam(&small_cparam);
@@ -16392,359 +16406,409 @@ main(void)
     shared_wobj_g = (unsigned char *)H5MM_malloc(shared_obj_size_g);
     shared_robj_g = (unsigned char *)H5MM_malloc(shared_obj_size_g);
 
-    /* create a file creation property list */
-    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+    /* Create a copy def_fapl and enable page buffering */
+    if((pb_fapl = H5Pcopy(def_fapl)) < 0)
+        TEST_ERROR
+    if(H5Pset_page_buffer_size(pb_fapl, PAGE_BUFFER_PAGE_SIZE, 0, 0) < 0)
         TEST_ERROR
-    if((fcpl2 = H5Pcopy(fcpl)) < 0) TEST_ERROR
 
-    /* Set file space strategy and persisting free-space */
-    /* This will be modified later on to run the test with different file space strategy setting */
-    if(H5Pset_file_space_strategy(fcpl2, H5F_FSPACE_STRATEGY_FSM_AGGR, FALSE, (hsize_t)1) < 0)
+    /* Create a file creation property list */
+    if((def_fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
         TEST_ERROR
 
     /* Initialize the shared write buffer for objects */
     for(u = 0; u < shared_obj_size_g; u++)
         shared_wobj_g[u] = (unsigned char)u;
 
-    /* Iterate over the testing parameters */
-    for(curr_test = FHEAP_TEST_NORMAL; curr_test < FHEAP_TEST_NTESTS; H5_INC_ENUM(fheap_test_type_t, curr_test)) {
-        /* Clear the testing parameters */
-        HDmemset(&tparam, 0, sizeof(fheap_test_param_t));
-        tparam.actual_id_len = HEAP_ID_LEN;
+    for(v = 0; v < num_pb_fs; v++) {
 
-        /* This will be modified later on to run the test with different file space strategy setting */
-        tparam.my_fcpl = fcpl2;
+        if((fcpl = H5Pcopy(def_fcpl)) < 0) 
+            TEST_ERROR
 
-        /* Set appropriate testing parameters for each test */
-        switch(curr_test) {
-            /* "Normal" testing parameters */
-            case FHEAP_TEST_NORMAL:
-                puts("Testing with normal parameters");
+        switch(v) {
+            case 0:
+                if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, FALSE, (hsize_t)1) < 0)
+                    TEST_ERROR
+                fapl = def_fapl;
                 break;
-
-            /* "Re-open heap" testing parameters */
-            case FHEAP_TEST_REOPEN:
-                puts("Testing with reopen heap flag set");
-                tparam.reopen_heap = FHEAP_TEST_REOPEN;
+            case 1:
+                if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0)
+                    TEST_ERROR
+                fapl = def_fapl;
+                break;
+            case 2:
+                if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1) < 0)
+                    TEST_ERROR
+                fapl = def_fapl;
+                break;
+            case 3:
+                if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0)
+                    TEST_ERROR
+                fapl = def_fapl;
+                break;
+            case 4:
+                if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1) < 0)
+                    TEST_ERROR
+                fapl = pb_fapl;
+                break;
+            case 5:
+                if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0)
+                    TEST_ERROR
+                fapl = pb_fapl;
                 break;
 
-            /* An unknown test? */
-            case FHEAP_TEST_NTESTS:
+            case NUM_PB_FS:
             default:
                 goto error;
-        } /* end switch */
-
-        /* Test fractal heap creation */
-        nerrors += test_create(fapl, &small_cparam, &tparam);
-        nerrors += test_reopen(fapl, &small_cparam, &tparam);
-        nerrors += test_open_twice(fapl, &small_cparam, &tparam);
-        nerrors += test_delete_open(fapl, &small_cparam, &tparam);
+        }
 
-        nerrors += test_id_limits(fapl, &small_cparam, tparam.my_fcpl);
-        nerrors += test_filtered_create(fapl, &small_cparam, tparam.my_fcpl);
-        nerrors += test_size(fapl, &small_cparam, tparam.my_fcpl);
-        nerrors += test_reopen_hdr(fapl, &small_cparam, tparam.my_fcpl);
+        /* Iterate over the testing parameters */
+        for(curr_test = FHEAP_TEST_NORMAL; curr_test < FHEAP_TEST_NTESTS; H5_INC_ENUM(fheap_test_type_t, curr_test)) {
+            /* Clear the testing parameters */
+            HDmemset(&tparam, 0, sizeof(fheap_test_param_t));
+            tparam.actual_id_len = HEAP_ID_LEN;
 
-        {
-        fheap_test_fill_t fill;        /* Size of objects to fill heap blocks with */
-
-        /* Filling with different sized objects */
-        for(fill = FHEAP_TEST_FILL_LARGE; fill < FHEAP_TEST_FILL_N; H5_INC_ENUM(fheap_test_fill_t, fill)) {
-            tparam.fill = fill;
+            /* Set to run with different file space setting */
+            tparam.my_fcpl = fcpl;
 
             /* Set appropriate testing parameters for each test */
-            switch(fill) {
-                /* "Bulk fill" heap blocks with 'large' objects */
-                case FHEAP_TEST_FILL_LARGE:
-                    puts("Bulk-filling blocks w/large objects");
+            switch(curr_test) {
+                /* "Normal" testing parameters */
+                case FHEAP_TEST_NORMAL:
+                    puts("Testing with normal parameters");
                     break;
 
-                /* "Bulk fill" heap blocks with 'single' objects */
-                case FHEAP_TEST_FILL_SINGLE:
-                    puts("Bulk-filling blocks w/single object");
+                /* "Re-open heap" testing parameters */
+                case FHEAP_TEST_REOPEN:
+                    puts("Testing with reopen heap flag set");
+                    tparam.reopen_heap = FHEAP_TEST_REOPEN;
                     break;
 
                 /* An unknown test? */
-                case FHEAP_TEST_FILL_N:
+                case FHEAP_TEST_NTESTS:
                 default:
                     goto error;
             } /* end switch */
 
-            /*
-             * Test fractal heap managed object insertion
-             */
+            /* Test fractal heap creation */
+            nerrors += test_create(fapl, &small_cparam, &tparam);
+            nerrors += test_reopen(fapl, &small_cparam, &tparam);
+            nerrors += test_open_twice(fapl, &small_cparam, &tparam);
+            nerrors += test_delete_open(fapl, &small_cparam, &tparam);
 
-            /* "Weird" sized objects */
-            nerrors += test_man_insert_weird(fapl, &small_cparam, &tparam);
+            nerrors += test_id_limits(fapl, &small_cparam, tparam.my_fcpl);
+            nerrors += test_filtered_create(fapl, &small_cparam, tparam.my_fcpl);
+            nerrors += test_size(fapl, &small_cparam, tparam.my_fcpl);
+            nerrors += test_reopen_hdr(fapl, &small_cparam, tparam.my_fcpl);
 
-#ifdef ALL_INSERT_TESTS
-            /* "Standard" sized objects, building from simple to complex heaps */
-            nerrors += test_man_insert_first(fapl, &small_cparam, &tparam);
-            nerrors += test_man_insert_second(fapl, &small_cparam, &tparam);
-            nerrors += test_man_insert_root_mult(fapl, &small_cparam, &tparam);
-            nerrors += test_man_insert_force_indirect(fapl, &small_cparam, &tparam);
-            nerrors += test_man_insert_fill_second(fapl, &small_cparam, &tparam);
-            nerrors += test_man_insert_third_direct(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_first_row(fapl, &small_cparam, &tparam);
-            nerrors += test_man_start_second_row(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_second_row(fapl, &small_cparam, &tparam);
-            nerrors += test_man_start_third_row(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_fourth_row(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_all_root_direct(fapl, &small_cparam, &tparam);
-            nerrors += test_man_first_recursive_indirect(fapl, &small_cparam, &tparam);
-            nerrors += test_man_second_direct_recursive_indirect(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_first_recursive_indirect(fapl, &small_cparam, &tparam);
-            nerrors += test_man_second_recursive_indirect(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_second_recursive_indirect(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_recursive_indirect_row(fapl, &small_cparam, &tparam);
-            nerrors += test_man_start_2nd_recursive_indirect(fapl, &small_cparam, &tparam);
-            nerrors += test_man_recursive_indirect_two_deep(fapl, &small_cparam, &tparam);
-            nerrors += test_man_start_3rd_recursive_indirect(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_first_3rd_recursive_indirect(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_3rd_recursive_indirect_row(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_all_3rd_recursive_indirect(fapl, &small_cparam, &tparam);
-            nerrors += test_man_start_4th_recursive_indirect(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_first_4th_recursive_indirect(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_4th_recursive_indirect_row(fapl, &small_cparam, &tparam);
-            nerrors += test_man_fill_all_4th_recursive_indirect(fapl, &small_cparam, &tparam);
-#endif /* ALL_INSERT_TESTS */
-            /* If this test fails, uncomment the tests above, which build up to this
-             * level of complexity gradually. -QAK
-             */
-            if(ExpressMode > 1)
-                printf("***Express test mode on.  test_man_start_5th_recursive_indirect is skipped\n");
-            else
-                nerrors += test_man_start_5th_recursive_indirect(fapl, &small_cparam, &tparam);
+            {
+            fheap_test_fill_t fill;        /* Size of objects to fill heap blocks with */
 
-            /*
-             * Test fractal heap object deletion
-             */
-            /* Simple removal */
-            nerrors += test_man_remove_bogus(fapl, &small_cparam, &tparam);
-            nerrors += test_man_remove_one(fapl, &small_cparam, &tparam);
-            nerrors += test_man_remove_two(fapl, &small_cparam, &tparam);
-            nerrors += test_man_remove_one_larger(fapl, &small_cparam, &tparam);
-            tparam.del_dir = FHEAP_DEL_FORWARD;
-            nerrors += test_man_remove_two_larger(fapl, &small_cparam, &tparam);
-            tparam.del_dir = FHEAP_DEL_REVERSE;
-            nerrors += test_man_remove_two_larger(fapl, &small_cparam, &tparam);
-            tparam.del_dir = FHEAP_DEL_FORWARD;
-            nerrors += test_man_remove_three_larger(fapl, &small_cparam, &tparam);
-            tparam.del_dir = FHEAP_DEL_REVERSE;
-            nerrors += test_man_remove_three_larger(fapl, &small_cparam, &tparam);
-
-            /* Incremental insert & removal */
-            tparam.del_dir = FHEAP_DEL_FORWARD;
-            nerrors += test_man_incr_insert_remove(fapl, &small_cparam, &tparam);
+            /* Filling with different sized objects */
+            for(fill = FHEAP_TEST_FILL_LARGE; fill < FHEAP_TEST_FILL_N; H5_INC_ENUM(fheap_test_fill_t, fill)) {
+                tparam.fill = fill;
 
-            {
-            fheap_test_del_dir_t del_dir;        /* Deletion direction */
-            fheap_test_del_drain_t drain_half;   /* Deletion draining */
+                /* Set appropriate testing parameters for each test */
+                switch(fill) {
+                    /* "Bulk fill" heap blocks with 'large' objects */
+                    case FHEAP_TEST_FILL_LARGE:
+                        puts("Bulk-filling blocks w/large objects");
+                        break;
 
-            /* More complex removal patterns */
-            for(del_dir = FHEAP_DEL_FORWARD; del_dir < FHEAP_DEL_NDIRS; H5_INC_ENUM(fheap_test_del_dir_t, del_dir)) {
-                tparam.del_dir = del_dir;
-                for(drain_half = FHEAP_DEL_DRAIN_ALL; drain_half < FHEAP_DEL_DRAIN_N; H5_INC_ENUM(fheap_test_del_drain_t, drain_half)) {
-                    tparam.drain_half = drain_half;
-                    /* Don't need to test deletion directions when deleting entire heap */
-                    if(tparam.del_dir == FHEAP_DEL_HEAP && tparam.drain_half > FHEAP_DEL_DRAIN_ALL)
+                    /* "Bulk fill" heap blocks with 'single' objects */
+                    case FHEAP_TEST_FILL_SINGLE:
+                        puts("Bulk-filling blocks w/single object");
                         break;
 
-                    /* Simple insertion patterns */
-                    nerrors += test_man_remove_root_direct(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_remove_two_direct(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_remove_first_row(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_remove_first_two_rows(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_remove_first_four_rows(fapl, &small_cparam, &tparam);
-                    if(ExpressMode > 1)
-                        printf("***Express test mode on.  Some tests skipped\n");
-                    else {
-                        nerrors += test_man_remove_all_root_direct(fapl, &small_cparam, &tparam);
-                        nerrors += test_man_remove_2nd_indirect(fapl, &small_cparam, &tparam);
-                        nerrors += test_man_remove_3rd_indirect(fapl, &small_cparam, &tparam);
-                    } /* end else */
-
-                    /* Skip blocks insertion */
-                    /* (covers insertion & deletion of skipped blocks) */
-                    nerrors += test_man_skip_start_block(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_skip_start_block_add_back(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_skip_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_skip_2nd_block(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_skip_2nd_block_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_one_partial_skip_2nd_block_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_row_skip_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_skip_direct_skip_indirect_two_rows_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_direct_skip_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_direct_skip_indirect_two_rows_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_2nd_direct_skip_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                    if(ExpressMode > 1)
-                        printf("***Express test mode on.  Some tests skipped\n");
-                    else {
-                        nerrors += test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                        nerrors += test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                        nerrors += test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                        nerrors += test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                        nerrors += test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped(fapl, &small_cparam, &tparam);
-                    } /* end else */
-
-                    /* Fragmented insertion patterns */
-                    /* (covers insertion & deletion of fragmented blocks) */
-                    nerrors += test_man_frag_simple(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_frag_direct(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_frag_2nd_direct(fapl, &small_cparam, &tparam);
-                    nerrors += test_man_frag_3rd_direct(fapl, &small_cparam, &tparam);
+                    /* An unknown test? */
+                    case FHEAP_TEST_FILL_N:
+                    default:
+                        goto error;
+                } /* end switch */
+
+                /*
+                 * Test fractal heap managed object insertion
+                 */
+
+                 /* "Weird" sized objects */
+                 nerrors += test_man_insert_weird(fapl, &small_cparam, &tparam);
+
+#ifdef ALL_INSERT_TESTS
+                 /* "Standard" sized objects, building from simple to complex heaps */
+                 nerrors += test_man_insert_first(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_insert_second(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_insert_root_mult(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_insert_force_indirect(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_insert_fill_second(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_insert_third_direct(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_first_row(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_start_second_row(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_second_row(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_start_third_row(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_fourth_row(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_all_root_direct(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_first_recursive_indirect(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_second_direct_recursive_indirect(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_first_recursive_indirect(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_second_recursive_indirect(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_second_recursive_indirect(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_recursive_indirect_row(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_start_2nd_recursive_indirect(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_recursive_indirect_two_deep(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_start_3rd_recursive_indirect(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_first_3rd_recursive_indirect(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_3rd_recursive_indirect_row(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_all_3rd_recursive_indirect(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_start_4th_recursive_indirect(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_first_4th_recursive_indirect(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_4th_recursive_indirect_row(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_fill_all_4th_recursive_indirect(fapl, &small_cparam, &tparam);
+#endif /* ALL_INSERT_TESTS */
+                /* If this test fails, uncomment the tests above, which build up to this
+                 * level of complexity gradually. -QAK
+                 */
+                if(ExpressMode > 1)
+                    printf("***Express test mode on.  test_man_start_5th_recursive_indirect is skipped\n");
+                else
+                    nerrors += test_man_start_5th_recursive_indirect(fapl, &small_cparam, &tparam);
+
+                /*
+                 * Test fractal heap object deletion
+                 */
+                 /* Simple removal */
+                 nerrors += test_man_remove_bogus(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_remove_one(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_remove_two(fapl, &small_cparam, &tparam);
+                 nerrors += test_man_remove_one_larger(fapl, &small_cparam, &tparam);
+                 tparam.del_dir = FHEAP_DEL_FORWARD;
+                 nerrors += test_man_remove_two_larger(fapl, &small_cparam, &tparam);
+                 tparam.del_dir = FHEAP_DEL_REVERSE;
+                 nerrors += test_man_remove_two_larger(fapl, &small_cparam, &tparam);
+                 tparam.del_dir = FHEAP_DEL_FORWARD;
+                 nerrors += test_man_remove_three_larger(fapl, &small_cparam, &tparam);
+                 tparam.del_dir = FHEAP_DEL_REVERSE;
+                nerrors += test_man_remove_three_larger(fapl, &small_cparam, &tparam);
+
+                /* Incremental insert & removal */
+                tparam.del_dir = FHEAP_DEL_FORWARD;
+                nerrors += test_man_incr_insert_remove(fapl, &small_cparam, &tparam);
+
+                {
+                fheap_test_del_dir_t del_dir;        /* Deletion direction */
+                fheap_test_del_drain_t drain_half;   /* Deletion draining */
+
+                /* More complex removal patterns */
+                for(del_dir = FHEAP_DEL_FORWARD; del_dir < FHEAP_DEL_NDIRS; H5_INC_ENUM(fheap_test_del_dir_t, del_dir)) {
+                    tparam.del_dir = del_dir;
+                    for(drain_half = FHEAP_DEL_DRAIN_ALL; drain_half < FHEAP_DEL_DRAIN_N; H5_INC_ENUM(fheap_test_del_drain_t, drain_half)) {
+                        tparam.drain_half = drain_half;
+                        /* Don't need to test deletion directions when deleting entire heap */
+                        if(tparam.del_dir == FHEAP_DEL_HEAP && tparam.drain_half > FHEAP_DEL_DRAIN_ALL)
+                            break;
+
+                        /* Simple insertion patterns */
+                        nerrors += test_man_remove_root_direct(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_remove_two_direct(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_remove_first_row(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_remove_first_two_rows(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_remove_first_four_rows(fapl, &small_cparam, &tparam);
+                        if(ExpressMode > 1)
+                            printf("***Express test mode on.  Some tests skipped\n");
+                        else {
+                            nerrors += test_man_remove_all_root_direct(fapl, &small_cparam, &tparam);
+                            nerrors += test_man_remove_2nd_indirect(fapl, &small_cparam, &tparam);
+                            nerrors += test_man_remove_3rd_indirect(fapl, &small_cparam, &tparam);
+                        } /* end else */
+
+                        /* Skip blocks insertion */
+                        /* (covers insertion & deletion of skipped blocks) */
+                        nerrors += test_man_skip_start_block(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_skip_start_block_add_back(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_skip_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_skip_2nd_block(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_skip_2nd_block_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_one_partial_skip_2nd_block_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_row_skip_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_skip_direct_skip_indirect_two_rows_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_direct_skip_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_direct_skip_indirect_two_rows_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_2nd_direct_skip_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                        if(ExpressMode > 1)
+                            printf("***Express test mode on.  Some tests skipped\n");
+                        else {
+                            nerrors += test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                            nerrors += test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                            nerrors += test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                            nerrors += test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                            nerrors += test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped(fapl, &small_cparam, &tparam);
+                        } /* end else */
+
+                        /* Fragmented insertion patterns */
+                        /* (covers insertion & deletion of fragmented blocks) */
+                        nerrors += test_man_frag_simple(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_frag_direct(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_frag_2nd_direct(fapl, &small_cparam, &tparam);
+                        nerrors += test_man_frag_3rd_direct(fapl, &small_cparam, &tparam);
+                    } /* end for */
                 } /* end for */
-            } /* end for */
 
-            /* Reset deletion drain parameter */
-            tparam.drain_half = FHEAP_DEL_DRAIN_ALL;
+                /* Reset deletion drain parameter */
+                tparam.drain_half = FHEAP_DEL_DRAIN_ALL;
 
-            } /* end block */
+                } /* end block */
             } /* end for */
-        } /* end block */
+            } /* end block */
 
-        /*
-         * Test fractal heap 'huge' & 'tiny' object insertion & deletion
-         */
-        {
-        fheap_test_del_dir_t del_dir;   /* Deletion direction */
-        unsigned id_len;                /* Length of heap IDs */
-
-        /* Test "normal" & "direct" storage of 'huge' & 'tiny' heap IDs */
-        for(id_len = 0; id_len < 3; id_len++) {
-            /* Set the ID length for this test */
-            small_cparam.id_len = (uint16_t)id_len;
-
-            /* Print information about each test */
-            switch(id_len) {
-                /* Use "normal" form for 'huge' object's heap IDs */
-                case 0:
-                    puts("Using 'normal' heap ID format for 'huge' objects");
-                    break;
+            /*
+             * Test fractal heap 'huge' & 'tiny' object insertion & deletion
+             */
+            {
+            fheap_test_del_dir_t del_dir;   /* Deletion direction */
+            unsigned id_len;                /* Length of heap IDs */
+
+            /* Test "normal" & "direct" storage of 'huge' & 'tiny' heap IDs */
+            for(id_len = 0; id_len < 3; id_len++) {
+                /* Set the ID length for this test */
+                small_cparam.id_len = (uint16_t)id_len;
+
+                /* Print information about each test */
+                switch(id_len) {
+                    /* Use "normal" form for 'huge' object's heap IDs */
+                    case 0:
+                        puts("Using 'normal' heap ID format for 'huge' objects");
+                        break;
 
-                /* Use "direct" form for 'huge' object's heap IDs */
-                case 1:
-                    puts("Using 'direct' heap ID format for 'huge' objects");
+                    /* Use "direct" form for 'huge' object's heap IDs */
+                    case 1:
+                        puts("Using 'direct' heap ID format for 'huge' objects");
 
-                    /* Adjust actual length of heap IDs for directly storing 'huge' object's file offset & length in heap ID */
-                    tparam.actual_id_len = 17;   /* 1 + 8 (file address size) + 8 (file length size) */
-                    break;
+                        /* Adjust actual length of heap IDs for directly storing 'huge' object's file offset & length in heap ID */
+                        tparam.actual_id_len = 17;   /* 1 + 8 (file address size) + 8 (file length size) */
+                        break;
 
-                /* Use "direct" storage for 'huge' objects and larger IDs for 'tiny' objects */
-                case 2:
-                    small_cparam.id_len = 37;
-                    puts("Using 'direct' heap ID format for 'huge' objects and larger IDs for 'tiny' objects");
-                    tparam.actual_id_len = 37;
-                    break;
+                    /* Use "direct" storage for 'huge' objects and larger IDs for 'tiny' objects */
+                    case 2:
+                        small_cparam.id_len = 37;
+                        puts("Using 'direct' heap ID format for 'huge' objects and larger IDs for 'tiny' objects");
+                        tparam.actual_id_len = 37;
+                        break;
 
-                /* An unknown test? */
-                default:
-                    goto error;
-            } /* end switch */
+                    /* An unknown test? */
+                    default:
+                        goto error;
+                } /* end switch */
+
+                /* Try several different methods of deleting objects */
+                for(del_dir = FHEAP_DEL_FORWARD; del_dir < FHEAP_DEL_NDIRS; H5_INC_ENUM(fheap_test_del_dir_t, del_dir)) {
+                    tparam.del_dir = del_dir;
+
+                    /* Test 'huge' object insert & delete */
+                    nerrors += test_huge_insert_one(fapl, &small_cparam, &tparam);
+                    nerrors += test_huge_insert_two(fapl, &small_cparam, &tparam);
+                    nerrors += test_huge_insert_three(fapl, &small_cparam, &tparam);
+                    nerrors += test_huge_insert_mix(fapl, &small_cparam, &tparam);
+                    nerrors += test_filtered_huge(fapl, &small_cparam, &tparam);
+
+                    /* Test 'tiny' object insert & delete */
+                    nerrors += test_tiny_insert_one(fapl, &small_cparam, &tparam);
+                    nerrors += test_tiny_insert_two(fapl, &small_cparam, &tparam);
+                    nerrors += test_tiny_insert_mix(fapl, &small_cparam, &tparam);
+                } /* end for */
+            } /* end for */
+
+            /* Reset the "normal" heap ID lengths */
+            small_cparam.id_len = 0;
+            tparam.actual_id_len = HEAP_ID_LEN;
+            } /* end block */
+
+            /* Test I/O filter support */
 
             /* Try several different methods of deleting objects */
+            {
+            fheap_test_del_dir_t del_dir;   /* Deletion direction */
+
             for(del_dir = FHEAP_DEL_FORWARD; del_dir < FHEAP_DEL_NDIRS; H5_INC_ENUM(fheap_test_del_dir_t, del_dir)) {
                 tparam.del_dir = del_dir;
 
-                /* Test 'huge' object insert & delete */
-                nerrors += test_huge_insert_one(fapl, &small_cparam, &tparam);
-                nerrors += test_huge_insert_two(fapl, &small_cparam, &tparam);
-                nerrors += test_huge_insert_three(fapl, &small_cparam, &tparam);
-                nerrors += test_huge_insert_mix(fapl, &small_cparam, &tparam);
-                nerrors += test_filtered_huge(fapl, &small_cparam, &tparam);
-
-                /* Test 'tiny' object insert & delete */
-                nerrors += test_tiny_insert_one(fapl, &small_cparam, &tparam);
-                nerrors += test_tiny_insert_two(fapl, &small_cparam, &tparam);
-                nerrors += test_tiny_insert_mix(fapl, &small_cparam, &tparam);
+                /* Controlled tests */
+                /* XXX: Re-enable file size checks in these tests, after the file has persistent free space tracking working */
+                nerrors += test_filtered_man_root_direct(fapl, &small_cparam, &tparam);
+                nerrors += test_filtered_man_root_indirect(fapl, &small_cparam, &tparam);
+
+                /* Random tests, with compressed blocks */
+                tparam.comp = FHEAP_TEST_COMPRESS;
+                nerrors += test_random((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(50*1000*1000) : (hsize_t)(25*1000*1000)), fapl, &small_cparam, &tparam);
+                nerrors += test_random_pow2((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(50*1000*1000) : (hsize_t)(2*1000*1000)), fapl, &small_cparam, &tparam);
+
+                /* Reset block compression */
+                tparam.comp = FHEAP_TEST_NO_COMPRESS;
             } /* end for */
-        } /* end for */
+            } /* end block */
+
+            /* Random object insertion & deletion */
+            if(ExpressMode > 1)
+                printf("***Express test mode on.  Some tests skipped\n");
+            else {
+                /* Random tests using "small" heap creation parameters */
+                puts("Using 'small' heap creation parameters");
+
+                /* (reduce size of tests when re-opening each time) */
+                /* XXX: Try to speed things up enough that these tests don't have to be reduced when re-opening */
+                tparam.del_dir = FHEAP_DEL_FORWARD;
+                nerrors += test_random((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(50*1000*1000)), fapl, &small_cparam, &tparam);
+                nerrors += test_random_pow2((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(4*1000*1000)), fapl, &small_cparam, &tparam);
+
+                tparam.del_dir = FHEAP_DEL_HEAP;
+                nerrors += test_random((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(50*1000*1000)), fapl, &small_cparam, &tparam);
+                nerrors += test_random_pow2((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(4*1000*1000)), fapl, &small_cparam, &tparam);
 
-        /* Reset the "normal" heap ID lengths */
-        small_cparam.id_len = 0;
-        tparam.actual_id_len = HEAP_ID_LEN;
-        } /* end block */
+                /* Random tests using "large" heap creation parameters */
+                puts("Using 'large' heap creation parameters");
+                tparam.actual_id_len = LARGE_HEAP_ID_LEN;
 
-        /* Test I/O filter support */
+                /* (reduce size of tests when re-opening each time) */
+                /* XXX: Try to speed things up enough that these tests don't have to be reduced when re-opening */
+                tparam.del_dir = FHEAP_DEL_FORWARD;
+                nerrors += test_random((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(50*1000*1000)), fapl, &large_cparam, &tparam);
+                nerrors += test_random_pow2((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(4*1000*1000)), fapl, &large_cparam, &tparam);
 
-        /* Try several different methods of deleting objects */
-        {
-        fheap_test_del_dir_t del_dir;   /* Deletion direction */
+                tparam.del_dir = FHEAP_DEL_HEAP;
+                nerrors += test_random((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(50*1000*1000)), fapl, &large_cparam, &tparam);
+                nerrors += test_random_pow2((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(4*1000*1000)), fapl, &large_cparam, &tparam);
 
-        for(del_dir = FHEAP_DEL_FORWARD; del_dir < FHEAP_DEL_NDIRS; H5_INC_ENUM(fheap_test_del_dir_t, del_dir)) {
-            tparam.del_dir = del_dir;
+                /* Reset the "normal" heap ID length */
+                tparam.actual_id_len = SMALL_HEAP_ID_LEN;
+            } /* end else */
 
-            /* Controlled tests */
-/* XXX: Re-enable file size checks in these tests, after the file has persistent free space tracking working */
-            nerrors += test_filtered_man_root_direct(fapl, &small_cparam, &tparam);
-            nerrors += test_filtered_man_root_indirect(fapl, &small_cparam, &tparam);
+            /* Test object writing support */
 
-            /* Random tests, with compressed blocks */
+            /* Basic object writing */
+            nerrors += test_write(fapl, &small_cparam, &tparam);
+
+            /* Writing objects in heap with filters */
             tparam.comp = FHEAP_TEST_COMPRESS;
-            nerrors += test_random((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(50*1000*1000) : (hsize_t)(25*1000*1000)), fapl, &small_cparam, &tparam);
-            nerrors += test_random_pow2((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(50*1000*1000) : (hsize_t)(2*1000*1000)), fapl, &small_cparam, &tparam);
+            nerrors += test_write(fapl, &small_cparam, &tparam);
 
             /* Reset block compression */
             tparam.comp = FHEAP_TEST_NO_COMPRESS;
         } /* end for */
-        } /* end block */
-
-        /* Random object insertion & deletion */
-        if(ExpressMode > 1)
-            printf("***Express test mode on.  Some tests skipped\n");
-        else {
-            /* Random tests using "small" heap creation parameters */
-            puts("Using 'small' heap creation parameters");
-
-            /* (reduce size of tests when re-opening each time) */
-/* XXX: Try to speed things up enough that these tests don't have to be reduced when re-opening */
-            tparam.del_dir = FHEAP_DEL_FORWARD;
-            nerrors += test_random((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(50*1000*1000)), fapl, &small_cparam, &tparam);
-            nerrors += test_random_pow2((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(4*1000*1000)), fapl, &small_cparam, &tparam);
-
-            tparam.del_dir = FHEAP_DEL_HEAP;
-            nerrors += test_random((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(50*1000*1000)), fapl, &small_cparam, &tparam);
-            nerrors += test_random_pow2((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(4*1000*1000)), fapl, &small_cparam, &tparam);
-
-            /* Random tests using "large" heap creation parameters */
-            puts("Using 'large' heap creation parameters");
-            tparam.actual_id_len = LARGE_HEAP_ID_LEN;
-
-            /* (reduce size of tests when re-opening each time) */
-/* XXX: Try to speed things up enough that these tests don't have to be reduced when re-opening */
-            tparam.del_dir = FHEAP_DEL_FORWARD;
-            nerrors += test_random((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(50*1000*1000)), fapl, &large_cparam, &tparam);
-            nerrors += test_random_pow2((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(4*1000*1000)), fapl, &large_cparam, &tparam);
-
-            tparam.del_dir = FHEAP_DEL_HEAP;
-            nerrors += test_random((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(50*1000*1000)), fapl, &large_cparam, &tparam);
-            nerrors += test_random_pow2((curr_test == FHEAP_TEST_NORMAL ? (hsize_t)(100*1000*1000) : (hsize_t)(4*1000*1000)), fapl, &large_cparam, &tparam);
-
-            /* Reset the "normal" heap ID length */
-            tparam.actual_id_len = SMALL_HEAP_ID_LEN;
-        } /* end else */
-
-        /* Test object writing support */
 
-        /* Basic object writing */
-        nerrors += test_write(fapl, &small_cparam, &tparam);
-
-        /* Writing objects in heap with filters */
-        tparam.comp = FHEAP_TEST_COMPRESS;
-        nerrors += test_write(fapl, &small_cparam, &tparam);
+        if(H5Pclose(fcpl) < 0)
+            TEST_ERROR
+    } /* end num_pb_fs */
 
-        /* Reset block compression */
-        tparam.comp = FHEAP_TEST_NO_COMPRESS;
-    } /* end for */
+    /* Tests that address specific bugs */
+    tparam.my_fcpl = def_fcpl;
+    fapl = def_fapl;
 
     /* Tests that address specific bugs */
     nerrors += test_bug1(fapl, &small_cparam, &tparam);
@@ -16763,12 +16827,12 @@ main(void)
     H5MM_xfree(shared_lens_g);
     H5MM_xfree(shared_offs_g);
 
-    if(H5Pclose(fcpl) < 0) TEST_ERROR
-    if(H5Pclose(fcpl2) < 0) TEST_ERROR
+    if(H5Pclose(def_fcpl) < 0) TEST_ERROR
+    if(H5Pclose(pb_fapl) < 0) TEST_ERROR
 
     /* Clean up file used */
 #ifndef QAK
-    h5_cleanup(FILENAME, fapl);
+    h5_cleanup(FILENAME, def_fapl);
 #else /* QAK */
 HDfprintf(stderr, "Uncomment cleanup!\n");
 #endif /* QAK */
@@ -16783,7 +16847,10 @@ error:
         H5MM_xfree(shared_ids_g);
         H5MM_xfree(shared_lens_g);
         H5MM_xfree(shared_offs_g);
-	H5Pclose(fapl);
+        H5Pclose(def_fapl);
+        H5Pclose(pb_fapl);
+        H5Pclose(def_fcpl);
+        H5Pclose(fcpl);
     } H5E_END_TRY;
     return 1;
 } /* end main() */
diff --git a/test/page_buffer.c b/test/page_buffer.c
index b94ad03..54a25d6 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -52,6 +52,10 @@ static unsigned test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr)
 static unsigned test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr);
 static unsigned test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr);
 static unsigned test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr);
+#ifdef H5_HAVE_PARALLEL
+static unsigned verify_page_buffering_disabled(hid_t orig_fapl, 
+    const char *env_h5_drvr);
+#endif /* H5_HAVE_PARALLEL */
 
 const char *FILENAME[] = {
     "filepaged",
@@ -2007,6 +2011,121 @@ error:
 
 
 /*-------------------------------------------------------------------------
+ * Function:    verify_page_buffering_disabled()
+ *
+ * Purpose:     This function should only be called in parallel 
+ *              builds.
+ *
+ *              At present, page buffering should be disabled in parallel
+ *              builds.  Verify this.
+ *
+ * Return:      0 if test is sucessful
+ *              1 if test fails
+ *
+ * Programmer:  John Mainzer
+ *              03/21/17
+ *              
+ * Changes:     None.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifdef H5_HAVE_PARALLEL
+static unsigned
+verify_page_buffering_disabled(hid_t orig_fapl, const char *env_h5_drvr)
+{
+    char filename[FILENAME_LEN]; /* Filename to use */
+    hid_t file_id = -1;          /* File ID */
+    hid_t fcpl = -1;
+    hid_t fapl = -1;
+
+    TESTING("Page Buffering Disabled");
+    h5_fixname(FILENAME[0], orig_fapl, filename, sizeof(filename));
+
+
+    /* first, try to create a file with page buffering enabled */
+
+    if((fapl = H5Pcopy(orig_fapl)) < 0)
+        TEST_ERROR
+
+    if(set_multi_split(env_h5_drvr, fapl, 4096)  != 0)
+        TEST_ERROR;
+
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_file_space_page_size(fcpl, 4096) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_page_buffer_size(fapl, 4096*8, 0, 0) < 0)
+        FAIL_STACK_ERROR;
+
+    /* try to create  the file -- should fail */
+    H5E_BEGIN_TRY {
+        file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
+    } H5E_END_TRY;
+
+    if(file_id >= 0)
+        TEST_ERROR;
+
+    /* now, create a file, close it, and then try to open it with page 
+     * buffering enabled.
+     */
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_file_space_page_size(fcpl, 4096) < 0)
+        FAIL_STACK_ERROR;
+
+    /* create the file */
+    if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR;
+
+    /* close the file */
+    if(H5Fclose(file_id) < 0)
+        FAIL_STACK_ERROR;
+
+    /* try to open the file using the fapl prepared above which enables 
+     * page buffering.  Should fail.
+     */
+    H5E_BEGIN_TRY {
+        file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl);
+    } H5E_END_TRY;
+
+    if(file_id >= 0)
+        TEST_ERROR;
+
+    if(H5Pclose(fcpl) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pclose(fapl) < 0)
+        FAIL_STACK_ERROR;
+
+    PASSED()
+
+    return 0;
+
+error:
+
+    H5E_BEGIN_TRY {
+        H5Pclose(fapl);
+        H5Pclose(fcpl);
+        H5Fclose(file_id);
+    } H5E_END_TRY;
+
+    return 1;
+
+} /* verify_page_buffering_disabled() */
+#endif /* H5_HAVE_PARALLEL */
+
+
+/*-------------------------------------------------------------------------
  * Function:    main()
  *
  * Purpose:     Main function for the page buffer tests.
@@ -2026,8 +2145,6 @@ main(void)
     unsigned    nerrors = 0;            /* Cumulative error count */
     const char  *env_h5_drvr = NULL;    /* File Driver value from environment */
 
-#ifndef H5_HAVE_PARALLEL
-
     h5_reset();
 
     /* Get the VFD to use */
@@ -2052,12 +2169,21 @@ main(void)
         PUTS_ERROR("Can't get VFD-dependent fapl")
     } /* end if */
 
+#ifdef H5_HAVE_PARALLEL 
+
+    HDputs("Page Buffering is disabled for parallel.");
+    nerrors += verify_page_buffering_disabled(fapl, env_h5_drvr);
+
+#else /* H5_HAVE_PARALLEL */
+
     nerrors += test_args(fapl, env_h5_drvr);
     nerrors += test_raw_data_handling(fapl, env_h5_drvr);
     nerrors += test_lru_processing(fapl, env_h5_drvr);
     nerrors += test_min_threshold(fapl, env_h5_drvr);
     nerrors += test_stats_collection(fapl, env_h5_drvr);
 
+#endif /* H5_HAVE_PARALLEL */
+
     h5_clean_files(FILENAME, fapl);
 
     if(nerrors)
@@ -2065,11 +2191,6 @@ main(void)
 
     HDputs("All Page Buffering tests passed.");
 
-#else
-    SKIPPED()
-    HDputs("Page Buffering is disabled for parallel.");
-#endif
-
     HDexit(EXIT_SUCCESS);
 
 error:
diff --git a/test/plugin.c b/test/plugin.c
index a70e885..2939595 100644
--- a/test/plugin.c
+++ b/test/plugin.c
@@ -12,24 +12,26 @@
  * to either file, you may request a copy from help@hdfgroup.org.            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /*
- * Programmer:	Raymond Lu
- *		13 February 2013
+ * Programmer:    Raymond Lu
+ *        13 February 2013
  *
- * Purpose:	Tests the plugin module (H5PL)
+ * Purpose:    Tests the plugin module (H5PL)
  */
 
 #include "h5test.h"
 #include "H5srcdir.h"
 
 /*
- * This file needs to access private datatypes from the H5Z package.
+ * This file needs to access private datatypes from the H5Z and H5PL package.
  */
+#define H5PL_FRIEND
+#include "H5PLpkg.h"
 #define H5Z_FRIEND
 #include "H5Zpkg.h"
 
 /* Filters for HDF5 internal test */
 #define H5Z_FILTER_DYNLIB1      257
-#define H5Z_FILTER_DYNLIB2      258 
+#define H5Z_FILTER_DYNLIB2      258
 #define H5Z_FILTER_DYNLIB3      259
 #define H5Z_FILTER_DYNLIB4      260
 
@@ -40,10 +42,10 @@ const char *FILENAME[] = {
 #define FILENAME_BUF_SIZE       1024
 
 /* Dataset names for testing filters */
-#define DSET_DEFLATE_NAME	"deflate"
-#define DSET_DYNLIB1_NAME	"dynlib1"
-#define DSET_DYNLIB2_NAME       "dynlib2"
-#define DSET_DYNLIB4_NAME   "dynlib4"
+#define DSET_DEFLATE_NAME    "deflate"
+#define DSET_DYNLIB1_NAME    "dynlib1"
+#define DSET_DYNLIB2_NAME    "dynlib2"
+#define DSET_DYNLIB4_NAME    "dynlib4"
 
 /* Parameters for internal filter test */
 #define FILTER_CHUNK_DIM1       2
@@ -62,65 +64,61 @@ const char *FILENAME[] = {
 
 #define GROUP_ITERATION 1000
 
-int	points_deflate[DSET_DIM1][DSET_DIM2], 
-        points_dynlib1[DSET_DIM1][DSET_DIM2],
-        points_dynlib2[DSET_DIM1][DSET_DIM2],
-        points_dynlib4[DSET_DIM1][DSET_DIM2],
-        points_bzip2[DSET_DIM1][DSET_DIM2];
+int    points_deflate[DSET_DIM1][DSET_DIM2],
+       points_dynlib1[DSET_DIM1][DSET_DIM2],
+       points_dynlib2[DSET_DIM1][DSET_DIM2],
+       points_dynlib4[DSET_DIM1][DSET_DIM2],
+       points_bzip2[DSET_DIM1][DSET_DIM2];
 
 
 /*-------------------------------------------------------------------------
- * Function:	test_filter_internal
+ * Function:  test_filter_internal
  *
- * Purpose:	Tests writing entire data and partial data with filters  
- *
- * Return:	Success:	0
- *		Failure:	-1
- *
- * Programmer:	Raymond Lu
- *              27 February 2013
+ * Purpose:   Tests writing entire data and partial data with filters
  *
+ * Return:    Success:    0
+ *            Failure:    -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 test_filter_internal(hid_t fid, const char *name, hid_t dcpl)
 {
-    hid_t		dataset;        /* Dataset ID */
-    hid_t		dxpl;           /* Dataset xfer property list ID */
-    hid_t		write_dxpl;     /* Dataset xfer property list ID for writing */
-    hid_t		sid;            /* Dataspace ID */
-    const hsize_t	size[2] = {DSET_DIM1, DSET_DIM2};           /* Dataspace dimensions */
-    const hsize_t	hs_offset[2] = {FILTER_HS_OFFSET1, FILTER_HS_OFFSET2}; /* Hyperslab offset */
-    const hsize_t	hs_size[2] = {FILTER_HS_SIZE1, FILTER_HS_SIZE2};   /* Hyperslab size */
-    void		*tconv_buf = NULL;      /* Temporary conversion buffer */
-    int	                points[DSET_DIM1][DSET_DIM2], check[DSET_DIM1][DSET_DIM2];
-    size_t		i, j;        /* Local index variables */
-    int                 n = 0;
+    herr_t       ret_value = -1;
+    hid_t        dataset = -1;          /* Dataset ID */
+    hid_t        dxpl = -1;             /* Dataset xfer property list ID */
+    hid_t        write_dxpl = -1;       /* Dataset xfer property list ID for writing */
+    hid_t        sid = -1;              /* Dataspace ID */
+    const hsize_t    size[2] = {DSET_DIM1, DSET_DIM2};                      /* Dataspace dimensions */
+    const hsize_t    hs_offset[2] = {FILTER_HS_OFFSET1, FILTER_HS_OFFSET2}; /* Hyperslab offset */
+    const hsize_t    hs_size[2] = {FILTER_HS_SIZE1, FILTER_HS_SIZE2};       /* Hyperslab size */
+    void        *tconv_buf = NULL;      /* Temporary conversion buffer */
+    int          points[DSET_DIM1][DSET_DIM2], check[DSET_DIM1][DSET_DIM2];
+    size_t       i, j;                  /* Local index variables */
+    int          n = 0;
 
     /* Create the data space */
-    if((sid = H5Screate_simple(2, size, NULL)) < 0) goto error;
+    if((sid = H5Screate_simple(2, size, NULL)) < 0) TEST_ERROR
 
     /*
      * Create a small conversion buffer to test strip mining. We
      * might as well test all we can!
      */
-    if((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0) goto error;
+    if((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR
     tconv_buf = HDmalloc((size_t)1000);
-    if(H5Pset_buffer(dxpl, (size_t)1000, tconv_buf, NULL) < 0) goto error;
+    if(H5Pset_buffer(dxpl, (size_t)1000, tconv_buf, NULL) < 0) TEST_ERROR
     if((write_dxpl = H5Pcopy(dxpl)) < 0) TEST_ERROR;
 
     TESTING("    filters (setup)");
 
     /* Check if all the filters are available */
-    if(H5Pall_filters_avail(dcpl)!=TRUE) {
+    if(H5Pall_filters_avail(dcpl) != TRUE) {
         H5_FAILED();
-        printf("    Line %d: Incorrect filter availability\n",__LINE__);
-        goto error;
+        HDprintf("    Line %d: Incorrect filter availability\n", __LINE__);
+        TEST_ERROR
     } /* end if */
 
     /* Create the dataset */
-    if((dataset = H5Dcreate2(fid, name, H5T_NATIVE_INT, sid, H5P_DEFAULT,
-			     dcpl, H5P_DEFAULT)) < 0) goto error;
+    if((dataset = H5Dcreate2(fid, name, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) TEST_ERROR
 
     PASSED();
 
@@ -130,20 +128,16 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl)
      */
     TESTING("    filters (uninitialized read)");
 
-    if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check) < 0)
-	TEST_ERROR;
-
-    for(i=0; i<(size_t)size[0]; i++) {
-	for(j=0; j<(size_t)size[1]; j++) {
-	    if(0!=check[i][j]) {
-		H5_FAILED();
-		printf("    Read a non-zero value.\n");
-		printf("    At index %lu,%lu\n",
-		       (unsigned long)i, (unsigned long)j);
-		goto error;
-	    }
-	}
-    }
+    if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check) < 0) TEST_ERROR;
+
+    for(i=0; i<(size_t)size[0]; i++)
+        for(j=0; j<(size_t)size[1]; j++)
+            if(0 != check[i][j]) {
+                H5_FAILED();
+                HDprintf("    Read a non-zero value.\n");
+                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                TEST_ERROR
+            } /* end if */
     PASSED();
 
     /*----------------------------------------------------------------------
@@ -154,14 +148,11 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl)
     TESTING("    filters (write)");
 
     n = 0;
-    for(i=0; i<size[0]; i++) {
-	for(j=0; j<size[1]; j++) {
-	    points[i][j] = (int)(n++);
-	}
-    }
+    for(i=0; i<size[0]; i++)
+        for(j=0; j<size[1]; j++)
+            points[i][j] = (int)(n++);
 
-    if(H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, points) < 0)
-	TEST_ERROR;
+    if(H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, points) < 0) TEST_ERROR;
 
     PASSED();
 
@@ -172,22 +163,19 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl)
     TESTING("    filters (read)");
 
     /* Read the dataset back */
-        if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check) < 0)
-	   TEST_ERROR;
-
-        /* Check that the values read are the same as the values written */
-        for(i=0; i<size[0]; i++) {
-	   for(j=0; j<size[1]; j++) {
-	       if(points[i][j] != check[i][j]) {
-		  H5_FAILED();
-		  fprintf(stderr,"    Read different values than written.\n");
-		  fprintf(stderr,"    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
-		  fprintf(stderr,"    At original: %d\n", (int)points[i][j]);
-		  fprintf(stderr,"    At returned: %d\n", (int)check[i][j]);
-		  goto error;
-	       }
-	   }
-        }
+    if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check) < 0) TEST_ERROR;
+
+    /* Check that the values read are the same as the values written */
+    for(i=0; i<size[0]; i++)
+        for(j=0; j<size[1]; j++)
+            if(points[i][j] != check[i][j]) {
+                H5_FAILED();
+                HDfprintf(stderr,"    Read different values than written.\n");
+                HDfprintf(stderr,"    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                HDfprintf(stderr,"    At original: %d\n", (int)points[i][j]);
+                HDfprintf(stderr,"    At returned: %d\n", (int)check[i][j]);
+                TEST_ERROR
+            } /* end if */
 
     PASSED();
 
@@ -200,30 +188,24 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl)
      */
     TESTING("    filters (modify)");
 
-    for(i=0; i<size[0]; i++) {
-	for(j=0; j<size[1]/2; j++) {
-	    points[i][j] = (int)HDrandom () % RANDOM_LIMIT;
-	}
-    }
-    if(H5Dwrite (dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, points) < 0)
-	TEST_ERROR;
-
-        /* Read the dataset back and check it */
-        if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check) < 0)
-	   TEST_ERROR;
-
-        /* Check that the values read are the same as the values written */
-        for(i=0; i<size[0]; i++) {
-	   for(j=0; j<size[1]; j++) {
-	       if(points[i][j] != check[i][j]) {
-		  H5_FAILED();
-		  printf("    Read different values than written.\n");
-		  printf("    At index %lu,%lu\n",
-		           (unsigned long)i, (unsigned long)j);
-		  goto error;
-	       }
-	   }
-        }
+    for(i=0; i<size[0]; i++)
+        for(j=0; j<size[1]/2; j++)
+            points[i][j] = (int)HDrandom () % RANDOM_LIMIT;
+
+    if(H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, points) < 0) TEST_ERROR;
+
+    /* Read the dataset back and check it */
+    if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check) < 0) TEST_ERROR;
+
+    /* Check that the values read are the same as the values written */
+    for(i=0; i<size[0]; i++)
+        for(j=0; j<size[1]; j++)
+            if(points[i][j] != check[i][j]) {
+                H5_FAILED();
+                HDprintf("    Read different values than written.\n");
+                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                TEST_ERROR
+            } /* end if */
 
     PASSED();
 
@@ -238,19 +220,17 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl)
     if(H5Dclose(dataset) < 0) TEST_ERROR;
     if((dataset = H5Dopen2(fid, name, H5P_DEFAULT)) < 0) TEST_ERROR;
 
-        if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check) < 0)
-            TEST_ERROR;
+    if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check) < 0) TEST_ERROR;
 
-        /* Check that the values read are the same as the values written */
-        for(i = 0; i < size[0]; i++)
-	   for(j = 0; j < size[1]; j++)
-	       if(points[i][j] != check[i][j]) {
-		  H5_FAILED();
-		  printf("    Read different values than written.\n");
-		  printf("    At index %lu,%lu\n",
-		        (unsigned long)i, (unsigned long)j);
-		  goto error;
-	       } /* end if */
+    /* Check that the values read are the same as the values written */
+    for(i = 0; i < size[0]; i++)
+        for(j = 0; j < size[1]; j++)
+            if(points[i][j] != check[i][j]) {
+                H5_FAILED();
+                HDprintf("    Read different values than written.\n");
+                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                TEST_ERROR
+            } /* end if */
 
     PASSED();
 
@@ -262,249 +242,228 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl)
      */
     TESTING("    filters (partial I/O)");
 
-    for(i=0; i<(size_t)hs_size[0]; i++) {
-	for(j=0; j<(size_t)hs_size[1]; j++) {
-	    points[(size_t)hs_offset[0]+i][(size_t)hs_offset[1]+j] = (int)HDrandom() % RANDOM_LIMIT;
-	}
-    }
-    if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, hs_offset, NULL, hs_size,
-			    NULL) < 0) TEST_ERROR;
+    for(i=0; i<(size_t)hs_size[0]; i++)
+        for(j=0; j<(size_t)hs_size[1]; j++)
+            points[(size_t)hs_offset[0]+i][(size_t)hs_offset[1]+j] = (int)HDrandom() % RANDOM_LIMIT;
+
+    if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL) < 0) TEST_ERROR;
     /* (Use the "read" DXPL because partial I/O on corrupted data test needs to ignore errors during writing) */
-    if(H5Dwrite (dataset, H5T_NATIVE_INT, sid, sid, dxpl, points) < 0)
-	TEST_ERROR;
-
-        if(H5Dread (dataset, H5T_NATIVE_INT, sid, sid, dxpl, check) < 0)
-	   TEST_ERROR;
-
-        /* Check that the values read are the same as the values written */
-        for(i=0; i<(size_t)hs_size[0]; i++) {
-	   for(j=0; j<(size_t)hs_size[1]; j++) {
-	       if(points[(size_t)hs_offset[0]+i][(size_t)hs_offset[1]+j] !=
-                      check[(size_t)hs_offset[0]+i][(size_t)hs_offset[1]+j]) {
-		  H5_FAILED();
-		  fprintf(stderr,"    Read different values than written.\n");
-		  fprintf(stderr,"    At index %lu,%lu\n",
-		         (unsigned long)((size_t)hs_offset[0]+i),
-		         (unsigned long)((size_t)hs_offset[1]+j));
-		  fprintf(stderr,"    At original: %d\n",
-		         (int)points[(size_t)hs_offset[0]+i][(size_t)hs_offset[1]+j]);
-		  fprintf(stderr,"    At returned: %d\n",
-		         (int)check[(size_t)hs_offset[0]+i][(size_t)hs_offset[1]+j]);
-		  goto error;
-	       }
-	   }
-        }
+    if(H5Dwrite(dataset, H5T_NATIVE_INT, sid, sid, dxpl, points) < 0) TEST_ERROR;
+
+    if(H5Dread(dataset, H5T_NATIVE_INT, sid, sid, dxpl, check) < 0) TEST_ERROR;
+
+    /* Check that the values read are the same as the values written */
+    for(i=0; i<(size_t)hs_size[0]; i++)
+        for(j=0; j<(size_t)hs_size[1]; j++)
+            if(points[(size_t)hs_offset[0]+i][(size_t)hs_offset[1]+j] != check[(size_t)hs_offset[0]+i][(size_t)hs_offset[1]+j]) {
+                H5_FAILED();
+                HDfprintf(stderr,"    Read different values than written.\n");
+                HDfprintf(stderr,"    At index %lu,%lu\n", (unsigned long)((size_t)hs_offset[0]+i), (unsigned long)((size_t)hs_offset[1]+j));
+                HDfprintf(stderr,"    At original: %d\n", (int)points[(size_t)hs_offset[0]+i][(size_t)hs_offset[1]+j]);
+                HDfprintf(stderr,"    At returned: %d\n", (int)check[(size_t)hs_offset[0]+i][(size_t)hs_offset[1]+j]);
+                TEST_ERROR
+            } /* end if */
 
     PASSED();
 
-    /* Save the data written to the file for later comparison when the file 
+    /* Save the data written to the file for later comparison when the file
      * is reopened for read test */
-    for(i=0; i<size[0]; i++) {
-        for(j=0; j<size[1]; j++) {
-            if(!HDstrcmp(name, DSET_DEFLATE_NAME)) {
-	        points_deflate[i][j] = points[i][j];
-            } else if(!HDstrcmp(name, DSET_DYNLIB1_NAME)) {
-	        points_dynlib1[i][j] = points[i][j];
-            } else if(!HDstrcmp(name, DSET_DYNLIB2_NAME)) {
-	        points_dynlib2[i][j] = points[i][j];
-            } else if(!HDstrcmp(name, DSET_DYNLIB4_NAME)) {
-            points_dynlib4[i][j] = points[i][j];
-            }
-	}
-    }
+    for(i=0; i<size[0]; i++)
+        for(j=0; j<size[1]; j++)
+            if(!HDstrcmp(name, DSET_DEFLATE_NAME))
+                points_deflate[i][j] = points[i][j];
+            else if(!HDstrcmp(name, DSET_DYNLIB1_NAME))
+                points_dynlib1[i][j] = points[i][j];
+            else if(!HDstrcmp(name, DSET_DYNLIB2_NAME))
+                points_dynlib2[i][j] = points[i][j];
+            else if(!HDstrcmp(name, DSET_DYNLIB4_NAME))
+                points_dynlib4[i][j] = points[i][j];
+
+    ret_value = 0;
 
+error:
     /* Clean up objects used for this test */
-    if(H5Dclose (dataset) < 0) goto error;
-    if(H5Sclose (sid) < 0) goto error;
-    if(H5Pclose (dxpl) < 0) goto error;
-    free (tconv_buf);
-
-    return(0);
+    H5E_BEGIN_TRY {
+        H5Dclose(dataset);
+        H5Sclose(sid);
+        H5Pclose(dxpl);
+    } H5E_END_TRY
 
-error:
     if(tconv_buf)
-        free (tconv_buf);
-    return -1;
+        HDfree(tconv_buf);
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
- * Function:	test_filters_for_datasets
- *
- * Purpose:	Tests creating datasets and writing data with dynamically
- *              loaded filters
+ * Function:  test_filters_for_datasets
  *
- * Return:	Success:	0
- *		Failure:	-1
- *
- * Programmer:	Raymond Lu
- *              14 March 2013
+ * Purpose:   Tests creating datasets and writing data with dynamically loaded filters
  *
+ * Return:    Success:    0
+ *            Failure:    -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 test_filters_for_datasets(hid_t file)
 {
-    hid_t	dc;                 /* Dataset creation property list ID */
-    const hsize_t chunk_size[2] = {FILTER_CHUNK_DIM1, FILTER_CHUNK_DIM2};  /* Chunk dimensions */
-    unsigned int         compress_level = 9;
-    unsigned int         dynlib4_values[4];
+    herr_t           ret_value = -1;
+    hid_t            dc = -1;    /* Dataset creation property list ID */
+    const hsize_t    chunk_size[2] = {FILTER_CHUNK_DIM1, FILTER_CHUNK_DIM2};  /* Chunk dimensions */
+    unsigned int     compress_level = 9;
+    unsigned int     dynlib4_values[4];
 
     /*----------------------------------------------------------
      * STEP 1: Test deflation by itself.
      *----------------------------------------------------------
      */
+    HDputs("Testing deflate filter");
 #ifdef H5_HAVE_FILTER_DEFLATE
-    puts("Testing deflate filter");
-    if((dc = H5Pcreate(H5P_DATASET_CREATE)) < 0) goto error;
-    if(H5Pset_chunk (dc, 2, chunk_size) < 0) goto error;
-    if(H5Pset_deflate (dc, 6) < 0) goto error;
+    if((dc = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR
+    if(H5Pset_chunk(dc, 2, chunk_size) < 0) TEST_ERROR
+    if(H5Pset_deflate(dc, 6) < 0) TEST_ERROR
 
-    if(test_filter_internal(file,DSET_DEFLATE_NAME,dc) < 0) goto error;
+    if(test_filter_internal(file, DSET_DEFLATE_NAME, dc) < 0) TEST_ERROR
     /* Clean up objects used for this test */
-    if(H5Pclose (dc) < 0) goto error;
+    if(H5Pclose(dc) < 0) TEST_ERROR
 #else /* H5_HAVE_FILTER_DEFLATE */
-    TESTING("deflate filter");
     SKIPPED();
-    puts("    Deflate filter not enabled");
+    HDputs("    Deflate filter not enabled");
 #endif /* H5_HAVE_FILTER_DEFLATE */
 
     /*----------------------------------------------------------
      * STEP 2: Test DYNLIB1 by itself.
      *----------------------------------------------------------
      */
-    puts("Testing DYNLIB1 filter");
-    if((dc = H5Pcreate(H5P_DATASET_CREATE)) < 0) goto error;
-    if(H5Pset_chunk (dc, 2, chunk_size) < 0) goto error;
-    if(H5Pset_filter (dc, H5Z_FILTER_DYNLIB1, H5Z_FLAG_MANDATORY, (size_t)1, &compress_level) < 0) goto error;
+    HDputs("    DYNLIB1 filter");
+    if((dc = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR
+    if(H5Pset_chunk(dc, 2, chunk_size) < 0) TEST_ERROR
+    if(H5Pset_filter(dc, H5Z_FILTER_DYNLIB1, H5Z_FLAG_MANDATORY, (size_t)1, &compress_level) < 0) TEST_ERROR
 
-    if(test_filter_internal(file,DSET_DYNLIB1_NAME,dc) < 0) goto error;
+    if(test_filter_internal(file, DSET_DYNLIB1_NAME, dc) < 0) TEST_ERROR
 
     /* Clean up objects used for this test */
-    if(H5Pclose (dc) < 0) goto error;
+    if(H5Pclose(dc) < 0) TEST_ERROR
 
-    /* Unregister the dynamic filter DYNLIB1 for testing purpose. The next time when this test is run for 
+    /* Unregister the dynamic filter DYNLIB1 for testing purpose. The next time when this test is run for
      * the new file format, the library's H5PL code has to search in the table of loaded plugin libraries
      * for this filter. */
-    if(H5Zunregister(H5Z_FILTER_DYNLIB1) < 0) goto error;
+    if(H5Zunregister(H5Z_FILTER_DYNLIB1) < 0) TEST_ERROR
 
     /*----------------------------------------------------------
      * STEP 3: Test DYNLIB2 by itself.
      *----------------------------------------------------------
      */
-    puts("Testing DYNLIB2 filter");
-    if((dc = H5Pcreate(H5P_DATASET_CREATE)) < 0) goto error;
-    if(H5Pset_chunk (dc, 2, chunk_size) < 0) goto error;
-    if(H5Pset_filter (dc, H5Z_FILTER_DYNLIB2, H5Z_FLAG_MANDATORY, 0, NULL) < 0) goto error;
+    HDputs("    DYNLIB2 filter");
+    if((dc = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR
+    if(H5Pset_chunk(dc, 2, chunk_size) < 0) TEST_ERROR
+    if(H5Pset_filter(dc, H5Z_FILTER_DYNLIB2, H5Z_FLAG_MANDATORY, 0, NULL) < 0) TEST_ERROR
 
-    if(test_filter_internal(file,DSET_DYNLIB2_NAME,dc) < 0) goto error;
+    if(test_filter_internal(file,DSET_DYNLIB2_NAME,dc) < 0) TEST_ERROR
 
     /* Clean up objects used for this test */
-    if(H5Pclose (dc) < 0) goto error;
+    if(H5Pclose(dc) < 0) TEST_ERROR
 
-    /* Unregister the dynamic filter DYNLIB2 for testing purpose. The next time when this test is run for 
+    /* Unregister the dynamic filter DYNLIB2 for testing purpose. The next time when this test is run for
      * the new file format, the library's H5PL code has to search in the table of loaded plugin libraries
      * for this filter. */
-    if(H5Zunregister(H5Z_FILTER_DYNLIB2) < 0) goto error;
+    if(H5Zunregister(H5Z_FILTER_DYNLIB2) < 0) TEST_ERROR
 
     /*----------------------------------------------------------
      * STEP 4: Test DYNLIB4 by itself.
      *----------------------------------------------------------
      */
-    puts("Testing DYNLIB4 filter");
-    if((dc = H5Pcreate(H5P_DATASET_CREATE)) < 0) goto error;
-    if(H5Pset_chunk (dc, 2, chunk_size) < 0) goto error;
+    HDputs("    DYNLIB4 filter");
+    if((dc = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR
+    if(H5Pset_chunk(dc, 2, chunk_size) < 0) TEST_ERROR
     dynlib4_values[0] = 9;
-    if(H5get_libversion(&dynlib4_values[1], &dynlib4_values[2], &dynlib4_values[3]) < 0) goto error;
-    if(H5Pset_filter (dc, H5Z_FILTER_DYNLIB4, H5Z_FLAG_MANDATORY, (size_t)4, dynlib4_values) < 0) goto error;
+    if(H5get_libversion(&dynlib4_values[1], &dynlib4_values[2], &dynlib4_values[3]) < 0) TEST_ERROR
+    if(H5Pset_filter(dc, H5Z_FILTER_DYNLIB4, H5Z_FLAG_MANDATORY, (size_t)4, dynlib4_values) < 0) TEST_ERROR
 
-    if(test_filter_internal(file,DSET_DYNLIB4_NAME,dc) < 0) goto error;
+    if(test_filter_internal(file, DSET_DYNLIB4_NAME, dc) < 0) TEST_ERROR
 
     /* Clean up objects used for this test */
-    if(H5Pclose (dc) < 0) goto error;
+    if(H5Pclose(dc) < 0) TEST_ERROR
 
     /* Unregister the dynamic filter DYNLIB4 for testing purpose. The next time when this test is run for
      * the new file format, the library's H5PL code has to search in the table of loaded plugin libraries
      * for this filter. */
-    if(H5Zunregister(H5Z_FILTER_DYNLIB4) < 0) goto error;
+    if(H5Zunregister(H5Z_FILTER_DYNLIB4) < 0) TEST_ERROR
 
-    return 0;
+    ret_value = 0;
 
 error:
-    return -1;
+    /* Clean up objects used for this test */
+    H5E_BEGIN_TRY {
+        H5Pclose(dc);
+    } H5E_END_TRY
+
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
- * Function:	test_read_data
- *
- * Purpose:	Tests reading data and compares values
- *
- * Return:	Success:	0
- *		Failure:	-1
+ * Function:  test_read_data
  *
- * Programmer:	Raymond Lu
- *              14 March 2013
+ * Purpose:   Tests reading data and compares values
  *
+ * Return:    Success:    0
+ *            Failure:    -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 test_read_data(hid_t dataset, int *origin_data)
 {
-    int	                check[DSET_DIM1][DSET_DIM2];
-    const hsize_t	size[2] = {DSET_DIM1, DSET_DIM2};           /* Dataspace dimensions */
-    int                 *data_p = origin_data;
-    size_t		i, j;        /* Local index variables */
+    herr_t        ret_value = -1;
+    int           check[DSET_DIM1][DSET_DIM2];
+    const hsize_t size[2] = {DSET_DIM1, DSET_DIM2};   /* Dataspace dimensions */
+    int          *data_p = origin_data;
+    size_t        i, j;        /* Local index variables */
 
     /* Read the dataset back */
-    if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check) < 0)
-        TEST_ERROR;
+    if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check) < 0) TEST_ERROR;
 
     /* Check that the values read are the same as the values written */
-    for(i=0; i<size[0]; i++) {
+    for(i=0; i<size[0]; i++)
         for(j=0; j<size[1]; j++) {
-	   if(*data_p != check[i][j]) {
-	       H5_FAILED();
-	       fprintf(stderr,"    Read different values than written.\n");
-	       fprintf(stderr,"    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
-	       fprintf(stderr,"    At original: %d\n", *data_p);
-	       fprintf(stderr,"    At returned: %d\n", (int)check[i][j]);
-	       goto error;
-	   }
+            if(*data_p != check[i][j]) {
+                H5_FAILED();
+                HDfprintf(stderr,"    Read different values than written.\n");
+                HDfprintf(stderr,"    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                HDfprintf(stderr,"    At original: %d\n", *data_p);
+                HDfprintf(stderr,"    At returned: %d\n", (int)check[i][j]);
+                TEST_ERROR
+            } /* end if */
            data_p++;
-	}
-    }
+        }
 
     PASSED();
-    return 0;
+    ret_value = 0;
 
 error:
-    return -1;
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
- * Function:    test_read_with_filters
+ * Function:  test_read_with_filters
  *
- * Purpose: Tests reading dataset created with dynamically loaded filters
- *
- * Return:  Success:    0
- *      Failure:    -1
- *
- * Programmer:  Raymond Lu
- *              14 March 2013
+ * Purpose:   Tests reading dataset created with dynamically loaded filters
  *
+ * Return:    Success:    0
+ *            Failure:    -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 test_read_with_filters(hid_t file)
 {
-    hid_t   dset;                 /* Dataset ID */
+    herr_t  ret_value = -1;
+    hid_t   dset = -1;                 /* Dataset ID */
 
     /*----------------------------------------------------------
      * STEP 1: Test deflation by itself.
      *----------------------------------------------------------
      */
-#ifdef H5_HAVE_FILTER_DEFLATE
-    TESTING("Testing deflate filter");
+    TESTING("deflate filter");
 
+#ifdef H5_HAVE_FILTER_DEFLATE
     if(H5Zfilter_avail(H5Z_FILTER_DEFLATE) != TRUE) TEST_ERROR
 
     if((dset = H5Dopen2(file,DSET_DEFLATE_NAME,H5P_DEFAULT)) < 0) TEST_ERROR
@@ -515,18 +474,17 @@ test_read_with_filters(hid_t file)
 
     /* Clean up objects used for this test */
 #else /* H5_HAVE_FILTER_DEFLATE */
-    TESTING("deflate filter");
     SKIPPED();
-    puts("    Deflate filter not enabled");
+    HDputs("    Deflate filter not enabled");
 #endif /* H5_HAVE_FILTER_DEFLATE */
 
     /*----------------------------------------------------------
      * STEP 2: Test DYNLIB1 by itself.
      *----------------------------------------------------------
      */
-    TESTING("Testing DYNLIB1 filter");
+    TESTING("    DYNLIB1 filter");
 
-    if((dset = H5Dopen2(file,DSET_DYNLIB1_NAME,H5P_DEFAULT)) < 0) TEST_ERROR
+    if((dset = H5Dopen2(file, DSET_DYNLIB1_NAME, H5P_DEFAULT)) < 0) TEST_ERROR
 
     if(test_read_data(dset, (int *)points_dynlib1) < 0) TEST_ERROR
 
@@ -536,9 +494,9 @@ test_read_with_filters(hid_t file)
      * STEP 3: Test Bogus2 by itself.
      *----------------------------------------------------------
      */
-    TESTING("Testing DYNLIB2 filter");
+    TESTING("    DYNLIB2 filter");
 
-    if((dset = H5Dopen2(file,DSET_DYNLIB2_NAME,H5P_DEFAULT)) < 0) TEST_ERROR
+    if((dset = H5Dopen2(file, DSET_DYNLIB2_NAME, H5P_DEFAULT)) < 0) TEST_ERROR
 
     if(test_read_data(dset, (int *)points_dynlib2) < 0) TEST_ERROR
 
@@ -548,7 +506,7 @@ test_read_with_filters(hid_t file)
      * STEP 4: Test DYNLIB4 by itself.
      *----------------------------------------------------------
      */
-    TESTING("Testing DYNLIB4 filter");
+    TESTING("    DYNLIB4 filter");
 
     if((dset = H5Dopen2(file,DSET_DYNLIB4_NAME,H5P_DEFAULT)) < 0) TEST_ERROR
 
@@ -556,27 +514,33 @@ test_read_with_filters(hid_t file)
 
     if(H5Dclose(dset) < 0) TEST_ERROR
 
-    return 0;
+    ret_value = 0;
 
 error:
-    return -1;
+    /* Clean up objects used for this test */
+    H5E_BEGIN_TRY {
+        H5Dclose(dset);
+    } H5E_END_TRY
+
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
- * Function:    test_noread_data
+ * Function:  test_noread_data
  *
- * Purpose: Tests not reading data
+ * Purpose:   Tests not reading data
  *
- * Return:  Success:    0
- *      Failure:    -1
+ * Return:    Success:    0
+ *            Failure:    -1
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
 test_noread_data(hid_t dataset)
 {
+    herr_t     ret_value = -1;
     int        check[DSET_DIM1][DSET_DIM2];
-    herr_t     ret;
+    herr_t     ret = -1;
 
     /* Read the dataset back */
     H5E_BEGIN_TRY {
@@ -586,113 +550,122 @@ test_noread_data(hid_t dataset)
         TEST_ERROR
 
     PASSED();
-    return 0;
+    ret_value = 0;
 
 error:
-    return -1;
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
- * Function:	test_noread_with_filters
- *
- * Purpose:	Tests reading dataset created with dynamically loaded filters disabled
+ * Function:  test_noread_with_filters
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Purpose:   Tests reading dataset created with dynamically loaded filters disabled
  *
+ * Return:    Success:    0
+ *            Failure:    -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 test_noread_with_filters(hid_t file)
 {
-    hid_t	dset;                 /* Dataset ID */
-    unsigned     plugin_state;         /* status of plugins */
-    TESTING("Testing DYNLIB1 filter with plugins disabled");
+    herr_t      ret_value = -1;
+    hid_t       dset = -1;            /* Dataset ID */
+    unsigned    plugin_state;         /* status of plugins */
+
+    TESTING("DYNLIB1 filter with plugins disabled");
 
     /* disable filter plugin */
     if(H5PLget_loading_state(&plugin_state) < 0) TEST_ERROR
     plugin_state = plugin_state & ~H5PL_FILTER_PLUGIN;
     if(H5PLset_loading_state(plugin_state) < 0) TEST_ERROR
 
-    if((dset = H5Dopen2(file,DSET_DYNLIB1_NAME,H5P_DEFAULT)) < 0) TEST_ERROR
+    if((dset = H5Dopen2(file, DSET_DYNLIB1_NAME, H5P_DEFAULT)) < 0) TEST_ERROR
 
     if(test_noread_data(dset) < 0) TEST_ERROR
 
     if(H5Dclose(dset) < 0) TEST_ERROR
 
-    /* re-enable filter plugin */
-    plugin_state = plugin_state | H5PL_FILTER_PLUGIN;
-    if(H5PLset_loading_state(plugin_state) < 0) TEST_ERROR
-
-    return 0;
+    ret_value = 0;
 
 error:
     /* re-enable filter plugin */
     plugin_state = plugin_state | H5PL_FILTER_PLUGIN;
-    if(H5PLset_loading_state(plugin_state) < 0) TEST_ERROR
-    return -1;
+    H5PLset_loading_state(plugin_state);
+
+    /* Clean up objects used for this test */
+    H5E_BEGIN_TRY {
+        H5Dclose(dset);
+    } H5E_END_TRY
+
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
- * Function:	test_filters_for_groups
- *
- * Purpose:	Tests creating group with dynamically loaded filters
+ * Function:  test_filters_for_groups
  *
- * Return:	Success:	0
- *		Failure:	-1
- *
- * Programmer:	Raymond Lu
- *              1 April 2013
+ * Purpose:   Tests creating group with dynamically loaded filters
  *
+ * Return:    Success:    0
+ *            Failure:    -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 test_filters_for_groups(hid_t file)
 {
-    hid_t	gcpl, gid, group;
-    int         i;
-    char        gname[256];
+    herr_t   ret_value = -1;
+    hid_t    gcpl = -1;
+    hid_t    gid = -1;
+    hid_t    group = -1;
+    int      i;
+    char     gname[256];
+
+    TESTING("DYNLIB3 filter for group");
 
-    TESTING("Testing DYNLIB3 filter for group");
+    if((gcpl = H5Pcreate(H5P_GROUP_CREATE)) < 0) TEST_ERROR
 
-    if((gcpl = H5Pcreate(H5P_GROUP_CREATE)) < 0) goto error;
-  
-    /* Use DYNLIB3 for creating groups */ 
-    if(H5Pset_filter (gcpl, H5Z_FILTER_DYNLIB3, H5Z_FLAG_MANDATORY, (size_t)0, NULL) < 0) goto error;
+    /* Use DYNLIB3 for creating groups */
+    if(H5Pset_filter (gcpl, H5Z_FILTER_DYNLIB3, H5Z_FLAG_MANDATORY, (size_t)0, NULL) < 0) TEST_ERROR
 
     /* Create a group using this filter */
-    if((gid = H5Gcreate2(file, "group1", H5P_DEFAULT, gcpl, H5P_DEFAULT)) < 0) goto error;
+    if((gid = H5Gcreate2(file, "group1", H5P_DEFAULT, gcpl, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Create multiple groups under "group1" */
-    for (i=0; i < GROUP_ITERATION; i++) {
-        sprintf(gname, "group_%d", i);
-        if((group = H5Gcreate2(gid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
-        if(H5Gclose(group) < 0) goto error; 
+    for(i=0; i < GROUP_ITERATION; i++) {
+        HDsprintf(gname, "group_%d", i);
+        if((group = H5Gcreate2(gid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+        if(H5Gclose(group) < 0) TEST_ERROR
     }
 
     /* Close the group */
-    if(H5Gclose(gid) < 0) goto error;
+    if(H5Gclose(gid) < 0) TEST_ERROR
 
     /* Clean up objects used for this test */
-    if(H5Pclose (gcpl) < 0) goto error;
+    if(H5Pclose(gcpl) < 0) TEST_ERROR
 
     PASSED();
 
-    return 0;
+    ret_value = 0;
 
 error:
-    return -1;
+    /* Clean up objects used for this test */
+    H5E_BEGIN_TRY {
+        H5Gclose(group);
+        H5Gclose(gid);
+        H5Pclose(gcpl);
+    } H5E_END_TRY
+
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
- * Function:	test_groups_with_filters
+ * Function:    test_groups_with_filters
  *
- * Purpose:	Tests opening group with dynamically loaded filters
+ * Purpose:    Tests opening group with dynamically loaded filters
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:    Success:    0
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              1 April 2013
  *
  *-------------------------------------------------------------------------
@@ -700,70 +673,316 @@ error:
 static herr_t
 test_groups_with_filters(hid_t file)
 {
-    hid_t	gid, group;
+    herr_t      ret_value = -1;
+    hid_t       gid;
+    hid_t       group;
     int         i;
     char        gname[256];
 
-    TESTING("Testing opening groups with DYNLIB3 filter");
+    TESTING("opening groups with DYNLIB3 filter");
 
     /* Open the top group */
-    if((gid = H5Gopen2(file, "group1", H5P_DEFAULT)) < 0) goto error;
+    if((gid = H5Gopen2(file, "group1", H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Create multiple groups under "group1" */
-    for (i=0; i < GROUP_ITERATION; i++) {
-        sprintf(gname, "group_%d", i);
-        if((group = H5Gopen2(gid, gname, H5P_DEFAULT)) < 0) goto error;
-        if(H5Gclose(group) < 0) goto error; 
+    for(i=0; i < GROUP_ITERATION; i++) {
+        HDsprintf(gname, "group_%d", i);
+        if((group = H5Gopen2(gid, gname, H5P_DEFAULT)) < 0) TEST_ERROR
+        if(H5Gclose(group) < 0) TEST_ERROR
     }
 
     /* Close the group */
-    if(H5Gclose(gid) < 0) goto error;
+    if(H5Gclose(gid) < 0) TEST_ERROR
 
     PASSED();
 
-    return 0;
+    ret_value = 0;
+
+error:
+    /* Clean up objects used for this test */
+    H5E_BEGIN_TRY {
+        H5Gclose(group);
+        H5Gclose(gid);
+    } H5E_END_TRY
+
+    return ret_value;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:  test_filter_path_apis
+ *
+ * Purpose:   Tests accessing the path table for dynamically loaded filters
+ *
+ * Return:    Success:    0
+ *            Failure:    -1
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+test_filter_path_apis(void)
+{
+    herr_t       ret_value = -1;
+    unsigned int i;
+    unsigned int ndx;
+    herr_t       ret;
+    ssize_t      pathlen = -1;
+    char         pathname[256];
+    char         tempname[256];
+
+    HDputs("Testing access to the filter path table");
+
+    if(H5Zfilter_avail(H5Z_FILTER_DYNLIB1) != TRUE) TEST_ERROR
+
+    ndx = H5PLsize();
+
+    TESTING("    remove");
+    /* Remove all existing paths*/
+    for(i=ndx; i > 0; i--)
+        if(H5PLremove(i-1) < 0) {
+            HDfprintf(stderr,"    at %d: %s\n", i, pathname);
+            TEST_ERROR
+        } /* end if */
+    /* Verify the table is empty */
+    if(H5PLsize() > 0) TEST_ERROR
+    PASSED();
+
+    TESTING("    remove (exceed min)");
+    /* Exceed the min path removal */
+    H5E_BEGIN_TRY {
+        ret = H5PLremove(0);
+    } H5E_END_TRY
+    if(ret >= 0) TEST_ERROR
+    PASSED();
+
+    TESTING("    append");
+    /* Create multiple paths to fill table */
+    for(i=0; i < H5PL_MAX_PATH_NUM; i++) {
+        HDsprintf(pathname, "a_path_%d", i);
+        if(H5PLappend(pathname) < 0) {
+            HDfprintf(stderr,"    at %d: %s\n", i, pathname);
+            TEST_ERROR
+        }
+    }
+    /* Verify the table is full */
+    if(H5PLsize() != H5PL_MAX_PATH_NUM) TEST_ERROR
+    PASSED();
+
+    TESTING("    append (exceed)");
+    /* Exceed the max path append */
+    H5E_BEGIN_TRY {
+        HDsprintf(pathname, "a_path_%d", H5PL_MAX_PATH_NUM);
+        ret = H5PLappend(pathname);
+    } H5E_END_TRY
+    if(ret >= 0) TEST_ERROR
+    PASSED();
+
+    TESTING("    remove (exceed max)");
+    /* Exceed the max path removal */
+    H5E_BEGIN_TRY {
+        ret = H5PLremove(H5PL_MAX_PATH_NUM);
+    } H5E_END_TRY
+    if(ret >= 0) TEST_ERROR
+    PASSED();
+
+    TESTING("    get (path name)");
+    if((pathlen = H5PLget(0, NULL, 0)) <= 0) {
+        HDfprintf(stderr,"    get path 0 length failed\n");
+        TEST_ERROR
+    }
+    if(pathlen != 8) TEST_ERROR
+
+    if((pathlen = H5PLget(0, pathname, 256)) <= 0) {
+        HDfprintf(stderr,"    get 0 len: %d : %s\n", pathlen, pathname);
+        TEST_ERROR
+    }
+    if(HDstrcmp(pathname, "a_path_0") != 0) {
+        HDfprintf(stderr,"    get 0: %s\n", pathname);
+        TEST_ERROR
+    }
+    PASSED();
+
+    TESTING("    get (bounds)");
+    if((pathlen = H5PLget(1, pathname, 256)) <= 0) TEST_ERROR
+    if(HDstrcmp(pathname, "a_path_1") != 0) {
+        HDfprintf(stderr,"    get 1: %s\n", pathname);
+        TEST_ERROR
+    }
+    if((pathlen = H5PLget(H5PL_MAX_PATH_NUM - 1, pathname, 256)) <= 0) TEST_ERROR
+    HDsprintf(tempname, "a_path_%d", H5PL_MAX_PATH_NUM - 1);
+    if(HDstrcmp(pathname, tempname) != 0) {
+        HDfprintf(stderr,"    get %d: %s\n", H5PL_MAX_PATH_NUM - 1, pathname);
+        TEST_ERROR
+    }
+    PASSED();
+
+    TESTING("    get (bounds exceed)");
+    H5E_BEGIN_TRY {
+        pathlen = H5PLget(H5PL_MAX_PATH_NUM, NULL, 0);
+    } H5E_END_TRY
+    if(pathlen > 0) TEST_ERROR
+    PASSED();
+
+    TESTING("    remove (verify for prepend)");
+    /* Remove one path*/
+    if(H5PLremove(8) < 0) TEST_ERROR
+
+    /* Verify that the entries were moved */
+    if((pathlen = H5PLget(8, pathname, 256)) <= 0) TEST_ERROR
+    if(HDstrcmp(pathname, "a_path_9") != 0) {
+        HDfprintf(stderr,"    get 8: %s\n", pathname);
+        TEST_ERROR
+    }
+    PASSED();
+
+    /* Verify the table is not full */
+    if (H5PLsize() != H5PL_MAX_PATH_NUM - 1) TEST_ERROR
+
+    TESTING("    prepend");
+    /* Prepend one path*/
+    HDsprintf(pathname, "a_path_%d", H5PL_MAX_PATH_NUM + 1);
+    if(H5PLprepend(pathname) < 0) {
+        HDfprintf(stderr,"    prepend %d: %s\n", H5PL_MAX_PATH_NUM + 1, pathname);
+        TEST_ERROR
+    }
+
+    /* Verify the table is full */
+    if(H5PLsize() != H5PL_MAX_PATH_NUM) TEST_ERROR
+
+    /* Verify that the entries were moved */
+    if(H5PLget(8, pathname, 256) <= 0) TEST_ERROR
+    if(HDstrcmp(pathname, "a_path_7") != 0) {
+        HDfprintf(stderr,"    get 8: %s\n", pathname);
+        TEST_ERROR
+    }
+    if(H5PLget(0, pathname, 256) <= 0) TEST_ERROR
+    HDsprintf(tempname, "a_path_%d", H5PL_MAX_PATH_NUM + 1);
+    if(HDstrcmp(pathname, tempname) != 0) {
+        HDfprintf(stderr,"    get 0: %s\n", pathname);
+        TEST_ERROR
+    }
+    PASSED();
+
+    TESTING("    prepend (exceed)");
+    /* Exceed the max path prepend */
+    H5E_BEGIN_TRY {
+        HDsprintf(pathname, "a_path_%d", H5PL_MAX_PATH_NUM + 2);
+        ret = H5PLprepend(pathname);
+    } H5E_END_TRY
+    if(ret >= 0) TEST_ERROR
+    PASSED();
+
+    TESTING("    replace");
+    /* Replace one path*/
+    HDsprintf(pathname, "a_path_%d", H5PL_MAX_PATH_NUM + 4);
+    if(H5PLreplace(pathname, 1) < 0) {
+        HDfprintf(stderr,"    replace 1: %s\n", pathname);
+        TEST_ERROR
+    }
+
+    /* Verify the table is full */
+    if(H5PLsize() != H5PL_MAX_PATH_NUM) TEST_ERROR
+
+    /* Verify that the entries were not moved */
+    if(H5PLget(0, pathname, 256) <= 0) TEST_ERROR
+    HDsprintf(tempname, "a_path_%d", H5PL_MAX_PATH_NUM + 1);
+    if(HDstrcmp(pathname, tempname) != 0) {
+        HDfprintf(stderr,"    get 0: %s\n", pathname);
+        TEST_ERROR
+    }
+    if(H5PLget(2, pathname, 256) <= 0) TEST_ERROR
+    if(HDstrcmp(pathname, "a_path_1") != 0) {
+        HDfprintf(stderr,"    get 2: %s\n", pathname);
+        TEST_ERROR
+    }
+    PASSED();
+
+    TESTING("    remove (verify for insert)");
+    /* Remove one path*/
+    if(H5PLremove(4) < 0) TEST_ERROR
+
+    /* Verify that the entries were moved */
+    if(H5PLget(4, pathname, 256) <= 0) TEST_ERROR
+    if(HDstrcmp(pathname, "a_path_4") != 0) {
+        HDfprintf(stderr,"    get 4: %s\n", pathname);
+        TEST_ERROR
+    }
+    PASSED();
+
+    /* Verify the table is not full */
+    if(H5PLsize() != 15) TEST_ERROR
+
+    TESTING("    insert");
+    /* Insert one path*/
+    HDsprintf(pathname, "a_path_%d", H5PL_MAX_PATH_NUM + 5);
+    if(H5PLinsert(pathname, 3) < 0) {
+        HDfprintf(stderr,"    insert 3: %s\n", pathname);
+        TEST_ERROR
+    }
+
+    /* Verify that the entries were moved */
+    if(H5PLget(4, pathname, 256) <= 0) TEST_ERROR
+    if(HDstrcmp(pathname, "a_path_2") != 0) {
+        HDfprintf(stderr,"    get 4: %s\n", pathname);
+        TEST_ERROR
+    }
+    PASSED();
+
+    /* Verify the table is full */
+    if(H5PLsize() != H5PL_MAX_PATH_NUM) TEST_ERROR
+
+    TESTING("    insert (exceed)");
+    /* Exceed the max path insert */
+    H5E_BEGIN_TRY {
+        HDsprintf(pathname, "a_path_%d", H5PL_MAX_PATH_NUM + 6);
+        ret = H5PLinsert(pathname, 12);
+    } H5E_END_TRY
+    if(ret >= 0) TEST_ERROR
+
+    PASSED();
+
+    ret_value = 0;
 
 error:
-    return -1;
+    return ret_value;
 }
 
 
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Tests the plugin module (H5PL)
+ * Purpose:    Tests the plugin module (H5PL)
  *
- * Return:	Success:	exit(EXIT_SUCCESS)
+ * Return:    Success:    exit(EXIT_SUCCESS)
  *
- *		Failure:	exit(EXIT_FAILURE)
+ *        Failure:    exit(EXIT_FAILURE)
  *
- * Programmer:	Raymond Lu
- *		14 March 2013
+ * Programmer:    Raymond Lu
+ *        14 March 2013
  *
  *-------------------------------------------------------------------------
  */
 int
 main(void)
 {
-    char		filename[FILENAME_BUF_SIZE];
-    hid_t		file, fapl, fapl2;
-    unsigned new_format;
-    int mdc_nelmts;
-    size_t rdcc_nelmts;
-    size_t rdcc_nbytes;
-    double rdcc_w0;
-    int	nerrors = 0;
+    char        filename[FILENAME_BUF_SIZE];
+    hid_t       file = -1;
+    hid_t       fapl = -1;
+    hid_t       fapl2 = -1;
+    unsigned    new_format;
+    int         mdc_nelmts;
+    size_t      rdcc_nelmts;
+    size_t      rdcc_nbytes;
+    double      rdcc_w0;
+    int         nerrors = 0;
 
     /* Testing setup */
     h5_reset();
     fapl = h5_fileaccess();
 
     /* Turn off the chunk cache, so all the chunks are immediately written to disk */
-    if(H5Pget_cache(fapl, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0) < 0)
-        TEST_ERROR 
+    if(H5Pget_cache(fapl, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0) < 0) TEST_ERROR
     rdcc_nbytes = 0;
-    if(H5Pset_cache(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0) < 0)
-        TEST_ERROR 
+    if(H5Pset_cache(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0) < 0) TEST_ERROR
 
     /* Copy the file access property list */
     if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR
@@ -779,50 +998,47 @@ main(void)
 
         /* Set the FAPL for the type of format */
         if(new_format) {
-            puts("\nTesting with new file format:");
+            HDputs("\nTesting with new file format:");
             my_fapl = fapl2;
         } /* end if */
         else {
-            puts("Testing with old file format:");
+            HDputs("Testing with old file format:");
             my_fapl = fapl;
         } /* end else */
 
         /* Create the file for this test */
-        if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, my_fapl)) < 0)
-            TEST_ERROR 
+        if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, my_fapl)) < 0) TEST_ERROR
 
         /* Test dynamically loaded filters for chunked dataset */
-        nerrors += (test_filters_for_datasets(file) < 0	? 1 : 0);
+        nerrors += (test_filters_for_datasets(file) < 0    ? 1 : 0);
 
         /* Test dynamically loaded filters for groups */
         nerrors += (test_filters_for_groups(file) < 0 ? 1 : 0);
 
-        if(H5Fclose(file) < 0)
-            TEST_ERROR 
+        if(H5Fclose(file) < 0) TEST_ERROR
     } /* end for */
 
     /* Close FAPL */
     if(H5Pclose(fapl2) < 0) TEST_ERROR
     if(H5Pclose(fapl) < 0) TEST_ERROR
-   
+
     /* Restore the default error handler (set in h5_reset()) */
     h5_restore_err();
 
-    puts("\nTesting reading data with with dynamic plugin filters:");
+    HDputs("\nTesting reading data with with dynamic plugin filters:");
 
     /* Close the library so that all loaded plugin libraries are unloaded */
     h5_reset();
     fapl = h5_fileaccess();
 
     /* Reopen the file for testing data reading */
-    if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
-        TEST_ERROR 
+    if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) TEST_ERROR
 
     /* Read the data with filters */
-    nerrors += (test_read_with_filters(file) < 0		? 1 : 0);
+    nerrors += (test_read_with_filters(file) < 0 ? 1 : 0);
 
     /* Open the groups with filters */
-    nerrors += (test_groups_with_filters(file) < 0	? 1 : 0);
+    nerrors += (test_groups_with_filters(file) < 0  ? 1 : 0);
 
     /* Restore the default error handler (set in h5_reset()) */
     h5_restore_err();
@@ -832,26 +1048,26 @@ main(void)
     fapl = h5_fileaccess();
 
     /* Reopen the file for testing data reading */
-    if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
-        TEST_ERROR
+    if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) TEST_ERROR
 
     /* Read the data with disabled filters */
     nerrors += (test_noread_with_filters(file) < 0  ? 1 : 0);
 
-    if(H5Fclose(file) < 0)
-        TEST_ERROR 
+    if(H5Fclose(file) < 0) TEST_ERROR
+
+    /* Test the APIs for access to the filter plugin path table */
+    nerrors += (test_filter_path_apis() < 0  ? 1 : 0);
+
+    if(nerrors) TEST_ERROR
 
-    if(nerrors)
-        TEST_ERROR 
-    printf("All plugin tests passed.\n");
+    HDprintf("All plugin tests passed.\n");
     h5_cleanup(FILENAME, fapl);
 
     return 0;
 
 error:
     nerrors = MAX(1, nerrors);
-    printf("***** %d PLUGIN TEST%s FAILED! *****\n",
-            nerrors, 1 == nerrors ? "" : "S");
+    HDprintf("***** %d PLUGIN TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     return 1;
 }
 
diff --git a/test/set_extent.c b/test/set_extent.c
index 17dc6a0..949120b 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -2603,10 +2603,12 @@ static int test_random_rank4( hid_t fapl, hid_t dcpl, hbool_t do_fillvalue,
     volatile unsigned i, j, k, l, m;            /* Local indices */
     char        filename[NAME_BUF_SIZE];
 
-    /*!FIXME Skip the test if a fixed array index is requested, as resizing
-     * fixed arrays is broken now.  Extensible arrays are also broken.  Remove
-     * these lines as appropriate when these problems are fixed. */
-    /* Fixed Array index type is now fixed */
+    /* *** FIXME ***
+     * Skip the test if an extensible array index is requested, as resizing
+     * them is broken.
+     *
+     * Remove these lines as appropriate when these problems are fixed.
+     */
     if(index_type == RANK4_INDEX_EARRAY)
         return 0;
 
@@ -2814,10 +2816,13 @@ static int test_random_rank4_vl( hid_t fapl, hid_t dcpl, hbool_t do_fillvalue,
     volatile unsigned i, j, k, l, m;            /* Local indices */
     char        filename[NAME_BUF_SIZE];
 
-    /*!FIXME Skip the test if a fixed array index is requested, as resizing
-     * fixed arrays is broken now.  Extensible arrays are also broken.  Remove
-     * these lines as appropriate when these problems are fixed. */
-    if(index_type == RANK4_INDEX_FARRAY || index_type == RANK4_INDEX_EARRAY)
+    /* *** FIXME ***
+     * Skip the test if an extensible array index is requested, as resizing
+     * them is broken.
+     *
+     * Remove these lines as appropriate when these problems are fixed.
+     */
+    if(index_type == RANK4_INDEX_EARRAY)
         return 0;
 
     /* Initialize fill value buffers so they aren't freed in case of an error */
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index a28af8e..f65b248 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -46,7 +46,9 @@ const char *FILENAMES[] = {
 /* local utility function declarations */
 
 static void create_data_sets(hid_t file_id, int min_dset, int max_dset);
+#if 0 /* keep pending full parallel cache image */
 static void delete_data_sets(hid_t file_id, int min_dset, int max_dset);
+#endif
 
 static void open_hdf5_file(const hbool_t create_file,
     const hbool_t mdci_sbem_expected,
@@ -796,7 +798,12 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset)
  *
  *-------------------------------------------------------------------------
  */
-
+#if 0 
+/* this code will be needed to test full support of cache image
+ * in parallel -- keep it around against that day.
+ *
+ *                                      -- JRM
+ */
 static void 
 delete_data_sets(hid_t file_id, int min_dset, int max_dset)
 {
@@ -843,6 +850,7 @@ delete_data_sets(hid_t file_id, int min_dset, int max_dset)
     return;
 
 } /* delete_data_sets() */
+#endif
 
 
 /*-------------------------------------------------------------------------
@@ -2756,12 +2764,22 @@ usage(void)
         "The \"setup\" parameter indicates that t_cache_image is being \n",
         "invokde for this purpose.\n",
         "\n",
-        "usage: t_cache_image [setup]\n",
+        "Similarly, only a serial process can add a cache image to an\n",
+        "existing file.\n",
+        "\n",
+        "Here again, one process forks a serial version of the test program\n",
+        "with the \"ici\" parameter.\n"
+        "\n",
+        "usage: t_cache_image [setup|ici m n]\n",
         "\n",
         "where:\n",
         "\n",
         "       setup parameter forces creation of test file\n",
         "\n",
+        "       ici parameter forces insertion of a cache image into the \n",
+        "       m   th test file, created by a parallel computation with .\n",
+        "       n   processes\n",
+        "\n",
         "Returns 0 on success, 1 on failure.\n",
         "\n",
         NULL,
@@ -3141,11 +3159,6 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
     /* 1) Open the test file created at the beginning of this test.
      *
      *    Verify that the file contains a cache image.
-     *
-     *    Verify that only process 0 reads the cache image.
-     *
-     *    Verify that all other processes receive the cache 
-     *    image block from process 0.
      */
 
     if ( pass ) {
@@ -3172,36 +3185,57 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
     if ( show_progress ) 
         HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
-    /* Verify that only process 0 reads the cache image. */
-
-    if ( show_progress ) 
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
-    /* Verify that all other processes receive the cache image block 
-     * from process 0.
+    /* 2) Verify that the file contains the expected data. 
+     *
+     *    Verify that only process 0 reads the cache image.
+     *
+     *    Verify that all other processes receive the cache 
+     *    image block from process 0.
      */
 
-    if ( show_progress ) 
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+    if ( pass ) {
 
+       verify_data_sets(file_id, 0, MAX_NUM_DSETS - 1);
+    }
 
-    /* 2) Verify that the file contains the expected data. */
+    /* Verify that only process 0 reads the cache image. */
+#if H5C_COLLECT_CACHE_STATS
     if ( pass ) {
 
-       verify_data_sets(file_id, 0, MAX_NUM_DSETS - 1);
+        if ( ( ( mpi_rank == 0 ) && ( cache_ptr->images_read != 1 ) ) ||
+             ( ( mpi_rank > 0 )  && ( cache_ptr->images_read != 0 ) ) ) {
+
+            pass = FALSE;
+            failure_mssg = "unexpected images_read.";
+        }
     }
+#endif /* H5C_COLLECT_CACHE_STATS */
 
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+    /* Verify that all other processes receive the cache image block 
+     * from process 0.
+     * 
+     * Since we have alread verified that only process 0 has read the 
+     * image, it is sufficient to verify that the image was loaded on 
+     * all processes.
+     */
 #if H5C_COLLECT_CACHE_STATS
     if ( pass ) {
 
-        if ( cache_ptr->images_loaded == 0 ) {
+        if ( cache_ptr->images_loaded != 1 ) {
 
             pass = FALSE;
-            failure_mssg = "metadata cache image block not loaded(1).";
+            failure_mssg = "Image not loaded?.";
         }
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
 
     /* 3) Close the file. */
  
@@ -3317,12 +3351,13 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
  *
  *		   Verify that the file contains a cache image.
  *
+ *              2) Verify that the file contains the expected data.
+ *
  *		   Verify that only process 0 reads the cache image.
  *
  *		   Verify that all other processes receive the cache 
  *		   image block from process 0.
  *
- *              2) Verify that the file contains the expected data.
  *
  *              3) Close the file.
  *
@@ -3434,36 +3469,56 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank)
     if ( show_progress ) 
         HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
-    /* Verify that only process 0 reads the cache image. */
 
-    if ( show_progress ) 
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
-
-    /* Verify that all other processes receive the cache image block 
-     * from process 0.
+    /* 2) Verify that the file contains the expected data.
+     *
+     *    Verify that only process 0 reads the cache image.
+     *
+     *    Verify that all other processes receive the cache 
+     *    image block from process 0.
      */
+    if ( pass ) {
 
-    if ( show_progress ) 
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
-
+       verify_data_sets(file_id, 0, MAX_NUM_DSETS - 1);
+    }
 
-    /* 2) Verify that the file contains the expected data. */
+    /* Verify that only process 0 reads the cache image. */
+#if H5C_COLLECT_CACHE_STATS
     if ( pass ) {
 
-       verify_data_sets(file_id, 0, MAX_NUM_DSETS - 1);
+        if ( ( ( mpi_rank == 0 ) && ( cache_ptr->images_read != 1 ) ) ||
+             ( ( mpi_rank > 0 )  && ( cache_ptr->images_read != 0 ) ) ) {
+
+            pass = FALSE;
+            failure_mssg = "unexpected images_read.";
+        }
     }
+#endif /* H5C_COLLECT_CACHE_STATS */
+
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
+    /* Verify that all other processes receive the cache image block 
+     * from process 0.
+     * 
+     * Since we have alread verified that only process 0 has read the 
+     * image, it is sufficient to verify that the image was loaded on 
+     * all processes.
+     */
 #if H5C_COLLECT_CACHE_STATS
     if ( pass ) {
 
-        if ( cache_ptr->images_loaded == 0 ) {
+        if ( cache_ptr->images_loaded != 1 ) {
 
             pass = FALSE;
-            failure_mssg = "metadata cache image block not loaded(2).";
+            failure_mssg = "Image not loaded?.";
         }
     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
+    if ( show_progress ) 
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
 
     /* 3) Close the file. */
  
@@ -3754,7 +3809,13 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
         HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
 
-    /* 7) Verify the datasets in the file backwards */
+    /* 7) Verify the datasets in the file backwards 
+     *
+     *    Verify that only process 0 reads the cache image.
+     *
+     *    Verify that all other processes receive the cache 
+     *    image block from process 0.
+     */
 
     i = num_dsets - 1;
     while ( ( pass ) && ( i >= 0 ) ) {
@@ -3763,6 +3824,46 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
         i--;
     }
 
+    if ( ( mpi_rank == 0 ) && ( show_progress ) )
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+    /* Verify that only process 0 reads the cache image. */
+#if H5C_COLLECT_CACHE_STATS
+    if ( pass ) {
+
+        if ( ( ( mpi_rank == 0 ) && ( cache_ptr->images_read != 1 ) ) ||
+             ( ( mpi_rank > 0 )  && ( cache_ptr->images_read != 0 ) ) ) {
+
+            pass = FALSE;
+            failure_mssg = "unexpected images_read.";
+        }
+    }
+#endif /* H5C_COLLECT_CACHE_STATS */
+
+    if ( ( mpi_rank == 0 ) && ( show_progress ) )
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+    /* Verify that all other processes receive the cache image block 
+     * from process 0.
+     * 
+     * Since we have alread verified that only process 0 has read the 
+     * image, it is sufficient to verify that the image was loaded on 
+     * all processes.
+     */
+#if H5C_COLLECT_CACHE_STATS
+    if ( pass ) {
+
+        if ( cache_ptr->images_loaded != 1 ) {
+
+            pass = FALSE;
+            failure_mssg = "Image not loaded?.";
+        }
+    }
+#endif /* H5C_COLLECT_CACHE_STATS */
+
+    if ( ( mpi_rank == 0 ) && ( show_progress ) )
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
 
     /* 8) Close the file */
 
@@ -3776,6 +3877,9 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
         }
     }
 
+    if ( ( mpi_rank == 0 ) && ( show_progress ) )
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
 
     /* 9) Open the file */
 
@@ -3804,7 +3908,13 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
         HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
 
-    /* 10) Verify the datasets in the file */
+    /* 10) Verify the datasets in the file 
+     *
+     *     Verify that only process 0 reads the cache image.
+     *
+     *     Verify that all other processes receive the cache 
+     *     image block from process 0.
+     */
 
     i = 0;
     while ( ( pass ) && ( i < num_dsets ) ) {
@@ -3816,6 +3926,43 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     if ( ( mpi_rank == 0 ) && ( show_progress ) )
         HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
+    /* Verify that only process 0 reads the cache image. */
+#if H5C_COLLECT_CACHE_STATS
+    if ( pass ) {
+
+        if ( ( ( mpi_rank == 0 ) && ( cache_ptr->images_read != 1 ) ) ||
+             ( ( mpi_rank > 0 )  && ( cache_ptr->images_read != 0 ) ) ) {
+
+            pass = FALSE;
+            failure_mssg = "unexpected images_read.";
+        }
+    }
+#endif /* H5C_COLLECT_CACHE_STATS */
+
+    if ( ( mpi_rank == 0 ) && ( show_progress ) )
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
+    /* Verify that all other processes receive the cache image block 
+     * from process 0.
+     * 
+     * Since we have alread verified that only process 0 has read the 
+     * image, it is sufficient to verify that the image was loaded on 
+     * all processes.
+     */
+#if H5C_COLLECT_CACHE_STATS
+    if ( pass ) {
+
+        if ( cache_ptr->images_loaded != 1 ) {
+
+            pass = FALSE;
+            failure_mssg = "Image not loaded?.";
+        }
+    }
+#endif /* H5C_COLLECT_CACHE_STATS */
+
+    if ( ( mpi_rank == 0 ) && ( show_progress ) )
+        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+
 
     /* 11) Delete the datasets in the file */